Merge pull request #6019 from grzesiek2010/COLLECT-5949z

Apply M3 styling to user identity and change reason text fields
getodk · Mar 26, 2024 · 38a4b0e · 38a4b0e
2 parents 2f8d417 + 0f4b444
commit 38a4b0e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/collect_app/src/main/res/layout/changes_reason_dialog.xml b/collect_app/src/main/res/layout/changes_reason_dialog.xml
@@ -62,7 +62,7 @@
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                style="?textInputFilledStyle"
                 android:layout_width="280dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_extra_large">

diff --git a/collect_app/src/main/res/layout/identify_user_dialog.xml b/collect_app/src/main/res/layout/identify_user_dialog.xml
@@ -61,7 +61,7 @@
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                style="?textInputFilledStyle"
                 android:layout_width="280dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_extra_large">

diff --git a/collect_app/src/main/res/layout/widget_answer_text.xml b/collect_app/src/main/res/layout/widget_answer_text.xml
@@ -5,11 +5,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+        style="?textInputFilledStyle"
         android:id="@+id/text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:boxBackgroundColor="?colorSurfaceContainerLow"
         app:errorTextAppearance="?textAppearanceBodyLarge">
 
         <com.google.android.material.textfield.TextInputEditText

diff --git a/collect_app/src/main/res/values/colors.xml b/collect_app/src/main/res/values/colors.xml
@@ -19,7 +19,7 @@
     <color name="colorSurfaceContainerLow">#f7f7f7</color>
     <color name="colorSurfaceContainer">#f7f7f7</color>
     <color name="colorSurfaceContainerHigh">#f7f7f7</color>
-    <color name="colorSurfaceContainerHighest">#ecf5fa</color>
+    <color name="colorSurfaceContainerHighest">#f2f2f2</color>
     <color name="colorSurfaceInverse">#003547</color>
     <color name="colorOnSurfaceInverse">#E1F4FF</color>