From a9a1532e017c93de429dd551e4de34d6d936a1f7 Mon Sep 17 00:00:00 2001
From: Ahmed Radhouane Belkilani <ahmed-radhouane.belkilani@niji.fr>
Date: Wed, 9 Feb 2022 11:08:46 +0100
Subject: [PATCH] #4640

 - change unread counter badge view in item_room to be in consistent place on the screen, to left of date/time.
 - change unread badge color state for dark and light theme to align with iOS.
 - add changelog file related to the issue.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
---
 changelog.d/4640.bugfix                          | 5 +++++
 library/ui-styles/src/main/res/values/colors.xml | 6 +++---
 vector/src/main/res/layout/item_room.xml         | 5 ++---
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/4640.bugfix

diff --git a/changelog.d/4640.bugfix b/changelog.d/4640.bugfix
new file mode 100644
index 0000000000..5095217f2a
--- /dev/null
+++ b/changelog.d/4640.bugfix
@@ -0,0 +1,5 @@
+# [[Issue #4640]](https://github.com/vector-im/element-android/issues/4640) The notification badge jumps around
+
+## Changes :
+- change unread counter badge view in item_room to be in consistent place on the screen, to left of date/time.
+- change unread badge color state for dark and light theme to align with iOS. 
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index ca6f6d3142..48ac48a8ca 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -58,9 +58,9 @@
 
     <!-- Other colors, which are not in the palette -->
     <attr name="vctr_unread_room_badge" format="color" />
-    <color name="vctr_unread_room_badge_light">#FF61708B</color>
-    <color name="vctr_unread_room_badge_dark">#FF61708B</color>
-    <color name="vctr_unread_room_badge_black">#FF61708B</color>
+    <color name="vctr_unread_room_badge_light">@color/palette_gray_200</color>
+    <color name="vctr_unread_room_badge_dark">@color/palette_gray_250</color>
+    <color name="vctr_unread_room_badge_black">@color/palette_gray_250</color>
 
     <attr name="vctr_fab_label_bg" format="color" />
     <color name="vctr_fab_label_bg_light">@android:color/white</color>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index defff5eeeb..68e3a85008 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -165,7 +165,6 @@
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/roomNameView"
         app:layout_constraintEnd_toStartOf="@id/roomLastEventTimeView"
-        app:layout_constraintStart_toEndOf="@id/roomDraftBadge"
         app:layout_constraintTop_toTopOf="@id/roomNameView"
         tools:background="@drawable/bg_unread_highlight"
         tools:text="4"
@@ -190,9 +189,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
-        android:textAlignment="viewStart"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAlignment="viewStart"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/roomNameView"
@@ -203,12 +202,12 @@
         android:id="@+id/roomTypingView"
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
-        android:textAlignment="viewStart"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
         android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="2"
+        android:textAlignment="viewStart"
         android:textColor="?colorPrimary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"