From 4a3b8af6afcbfdc2a93d11fae552cb3ccfc81ec0 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 29 Aug 2022 10:35:30 -0300
Subject: [PATCH] Utilize proper control color for text cursor in gift badge
 message.

---
 app/src/main/res/layout/dsl_multiline_text_input.xml | 4 ++--
 app/src/main/res/values/styles.xml                   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/dsl_multiline_text_input.xml b/app/src/main/res/layout/dsl_multiline_text_input.xml
index 99c985664..db528c49c 100644
--- a/app/src/main/res/layout/dsl_multiline_text_input.xml
+++ b/app/src/main/res/layout/dsl_multiline_text_input.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_layout"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5e1160b93..022f4018a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -467,6 +467,10 @@
         <item name="android:layoutDirection">ltr</item>
     </style>
 
+    <style name="ThemeOverlay.Signal.TextInputEditText.FilledBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox">
+        <item name="colorControlActivated">@color/signal_colorPrimary</item>
+    </style>
+
     <style name="Widget.Signal.TextInputLayout.FilledBox" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
         <item name="android:paddingStart">@dimen/dsl_settings_gutter</item>
         <item name="android:paddingEnd">@dimen/dsl_settings_gutter</item>
@@ -477,8 +481,9 @@
         <item name="boxCornerRadiusTopStart">10dp</item>
         <item name="boxStrokeWidth">0dp</item>
         <item name="boxStrokeWidthFocused">0dp</item>
-        <item name="hintTextColor">@color/signal_accent_primary</item>
+        <item name="hintTextColor">@color/signal_text_hint</item>
         <item name="android:textColorHint">@color/signal_text_hint</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Signal.TextInputEditText.FilledBox</item>
     </style>
 
     <style name="Widget.Signal.TextInputLayout.FilledBox.ContactNameEditor">