From cb20acfa5232c067163c6acf481a2fe2567787e5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 27 Sep 2023 15:05:28 +0200
Subject: [PATCH] Display unread messages & missed calls counters on each
 account in side menu

---
 .../org/linphone/ui/main/model/AccountModel.kt    |  3 +++
 app/src/main/res/drawable/shape_red_round.xml     |  5 +++++
 app/src/main/res/layout-land/bottom_nav_bar.xml   |  2 +-
 .../main/res/layout-land/call_extra_actions.xml   | 11 ++++++-----
 app/src/main/res/layout/account_list_cell.xml     | 15 +++++++++++++++
 app/src/main/res/layout/bottom_nav_bar.xml        |  2 +-
 app/src/main/res/layout/call_extra_actions.xml    |  9 +++++----
 7 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_red_round.xml

diff --git a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
index cc9174f47..e09afef90 100644
--- a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
@@ -57,6 +57,8 @@ class AccountModel @WorkerThread constructor(
 
     val showTrust = MutableLiveData<Boolean>()
 
+    val notificationsCount = MutableLiveData<Int>()
+
     private val accountListener = object : AccountListenerStub() {
         @WorkerThread
         override fun onRegistrationStateChanged(
@@ -137,6 +139,7 @@ class AccountModel @WorkerThread constructor(
         }
 
         isDefault.postValue(coreContext.core.defaultAccount == account)
+        notificationsCount.postValue(account.unreadChatMessageCount + account.missedCallsCount)
 
         val state = account.state
         registrationState.postValue(state)
diff --git a/app/src/main/res/drawable/shape_red_round.xml b/app/src/main/res/drawable/shape_red_round.xml
new file mode 100644
index 000000000..f8bd6c05d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_red_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="44dp" android:height="44dp" />
+    <solid android:color="@color/red_danger_500"/>
+</shape>
\ No newline at end of file
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 3326adb6b..cd7ae7d76 100644
--- a/app/src/main/res/layout-land/bottom_nav_bar.xml
+++ b/app/src/main/res/layout-land/bottom_nav_bar.xml
@@ -67,7 +67,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:gravity="center"
-            android:background="@drawable/shape_orange_round"
+            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}"
             android:textColor="@color/white"
             android:textSize="13sp"
diff --git a/app/src/main/res/layout-land/call_extra_actions.xml b/app/src/main/res/layout-land/call_extra_actions.xml
index 769866bf9..bc59ee999 100644
--- a/app/src/main/res/layout-land/call_extra_actions.xml
+++ b/app/src/main/res/layout-land/call_extra_actions.xml
@@ -87,17 +87,18 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
-            android:id="@+id/missed_calls"
+            android:id="@+id/calls_count"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginStart="50dp"
+            android:layout_marginStart="40dp"
+            android:layout_marginTop="25dp"
             android:gravity="center"
-            android:background="@drawable/shape_orange_round"
+            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
             android:textColor="@color/white"
             android:textSize="13sp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toTopOf="@id/calls_list"
+            app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/calls_list"
             app:layout_constraintEnd_toEndOf="@id/calls_list"/>
 
@@ -207,8 +208,8 @@
             app:layout_constraintTop_toBottomOf="@id/chat" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/in_call_extra_action_label_style"
             android:id="@+id/chat_label"
+            style="@style/in_call_extra_action_label_style"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingBottom="15dp"
diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml
index f3945c634..c5316bf7f 100644
--- a/app/src/main/res/layout/account_list_cell.xml
+++ b/app/src/main/res/layout/account_list_cell.xml
@@ -46,6 +46,21 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/missed_calls"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_marginEnd="3dp"
+            android:gravity="center"
+            android:background="@drawable/shape_red_round"
+            android:text="@{String.valueOf(model.notificationsCount), default=`1`}"
+            android:textColor="@color/white"
+            android:textSize="8sp"
+            android:visibility="@{model.notificationsCount > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            app:layout_constraintBottom_toBottomOf="@id/avatar"
+            app:layout_constraintEnd_toEndOf="@id/avatar"/>
+
         <ImageView
             android:id="@+id/trust_badge"
             android:layout_width="@dimen/avatar_presence_badge_size"
diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml
index 4dfb6a549..80786cf8a 100644
--- a/app/src/main/res/layout/bottom_nav_bar.xml
+++ b/app/src/main/res/layout/bottom_nav_bar.xml
@@ -74,7 +74,7 @@
             android:layout_marginStart="50dp"
             android:layout_marginTop="5dp"
             android:gravity="center"
-            android:background="@drawable/shape_orange_round"
+            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}"
             android:textColor="@color/white"
             android:textSize="13sp"
diff --git a/app/src/main/res/layout/call_extra_actions.xml b/app/src/main/res/layout/call_extra_actions.xml
index a86569738..b4dd1e575 100644
--- a/app/src/main/res/layout/call_extra_actions.xml
+++ b/app/src/main/res/layout/call_extra_actions.xml
@@ -87,17 +87,18 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
-            android:id="@+id/missed_calls"
+            android:id="@+id/calls_count"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginStart="50dp"
+            android:layout_marginStart="40dp"
+            android:layout_marginTop="25dp"
             android:gravity="center"
-            android:background="@drawable/shape_orange_round"
+            android:background="@drawable/shape_red_round"
             android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
             android:textColor="@color/white"
             android:textSize="13sp"
             android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toTopOf="@id/calls_list"
+            app:layout_constraintTop_toBottomOf="@id/main_actions"
             app:layout_constraintStart_toStartOf="@id/calls_list"
             app:layout_constraintEnd_toEndOf="@id/calls_list"/>