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..e7bbd5fe6fb 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_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" /> @@ -112,7 +112,7 @@ android:id="@+id/mark_chapters_completed_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/profile_edit_background" + android:background="@color/component_color_mark_chapters_completed_background_color" android:clipToPadding="false" android:overScrollMode="never" android:paddingBottom="40dp" diff --git a/app/src/main/res/layout/mark_chapters_completed_story_summary_view.xml b/app/src/main/res/layout/mark_chapters_completed_story_summary_view.xml index fa69fa12717..186998e2ba1 100644 --- a/app/src/main/res/layout/mark_chapters_completed_story_summary_view.xml +++ b/app/src/main/res/layout/mark_chapters_completed_story_summary_view.xml @@ -18,13 +18,13 @@ android:id="@+id/mark_chapters_completed_story_name_text_view" style="@style/Subtitle1ViewStart" android:layout_width="match_parent" - android:background="@color/color_def_white" + android:background="@color/component_color_mark_chapters_completed_subtext_heading_background_color" android:paddingStart="16dp" android:paddingTop="20dp" android:paddingEnd="16dp" android:paddingBottom="20dp" android:text="@{viewModel.storyName}" - android:textColor="@color/oppia_primary_text_dark" + android:textColor="@color/component_color_mark_chapters_completed_subtext_heading_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="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 d657f17009d..1bae6f2cfff 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_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" /> @@ -112,7 +112,7 @@ android:id="@+id/mark_stories_completed_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/profile_edit_background" + android:background="@color/component_color_mark_stories_completed_background_color" android:clipToPadding="false" android:overScrollMode="never" android:paddingVertical="40dp" diff --git a/app/src/main/res/layout/mark_stories_completed_story_summary_view.xml b/app/src/main/res/layout/mark_stories_completed_story_summary_view.xml index 94b41e448d3..e9205d0c07f 100644 --- a/app/src/main/res/layout/mark_stories_completed_story_summary_view.xml +++ b/app/src/main/res/layout/mark_stories_completed_story_summary_view.xml @@ -33,7 +33,7 @@ android:paddingBottom="26dp" android:text="@{viewModel.storySummary.storyName}" android:textAlignment="viewStart" - android:textColor="@color/oppia_primary_text" + android:textColor="@color/checkbox_text_color" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="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 01ec032cc88..00ea5dda2ba 100644 --- a/app/src/main/res/layout/mark_topics_completed_fragment.xml +++ b/app/src/main/res/layout/mark_topics_completed_fragment.xml @@ -32,7 +32,7 @@ android:id="@+id/mark_topics_completed_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/oppia_primary" + android:background="@color/component_color_mark_topics_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_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" /> @@ -112,7 +112,7 @@ android:id="@+id/mark_topics_completed_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/profile_edit_background" + android:background="@color/component_color_mark_topics_completed_background_color" android:clipToPadding="false" android:overScrollMode="never" android:paddingVertical="40dp" diff --git a/app/src/main/res/layout/mark_topics_completed_topic_view.xml b/app/src/main/res/layout/mark_topics_completed_topic_view.xml index 846260a5647..15eb7c66fbf 100644 --- a/app/src/main/res/layout/mark_topics_completed_topic_view.xml +++ b/app/src/main/res/layout/mark_topics_completed_topic_view.xml @@ -33,7 +33,7 @@ android:paddingBottom="26dp" android:text="@{viewModel.topic.name}" android:textAlignment="viewStart" - android:textColor="@color/oppia_primary_text" + android:textColor="@color/checkbox_text_color" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index 8778915452d..822352d053f 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -82,4 +82,10 @@ @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 + @color/color_def_white + @color/color_def_white 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..c97e06cfef9 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -82,4 +82,10 @@ @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 + @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 0e5a42c1e79..638e760ae1a 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -186,4 +186,27 @@ @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_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_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_mark_chapters_background_color + @color/color_palette_mark_completed_text_color + @color/color_palette_mark_completed_all_text_color