From 9cd7d06de5c0941057f86bad09c8e3460c04d0f4 Mon Sep 17 00:00:00 2001 From: bhaktideshmukh Date: Fri, 22 Jul 2022 12:43:44 +0900 Subject: [PATCH 1/2] dark_mode --- app/src/main/res/color/checkbox_text_color.xml | 6 +++--- .../main/res/drawable/ic_check_box_checked.xml | 2 +- .../layout/mark_chapters_completed_fragment.xml | 6 +++--- ...rk_chapters_completed_story_summary_view.xml | 4 ++-- .../layout/mark_stories_completed_fragment.xml | 6 +++--- ...ark_stories_completed_story_summary_view.xml | 2 +- .../layout/mark_topics_completed_fragment.xml | 6 +++--- .../layout/mark_topics_completed_topic_view.xml | 2 +- app/src/main/res/values-night/color_palette.xml | 4 ++++ app/src/main/res/values/color_defs.xml | 2 ++ app/src/main/res/values/color_palette.xml | 4 ++++ app/src/main/res/values/component_colors.xml | 17 +++++++++++++++++ 12 files changed, 44 insertions(+), 17 deletions(-) diff --git a/app/src/main/res/color/checkbox_text_color.xml b/app/src/main/res/color/checkbox_text_color.xml index dff1ece24e9..0224c0f546d 100644 --- a/app/src/main/res/color/checkbox_text_color.xml +++ b/app/src/main/res/color/checkbox_text_color.xml @@ -1,12 +1,12 @@ - - - diff --git a/app/src/main/res/drawable/ic_check_box_checked.xml b/app/src/main/res/drawable/ic_check_box_checked.xml index 85ca608c033..f18efa940af 100644 --- a/app/src/main/res/drawable/ic_check_box_checked.xml +++ b/app/src/main/res/drawable/ic_check_box_checked.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/layout/mark_chapters_completed_fragment.xml b/app/src/main/res/layout/mark_chapters_completed_fragment.xml index 3389d5e652b..d27dd68fb8a 100644 --- a/app/src/main/res/layout/mark_chapters_completed_fragment.xml +++ b/app/src/main/res/layout/mark_chapters_completed_fragment.xml @@ -32,7 +32,7 @@ android:id="@+id/mark_chapters_completed_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/oppia_primary" + android:background="@color/component_color_mark_chapters_completed_primary_toolbar_color" android:textSize="20sp" app:navigationContentDescription="@string/navigate_up" app:navigationIcon="?attr/homeAsUpIndicator" @@ -44,7 +44,7 @@ + android:background="@color/component_color_mark_chapters_completed_secondary_toolbar_color"> diff --git a/app/src/main/res/layout/mark_stories_completed_fragment.xml b/app/src/main/res/layout/mark_stories_completed_fragment.xml index d657f17009d..72ada817a6e 100644 --- a/app/src/main/res/layout/mark_stories_completed_fragment.xml +++ b/app/src/main/res/layout/mark_stories_completed_fragment.xml @@ -32,7 +32,7 @@ android:id="@+id/mark_stories_completed_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/oppia_primary" + android:background="@color/component_color_mark_stories_completed_primary_toolbar_color" android:textSize="20sp" app:navigationContentDescription="@string/navigate_up" app:navigationIcon="?attr/homeAsUpIndicator" @@ -44,7 +44,7 @@ + android:background="@color/component_color_mark_stories_completed_secondary_toolbar_color"> + android:background="@color/component_color_mark_topics_completed_secondary_toolbar_color"> @color/color_def_dark_mode_question_player_progress_bar_gradient_center @color/color_def_dark_mode_question_player_progress_bar_gradient_end @color/color_def_white + @color/color_def_oppia_light_black + @color/color_def_white + @color/color_def_oppia_turquoise + @color/color_def_oppia_turquoise diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml index 078786856cd..3f420995410 100644 --- a/app/src/main/res/values/color_defs.xml +++ b/app/src/main/res/values/color_defs.xml @@ -80,4 +80,6 @@ #23272A00 #23272A #00C7B6 + #E5E5E5 + #008577 diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index 5db583630ea..f9c96bf6927 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -82,4 +82,8 @@ @color/color_def_question_player_progress_bar_gradient_center @color/color_def_question_player_progress_bar_gradient_end @color/color_def_white + @color/color_def_whitish_grey + @color/color_def_accessible_grey + @color/color_def_accessible_grey + @color/color_def_checkbox_green diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 0e5a42c1e79..460ef7b06fc 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -186,4 +186,21 @@ @color/color_palette_dark_text_color @color/color_palette_dark_text_color @color/color_palette_hint_text_color + + @color/color_palette_toolbar_color + @color/color_palette_secondary_toolbar_color + @color/color_palette_mark_chapters_background_color + @color/color_palette_checkbox_text_unselected_state_color + @color/color_palette_checkbox_text_selected_state_color + @color/color_palette_checkbox_selected_state_color + @color/color_palette_container_background_color + @color/color_palette_highlighted_text_color + + @color/color_palette_toolbar_color + @color/color_palette_secondary_toolbar_color + @color/color_palette_mark_chapters_background_color + + @color/color_palette_toolbar_color + @color/color_palette_secondary_toolbar_color + @color/color_palette_mark_chapters_background_color From 98a58e63368989776749fe6075d7a740be0d9bf3 Mon Sep 17 00:00:00 2001 From: bhaktideshmukh Date: Mon, 25 Jul 2022 12:36:46 +0900 Subject: [PATCH 2/2] added mark_completed_text color --- .../res/layout/mark_chapters_completed_fragment.xml | 6 +++--- .../res/layout/mark_stories_completed_fragment.xml | 6 +++--- .../res/layout/mark_topics_completed_fragment.xml | 6 +++--- app/src/main/res/values-night/color_palette.xml | 2 ++ app/src/main/res/values/color_palette.xml | 2 ++ app/src/main/res/values/component_colors.xml | 12 +++++++++--- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/layout/mark_chapters_completed_fragment.xml b/app/src/main/res/layout/mark_chapters_completed_fragment.xml index d27dd68fb8a..e7bbd5fe6fb 100644 --- a/app/src/main/res/layout/mark_chapters_completed_fragment.xml +++ b/app/src/main/res/layout/mark_chapters_completed_fragment.xml @@ -44,7 +44,7 @@ + android:background="@color/component_color_mark_chapters_completed_container_background_color"> @@ -93,7 +93,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:text="@string/modify_lesson_progress_mark_completed_uppercase" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_mark_chapters_completed_text_mark_completed_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/mark_stories_completed_fragment.xml b/app/src/main/res/layout/mark_stories_completed_fragment.xml index 72ada817a6e..1bae6f2cfff 100644 --- a/app/src/main/res/layout/mark_stories_completed_fragment.xml +++ b/app/src/main/res/layout/mark_stories_completed_fragment.xml @@ -44,7 +44,7 @@ + android:background="@color/component_color_mark_stories_completed_container_background_color"> @@ -93,7 +93,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:text="@string/modify_lesson_progress_mark_completed_uppercase" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_mark_stories_completed_text_mark_completed_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/mark_topics_completed_fragment.xml b/app/src/main/res/layout/mark_topics_completed_fragment.xml index ceab01d2a70..00ea5dda2ba 100644 --- a/app/src/main/res/layout/mark_topics_completed_fragment.xml +++ b/app/src/main/res/layout/mark_topics_completed_fragment.xml @@ -44,7 +44,7 @@ + android:background="@color/component_color_mark_topics_completed_container_background_color"> @@ -93,7 +93,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:text="@string/modify_lesson_progress_mark_completed_uppercase" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_mark_topics_completed_text_mark_completed_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 9d51a6afc57..822352d053f 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -86,4 +86,6 @@ @color/color_def_white @color/color_def_oppia_turquoise @color/color_def_oppia_turquoise + @color/color_def_white + @color/color_def_white diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index f9c96bf6927..c97e06cfef9 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -86,4 +86,6 @@ @color/color_def_accessible_grey @color/color_def_accessible_grey @color/color_def_checkbox_green + @color/color_def_white + @color/color_def_white diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 460ef7b06fc..638e760ae1a 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -188,19 +188,25 @@ @color/color_palette_hint_text_color @color/color_palette_toolbar_color - @color/color_palette_secondary_toolbar_color + @color/color_palette_secondary_toolbar_color @color/color_palette_mark_chapters_background_color @color/color_palette_checkbox_text_unselected_state_color @color/color_palette_checkbox_text_selected_state_color @color/color_palette_checkbox_selected_state_color @color/color_palette_container_background_color @color/color_palette_highlighted_text_color + @color/color_palette_mark_completed_text_color + @color/color_palette_mark_completed_all_text_color @color/color_palette_toolbar_color - @color/color_palette_secondary_toolbar_color + @color/color_palette_secondary_toolbar_color @color/color_palette_mark_chapters_background_color + @color/color_palette_mark_completed_text_color + @color/color_palette_mark_completed_all_text_color @color/color_palette_toolbar_color - @color/color_palette_secondary_toolbar_color + @color/color_palette_secondary_toolbar_color @color/color_palette_mark_chapters_background_color + @color/color_palette_mark_completed_text_color + @color/color_palette_mark_completed_all_text_color