diff --git a/app/src/main/res/color/drawer_item.xml b/app/src/main/res/color/drawer_item.xml index c34de39b494..748e664fe54 100644 --- a/app/src/main/res/color/drawer_item.xml +++ b/app/src/main/res/color/drawer_item.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/drawer_fragment.xml b/app/src/main/res/layout/drawer_fragment.xml index 9b0126a401e..5278a05f0e4 100644 --- a/app/src/main/res/layout/drawer_fragment.xml +++ b/app/src/main/res/layout/drawer_fragment.xml @@ -25,7 +25,7 @@ @@ -67,7 +67,7 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" app:srcCompat="@drawable/ic_baseline_code_24" - android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_image_color : @color/component_color_drawer_fragment_developer_options_image_color}"/> + android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_image_color : @color/component_color_shared_primary_dark_text_color}" /> @@ -98,7 +98,7 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp" - android:tint="@{footerViewModel.isAdministratorControlsSelected ? @color/component_color_drawer_fragment_admin_controls_selected_image_color : @color/component_color_drawer_fragment_admin_controls_image_color}" /> + android:tint="@{footerViewModel.isAdministratorControlsSelected ? @color/component_color_drawer_fragment_admin_controls_selected_image_color : @color/component_color_shared_primary_dark_text_color}" /> diff --git a/app/src/main/res/layout/nav_header_navigation_drawer.xml b/app/src/main/res/layout/nav_header_navigation_drawer.xml index a7ceebbf195..eb9d9a0ccad 100644 --- a/app/src/main/res/layout/nav_header_navigation_drawer.xml +++ b/app/src/main/res/layout/nav_header_navigation_drawer.xml @@ -14,7 +14,7 @@ android:id="@+id/header_linear_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/navbar_header_background" + android:background="@color/component_color_shared_navbar_header_background_color" android:gravity="bottom" android:onClick="@{(v) -> viewModel.onHeaderClicked()}" android:orientation="vertical" @@ -41,7 +41,7 @@ android:layout_marginTop="8dp" android:fontFamily="sans-serif-medium" android:text="@{viewModel.profile.name}" - android:textColor="@color/color_def_white" + android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="14sp" /> diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml index decc5bb993c..adeb5ba2242 100644 --- a/app/src/main/res/values-night/color_palette.xml +++ b/app/src/main/res/values-night/color_palette.xml @@ -125,7 +125,7 @@ @color/color_def_oppia_light_black @color/color_def_dark_pink @color/color_def_forest_green - @color/color_def_oppia_pink + @color/color_def_oppia_turquoise @color/color_def_persian_blue @color/color_def_bright_green @color/color_def_white @@ -180,4 +180,5 @@ @color/color_def_grey @color/color_def_light_grey @color/color_def_columbia_blue + @color/color_def_japanese_indigo diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml index 83abb33a138..2db1f9a10ae 100644 --- a/app/src/main/res/values/color_defs.xml +++ b/app/src/main/res/values/color_defs.xml @@ -100,4 +100,5 @@ #80707070 #C6DCDA #00236E + #264653 diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml index e90a3bc38a0..6847ab00cd6 100644 --- a/app/src/main/res/values/color_palette.xml +++ b/app/src/main/res/values/color_palette.xml @@ -125,7 +125,7 @@ @color/color_def_oppia_light_green @color/color_def_oppia_brown_dark @color/color_def_oppia_brown_dark - @color/color_def_oppia_red + @color/color_def_oppia_brown_dark @color/color_def_persian_blue @color/color_def_oppia_light_brown @color/color_def_black @@ -181,4 +181,5 @@ @color/color_def_grey @color/color_def_light_grey @color/color_def_columbia_blue + @color/color_def_japanese_indigo diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml index 23af91525f4..bd50c327d1f 100644 --- a/app/src/main/res/values/component_colors.xml +++ b/app/src/main/res/values/component_colors.xml @@ -9,6 +9,7 @@ @color/color_palette_tertiary_background_color @color/color_palette_topic_activity_background_color @color/color_palette_content_container_background_color + @color/color_palette_primary_container_background_color @color/color_palette_primary_background_color @color/color_palette_topic_card_item_background_color @color/color_palette_highlighted_text_color @@ -82,6 +83,7 @@ @color/color_palette_shared_card_border_stroke_color @color/color_palette_highlighted_background_color @color/color_palette_item_background_stroke_color + @color/color_palette_navbar_header_background_color @color/color_palette_status_bar_color @color/color_palette_fragment_status_bar_color @@ -251,16 +253,10 @@ @color/color_palette_show_text_color @color/color_palette_show_text_color - @color/color_palette_primary_container_background_color @color/color_palette_menu_selected_text_color - @color/color_palette_menu_text_color - @color/color_palette_dark_text_color @color/color_palette_developer_option_menu_selected_color - @color/color_palette_dark_text_color @color/color_palette_developer_option_menu_selected_color - @color/color_palette_dark_text_color @color/color_palette_menu_selected_text_color - @color/color_palette_dark_text_color @color/color_palette_menu_selected_text_color @color/color_palette_concept_card_toolbar_color diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cf9fc047081..4765106bcbd 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -69,7 +69,7 @@ sans-serif-medium @dimen/clickable_item_min_height true - @color/color_def_white + @color/component_color_shared_secondary_4_text_color 14sp