From 87748fa80cb165d9bf39f7c5a13079a5f182a3af Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 29 Mar 2022 17:52:00 -0400
Subject: [PATCH] Use an inset ripple for contact list items.

Closes #10786

Co-authored-by: Thore Goebel <hello@thore.io>
---
 .../rounded_inset_ripple_background.xml       | 39 +++++++++++++++++++
 .../rounded_inset_ripple_background.xml       |  7 ++++
 .../contact_selection_invite_action_item.xml  |  3 +-
 .../layout/contact_selection_list_item.xml    |  2 +-
 .../contact_selection_new_group_item.xml      |  3 +-
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable-v21/rounded_inset_ripple_background.xml
 create mode 100644 app/src/main/res/drawable/rounded_inset_ripple_background.xml

diff --git a/app/src/main/res/drawable-v21/rounded_inset_ripple_background.xml b/app/src/main/res/drawable-v21/rounded_inset_ripple_background.xml
new file mode 100644
index 0000000000..cccf562b19
--- /dev/null
+++ b/app/src/main/res/drawable-v21/rounded_inset_ripple_background.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:enterFadeDuration="100"
+    android:exitFadeDuration="100">
+
+    <item android:state_selected="true">
+        <inset
+            android:insetLeft="12dp"
+            android:insetRight="12dp"
+            android:insetTop="2dp"
+            android:insetBottom="2dp">
+
+            <shape android:shape="rectangle">
+                <solid android:color="@color/conversation_list_selected_color" />
+                <corners android:radius="18dp" />
+            </shape>
+        </inset>
+    </item>
+
+    <item>
+        <ripple android:color="@color/conversation_list_selected_color">
+            <item android:id="@android:id/mask">
+                <inset
+                    android:insetLeft="12dp"
+                    android:insetRight="12dp"
+                    android:insetTop="2dp"
+                    android:insetBottom="2dp">
+
+                    <shape android:shape="rectangle">
+                        <solid android:color="@color/transparent_black_60" />
+                        <corners android:radius="18dp" />
+                    </shape>
+                </inset>
+            </item>
+            <item android:drawable="@drawable/conversation_list_item_background_default" />
+        </ripple>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/rounded_inset_ripple_background.xml b/app/src/main/res/drawable/rounded_inset_ripple_background.xml
new file mode 100644
index 0000000000..0b29e579fe
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_inset_ripple_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
+    <item android:drawable="@color/core_ultramarine_33" android:state_pressed="true" />
+    <item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
+    <item android:drawable="@drawable/conversation_list_item_background_default" />
+</selector>
diff --git a/app/src/main/res/layout/contact_selection_invite_action_item.xml b/app/src/main/res/layout/contact_selection_invite_action_item.xml
index df13359b0b..148eb5e390 100644
--- a/app/src/main/res/layout/contact_selection_invite_action_item.xml
+++ b/app/src/main/res/layout/contact_selection_invite_action_item.xml
@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     android:minHeight="@dimen/contact_selection_item_height"
     android:paddingStart="@dimen/dsl_settings_gutter"
-    android:paddingEnd="@dimen/dsl_settings_gutter">
+    android:paddingEnd="@dimen/dsl_settings_gutter"
+    android:background="@drawable/rounded_inset_ripple_background">
 
     <ImageView
         android:id="@+id/invite_image"
diff --git a/app/src/main/res/layout/contact_selection_list_item.xml b/app/src/main/res/layout/contact_selection_list_item.xml
index 33ff3e2ce0..030e9ea75b 100644
--- a/app/src/main/res/layout/contact_selection_list_item.xml
+++ b/app/src/main/res/layout/contact_selection_list_item.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/conversation_item_background"
+    android:background="@drawable/rounded_inset_ripple_background"
     android:focusable="true"
     android:minHeight="@dimen/contact_selection_item_height"
     android:paddingStart="@dimen/dsl_settings_gutter"
diff --git a/app/src/main/res/layout/contact_selection_new_group_item.xml b/app/src/main/res/layout/contact_selection_new_group_item.xml
index 23ca55869b..2bf3df4447 100644
--- a/app/src/main/res/layout/contact_selection_new_group_item.xml
+++ b/app/src/main/res/layout/contact_selection_new_group_item.xml
@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     android:minHeight="@dimen/contact_selection_item_height"
     android:paddingStart="@dimen/dsl_settings_gutter"
-    android:paddingEnd="@dimen/dsl_settings_gutter">
+    android:paddingEnd="@dimen/dsl_settings_gutter"
+    android:background="@drawable/rounded_inset_ripple_background">
 
     <ImageView
         android:id="@+id/invite_image"