From f2413288ca7010fba3b0ccd85395434e4fdd7077 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Mon, 2 Sep 2024 15:58:12 +1000
Subject: [PATCH] Fixing styling issue in unread scroll to bottom button

---
 app/src/main/res/layout/activity_conversation_v2.xml | 2 +-
 app/src/main/res/values/attrs.xml                    | 1 -
 app/src/main/res/values/themes.xml                   | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index d8e6b1fe73..db8a6a2b3c 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -199,7 +199,7 @@
             android:layout_centerHorizontal="true"
             android:layout_alignParentTop="true"
             android:background="@drawable/rounded_rectangle"
-            android:backgroundTint="?conversation_unread_count_indicator_background">
+            android:backgroundTint="?backgroundSecondary">
 
             <TextView
                 android:id="@+id/unreadCountTextView"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index b55d951473..c867e808ab 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -177,7 +177,6 @@
     <attr name="mention_candidates_view_background" format="color|reference"/>
     <attr name="scroll_to_bottom_button_background" format="color|reference"/>
     <attr name="scroll_to_bottom_button_border" format="color|reference"/>
-    <attr name="conversation_unread_count_indicator_background" format="color|reference"/>
 
     <attr name="verification_background" format="color"/>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 662d811064..69acb6d381 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -386,7 +386,6 @@
         <item name="mention_candidates_view_background">@color/classic_dark_2</item>
         <item name="scroll_to_bottom_button_background">@color/classic_dark_1</item>
         <item name="scroll_to_bottom_button_border">@color/classic_dark_3</item>
-        <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
         <item name="message_selected">@color/classic_dark_2</item>
     </style>
 
@@ -476,7 +475,6 @@
         <item name="mention_candidates_view_background">?colorCellBackground</item>
         <item name="scroll_to_bottom_button_background">@color/classic_light_4</item>
         <item name="scroll_to_bottom_button_border">@color/classic_light_2</item>
-        <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
         <item name="message_selected">@color/classic_light_4</item>
 
     </style>
@@ -562,7 +560,6 @@
         <item name="mention_candidates_view_background">@color/ocean_dark_2</item>
         <item name="scroll_to_bottom_button_background">@color/ocean_dark_4</item>
         <item name="scroll_to_bottom_button_border">?colorPrimary</item>
-        <item name="conversation_unread_count_indicator_background">@color/ocean_dark_4</item>
         <item name="message_selected">@color/ocean_dark_1</item>
 
     </style>
@@ -649,7 +646,6 @@
         <item name="mention_candidates_view_background">?colorCellBackground</item>
         <item name="scroll_to_bottom_button_background">?input_bar_button_background_opaque</item>
         <item name="scroll_to_bottom_button_border">?input_bar_button_background_opaque_border</item>
-        <item name="conversation_unread_count_indicator_background">?colorAccent</item>
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
         <item name="conversation_unread_background_color">@color/ocean_light_5</item>
         <item name="conversation_pinned_icon_color">?android:textColorSecondary</item>
@@ -732,7 +728,6 @@
         <item name="mention_candidates_view_background">@color/classic_dark_2</item>
         <item name="scroll_to_bottom_button_background">@color/classic_dark_1</item>
         <item name="scroll_to_bottom_button_border">@color/classic_dark_3</item>
-        <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
         <item name="message_selected">@color/classic_dark_2</item>
     </style>