mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-21 21:58:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix call layout and chat list

Browse source
This commit is contained in:
Erwan Croze 2018-09-27 11:23:28 +02:00
parent f1cdcfeba0
commit 8d8e0aa7e2
7 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/layout/call.xml
View file

@ -93,8 +93,8 @@
<ImageView
android:id="@+id/contact_picture"
android:layout_width="180dp"
android:layout_height="180dp"
android:layout_width="225dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:contentDescription="@string/content_description_contact_picture"
android:src="@drawable/avatar_big_secure1"/>

9
res/layout/call_incoming.xml
View file

@ -47,9 +47,10 @@
android:id="@+id/contact_detail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/menu"
android:layout_below="@id/top_bar"
android:paddingTop="10dp"
android:layout_above="@+id/menu">
android:gravity="center"
android:paddingTop="10dp">
<TextView
android:id="@+id/contact_name"
@ -68,8 +69,8 @@
android:layout_height="wrap_content"
android:layout_below="@id/contact_name"
android:layout_centerHorizontal="true"
android:paddingBottom="10dp"
android:layout_gravity="center_vertical|center_horizontal" />
android:layout_gravity="center_vertical|center_horizontal"
android:paddingBottom="10dp"/>
<RelativeLayout
android:id="@+id/avatar_layout"

11
res/layout/call_outgoing.xml
View file

@ -47,6 +47,7 @@
android:layout_height="match_parent"
android:layout_above="@id/menu"
android:layout_below="@id/top_bar"
android:gravity="center"
android:paddingTop="10dp">
<TextView
@ -56,8 +57,8 @@
android:layout_height="wrap_content"
android:layout_below="@id/avatar_layout"
android:layout_centerHorizontal="true"
android:paddingTop="5dp"
android:gravity="center_vertical|center_horizontal" />
android:gravity="center_vertical|center_horizontal"
android:paddingTop="5dp"/>
<TextView
android:id="@+id/contact_number"
@ -66,8 +67,8 @@
android:layout_height="wrap_content"
android:layout_below="@id/contact_name"
android:layout_centerHorizontal="true"
android:paddingBottom="10dp"
android:layout_gravity="center_vertical|center_horizontal" />
android:layout_gravity="center_vertical|center_horizontal"
android:paddingBottom="10dp"/>
<RelativeLayout
android:id="@+id/avatar_layout"
@ -79,7 +80,7 @@
<ImageView
android:id="@+id/contact_picture"
android:layout_width="200dp"
android:layout_width="225dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:contentDescription="@string/content_description_contact_picture"

14
res/layout/chat_bubble.xml
View file

@ -130,13 +130,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/image"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_below="@id/file_name"
android:layout_centerHorizontal="true"
android:scaleType="centerInside"/>
<ImageView
android:id="@+id/image"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_below="@id/file_name"
android:layout_centerHorizontal="true"
android:scaleType="centerInside"/>
<Button
android:id="@+id/open_file"

1
res/values-fr/strings.xml
View file

@ -47,6 +47,7 @@
<string name="no">Non</string>
<string name="yes">Oui</string>
<string name="link_account">Associer votre compte</string>
<string name="you">Vous</string>
<!--Launch screen-->
<string name="app_description">le client SIP <i>libre</i></string>
<!--Assistant-->

1
res/values/strings.xml
View file

@ -53,6 +53,7 @@
<string name="yes">Yes</string>
<string name="link_account">Link your account</string>
<string name="update_available">An update is available</string>
<string name="you">You</string>
<!-- Launch screen -->
<string name="app_description"></string>

7
src/android/org/linphone/chat/ChatRoomsAdapter.java
View file

@ -60,6 +60,7 @@ import java.util.List;
import static android.text.format.DateUtils.isToday;
import static org.linphone.LinphoneUtils.getZrtpStatus;
import static org.linphone.LinphoneUtils.hasContentFileSharing;
import static org.linphone.LinphoneUtils.isUs;
public class ChatRoomsAdapter extends ListSelectionAdapter {
@ -230,7 +231,11 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
if (contact != null) {
holder.lastMessageSenderView.setText(contact.getFullName() + mContext.getString(R.string.separator));
} else {
holder.lastMessageSenderView.setText(LinphoneUtils.getAddressDisplayName(lastMessageSenderAddress) + mContext.getString(R.string.separator));
if (isUs(LinphoneManager.getLc().getDefaultProxyConfig(), lastMessage.getFromAddress().getUsername())) {
holder.lastMessageSenderView.setText(mContext.getString(R.string.you) + mContext.getString(R.string.separator));
} else {
holder.lastMessageSenderView.setText(LinphoneUtils.getAddressDisplayName(lastMessageSenderAddress) + mContext.getString(R.string.separator));
}
}
}
}