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 @@ - + 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 @@ - + + android:color="@color/oppia_grey_border_dark" /> 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 @@ - + + android:color="@color/color_def_oppia_dark_blue" /> 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 @@ + android:color="@color/color_def_black"/> + android:color="@color/color_def_white"/> 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 @@ @color/color_def_white @color/color_def_oppia_light_black @color/color_def_accessible_light_grey - @color/color_def_white @color/color_def_oppia_light_black @color/color_def_accessible_grey @color/color_def_white @@ -34,12 +33,6 @@ @color/color_def_oppia_light_black @color/color_def_oppia_grayish_black @color/color_def_dark_blue - @color/color_def_oppia_pink - @color/color_def_oppia_dark_grey - @color/color_def_white - @color/color_def_white - @color/color_def_white - @color/color_def_white @color/color_def_oppia_grayish_black @color/color_def_white @color/color_def_white @@ -52,20 +45,6 @@ @color/color_def_oppia_pink @color/color_def_forest_green @color/color_def_forest_green - @color/color_def_white - @color/color_def_oppia_silver - @color/color_def_oppia_turquoise - @color/color_def_oppia_dark_grey - @color/color_def_maastricht_blue - @color/color_def_forest_green - @color/color_def_oppia_light_black - @color/color_def_dark_pink - @color/color_def_oppia_pink - @color/color_def_persian_blue - @color/color_def_bright_green - @color/color_def_white - @color/color_def_oppia_metallic_blue - @color/color_def_dark_purple @color/color_def_black_grey @color/color_def_oppia_turquoise @color/color_def_dark_pink 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 @@ @color/color_palette_accent_color false true - @style/InputInteractionEditText @style/Animation.Activity @color/component_color_shared_activity_status_bar_color 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 @@ #395FD0 #DDDDDD #707070 - #923026 #FFFFF0 #999999 #02655c - #666666 - #923026 - #0e162f - #081661 - #8A3D69 - #00609C - #009C8A - #674172 - #7659B6 - #2F6687 - #A6503A - #441530 #923026 #33999999 + #8A3D69 #ACFFF8 #61999999 #00E4F2F1 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/color_def_accessible_light_grey_2 @color/color_def_white @color/color_def_spanish_grey - @color/color_def_spanish_grey @color/color_def_bright_grey @color/color_def_white @color/color_def_black @@ -34,12 +33,6 @@ @color/color_def_oppia_light_green @color/color_def_oppia_solid_blue @color/color_def_oppia_stroke_blue - @color/color_def_input_error - @color/color_def_white - @color/color_def_black - @color/color_def_oppia_dark_blue - @color/color_def_mid_grey - @color/color_def_mid_grey @color/color_def_white @color/color_def_oppia_dark_blue @color/color_def_oppia_dark_blue @@ -52,20 +45,6 @@ @color/color_def_error_text @color/color_def_accessible_grey @color/color_def_accessible_grey - @color/color_def_oppia_dark_grey_border - @color/color_def_oppia_dark_blue - @color/color_def_white - @color/color_def_oppia_dark_blue - @color/color_def_ocean_blue - @color/color_def_oppia_green - @color/color_def_oppia_light_green - @color/color_def_oppia_brown_dark - @color/color_def_oppia_brown_dark - @color/color_def_persian_blue - @color/color_def_oppia_light_brown - @color/color_def_black - @color/color_def_teal_blue - @color/color_def_dark_red @color/color_def_black_grey @color/color_def_oppia_dark_blue @color/color_def_oppia_brown_dark 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 @@ - @color/color_palette_cursor_color + @color/color_palette_primary_text_color @color/color_palette_toolbar_color @color/color_palette_highlighted_text_color @color/color_palette_highlighted_text_color @color/color_palette_exploration_background_color @color/color_palette_highlighted_text_color @color/color_palette_highlighted_text_color - @color/color_palette_highlighted_text_color - @color/color_palette_input_error_color - @color/color_palette_submitted_answer_item_solid_color - @color/color_palette_submitted_answer_item_stroke_color - @color/color_palette_highlighted_text_color - @color/color_palette_hint_text_input_interaction_color - @color/color_palette_input_interaction_edit_text_border_color - @color/color_palette_input_interaction_edit_text_not_selected_border_color - @color/color_palette_arrow_down_grey_color - @color/color_palette_arrow_right_grey_color @color/color_palette_rounded_rect_background_color @color/color_palette_multiple_choice_color @color/color_palette_multiple_choice_text_color @@ -50,7 +40,7 @@ @color/color_palette_primary_text_color @color/color_palette_primary_text_color @color/color_palette_primary_text_color - @color/color_palette_text_input_background_color + @color/color_palette_text_input_background_color @color/color_palette_error_color @color/color_palette_container_background_color @color/color_palette_dark_background_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 @@