Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #4477: Revert "Fixes part of #4195 : Added dark mode support to QuestionPlayer and Exploration" #4478

Merged
merged 1 commit into from
Jul 29, 2022
Merged

Fix #4477: Revert "Fixes part of #4195 : Added dark mode support to QuestionPlayer and Exploration" #4478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/color_cursor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/edit_text_background_border.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/edit_text_background_border_blue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion app/src/main/res/drawable/ic_arrow_down_grey_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/drawable/ic_arrow_right_grey_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/submitted_answer_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 7 additions & 7 deletions app/src/main/res/layout/activity_input_interaction_view_test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" />
Expand All @@ -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}" />

Expand All @@ -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}" />
Expand All @@ -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}" />

Expand Down Expand Up @@ -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}" />

Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/layout/fraction_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/layout/math_expression_interactions_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/layout/numeric_input_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/layout/ratio_input_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/submitted_answer_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/text_input_interaction_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
21 changes: 0 additions & 21 deletions app/src/main/res/values-night/color_palette.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-v21/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 1 addition & 13 deletions app/src/main/res/values/color_defs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 0 additions & 21 deletions app/src/main/res/values/color_palette.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Loading