From e5f227ba35cf238de6b8946ba3e715dae09dfb47 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 9 Dec 2024 13:49:16 +0100
Subject: [PATCH] Do not list ourselves in group conversation participants if
 we have left, reworked disabled/encrypted conversation info box

---
 .../viewmodel/ConversationInfoViewModel.kt    | 32 ++++++++-------
 .../chat_conversation_secured_first_event.xml | 41 +++++++++----------
 ...n_send_area_disabled_unsecured_warning.xml | 41 +++++++++----------
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
index 7d7215864..c12359ce3 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
@@ -556,21 +556,23 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi
                 participantsList.add(model)
             }
 
-            // Add ourselves at the end of the list
-            val meParticipant = chatRoom.me
-            if (meParticipant != null) {
-                val model = ParticipantModel(
-                    meParticipant.address,
-                    selfAdmin,
-                    isParticipantAdmin = selfAdmin,
-                    showMenu = false,
-                    isParticipantMyself = true,
-                    onMenuClicked = { view, model ->
-                        // openMenu
-                        showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
-                    }
-                )
-                participantsList.add(model)
+            if (!chatRoom.isReadOnly) {
+                // Add ourselves at the end of the list
+                val meParticipant = chatRoom.me
+                if (meParticipant != null) {
+                    val model = ParticipantModel(
+                        meParticipant.address,
+                        selfAdmin,
+                        isParticipantAdmin = selfAdmin,
+                        showMenu = false,
+                        isParticipantMyself = true,
+                        onMenuClicked = { view, model ->
+                            // openMenu
+                            showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
+                        }
+                    )
+                    participantsList.add(model)
+                }
             }
         }
 
diff --git a/app/src/main/res/layout/chat_conversation_secured_first_event.xml b/app/src/main/res/layout/chat_conversation_secured_first_event.xml
index 8135e588d..c6bfda8f6 100644
--- a/app/src/main/res/layout/chat_conversation_secured_first_event.xml
+++ b/app/src/main/res/layout/chat_conversation_secured_first_event.xml
@@ -17,8 +17,9 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:contentDescription="@null"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
             android:background="@drawable/shape_squircle_main2_200_chat_event_border"
-            app:layout_constraintWidth_max="300dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -26,32 +27,31 @@
 
         <ImageView
             android:id="@+id/secured_icon"
-            android:layout_width="@dimen/small_icon_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="5dp"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             android:paddingTop="3dp"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
             android:src="@drawable/lock_simple_bold"
             app:tint="@color/blue_info_500"
             app:layout_constraintTop_toTopOf="@id/secured_title"
-            app:layout_constraintBottom_toBottomOf="@id/secured_title"
-            app:layout_constraintEnd_toStartOf="@id/secured_title"/>
+            app:layout_constraintBottom_toBottomOf="@id/secured_subtitle"
+            app:layout_constraintStart_toStartOf="@id/secured_background"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
             android:id="@+id/secured_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="15dp"
             android:text="@string/conversation_end_to_end_encrypted_event_title"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentTop="true"
             android:textSize="12sp"
             android:textColor="@color/blue_info_500"
-            app:layout_constraintWidth_max="280dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/secured_icon"
+            app:layout_constraintEnd_toEndOf="@id/secured_background"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -59,17 +59,16 @@
             android:id="@+id/secured_subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            android:paddingBottom="5dp"
-            android:gravity="center"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginEnd="15dp"
             android:text="@string/conversation_end_to_end_encrypted_event_subtitle"
             android:textColor="?attr/color_grey_400"
             android:textSize="12sp"
-            app:layout_constraintWidth_max="300dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/secured_title"/>
+            app:layout_constraintStart_toEndOf="@id/secured_icon"
+            app:layout_constraintEnd_toEndOf="@id/secured_background"
+            app:layout_constraintTop_toBottomOf="@id/secured_title"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml b/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml
index 972de6cc3..95184a9a5 100644
--- a/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area_disabled_unsecured_warning.xml
@@ -17,8 +17,9 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:contentDescription="@null"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
             android:background="@drawable/shape_squircle_main2_200_chat_event_border"
-            app:layout_constraintWidth_max="300dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -26,32 +27,31 @@
 
         <ImageView
             android:id="@+id/disabled_icon"
-            android:layout_width="@dimen/small_icon_size"
-            android:layout_height="0dp"
-            android:layout_marginEnd="5dp"
+            android:layout_width="@dimen/icon_size"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             android:paddingTop="3dp"
             android:adjustViewBounds="true"
             android:contentDescription="@null"
             android:src="@drawable/lock_simple_open_bold"
             app:tint="@color/orange_warning_600"
             app:layout_constraintTop_toTopOf="@id/disabled_title"
-            app:layout_constraintBottom_toBottomOf="@id/disabled_title"
-            app:layout_constraintEnd_toStartOf="@id/disabled_title"/>
+            app:layout_constraintBottom_toBottomOf="@id/disabled_subtitle"
+            app:layout_constraintStart_toStartOf="@id/disabled_background"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
             android:id="@+id/disabled_title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="15dp"
             android:text="@string/conversation_warning_disabled_because_not_secured_title"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentTop="true"
             android:textSize="12sp"
             android:textColor="@color/orange_warning_600"
-            app:layout_constraintWidth_max="280dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/disabled_icon"
+            app:layout_constraintEnd_toEndOf="@id/disabled_background"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -59,17 +59,16 @@
             android:id="@+id/disabled_subtitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:paddingStart="5dp"
-            android:paddingEnd="5dp"
-            android:paddingBottom="5dp"
-            android:gravity="center"
+            android:layout_marginStart="8dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginEnd="15dp"
             android:text="@string/conversation_warning_disabled_because_not_secured_subtitle"
             android:textColor="?attr/color_grey_400"
             android:textSize="12sp"
-            app:layout_constraintWidth_max="300dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/disabled_title"/>
+            app:layout_constraintStart_toEndOf="@id/disabled_icon"
+            app:layout_constraintEnd_toEndOf="@id/disabled_background"
+            app:layout_constraintTop_toBottomOf="@id/disabled_title"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>