From f011cc89c6509296201978dd22dd348ed08aeb01 Mon Sep 17 00:00:00 2001
From: Saptak Manna <saptakmanna100@gmail.com>
Date: Sat, 13 Jul 2024 20:40:21 +0530
Subject: [PATCH] Update dark mode colors

---
 .../app/classroom/classroomlist/ClassroomList.kt     | 12 +++++++-----
 .../app/classroom/promotedlist/PromotedList.kt       |  2 +-
 app/src/main/res/values-night/color_palette.xml      |  9 ++++++---
 app/src/main/res/values/color_defs.xml               |  7 +++++--
 app/src/main/res/values/color_palette.xml            |  8 +++++---
 app/src/main/res/values/component_colors.xml         |  2 ++
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/classroom/classroomlist/ClassroomList.kt b/app/src/main/java/org/oppia/android/app/classroom/classroomlist/ClassroomList.kt
index 0b4c6724283..e92f9521413 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/classroomlist/ClassroomList.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/classroomlist/ClassroomList.kt
@@ -100,9 +100,9 @@ fun ClassroomCard(
         classroomSummaryViewModel.handleClassroomClick()
       },
     backgroundColor = if (isCardSelected) {
-      colorResource(id = R.color.component_color_classroom_card_color)
+      colorResource(id = R.color.component_color_classroom_card_selected_color)
     } else {
-      colorResource(id = R.color.component_color_shared_screen_primary_background_color)
+      colorResource(id = R.color.component_color_classroom_card_color)
     },
     border = BorderStroke(2.dp, color = colorResource(id = R.color.color_def_oppia_green)),
     elevation = dimensionResource(id = R.dimen.classrooms_card_elevation),
