From ca2772536bf21a4a6b40604cf6be19ad01f6bafc Mon Sep 17 00:00:00 2001
From: Ben Henning <henning.benmax@gmail.com>
Date: Fri, 29 Jul 2022 01:37:41 -0700
Subject: [PATCH] Revert "Fixes part of #4195 : Added dark mode support to
 QuestionPlayer and Exploration (#4382)"

This reverts commit c3b42a4c573e21d368d76d18b3b0584e351340aa.
---
 app/src/main/res/drawable/color_cursor.xml    |  2 +-
 .../drawable/edit_text_background_border.xml  |  4 ++--
 .../edit_text_background_border_blue.xml      |  4 ++--
 .../res/drawable/ic_arrow_down_grey_24dp.xml  |  1 -
 .../res/drawable/ic_arrow_right_grey_24dp.xml |  1 -
 .../drawable/submitted_answer_background.xml  |  4 ++--
 .../activity_input_interaction_view_test.xml  | 14 ++++++-------
 .../res/layout/fraction_interaction_item.xml  |  2 --
 .../math_expression_interactions_item.xml     |  2 --
 .../layout/numeric_input_interaction_item.xml |  2 --
 .../layout/ratio_input_interaction_item.xml   |  2 --
 .../main/res/layout/submitted_answer_item.xml |  2 +-
 .../layout/text_input_interaction_item.xml    |  1 -
 .../main/res/values-night/color_palette.xml   | 21 -------------------
 app/src/main/res/values-v21/themes.xml        |  1 -
 app/src/main/res/values/color_defs.xml        | 14 +------------
 app/src/main/res/values/color_palette.xml     | 21 -------------------
 app/src/main/res/values/component_colors.xml  | 14 ++-----------
 app/src/main/res/values/styles.xml            |  3 +--
 app/src/main/res/values/themes.xml            |  1 -
 20 files changed, 19 insertions(+), 97 deletions(-)

diff --git a/app/src/main/res/drawable/color_cursor.xml b/app/src/main/res/drawable/color_cursor.xml
index 4573a4b96a4..2f93b37ddcf 100644
--- a/app/src/main/res/drawable/color_cursor.xml
+++ b/app/src/main/res/drawable/color_cursor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <size android:width="2dp" />
+  <size android:width="0.5dp" />
   <solid android:color="@color/component_color_shared_edit_text_cursor_color" />
 </shape>
diff --git a/app/src/main/res/drawable/edit_text_background_border.xml b/app/src/main/res/drawable/edit_text_background_border.xml
index 4bc3a0fd077..3dd64225973 100644
--- a/app/src/main/res/drawable/edit_text_background_border.xml
+++ b/app/src/main/res/drawable/edit_text_background_border.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <corners android:radius="4dp" />
-  <solid android:color="@color/component_color_shared_input_interaction_edit_text_background_color" />
+  <solid android:color="@color/color_def_white" />
   <stroke
     android:width="1dp"
-    android:color="@color/component_color_shared_input_interaction_edit_text_not_selected_border_color" />
+    android:color="@color/oppia_grey_border_dark" />
 </shape>
diff --git a/app/src/main/res/drawable/edit_text_background_border_blue.xml b/app/src/main/res/drawable/edit_text_background_border_blue.xml
index 8291c80cc18..852ab5a8df3 100644
--- a/app/src/main/res/drawable/edit_text_background_border_blue.xml
+++ b/app/src/main/res/drawable/edit_text_background_border_blue.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <corners android:radius="4dp" />
-  <solid android:color="@color/component_color_shared_input_interaction_edit_text_background_color" />
+  <solid android:color="@color/color_def_white" />
   <stroke
     android:width="2dp"
-    android:color="@color/component_color_shared_input_interaction_edit_text_border_color" />
+    android:color="@color/color_def_oppia_dark_blue" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_arrow_down_grey_24dp.xml b/app/src/main/res/drawable/ic_arrow_down_grey_24dp.xml
index d96f89eef1e..59518af0471 100644
--- a/app/src/main/res/drawable/ic_arrow_down_grey_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_down_grey_24dp.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
-  android:tint="@color/component_color_shared_arrow_down_grey_color"
   android:viewportWidth="24"
   android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_arrow_right_grey_24dp.xml b/app/src/main/res/drawable/ic_arrow_right_grey_24dp.xml
index bbdcc03ccde..9053c17788f 100644
--- a/app/src/main/res/drawable/ic_arrow_right_grey_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_right_grey_24dp.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/component_color_shared_arrow_right_grey_color"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/submitted_answer_background.xml b/app/src/main/res/drawable/submitted_answer_background.xml
index 486748ac486..67dc05683d9 100644
--- a/app/src/main/res/drawable/submitted_answer_background.xml
+++ b/app/src/main/res/drawable/submitted_answer_background.xml
@@ -4,9 +4,9 @@
   android:shape="rectangle">
   <stroke
     android:width="1dp"
-    android:color="@color/component_color_shared_submitted_answer_item_stroke_color"/>
+    android:color="@color/color_def_black"/>
   <corners
     android:radius="4dp"/>
   <solid
-    android:color="@color/component_color_shared_submitted_answer_item_solid_color"/>
+    android:color="@color/color_def_white"/>
 </shape>
diff --git a/app/src/main/res/layout/activity_input_interaction_view_test.xml b/app/src/main/res/layout/activity_input_interaction_view_test.xml
index d4a4ce03572..fa9b7cb3920 100644
--- a/app/src/main/res/layout/activity_input_interaction_view_test.xml
+++ b/app/src/main/res/layout/activity_input_interaction_view_test.xml
@@ -57,8 +57,8 @@
         android:paddingBottom="8dp"
         android:singleLine="true"
         android:text="@={fractionInteractionViewModel.answerText}"
-        android:textColor="@color/component_color_shared_input_interaction_edit_text_color"
-        android:textColorHint="@color/component_color_shared_edit_text_hint_color"
+        android:textColor="@color/oppia_primary_text"
+        android:textColorHint="@color/edit_text_hint"
         android:textSize="14sp"
         android:textStyle="italic"
         app:textChangedListener="@{fractionInteractionViewModel.answerTextWatcher}" />
@@ -73,7 +73,7 @@
         android:fontFamily="sans-serif"
         android:minHeight="32dp"
         android:text="@{fractionInteractionViewModel.errorMessage}"
-        android:textColor="@color/component_color_shared_input_error_color"
+        android:textColor="@color/edit_text_error"
         android:textSize="12sp"
         android:visibility="@{fractionInteractionViewModel.errorMessage.length() > 0 ? View.VISIBLE : View.INVISIBLE}" />
 
@@ -94,8 +94,8 @@
         android:paddingBottom="8dp"
         android:singleLine="true"
         android:text="@={ratioInteractionInputViewModel.answerText}"
-        android:textColor="@color/component_color_shared_input_interaction_edit_text_color"
-        android:textColorHint="@color/component_color_shared_edit_text_hint_color"
+        android:textColor="@color/oppia_primary_text"
+        android:textColorHint="@color/edit_text_hint"
         android:textSize="14sp"
         android:textStyle="italic"
         app:textChangedListener="@{ratioInteractionInputViewModel.answerTextWatcher}" />
@@ -110,7 +110,7 @@
         android:fontFamily="sans-serif"
         android:minHeight="32dp"
         android:text="@{ratioInteractionInputViewModel.errorMessage}"
-        android:textColor="@color/component_color_shared_input_error_color"
+        android:textColor="@color/edit_text_error"
         android:textSize="12sp"
         android:visibility="@{ratioInteractionInputViewModel.errorMessage.length() > 0 ? View.VISIBLE : View.INVISIBLE}" />
 
@@ -140,7 +140,7 @@
         android:fontFamily="sans-serif"
         android:minHeight="32dp"
         android:text="@{numericInputViewModel.errorMessage}"
-        android:textColor="@color/component_color_shared_input_error_color"
+        android:textColor="@color/edit_text_error"
         android:textSize="12sp"
         android:visibility="@{numericInputViewModel.errorMessage.length() > 0 ? View.VISIBLE : View.INVISIBLE}" />
 
diff --git a/app/src/main/res/layout/fraction_interaction_item.xml b/app/src/main/res/layout/fraction_interaction_item.xml
index 4ac40582241..f361f591c1a 100644
--- a/app/src/main/res/layout/fraction_interaction_item.xml
+++ b/app/src/main/res/layout/fraction_interaction_item.xml
@@ -26,7 +26,6 @@
       android:hint="@{viewModel.hintText}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
-      android:textColorHint="@color/component_color_shared_edit_text_hint_color"
       app:textChangedListener="@{viewModel.answerTextWatcher}"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -36,7 +35,6 @@
       android:id="@+id/fraction_input_error"
       style="@style/InputInteractionErrorTextView"
       android:text="@{viewModel.errorMessage}"
-      android:textColor="@color/component_color_shared_input_error_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/fraction_input_interaction_view"
diff --git a/app/src/main/res/layout/math_expression_interactions_item.xml b/app/src/main/res/layout/math_expression_interactions_item.xml
index 6676f721cc8..23bc09f680a 100644
--- a/app/src/main/res/layout/math_expression_interactions_item.xml
+++ b/app/src/main/res/layout/math_expression_interactions_item.xml
@@ -26,7 +26,6 @@
       app:placeholder="@{viewModel.hintText}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
-      android:textColorHint="@color/component_color_shared_edit_text_hint_color"
       app:textChangedListener="@{viewModel.answerTextWatcher}"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -37,7 +36,6 @@
       android:id="@+id/math_expression_input_error"
       style="@style/InputInteractionErrorTextView"
       android:text="@{viewModel.errorMessage}"
-      android:textColor="@color/component_color_shared_input_error_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/math_expression_input_interaction_view"
diff --git a/app/src/main/res/layout/numeric_input_interaction_item.xml b/app/src/main/res/layout/numeric_input_interaction_item.xml
index bea2d287176..542881cbedf 100644
--- a/app/src/main/res/layout/numeric_input_interaction_item.xml
+++ b/app/src/main/res/layout/numeric_input_interaction_item.xml
@@ -27,7 +27,6 @@
       android:hint="@string/numeric_input_hint"
       android:inputType="numberDecimal"
       android:text="@={viewModel.answerText}"
-      android:textColorHint="@color/component_color_shared_edit_text_hint_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
@@ -36,7 +35,6 @@
     <TextView
       style="@style/InputInteractionErrorTextView"
       android:text="@{viewModel.errorMessage}"
-      android:textColor="@color/component_color_shared_input_error_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/numeric_input_interaction_view"
diff --git a/app/src/main/res/layout/ratio_input_interaction_item.xml b/app/src/main/res/layout/ratio_input_interaction_item.xml
index 7b3b19d26ce..c4a0ba6137a 100644
--- a/app/src/main/res/layout/ratio_input_interaction_item.xml
+++ b/app/src/main/res/layout/ratio_input_interaction_item.xml
@@ -29,7 +29,6 @@
       android:hint="@{viewModel.hintText}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
-      android:textColorHint="@color/component_color_shared_edit_text_hint_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
@@ -39,7 +38,6 @@
       android:id="@+id/ratio_input_error"
       style="@style/InputInteractionErrorTextView"
       android:text="@{viewModel.errorMessage}"
-      android:textColor="@color/component_color_shared_input_error_color"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/ratio_input_interaction_view"
diff --git a/app/src/main/res/layout/submitted_answer_item.xml b/app/src/main/res/layout/submitted_answer_item.xml
index 48524cf665e..eefa16492f5 100644
--- a/app/src/main/res/layout/submitted_answer_item.xml
+++ b/app/src/main/res/layout/submitted_answer_item.xml
@@ -50,7 +50,7 @@
       android:contentDescription="@{viewModel.submittedAnswerContentDescription}"
       android:padding="12dp"
       android:text="@{viewModel.submittedAnswer}"
-      android:textColor="@color/component_color_shared_submitted_answer_item_text_color"
+      android:textColor="@color/oppia_primary_text"
       android:textSize="16sp"
       android:visibility="gone"
       app:layout_constrainedWidth="true"
diff --git a/app/src/main/res/layout/text_input_interaction_item.xml b/app/src/main/res/layout/text_input_interaction_item.xml
index 3ef9463ff59..1e50a348dbb 100644
--- a/app/src/main/res/layout/text_input_interaction_item.xml
+++ b/app/src/main/res/layout/text_input_interaction_item.xml
@@ -25,7 +25,6 @@
       android:hint="@{viewModel.hintText}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
-      android:textColorHint="@color/component_color_shared_edit_text_hint_color"
       app:textChangedListener="@{viewModel.answerTextWatcher}"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index 822352d053f..741d22d50ba 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -20,7 +20,6 @@
   <color name="color_palette_light_description_text_color">@color/color_def_white</color>
   <color name="color_palette_primary_background_color">@color/color_def_oppia_light_black</color>
   <color name="color_palette_hint_text_color">@color/color_def_accessible_light_grey</color>
-  <color name="color_palette_hint_text_input_interaction_color">@color/color_def_white</color>
   <color name="color_palette_secondary_background_color">@color/color_def_oppia_light_black</color>
   <color name="color_palette_primary_container_background_color">@color/color_def_accessible_grey</color>
   <color name="color_palette_icon_background_color">@color/color_def_white</color>
@@ -34,12 +33,6 @@
   <color name="color_palette_revision_card_background_color">@color/color_def_oppia_light_black</color>
   <color name="color_palette_content_background_solid_color">@color/color_def_oppia_grayish_black</color>
   <color name="color_palette_content_background_stroke_color">@color/color_def_dark_blue</color>
-  <color name="color_palette_input_error_color">@color/color_def_oppia_pink</color>
-  <color name="color_palette_submitted_answer_item_solid_color">@color/color_def_oppia_dark_grey</color>
-  <color name="color_palette_submitted_answer_item_stroke_color">@color/color_def_white</color>
-  <color name="color_palette_input_interaction_edit_text_border_color">@color/color_def_white</color>
-  <color name="color_palette_arrow_down_grey_color">@color/color_def_white</color>
-  <color name="color_palette_arrow_right_grey_color">@color/color_def_white</color>
   <color name="color_palette_rounded_rect_background_color">@color/color_def_oppia_grayish_black</color>
   <color name="color_palette_multiple_choice_color">@color/color_def_white</color>
   <color name="color_palette_multiple_choice_text_color">@color/color_def_white</color>
@@ -52,20 +45,6 @@
   <color name="color_palette_error_text_color">@color/color_def_oppia_pink</color>
   <color name="color_palette_show_eye_icon_color">@color/color_def_forest_green</color>
   <color name="color_palette_hide_eye_icon_color">@color/color_def_forest_green</color>
-  <color name="color_palette_input_interaction_edit_text_not_selected_border_color">@color/color_def_white</color>
-  <color name="color_palette_cursor_color">@color/color_def_oppia_silver</color>
-  <color name="color_palette_icon_background_secondary_color">@color/color_def_oppia_turquoise</color>
-  <color name="color_palette_accent_background_color">@color/color_def_oppia_dark_grey</color>
-  <color name="color_palette_seekbar_progress_background_color">@color/color_def_maastricht_blue</color>
-  <color name="color_palette_toolbar_secondary_color">@color/color_def_forest_green</color>
-  <color name="color_palette_secondary_dark_background_color">@color/color_def_oppia_light_black</color>
-  <color name="color_palette_concept_card_toolbar_color">@color/color_def_dark_pink</color>
-  <color name="color_palette_menu_selected_text_color">@color/color_def_oppia_pink</color>
-  <color name="color_palette_developer_option_menu_selected_color">@color/color_def_persian_blue</color>
-  <color name="color_palette_underline_view_color">@color/color_def_bright_green</color>
-  <color name="color_palette_menu_text_color">@color/color_def_white</color>
-  <color name="color_palette_secondary_container_background_color">@color/color_def_oppia_metallic_blue</color>
-  <color name="color_palette_concept_status_bar_color">@color/color_def_dark_purple</color>
   <color name="color_palette_disabled_button_background_color">@color/color_def_black_grey</color>
   <color name="color_palette_back_arrow_button_color">@color/color_def_oppia_turquoise</color>
   <color name="color_palette_replay_button_color">@color/color_def_dark_pink</color>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 2fcb8536985..6836b964a9e 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -15,7 +15,6 @@
     <item name="colorAccent">@color/color_palette_accent_color</item>
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
-    <item name="android:textCursorDrawable">@style/InputInteractionEditText</item>
     <item name="android:windowAnimationStyle">@style/Animation.Activity</item>
     <item name="android:statusBarColor">@color/component_color_shared_activity_status_bar_color</item>
   </style>
diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml
index 3f420995410..74d331b6d52 100644
--- a/app/src/main/res/values/color_defs.xml
+++ b/app/src/main/res/values/color_defs.xml
@@ -54,24 +54,12 @@
   <color name="color_def_dark_blue">#395FD0</color>
   <color name="color_def_oppia_grey_border">#DDDDDD</color>
   <color name="color_def_dark_silver">#707070</color>
-  <color name="color_def_input_error">#923026</color>
   <color name="color_def_yellow_ivory">#FFFFF0</color>
   <color name="color_def_chooser_grey">#999999</color>
   <color name="color_def_green">#02655c</color>
-  <color name="color_def_oppia_dark_grey_border">#666666</color>
-  <color name="color_def_error">#923026</color>
-  <color name="color_def_maastricht_blue">#0e162f</color>
-  <color name="color_def_ocean_blue">#081661</color>
-  <color name="color_def_dark_pink">#8A3D69</color>
-  <color name="color_def_persian_blue">#00609C</color>
-  <color name="color_def_bright_green">#009C8A</color>
-  <color name="color_def_grape_violet">#674172</color>
-  <color name="color_def_bright_violet">#7659B6</color>
-  <color name="color_def_teal_blue">#2F6687</color>
-  <color name="color_def_dark_red">#A6503A</color>
-  <color name="color_def_dark_purple">#441530</color>
   <color name="color_def_error_text">#923026</color>
   <color name="color_def_black_grey">#33999999</color>
+  <color name="color_def_dark_pink">#8A3D69</color>
   <color name="color_def_light_turquoise">#ACFFF8</color>
   <color name="color_def_submit_button_inactive">#61999999</color>
   <color name="color_def_question_player_progress_bar_gradient_start">#00E4F2F1</color>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index c97e06cfef9..4626e3caa8c 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -20,7 +20,6 @@
   <color name="color_palette_light_description_text_color">@color/color_def_accessible_light_grey_2</color>
   <color name="color_palette_primary_background_color">@color/color_def_white</color>
   <color name="color_palette_hint_text_color">@color/color_def_spanish_grey</color>
-  <color name="color_palette_hint_text_input_interaction_color">@color/color_def_spanish_grey</color>
   <color name="color_palette_secondary_background_color">@color/color_def_bright_grey</color>
   <color name="color_palette_primary_container_background_color">@color/color_def_white</color>
   <color name="color_palette_icon_background_color">@color/color_def_black</color>
@@ -34,12 +33,6 @@
   <color name="color_palette_revision_card_background_color">@color/color_def_oppia_light_green</color>
   <color name="color_palette_content_background_solid_color">@color/color_def_oppia_solid_blue</color>
   <color name="color_palette_content_background_stroke_color">@color/color_def_oppia_stroke_blue</color>
-  <color name="color_palette_input_error_color">@color/color_def_input_error</color>
-  <color name="color_palette_submitted_answer_item_solid_color">@color/color_def_white</color>
-  <color name="color_palette_submitted_answer_item_stroke_color">@color/color_def_black</color>
-  <color name="color_palette_input_interaction_edit_text_border_color">@color/color_def_oppia_dark_blue</color>
-  <color name="color_palette_arrow_down_grey_color">@color/color_def_mid_grey</color>
-  <color name="color_palette_arrow_right_grey_color">@color/color_def_mid_grey</color>
   <color name="color_palette_rounded_rect_background_color">@color/color_def_white</color>
   <color name="color_palette_multiple_choice_color">@color/color_def_oppia_dark_blue</color>
   <color name="color_palette_multiple_choice_text_color">@color/color_def_oppia_dark_blue</color>
@@ -52,20 +45,6 @@
   <color name="color_palette_error_text_color">@color/color_def_error_text</color>
   <color name="color_palette_show_eye_icon_color">@color/color_def_accessible_grey</color>
   <color name="color_palette_hide_eye_icon_color">@color/color_def_accessible_grey</color>
-  <color name="color_palette_input_interaction_edit_text_not_selected_border_color">@color/color_def_oppia_dark_grey_border</color>
-  <color name="color_palette_cursor_color">@color/color_def_oppia_dark_blue</color>
-  <color name="color_palette_icon_background_secondary_color">@color/color_def_white</color>
-  <color name="color_palette_accent_background_color">@color/color_def_oppia_dark_blue</color>
-  <color name="color_palette_seekbar_progress_background_color">@color/color_def_ocean_blue</color>
-  <color name="color_palette_toolbar_secondary_color">@color/color_def_oppia_green</color>
-  <color name="color_palette_secondary_dark_background_color">@color/color_def_oppia_light_green</color>
-  <color name="color_palette_concept_card_toolbar_color">@color/color_def_oppia_brown_dark</color>
-  <color name="color_palette_menu_selected_text_color">@color/color_def_oppia_brown_dark</color>
-  <color name="color_palette_developer_option_menu_selected_color">@color/color_def_persian_blue</color>
-  <color name="color_palette_underline_view_color">@color/color_def_oppia_light_brown</color>
-  <color name="color_palette_menu_text_color">@color/color_def_black</color>
-  <color name="color_palette_secondary_container_background_color">@color/color_def_teal_blue</color>
-  <color name="color_palette_concept_status_bar_color">@color/color_def_dark_red</color>
   <color name="color_palette_disabled_button_background_color">@color/color_def_black_grey</color>
   <color name="color_palette_back_arrow_button_color">@color/color_def_oppia_dark_blue</color>
   <color name="color_palette_replay_button_color">@color/color_def_oppia_brown_dark</color>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 638e760ae1a..c01ce15d7d5 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="component_color_shared_edit_text_cursor_color">@color/color_palette_cursor_color</color>
+  <color name="component_color_shared_edit_text_cursor_color">@color/color_palette_primary_text_color</color>
   <color name="component_color_shared_activity_toolbar_color">@color/color_palette_toolbar_color</color>
   <color name="component_color_shared_content_item_text_view_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_feedback_item_text_view_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_state_fragment_background_color">@color/color_palette_exploration_background_color</color>
   <color name="component_color_shared_previous_responses_header_item_container_background_color">@color/color_palette_highlighted_text_color</color>
   <color name="component_color_shared_previous_responses_header_item_text_color">@color/color_palette_highlighted_text_color</color>
-  <color name="component_color_shared_input_interaction_edit_text_color">@color/color_palette_highlighted_text_color</color>
-  <color name="component_color_shared_input_error_color">@color/color_palette_input_error_color</color>
-  <color name="component_color_shared_submitted_answer_item_solid_color">@color/color_palette_submitted_answer_item_solid_color</color>
-  <color name="component_color_shared_submitted_answer_item_stroke_color">@color/color_palette_submitted_answer_item_stroke_color</color>
-  <color name="component_color_shared_submitted_answer_item_text_color">@color/color_palette_highlighted_text_color</color>
-  <color name="component_color_shared_edit_text_hint_color">@color/color_palette_hint_text_input_interaction_color</color>
-  <color name="component_color_shared_input_interaction_edit_text_border_color">@color/color_palette_input_interaction_edit_text_border_color</color>
-  <color name="component_color_shared_input_interaction_edit_text_not_selected_border_color">@color/color_palette_input_interaction_edit_text_not_selected_border_color</color>
-  <color name="component_color_shared_arrow_down_grey_color">@color/color_palette_arrow_down_grey_color</color>
-  <color name="component_color_shared_arrow_right_grey_color">@color/color_palette_arrow_right_grey_color</color>
   <color name="component_color_shared_rounded_rect_background_color">@color/color_palette_rounded_rect_background_color</color>
   <color name="component_color_shared_multiple_choice_interaction_color">@color/color_palette_multiple_choice_color</color>
   <color name="component_color_shared_multiple_choice_interaction_text_color">@color/color_palette_multiple_choice_text_color</color>
@@ -50,7 +40,7 @@
   <color name="component_color_shared_text_input_layout_stroke_color">@color/color_palette_primary_text_color</color>
   <color name="component_color_shared_text_input_edit_text_text_color">@color/color_palette_primary_text_color</color>
   <color name="component_color_shared_input_interaction_edit_text_text_color">@color/color_palette_primary_text_color</color>
-  <color name="component_color_shared_input_interaction_edit_text_background_color">@color/color_palette_text_input_background_color</color>
+  <color name="component_color_shared_text_input_layout_background_color">@color/color_palette_text_input_background_color</color>
   <color name="component_color_shared_text_input_layout_error_color">@color/color_palette_error_color</color>
   <color name="component_color_general_item_background_solid_color">@color/color_palette_container_background_color</color>
   <color name="component_color_general_item_background_stroke_color">@color/color_palette_dark_background_color</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 06b21244d8e..d7237b66bd2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -164,7 +164,7 @@
   </style>
 
   <style name="TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-    <item name="boxBackgroundColor">@color/component_color_shared_input_interaction_edit_text_background_color</item>
+    <item name="boxBackgroundColor">@color/component_color_shared_text_input_layout_background_color</item>
     <item name="boxCornerRadiusBottomEnd">@dimen/text_input_layout_corner_radius</item>
     <item name="boxCornerRadiusBottomStart">@dimen/text_input_layout_corner_radius</item>
     <item name="boxCornerRadiusTopEnd">@dimen/text_input_layout_corner_radius</item>
@@ -366,7 +366,6 @@
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:background">@drawable/edit_text_background</item>
-    <item name="android:textCursorDrawable">@drawable/color_cursor</item>
     <item name="android:fontFamily">sans-serif</item>
     <item name="android:imeOptions">actionDone</item>
     <item name="android:longClickable">false</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2e73bb30b6a..eec60bb6ce4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,7 +14,6 @@
     <item name="colorAccent">@color/color_palette_accent_color</item>
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
-    <item name="android:textCursorDrawable">@style/InputInteractionEditText</item>
     <item name="android:windowAnimationStyle">@style/Animation.Activity</item>
   </style>