From 6f9a5a600985018f56061ad4841fe9ba0af4a675 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 4 Dec 2023 10:20:02 +0100
Subject: [PATCH] Small improvements over reactions layout

---
 .../org/linphone/ui/main/chat/model/MessageModel.kt |  3 ++-
 .../linphone/utils/SlidingPaneBackPressCallback.kt  |  5 ++++-
 app/src/main/res/layout/chat_bubble_incoming.xml    | 11 +----------
 app/src/main/res/layout/chat_bubble_outgoing.xml    | 11 +----------
 app/src/main/res/values/styles.xml                  | 13 +++++++++++++
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index d5b6ca855..94c39c281 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -413,7 +413,8 @@ class MessageModel @WorkerThread constructor(
             }
 
             if (sameReactionTwiceOrMore) {
-                reactionsList += allReactions.size.toString()
+                val count = allReactions.size.toString()
+                reactionsList += " $count"
             }
         }
 
diff --git a/app/src/main/java/org/linphone/utils/SlidingPaneBackPressCallback.kt b/app/src/main/java/org/linphone/utils/SlidingPaneBackPressCallback.kt
index 70b834727..b56bdc140 100644
--- a/app/src/main/java/org/linphone/utils/SlidingPaneBackPressCallback.kt
+++ b/app/src/main/java/org/linphone/utils/SlidingPaneBackPressCallback.kt
@@ -48,7 +48,10 @@ class SlidingPaneBackPressedCallback(private val slidingPaneLayout: SlidingPaneL
             slidingPaneLayout.hideKeyboard()
             slidingPaneLayout.closePane()
         } else {
-            Log.w("$TAG handleOnBackPressed: sliding pane is not open!")
+            Log.w(
+                "$TAG handleOnBackPressed: sliding pane is not open, disabling back press callback!"
+            )
+            isEnabled = true
         }
     }
 
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 0a9812d8d..8e68c4ef5 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -233,21 +233,12 @@
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
+            style="@style/message_reaction_style"
             android:id="@+id/reactions"
             android:onClick="@{showReactionInfoClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-5dp"
-            android:layout_marginBottom="5dp"
-            android:orientation="horizontal"
-            android:background="@drawable/shape_chat_bubble_reactions_background"
             android:text="@{model.reactions, default=@string/emoji_love}"
-            android:textSize="15sp"
-            android:textColor="?attr/color_main2_600"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
             android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintEnd_toEndOf="@id/bubble"
             app:layout_constraintTop_toBottomOf="@id/bubble"
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 1f28862a0..86deecd31 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -195,21 +195,12 @@
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
+            style="@style/message_reaction_style"
             android:id="@+id/reactions"
             android:onClick="@{showReactionInfoClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-5dp"
-            android:layout_marginBottom="5dp"
-            android:orientation="horizontal"
-            android:background="@drawable/shape_chat_bubble_reactions_background"
             android:text="@{model.reactions, default=@string/emoji_love}"
-            android:textSize="20sp"
-            android:textColor="?attr/color_main2_600"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
             android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintEnd_toEndOf="@id/bubble"
             app:layout_constraintTop_toBottomOf="@id/bubble"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e1745f19b..c189566d9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -125,6 +125,19 @@
         <item name="android:elevation">3dp</item>
         <item name="android:background">@drawable/circle_white_button_background</item>
     </style>
+    <style name="message_reaction_style">
+        <item name="android:fontFamily">@font/noto_sans</item>
+        <item name="android:textColor">?attr/color_main2_600</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:paddingStart">10dp</item>
+        <item name="android:paddingEnd">10dp</item>
+        <item name="android:paddingBottom">5dp</item>
+        <item name="android:paddingTop">2dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:layout_marginTop">-15dp</item>
+        <item name="android:layout_marginBottom">10dp</item>
+        <item name="android:background">@drawable/shape_chat_bubble_reactions_background</item>
+    </style>
     <style name="call_numpad_digits_style">
         <item name="android:fontFamily">@font/noto_sans</item>
         <item name="android:textColor">@color/white</item>