From f0988f37f3cc6f1a1750d9033d7213967f756624 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 4 Mar 2022 11:31:28 -0400
Subject: [PATCH] Update UI for View More  in contact lists.

---
 .../contacts/ContactsCursorLoader.java        |  2 +-
 .../main/res/layout/contacts_expand_item.xml  | 26 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
index 85d7c4a5d..e2da6abfe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
@@ -58,7 +58,7 @@ public class ContactsCursorLoader extends AbstractContactsCursorLoader {
     public static final int FLAG_HIDE_RECENT_HEADER    = 1 << 7;
     public static final int FLAG_GROUPS_AFTER_CONTACTS = 1 << 8;
     public static final int FLAG_STORIES               = 1 << 9;
-    public static final int FLAG_ALL                   = FLAG_PUSH | FLAG_SMS | FLAG_ACTIVE_GROUPS | FLAG_INACTIVE_GROUPS | FLAG_SELF | FLAG_STORIES;
+    public static final int FLAG_ALL                   = FLAG_PUSH | FLAG_SMS | FLAG_ACTIVE_GROUPS | FLAG_INACTIVE_GROUPS | FLAG_SELF;
   }
 
   private static final int RECENT_CONVERSATION_MAX = 25;
diff --git a/app/src/main/res/layout/contacts_expand_item.xml b/app/src/main/res/layout/contacts_expand_item.xml
index 82bd3e0ab..f6904b318 100644
--- a/app/src/main/res/layout/contacts_expand_item.xml
+++ b/app/src/main/res/layout/contacts_expand_item.xml
@@ -3,15 +3,31 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="56dp"
+    android:background="?selectableItemBackground"
     android:paddingHorizontal="@dimen/dsl_settings_gutter">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:contentDescription="@string/ExpandModel__show_more"
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/image"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@color/signal_button_secondary_ripple"
+        android:importantForAccessibility="no"
+        android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_chevron_down_20" />
+        app:shapeAppearance="@style/ShapeAppearanceOverlay.Signal.Circle"
+        app:srcCompat="@drawable/ic_chevron_down_20"
+        app:tint="@color/signal_icon_tint_primary" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:paddingHorizontal="16dp"
+        android:text="@string/ExpandModel__view_more"
+        android:textAppearance="@style/Signal.Text.Body"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/image" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aab3131a4..232dadca2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4602,7 +4602,7 @@
 
     <!-- endregion -->
     <!-- Content description for expand contacts chevron -->
-    <string name="ExpandModel__show_more">Show more</string>
+    <string name="ExpandModel__view_more">View more</string>
 
     <!-- EOF -->