@@ -110,10 +110,12 @@ fun ClassroomCard(
     Column(
       modifier = Modifier.padding(
         horizontal = dimensionResource(id = R.dimen.classrooms_card_padding_horizontal),
-        vertical = if (isSticky) 
+        vertical = if (isSticky) {
           dimensionResource(id = R.dimen.classrooms_card_collapsed_padding_vertical)
-        else
-          dimensionResource(id = R.dimen.classrooms_card_padding_vertical),
+        }
+        else {
+          dimensionResource(id = R.dimen.classrooms_card_padding_vertical)
+        },
       ),
       verticalArrangement = Arrangement.Center,
       horizontalAlignment = Alignment.CenterHorizontally,
diff --git a/app/src/main/java/org/oppia/android/app/classroom/promotedlist/PromotedList.kt b/app/src/main/java/org/oppia/android/app/classroom/promotedlist/PromotedList.kt
index 3ac2bdebf1d..446cc63764c 100644
--- a/app/src/main/java/org/oppia/android/app/classroom/promotedlist/PromotedList.kt
+++ b/app/src/main/java/org/oppia/android/app/classroom/promotedlist/PromotedList.kt
@@ -127,7 +127,7 @@ fun PromotedStoryCard(
       )
       .clickable { promotedStoryViewModel.clickOnStoryTile() },
     backgroundColor = colorResource(
-      id = R.color.component_color_shared_screen_primary_background_color
+      id = R.color.component_color_classroom_promoted_list_card_background_color
     ),
     elevation = dimensionResource(id = R.dimen.promoted_story_card_elevation),
   ) {
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
index bed7ab257be..f4cdb8dc831 100644
--- a/app/src/main/res/values-night/color_palette.xml
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -132,7 +132,7 @@
   <color name="color_palette_revision_card_toolbar_color">@color/color_def_forest_green</color>
   <color name="color_palette_hints_and_solutions_fragment_toolbar_color">@color/color_def_oppia_dark_blue</color>
   <color name="color_palette_menu_selected_text_color">@color/color_def_oppia_turquoise</color>
-  <color name="color_palette_developer_option_menu_selected_color">@color/color_def_persian_blue</color>
+  <color name="color_palette_developer_option_menu_selected_color">@color/color_def_persian_blue_1</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>
@@ -242,7 +242,10 @@
   <color name="color_palette_text_error_color">@color/color_def_oppia_reddish_brown</color>
   <color name="color_palette_edittext_stroke_color">@color/color_def_accessible_light_grey_2</color>
   <!-- CLASSROOM -->
-  <color name="color_palette_classroom_card_color">@color/color_def_greenish_black</color>
+  <color name="color_palette_classroom_card_color">@color/color_def_greenish_black_2</color>
+  <color name="color_palette_classroom_card_selected_color">@color/color_def_greenish_black_1</color>
   <color name="color_palette_classroom_shared_text_color">@color/color_def_white</color>
-  <color name="color_palette_classroom_topic_list_background_color">@color/color_def_greenish_black</color>
+  <color name="color_palette_classroom_topic_list_background_color">@color/color_def_greenish_black_3</color>
+  <color name="color_palette_classroom_promoted_list_classroom_label_color">@color/color_def_persian_blue_2</color>
+  <color name="color_palette_classroom_promoted_list_card_background_color">@color/color_def_greenish_black_2</color>
 </resources>
diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml
index 4eb98853686..94e0fe5c8a9 100644
--- a/app/src/main/res/values/color_defs.xml
+++ b/app/src/main/res/values/color_defs.xml
@@ -95,7 +95,8 @@
   <color name="color_def_white_0">#00FFFFFF</color>
   <color name="color_def_maastricht_blue">#0e162f</color>
   <color name="color_def_ocean_blue">#081661</color>
-  <color name="color_def_persian_blue">#00609C</color>
+  <color name="color_def_persian_blue_1">#00609C</color>
+  <color name="color_def_persian_blue_2">#0097F5</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>
@@ -145,7 +146,9 @@
   <color name="color_def_pale_green">#E2F5F4</color>
   <color name="color_def_black_25">#25000000</color>
   <color name="color_def_greenish_white">#EDF6F5</color>
-  <color name="color_def_greenish_black">#172B28</color>
+  <color name="color_def_greenish_black_1">#325D57</color>
+  <color name="color_def_greenish_black_2">#1C3531</color>
+  <color name="color_def_greenish_black_3">#1D3532</color>
   <color name="color_def_jade">#8EBBB6</color>
   <color name="color_def_dark_jade">#64817E</color>
   <color name="color_def_light_orange">#F8BF74</color>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
index cb6a86c2ff9..419de34b3bf 100644
--- a/app/src/main/res/values/color_palette.xml
+++ b/app/src/main/res/values/color_palette.xml
@@ -136,7 +136,7 @@
   <color name="color_palette_revision_card_toolbar_color">@color/color_def_oppia_brown_dark</color>
   <color name="color_palette_hints_and_solutions_fragment_toolbar_color">@color/color_def_oppia_dark_blue</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_developer_option_menu_selected_color">@color/color_def_persian_blue_1</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>
@@ -285,8 +285,10 @@
   <color name="color_palette_edittext_stroke_color">@color/color_def_accessible_light_grey_2</color>
   <color name="color_palette_text_error_color">@color/color_def_error_text</color>
   <!-- CLASSROOM -->
-  <color name="color_palette_classroom_card_color">@color/color_def_greenish_white</color>
+  <color name="color_palette_classroom_card_color">@color/color_def_white</color>
+  <color name="color_palette_classroom_card_selected_color">@color/color_def_greenish_white</color>
   <color name="color_palette_classroom_shared_text_color">@color/color_def_green</color>
   <color name="color_palette_classroom_topic_list_background_color">@color/color_def_greenish_white</color>
-  <color name="color_palette_classroom_promoted_list_classroom_label_color">@color/color_def_persian_blue</color>
+  <color name="color_palette_classroom_promoted_list_classroom_label_color">@color/color_def_persian_blue_1</color>
+  <color name="color_palette_classroom_promoted_list_card_background_color">@color/color_def_white</color>
 </resources>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index 6ed6c6a5df8..a0bab6bf31d 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -322,9 +322,11 @@
   <color name="component_color_shared_error_color">@color/color_palette_text_error_color</color>
   <!-- Classroom List Activity -->
   <color name="component_color_classroom_card_color">@color/color_palette_classroom_card_color</color>
+  <color name="component_color_classroom_card_selected_color">@color/color_palette_classroom_card_selected_color</color>
   <color name="component_color_classroom_card_icon_color">@color/color_palette_classroom_shared_text_color</color>
   <color name="component_color_classroom_card_text_color">@color/color_palette_classroom_shared_text_color</color>
   <color name="component_color_classroom_all_topics_header_text_color">@color/color_palette_classroom_shared_text_color</color>
   <color name="component_color_classroom_topic_list_background_color">@color/color_palette_classroom_topic_list_background_color</color>
   <color name="component_color_classroom_promoted_list_classroom_label_color">@color/color_palette_classroom_promoted_list_classroom_label_color</color>
+  <color name="component_color_classroom_promoted_list_card_background_color">@color/color_palette_classroom_promoted_list_card_background_color</color>
 </resources>