From 75d1f719ae6d0127604b96a18a9fd98ab53723d5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 26 Jan 2024 11:00:53 +0100
Subject: [PATCH] Fixed favorites caret not switching direction in landscape +
 conversation title in landscape not displayed properly + show suggestions SIP
 addresses domain instead of just username + remove default account address
 from suggestions

---
 .../ui/main/history/model/ContactOrSuggestionModel.kt    | 2 ++
 .../ui/main/viewmodel/AddressSelectionViewModel.kt       | 5 +++++
 app/src/main/res/layout-land/contacts_list_fragment.xml  | 2 +-
 app/src/main/res/layout/chat_conversation_fragment.xml   | 9 ++++-----
 .../main/res/layout/start_call_suggestion_list_cell.xml  | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/history/model/ContactOrSuggestionModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/ContactOrSuggestionModel.kt
index 749ed3c85..a87d978c5 100644
--- a/app/src/main/java/org/linphone/ui/main/history/model/ContactOrSuggestionModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/model/ContactOrSuggestionModel.kt
@@ -45,6 +45,8 @@ class ContactOrSuggestionModel @WorkerThread constructor(
         address.username.orEmpty()
     }
 
+    val sipUri = address.asStringUriOnly()
+
     val initials = AppUtils.getInitials(name)
 
     val avatarModel = MutableLiveData<ContactAvatarModel>()
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
index eca7d7889..5eda304f6 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
@@ -251,6 +251,11 @@ abstract class AddressSelectionViewModel @UiThread constructor() : DefaultAccoun
                             continue
                         }
                     }
+                    val defaultAccountAddress = coreContext.core.defaultAccount?.params?.identityAddress
+                    if (defaultAccountAddress != null && address.weakEqual(defaultAccountAddress)) {
+                        Log.i("$TAG Removing from suggestions current default account address")
+                        continue
+                    }
 
                     val model = ContactOrSuggestionModel(address) {
                         coreContext.startCall(address)
diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml
index 4a9dbfe2d..61768ab53 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -93,7 +93,7 @@
                         android:layout_marginEnd="16dp"
                         android:layout_marginTop="20dp"
                         android:text="@string/contacts_list_favourites_title"
-                        android:drawableEnd="@drawable/caret_up"
+                        android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
                         android:drawableTint="@color/gray_main2_600"/>
 
                     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 122af3d21..16aeb84f3 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -84,7 +84,6 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginStart="5dp"
                 coilAvatar="@{viewModel.avatarModel}"
-                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toEndOf="@id/back"
                 app:layout_constraintTop_toTopOf="@id/back" />
 
@@ -125,7 +124,7 @@
                 android:gravity="center_vertical"
                 app:layout_constraintEnd_toStartOf="@id/start_call"
                 app:layout_constraintStart_toEndOf="@id/avatar"
-                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintTop_toTopOf="@id/avatar"
                 app:layout_constraintBottom_toTopOf="@id/muted"/>
 
             <ImageView
@@ -136,7 +135,7 @@
                 android:visibility="@{viewModel.isMuted ? View.VISIBLE : View.GONE, default=gone}"
                 app:layout_constraintStart_toStartOf="@id/title"
                 app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintBottom_toBottomOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/avatar"
                 app:tint="@color/orange_main_400"/>
 
             <ImageView
@@ -147,8 +146,8 @@
                 android:padding="15dp"
                 android:adjustViewBounds="true"
                 android:src="@drawable/dots_three_vertical"
-                app:layout_constraintTop_toTopOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/back"
+                app:layout_constraintTop_toTopOf="@id/avatar"
+                app:layout_constraintBottom_toBottomOf="@id/avatar"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:tint="?attr/color_main2_500"/>
 
diff --git a/app/src/main/res/layout/start_call_suggestion_list_cell.xml b/app/src/main/res/layout/start_call_suggestion_list_cell.xml
index bfd964be7..6b64359e5 100644
--- a/app/src/main/res/layout/start_call_suggestion_list_cell.xml
+++ b/app/src/main/res/layout/start_call_suggestion_list_cell.xml
@@ -38,7 +38,7 @@
             android:id="@+id/name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@{model.name, default=`John Doe`}"
+            android:text="@{model.sipUri, default=`john.doe@sip.linphone.org`}"
             android:textSize="14sp"
             android:layout_marginStart="10dp"
             app:layout_constraintStart_toEndOf="@id/avatar"