From bef704d4459837d1341883676759e8bef47715f7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 3 Oct 2023 16:55:42 +0200
Subject: [PATCH] Moved account unread notification count in drawer

---
 app/src/main/res/layout/account_list_cell.xml | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml
index c5316bf7f..7852bc25f 100644
--- a/app/src/main/res/layout/account_list_cell.xml
+++ b/app/src/main/res/layout/account_list_cell.xml
@@ -46,21 +46,6 @@
             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"
@@ -109,12 +94,29 @@
             app:layout_constraintTop_toBottomOf="@id/name"
             app:layout_constraintBottom_toTopOf="@id/separator"/>
 
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/notifications_count"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="16dp"
+            android:gravity="center"
+            android:background="@drawable/shape_red_round"
+            android:text="@{String.valueOf(model.notificationsCount), default=`1`}"
+            android:textColor="@color/white"
+            android:textSize="13sp"
+            android:visibility="@{model.notificationsCount > 0 ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/menu"/>
+
         <ImageView
             android:onClick="@{() -> model.openMenu(menu)}"
             android:id="@+id/menu"
-            android:layout_width="@dimen/icon_size"
+            android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_marginEnd="16dp"
+            android:padding="15dp"
+            android:adjustViewBounds="true"
             android:src="@drawable/dots_three_vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/name"