From 5f6c02e2ca3dbf6f5795be1d4f79c3aaf7218c85 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Nov 2024 15:04:09 +0100
Subject: [PATCH] Fixed minor UI issues

---
 .../ui/main/chat/fragment/ConversationsListFragment.kt        | 2 +-
 .../java/org/linphone/ui/main/chat/model/ConversationModel.kt | 4 +++-
 app/src/main/res/layout-land/main_activity_top_bar.xml        | 4 ++--
 app/src/main/res/layout/main_activity_top_bar.xml             | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
index 060d6c1fe..ab26aaaaa 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
@@ -127,7 +127,7 @@ class ConversationsListFragment : AbstractMainFragment() {
                 val modalBottomSheet = ConversationDialogFragment(
                     model.isMuted.value == true,
                     model.isGroup,
-                    model.isReadOnly,
+                    model.isReadOnly.value == true,
                     (model.unreadMessageCount.value ?: 0) > 0,
                     { // onDismiss
                         adapter.resetSelection()
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt
index 4e3bacc9c..34c2a919e 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt
@@ -57,7 +57,7 @@ class ConversationModel @WorkerThread constructor(val chatRoom: ChatRoom) {
 
     val isEncrypted = chatRoom.hasCapability(Capabilities.Encrypted.toInt())
 
-    val isReadOnly = chatRoom.isReadOnly
+    val isReadOnly = MutableLiveData<Boolean>()
 
     val subject = MutableLiveData<String>()
 
@@ -172,6 +172,7 @@ class ConversationModel @WorkerThread constructor(val chatRoom: ChatRoom) {
 
         isMuted.postValue(chatRoom.muted)
         isEphemeral.postValue(chatRoom.isEphemeralEnabled)
+        isReadOnly.postValue(chatRoom.isReadOnly)
         Log.d(
             "$TAG Ephemeral messages are [${if (chatRoom.isEphemeralEnabled) "enabled" else "disabled"}], lifetime is [${chatRoom.ephemeralLifetime}]"
         )
@@ -257,6 +258,7 @@ class ConversationModel @WorkerThread constructor(val chatRoom: ChatRoom) {
         coreContext.postOnCoreThread {
             chatRoom.leave()
             Log.i("$TAG Group conversation [$id] has been leaved")
+            isReadOnly.postValue(true)
         }
     }
 
diff --git a/app/src/main/res/layout-land/main_activity_top_bar.xml b/app/src/main/res/layout-land/main_activity_top_bar.xml
index 7a9a91b7d..f8aff32c7 100644
--- a/app/src/main/res/layout-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-land/main_activity_top_bar.xml
@@ -52,11 +52,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
-            android:layout_marginTop="2dp"
             layout="@layout/contact_avatar"
             bind:model="@{viewModel.account}"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index bf86aaa39..5953e8530 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -52,11 +52,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
-            android:layout_marginTop="2dp"
             layout="@layout/contact_avatar"
             bind:model="@{viewModel.account}"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"