From 32acd6e029c974e16841b53b2a3ab528d9ac625f Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Mon, 2 Sep 2024 16:17:52 +1000
Subject: [PATCH] Fixing up styling of Prominent buttons and "view_user" to
 work better on different bg colors

---
 .../main/res/color/prominent_button_color.xml |  2 +-
 .../drawable/conversation_view_background.xml |  9 -------
 ...inent_outline_button_medium_background.xml | 26 ++++++++++++++-----
 app/src/main/res/layout/view_user.xml         |  2 +-
 4 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 app/src/main/res/drawable/conversation_view_background.xml

diff --git a/app/src/main/res/color/prominent_button_color.xml b/app/src/main/res/color/prominent_button_color.xml
index 39985565d1..911a0c5429 100644
--- a/app/src/main/res/color/prominent_button_color.xml
+++ b/app/src/main/res/color/prominent_button_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/gray50"/>
+    <item android:state_enabled="false" android:color="?android:textColorTertiary"/>
     <item android:color="?prominentButtonColor"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/conversation_view_background.xml b/app/src/main/res/drawable/conversation_view_background.xml
deleted file mode 100644
index 50e38698b4..0000000000
--- a/app/src/main/res/drawable/conversation_view_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:colorControlHighlight">
-
-    <item>
-        <color android:color="?colorPrimary" />
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/prominent_outline_button_medium_background.xml b/app/src/main/res/drawable/prominent_outline_button_medium_background.xml
index 4bde2f855c..503b30c158 100644
--- a/app/src/main/res/drawable/prominent_outline_button_medium_background.xml
+++ b/app/src/main/res/drawable/prominent_outline_button_medium_background.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?prominentButtonColor">
-    <item>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <solid android:color="?colorPrimary"/>
+            <solid android:color="@android:color/transparent"/>
             <corners android:radius="@dimen/medium_button_corner_radius" />
             <stroke
-                android:color="?prominentButtonColor"
+                android:color="?android:textColorTertiary"
                 android:width="@dimen/border_thickness" />
         </shape>
     </item>
-</ripple>
+    <item>
+        <ripple
+            android:color="?prominentButtonColor">
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@android:color/transparent"/>
+                    <corners android:radius="@dimen/medium_button_corner_radius" />
+                    <stroke
+                        android:color="?prominentButtonColor"
+                        android:width="@dimen/border_thickness" />
+                </shape>
+            </item>
+        </ripple>
+    </item>
+</selector>
+
diff --git a/app/src/main/res/layout/view_user.xml b/app/src/main/res/layout/view_user.xml
index 826b3fffc9..965efe7780 100644
--- a/app/src/main/res/layout/view_user.xml
+++ b/app/src/main/res/layout/view_user.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:background="@drawable/conversation_view_background"
+    android:background="?attr/selectableItemBackground"
     android:contentDescription="@string/AccessibilityId_contact"
     android:orientation="vertical">