From bafd2817ee4131d94304589c1d54d4ef6608a361 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Fri, 26 Jun 2020 17:11:39 -0300
Subject: [PATCH] Fix pending member activity background color.

---
 .../group_pending_member_invites_fragment.xml   | 17 +++++++++--------
 app/src/main/res/values/attrs.xml               |  3 ---
 app/src/main/res/values/themes.xml              |  6 ------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/group_pending_member_invites_fragment.xml b/app/src/main/res/layout/group_pending_member_invites_fragment.xml
index 0ab7b72d97..2eb2138010 100644
--- a/app/src/main/res/layout/group_pending_member_invites_fragment.xml
+++ b/app/src/main/res/layout/group_pending_member_invites_fragment.xml
@@ -4,8 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/pending_member_background"
+    android:background="?pref_divider"
     android:fillViewport="true"
+    android:paddingTop="0dp"
     tools:context="org.thoughtcrime.securesms.groups.ui.pendingmemberinvites.PendingMemberInvitesFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -17,7 +18,7 @@
             android:id="@+id/cardView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:cardBackgroundColor="?android:attr/windowBackground"
+            app:cardBackgroundColor="?android:windowBackground"
             app:layout_constraintTop_toTopOf="parent">
 
             <LinearLayout
@@ -45,9 +46,9 @@
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="24dp"
                     android:text="@string/PendingMembersActivity_you_have_no_pending_invites"
+                    android:textColor="?android:textColorSecondary"
                     android:visibility="gone"
-                    tools:visibility="visible"
-                    android:textColor="?pending_member_empty_text_color" />
+                    tools:visibility="visible" />
 
                 <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
                     android:id="@+id/members_you_invited"
@@ -62,8 +63,8 @@
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            app:cardBackgroundColor="?android:attr/windowBackground"
+            android:layout_marginTop="12dp"
+            app:cardBackgroundColor="?android:windowBackground"
             app:layout_constraintTop_toBottomOf="@+id/cardView">
 
             <LinearLayout
@@ -91,9 +92,9 @@
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="8dp"
                     android:text="@string/PendingMembersActivity_no_pending_invites_by_other_group_members"
+                    android:textColor="?android:textColorSecondary"
                     android:visibility="gone"
-                    tools:visibility="visible"
-                    android:textColor="?pending_member_empty_text_color" />
+                    tools:visibility="visible" />
 
                 <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
                     android:id="@+id/members_others_invited"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 535345102b..7d316a9305 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -286,9 +286,6 @@
     <attr name="megaphone_reactions_shade" format="color"/>
     <attr name="megaphone_reactions_close_tint" format="color"/>
 
-    <attr name="pending_member_background" format="color" />
-    <attr name="pending_member_empty_text_color" format="color" />
-
     <attr name="debuglog_color_none" format="color" />
     <attr name="debuglog_color_verbose" format="color" />
     <attr name="debuglog_color_debug" format="color" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2ca95ca3e7..980438d5b7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -430,9 +430,6 @@
         <item name="shared_contact_details_titlebar">@color/grey_400</item>
         <item name="shared_contact_item_button_color">@color/core_grey_02</item>
 
-        <item name="pending_member_background">@color/core_grey_02</item>
-        <item name="pending_member_empty_text_color">@color/core_grey_60</item>
-
         <item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_light</item>
         <item name="contact_selection_invite_icon">@drawable/ic_invite_circle_light</item>
         <item name="contact_selection_checkbox_background">@drawable/contact_selection_checkbox_light</item>
@@ -729,9 +726,6 @@
         <item name="shared_contact_details_titlebar">@color/grey_900</item>
         <item name="shared_contact_item_button_color">@color/core_grey_85</item>
 
-        <item name="pending_member_background">@color/core_grey_80</item>
-        <item name="pending_member_empty_text_color">@color/core_grey_25</item>
-
         <item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_dark</item>
         <item name="contact_selection_invite_icon">@drawable/ic_invite_circle_dark</item>
         <item name="contact_selection_checkbox_background">@drawable/contact_selection_checkbox_dark</item>