From ba919d4ecc8a7ab8e10ff317cc9aa960029d57aa Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 2 Feb 2023 13:36:39 -0400
Subject: [PATCH] Add proper styling for text inputs.

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

diff --git a/app/src/main/res/layout/username_edit_fragment.xml b/app/src/main/res/layout/username_edit_fragment.xml
index bf154942e..5f63417a9 100644
--- a/app/src/main/res/layout/username_edit_fragment.xml
+++ b/app/src/main/res/layout/username_edit_fragment.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_x_24"
+        app:navigationIcon="@drawable/ic_arrow_left_24"
         app:title="@string/UsernameEditFragment_username"
         app:titleTextAppearance="@style/Signal.Text.TitleLarge" />
 
@@ -47,7 +47,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/summary"
         app:suffixTextColor="@color/signal_colorOnSurface"
-        tools:suffixText="| #1234">
+        tools:suffixText="| .1234">
 
         <EditText
             android:id="@+id/username_text"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8aa44a886..c0c43286c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -479,11 +479,11 @@
     <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>
-        <item name="boxBackgroundColor">@color/signal_background_secondary</item>
-        <item name="boxCornerRadiusBottomEnd">10dp</item>
-        <item name="boxCornerRadiusBottomStart">10dp</item>
-        <item name="boxCornerRadiusTopEnd">10dp</item>
-        <item name="boxCornerRadiusTopStart">10dp</item>
+        <item name="boxBackgroundColor">@color/signal_colorSurfaceVariant</item>
+        <item name="boxCornerRadiusBottomEnd">0dp</item>
+        <item name="boxCornerRadiusBottomStart">0dp</item>
+        <item name="boxCornerRadiusTopEnd">4dp</item>
+        <item name="boxCornerRadiusTopStart">4dp</item>
         <item name="boxStrokeWidth">0dp</item>
         <item name="boxStrokeWidthFocused">0dp</item>
         <item name="hintTextColor">@color/signal_text_hint</item>