From 553ca7bb6852db611b0ae43d9eb543b8cda4c5b4 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Thu, 17 Jun 2021 23:57:39 -0400
Subject: [PATCH] close #1338

---
 app/src/main/res/layout/dialog_profilepic.xml             | 4 +++-
 .../main/res/layout/fragment_direct_messages_thread.xml   | 8 ++++----
 app/src/main/res/layout/layout_dm_media_share.xml         | 1 +
 app/src/main/res/layout/layout_gif_picker.xml             | 1 -
 app/src/main/res/values/strings.xml                       | 1 +
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/dialog_profilepic.xml b/app/src/main/res/layout/dialog_profilepic.xml
index adb825d3..a30481c5 100644
--- a/app/src/main/res/layout/dialog_profilepic.xml
+++ b/app/src/main/res/layout/dialog_profilepic.xml
@@ -35,12 +35,14 @@
         style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
         android:layout_marginRight="8dp"
         android:layout_marginBottom="4dp"
-        android:layout_gravity="bottom|end"
         android:backgroundTint="@color/black_a50"
         android:text="@string/action_download"
+        android:textColor="@color/white"
         android:visibility="gone"
         app:icon="@drawable/ic_download"
+        app:iconTint="@color/white"
         tools:visibility="visible" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_direct_messages_thread.xml b/app/src/main/res/layout/fragment_direct_messages_thread.xml
index df098c98..27c6716c 100644
--- a/app/src/main/res/layout/fragment_direct_messages_thread.xml
+++ b/app/src/main/res/layout/fragment_direct_messages_thread.xml
@@ -225,17 +225,17 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:visibility="gone"
-            app:counter_time_color="@color/white"
+            app:counter_time_color="?attr/colorOnPrimary"
             app:layout_constraintBottom_toBottomOf="@id/input_bg"
             app:layout_constraintEnd_toEndOf="@id/input_bg"
             app:layout_constraintStart_toStartOf="@id/input"
             app:layout_constraintTop_toBottomOf="@id/chats_barrier"
             app:slide_to_cancel_arrow="@drawable/recv_ic_arrow"
-            app:slide_to_cancel_arrow_color="@color/white"
+            app:slide_to_cancel_arrow_color="?attr/colorOnPrimary"
             app:slide_to_cancel_bounds="0dp"
             app:slide_to_cancel_margin_right="16dp"
-            app:slide_to_cancel_text="Slide To Cancel"
-            app:slide_to_cancel_text_color="@color/white"
+            app:slide_to_cancel_text="@string/slide_to_cancel"
+            app:slide_to_cancel_text_color="?attr/colorOnPrimary"
             tools:visibility="visible" />
 
         <awais.instagrabber.customviews.RecordButton
diff --git a/app/src/main/res/layout/layout_dm_media_share.xml b/app/src/main/res/layout/layout_dm_media_share.xml
index dfe9e45c..6e4f74de 100644
--- a/app/src/main/res/layout/layout_dm_media_share.xml
+++ b/app/src/main/res/layout/layout_dm_media_share.xml
@@ -50,6 +50,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+        android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/profile_pic"
         app:layout_constraintEnd_toStartOf="@id/type_icon"
         app:layout_constraintStart_toEndOf="@id/profile_pic"
diff --git a/app/src/main/res/layout/layout_gif_picker.xml b/app/src/main/res/layout/layout_gif_picker.xml
index b8b736b9..a92ceaf4 100644
--- a/app/src/main/res/layout/layout_gif_picker.xml
+++ b/app/src/main/res/layout/layout_gif_picker.xml
@@ -51,7 +51,6 @@
         android:hint="@string/search_giphy"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
-        android:textColor="@color/white"
         android:textColorHint="@color/grey_500"
         app:layout_constraintBottom_toTopOf="@id/gif_list"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cea7976b..ee749e62 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -521,4 +521,5 @@
     <string name="sending">Sending...</string>
     <string name="share_via_dm">Share via DM</string>
     <string name="share_link">Share link…</string>
+    <string name="slide_to_cancel">Slide to Cancel</string>
 </resources>