From df9a346de547504cf2bde5a4cbdd561b8d57b296 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 13 May 2025 13:48:15 +0200
Subject: [PATCH] Reworked unread count indicators

---
 .../java/org/linphone/core/CoreContext.kt     |  6 +++--
 .../main/res/layout-land/bottom_nav_bar.xml   | 23 ++++++-------------
 .../layout-land/call_actions_bottom_sheet.xml | 22 +++++-------------
 .../call_conference_actions_bottom_sheet.xml  | 22 +++++-------------
 app/src/main/res/layout/account_list_cell.xml | 11 +++------
 app/src/main/res/layout/bottom_nav_bar.xml    | 22 +++++-------------
 .../res/layout/call_actions_bottom_sheet.xml  | 22 +++++-------------
 .../call_conference_actions_bottom_sheet.xml  | 22 +++++-------------
 .../res/layout/chat_conversation_fragment.xml | 10 +++-----
 app/src/main/res/layout/chat_list_cell.xml    | 10 +++-----
 app/src/main/res/values/dimen.xml             |  1 +
 app/src/main/res/values/styles.xml            | 12 ++++++++++
 12 files changed, 63 insertions(+), 120 deletions(-)

diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 184bc189d..dc0af6299 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -260,8 +260,10 @@ class CoreContext
                 if (core.defaultAccount == null && accounts.isNotEmpty()) {
                     val firstAccount = accounts.firstOrNull()
                     if (firstAccount != null) {
-                        Log.w("$TAG Default account is null but account list isn't empty, using account [${firstAccount.
-                        params.identityAddress?.asStringUriOnly()}] as default")
+                        val sipUri = firstAccount.params.identityAddress?.asStringUriOnly()
+                        Log.w(
+                            "$TAG Default account is null but account list isn't empty, using account [$sipUri] as default"
+                        )
                         core.defaultAccount = firstAccount
                     }
                 }
diff --git a/app/src/main/res/layout-land/bottom_nav_bar.xml b/app/src/main/res/layout-land/bottom_nav_bar.xml
index 727ac6e96..8ddb35647 100644
--- a/app/src/main/res/layout-land/bottom_nav_bar.xml
+++ b/app/src/main/res/layout-land/bottom_nav_bar.xml
@@ -50,15 +50,11 @@
             app:layout_constraintTop_toBottomOf="@id/contacts" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/missed_calls"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
             android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toTopOf="@id/calls"
             app:layout_constraintEnd_toEndOf="@id/calls"/>
@@ -81,16 +77,11 @@
             app:layout_constraintTop_toBottomOf="@id/calls" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/unread_messages"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
-            android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
+            android:text="@{String.valueOf(viewModel.unreadMessages), default=`100`}"
             android:visibility="@{viewModel.unreadMessages > 0 &amp;&amp; !viewModel.hideConversations ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toTopOf="@id/conversations"
             app:layout_constraintEnd_toEndOf="@id/conversations"/>
diff --git a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml
index d8c0c2f14..377d5fc47 100644
--- a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml
@@ -91,18 +91,13 @@
             app:tint="@color/in_call_button_tint_color" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/calls_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/calls_list"
@@ -156,18 +151,13 @@
             app:layout_constraintBottom_toBottomOf="@id/chat"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/unread_messages_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/chat"
diff --git a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
index 2807de4b7..0d9a2e5e0 100644
--- a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
@@ -87,18 +87,13 @@
             app:layout_constraintTop_toBottomOf="@id/main_actions" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/calls_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/calls_list"
@@ -138,18 +133,13 @@
             app:layout_constraintEnd_toEndOf="@id/chat_label"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/unread_messages_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/chat"
diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml
index 94a7ff754..5f562216a 100644
--- a/app/src/main/res/layout/account_list_cell.xml
+++ b/app/src/main/res/layout/account_list_cell.xml
@@ -110,17 +110,12 @@
             app:layout_constraintEnd_toStartOf="@id/notifications_count"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/notifications_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginEnd="16dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(model.notificationsCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{model.notificationsCount > 0 ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml
index cb2bbe0c6..f0ad8f7b0 100644
--- a/app/src/main/res/layout/bottom_nav_bar.xml
+++ b/app/src/main/res/layout/bottom_nav_bar.xml
@@ -56,18 +56,13 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/missed_calls"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="50dp"
             android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toTopOf="@id/calls"
             app:layout_constraintStart_toStartOf="@id/calls"
