mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 19:38:08 +00:00
Some UI fix
This commit is contained in:
parent
880a546724
commit
12a41b8325
6 changed files with 24 additions and 17 deletions
|
|
@ -134,7 +134,8 @@ Mobile Security Intense"
|
|||
android:layout_width="250dp"
|
||||
android:layout_height="250dp"
|
||||
android:background="@color/transparent"
|
||||
android:src="@drawable/avatar_mask_border"/>
|
||||
android:src="@drawable/avatar_mask_border"
|
||||
android:visibility="visible"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/layout_button"
|
||||
|
|
@ -151,7 +152,7 @@ Mobile Security Intense"
|
|||
android:background="#595959"
|
||||
android:text="retour"
|
||||
android:textColor="#ffffff"
|
||||
android:visibility="gone"/>
|
||||
android:visibility="visible"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/valider"
|
||||
|
|
@ -162,18 +163,19 @@ Mobile Security Intense"
|
|||
android:background="#ff6600"
|
||||
android:text="valider"
|
||||
android:textColor="#ffffff"
|
||||
android:visibility="gone"/>
|
||||
android:visibility="visible"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/code_sms"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:background="#c4c4c4"
|
||||
android:background="#f3f3f3"
|
||||
android:inputType="number"
|
||||
android:maxLines="1"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/colorB"
|
||||
android:visibility="gone"/>
|
||||
android:visibility="visible"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<View
|
||||
|
|
|
|||
|
|
@ -45,9 +45,10 @@
|
|||
android:id="@+id/secure"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="18dp"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="15dp"
|
||||
android:layout_marginRight="15dp"
|
||||
android:layout_toLeftOf="@+id/adminLayout"
|
||||
android:src="@drawable/security_1"
|
||||
android:visibility="visible"/>
|
||||
|
||||
|
|
@ -123,20 +124,21 @@
|
|||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toRightOf="@id/avatar_layout"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_toLeftOf="@id/secure"
|
||||
android:layout_marginLeft="10dp">
|
||||
android:layout_toRightOf="@id/avatar_layout"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/name"
|
||||
style="@style/font6"
|
||||
android:lines="1"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"/>
|
||||
android:layout_alignParentTop="true"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:maxLines="1"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,8 @@
|
|||
android:contentDescription="@string/content_description_unread_chat_message"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
android:textSize="18sp"/>
|
||||
android:textAlignment="center"
|
||||
android:textSize="16sp"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@id/lastMessageLayout"
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@
|
|||
<bool name="disable_chat">false</bool>
|
||||
<bool name="disable_chat_message_notification">false</bool>
|
||||
<bool name="disable_chat_send_file">false</bool>
|
||||
<string name="temp_photo_name">linphone-android-photo-temp</string>
|
||||
<string name="temp_photo_name_with_date">linphone-android-photo-%s</string>
|
||||
<string name="temp_photo_name">msi-android-photo-temp</string>
|
||||
<string name="temp_photo_name_with_date">msi-android-photo-%s</string>
|
||||
<bool name="lower_space_between_chat_bubbles_if_same_person">true</bool>
|
||||
|
||||
<!-- Contacts -->
|
||||
|
|
|
|||
|
|
@ -204,6 +204,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
|
|||
holder.messageStatus.setVisibility(View.GONE);
|
||||
holder.messageSendingInProgress.setVisibility(View.GONE);
|
||||
holder.imdmLayout.setVisibility(View.GONE);
|
||||
holder.imdmIcon.setVisibility(View.GONE);
|
||||
holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
|
||||
|
||||
if (isEditionEnabled()) {
|
||||
|
|
@ -574,6 +575,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
|
|||
});
|
||||
}
|
||||
}
|
||||
notifyDataSetChanged();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ public class GroupInfoAdapter extends BaseAdapter {
|
|||
if (mHideAdminFeatures) {
|
||||
delete.setVisibility(View.INVISIBLE);
|
||||
isAdmin.setOnClickListener(null); // Do not allow not admin to remove it's rights but display admins
|
||||
isNotAdmin.setVisibility(View.GONE); // Hide not admin button for not admin participants
|
||||
isNotAdmin.setVisibility(ca.isAdmin() ? View.GONE : View.INVISIBLE); // Hide not admin button for not admin participants
|
||||
} else if (mChatRoom != null) {
|
||||
boolean found = false;
|
||||
for (Participant p : mChatRoom.getParticipants()) {
|
||||
|
|
@ -202,7 +202,7 @@ public class GroupInfoAdapter extends BaseAdapter {
|
|||
}
|
||||
}
|
||||
if (!found) {
|
||||
isNotAdmin.setVisibility(View.GONE); // Hide not admin button for participant not yet added so even if user click it it won't have any effect
|
||||
isNotAdmin.setVisibility(ca.isAdmin() ? View.GONE : View.INVISIBLE); // Hide not admin button for participant not yet added so even if user click it it won't have any effect
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue