Merge branch 'develop' into app-and-os-deprecation-milestone-3

oppia · Sep 11, 2023 · b8747f7 · b8747f7
2 parents eada6c9 + a1ba8bd
commit b8747f7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/app/src/main/res/color/component_color_text_layout.xml b/app/src/main/res/color/component_color_text_layout.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/color_palette_edit_text_inactive_color" android:state_focused="false"/>
+  <item android:color="@color/color_palette_edit_text_active_color" android:state_focused="true"/>
+</selector>
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
@@ -225,4 +225,6 @@
   <color name="color_palette_nps_selected_text_color">@color/color_def_white</color>
   <color name="color_palette_nps_selected_background_color">@color/color_def_oppia_green</color>
   <color name="color_palette_nps_unselected_background_color">@color/color_def_pale_green</color>
+  <color name="color_palette_edit_text_inactive_color">@color/color_def_black_87</color>
+  <color name="color_palette_edit_text_active_color">@color/color_def_white</color>
 </resources>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
@@ -265,4 +265,6 @@
   <color name="color_palette_survey_disabled_button_text_color">@color/color_def_chooser_grey</color>
   <color name="color_palette_button_text_color">@color/color_def_persian_green</color>
   <color name="color_palette_edit_text_unselected_color">@color/color_def_grey</color>
+  <color name="color_palette_edit_text_inactive_color">@color/color_def_black_87</color>
+  <color name="color_palette_edit_text_active_color">@color/color_def_black_87</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -170,7 +170,7 @@
     <item name="boxCornerRadiusBottomStart">@dimen/text_input_layout_corner_radius</item>
     <item name="boxCornerRadiusTopEnd">@dimen/text_input_layout_corner_radius</item>
     <item name="boxCornerRadiusTopStart">@dimen/text_input_layout_corner_radius</item>
-    <item name="boxStrokeColor">@color/component_color_shared_text_input_layout_stroke_color</item>
+    <item name="boxStrokeColor">@color/component_color_text_layout</item>
     <item name="boxStrokeWidth">@dimen/text_input_layout_stroke_width</item>
     <item name="errorEnabled">true</item>
     <item name="errorIconTint">@color/component_color_shared_text_input_layout_error_color</item>