@@ -94,18 +89,13 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/unread_messages"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="50dp"
             android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{viewModel.unreadMessages > 0 &amp;&amp; !viewModel.hideConversations ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toTopOf="@id/conversations"
             app:layout_constraintStart_toStartOf="@id/conversations"
diff --git a/app/src/main/res/layout/call_actions_bottom_sheet.xml b/app/src/main/res/layout/call_actions_bottom_sheet.xml
index 0437465fd..c3786f09e 100644
--- a/app/src/main/res/layout/call_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_actions_bottom_sheet.xml
@@ -91,18 +91,13 @@
             app:layout_constraintTop_toBottomOf="@id/main_actions" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/calls_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/calls_list"
@@ -156,18 +151,13 @@
             app:layout_constraintBottom_toBottomOf="@id/chat"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/unread_messages_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/transfer_label"
             app:layout_constraintStart_toStartOf="@id/chat"
diff --git a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
index 16287c53d..c23e7b9df 100644
--- a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
@@ -87,18 +87,13 @@
             app:layout_constraintTop_toBottomOf="@id/main_actions" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/calls_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/calls_list"
@@ -138,18 +133,13 @@
             app:layout_constraintEnd_toEndOf="@id/screen_sharing"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/unread_messages_count"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="40dp"
             android:layout_marginTop="25dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="13sp"
-            android:paddingBottom="2dp"
             android:visibility="@{viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/screen_sharing_label"
             app:layout_constraintStart_toStartOf="@id/chat"
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 48a70bf0a..eda6ea147 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -348,17 +348,13 @@
                     app:layout_constraintBottom_toTopOf="@id/send_area" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/default_text_style"
+                    style="@style/unread_count_text_style"
                     android:id="@+id/unread_messages"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="@dimen/unread_count_indicator_size"
+                    android:layout_height="@dimen/unread_count_indicator_size"
                     android:layout_marginTop="-13dp"
                     android:layout_marginStart="-11dp"
-                    android:gravity="center"
-                    android:background="@drawable/shape_red_round"
                     android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}"
-                    android:textColor="?attr/color_on_main"
-                    android:textSize="13sp"
                     android:visibility="@{viewModel.isUserScrollingUp &amp;&amp; viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}"
                     app:layout_constraintTop_toTopOf="@id/scroll_to_bottom"
                     app:layout_constraintStart_toEndOf="@id/scroll_to_bottom"/>
diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml
index 77d4e4c90..43375ce96 100644
--- a/app/src/main/res/layout/chat_list_cell.xml
+++ b/app/src/main/res/layout/chat_list_cell.xml
@@ -144,16 +144,12 @@
             app:layout_constraintBottom_toBottomOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/unread_count_text_style"
             android:id="@+id/notifications_count"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="@dimen/unread_count_indicator_size"
+            android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginEnd="10dp"
-            android:gravity="center"
-            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(model.unreadMessageCount), default=`99`}"
-            android:textColor="?attr/color_on_main"
-            android:textSize="11sp"
             android:visibility="@{model.unreadMessageCount > 0 ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/date_time"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index f46aad053..f44b6a412 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -94,6 +94,7 @@
     <dimen name="chat_bubble_start_margin_when_avatar_displayed">10dp</dimen>
     <dimen name="chat_conversation_header_avatar_start_margin_if_back_button">5dp</dimen>
     <dimen name="chat_conversation_header_avatar_start_margin_if_no_back_button">15dp</dimen>
+    <dimen name="unread_count_indicator_size">24dp</dimen>
 
     <dimen name="chat_room_emoji_picker_height">300dp</dimen>
     <dimen name="chat_room_participants_list_max_height">300dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5b54e32e7..b77910e78 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -187,4 +187,16 @@
         <item name="android:adjustViewBounds">true</item>
         <item name="android:scaleType">centerCrop</item>
     </style>
+    <style name="unread_count_text_style">
+        <item name="android:fontFamily">@font/noto_sans</item>
+        <item name="android:textColor">?attr/color_on_main</item>
+        <item name="android:textColorHint">?attr/color_hint_text</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/shape_red_round</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:paddingBottom">2dp</item>
+        <item name="android:autoSizeTextType">uniform</item>
+        <item name="android:autoSizeMinTextSize">8sp</item>
+        <item name="android:autoSizeStepGranularity">1sp</item>
+    </style>
 </resources>