Merge branch 'oppia:develop' into enable_dagger_graph_access_for_bind…

…able_adapter
KevinGitonga · Jul 15, 2022 · f9105ac · f9105ac
2 parents 459a9a5 + e695446
commit f9105ac
Show file tree

Hide file tree

Showing 22 changed files with 626 additions and 37 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -50,9 +50,6 @@ gradlew.bat @BenHenning
 # Devbots configurations.
 /.devbots/ @BenHenning
 
-# All tests.
-*Test.kt @anandwana001
-
 # All resource files.
 /app/src/main/res/**/*.xml @rt4914
 /utility/src/main/res/**/*.xml @rt4914
@@ -72,7 +69,7 @@ gradlew.bat @BenHenning
 *Manifest.xml @BenHenning
 
 # Linter configuration.
-buf.yaml @anandwana001
+buf.yaml @BenHenning
 
 # Third-party dependencies.
 /third_party/ @BenHenning
@@ -144,7 +141,7 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 /app/src/*/java/org/oppia/android/app/viewmodel/ @BenHenning
 
 # App testing infrastructure.
-/app/src/*/java/org/oppia/android/app/testing/ @anandwana001
+/app/src/*/java/org/oppia/android/app/testing/ @BenHenning
 
 #####################################################################################
 #                                  domain module                                    #
@@ -167,7 +164,7 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 #####################################################################################
 
 # Global testing module code ownership.
-/testing/**/*.kt @anandwana001 @BenHenning
+/testing/**/*.kt @BenHenning
 
 #####################################################################################
 #                                    data module                                    #
@@ -200,9 +197,6 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 # Global scripts code ownership.
 /scripts/ @BenHenning
 
-# Shell file ownership.
-/scripts/**/*.sh @anandwana001 @BenHenning
-
 # Script proto ownership.
 /scripts/**/*.proto @BenHenning
 
@@ -225,7 +219,7 @@ config/kitkat_main_dex_class_list.txt @BenHenning
 #####################################################################################
 
 # End-to-end test utilities and modules.
-/instrumentation/src/java/**/*.kt @anandwana001 @BenHenning
+/instrumentation/**/*.kt @BenHenning
 
 #####################################################################################
 #                                global overrides                                   #

diff --git a/app/src/main/res/drawable/congratulations_text_background_shadow.xml b/app/src/main/res/drawable/congratulations_text_background_shadow.xml
@@ -92,9 +92,9 @@
   <item>
     <shape>
       <stroke android:width="3dp"
-        android:color="@color/color_def_green_shade_80"/>
+        android:color="@color/component_color_shared_correct_text_stroke_color"/>
       <corners android:radius="4dp" />
-      <solid android:color="@color/color_def_light_green" />
+      <solid android:color="@color/component_color_shared_correct_text_solid_color" />
     </shape>
   </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/general_item_border_cyan.xml b/app/src/main/res/drawable/general_item_border_cyan.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/component_color_option_activity_options_background_color_cyan" />
+  <solid android:color="@color/component_color_option_activity_options_cyan_background_color" />
   <stroke
     android:width="1dp"
     android:color="@color/color_def_black_12" />

diff --git a/app/src/main/res/drawable/ic_arrow_back_oppia_dark_blue_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_oppia_dark_blue_24dp.xml
@@ -2,6 +2,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"
+  android:tint="@color/component_color_shared_back_arrow_button_color"
   android:viewportWidth="24.0"
   android:viewportHeight="24.0"
   android:autoMirrored="true">

diff --git a/app/src/main/res/drawable/previous_next_state_image_view_background.xml b/app/src/main/res/drawable/previous_next_state_image_view_background.xml
@@ -5,5 +5,5 @@
   <corners
     android:radius="@dimen/state_previous_next_button_radius"/>
   <solid
-    android:color="@color/color_def_oppia_light_yellow"/>
+    android:color="@color/component_color_shared_previous_next_state_image_view_background_color"/>
 </shape>
diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml
@@ -3,17 +3,17 @@
   <item android:id="@+id/background">
     <shape>
       <corners android:radius="8dp" />
-      <solid android:color="@color/color_def_white" />
+      <solid android:color="@color/component_color_shared_progress_bar_background_color" />
       <stroke
         android:width="1dp"
-        android:color="@color/oppia_primary" />
+        android:color="@color/component_color_shared_progress_bar_stroke_color" />
     </shape>
   </item>
   <item android:id="@+id/progress">
     <scale android:scaleWidth="100%">
       <shape>
         <corners android:radius="8dp" />
-        <solid android:color="@color/oppia_primary" />
+        <solid android:color="@color/component_color_shared_progress_bar_solid_color" />
       </shape>
     </scale>
   </item>

diff --git a/app/src/main/res/drawable/question_player_progress_bar_background_gradient.xml b/app/src/main/res/drawable/question_player_progress_bar_background_gradient.xml
@@ -3,8 +3,8 @@
   android:shape="rectangle">
   <gradient
     android:angle="270"
-    android:endColor="@color/question_player_progress_bar_gradient_end"
-    android:centerColor="@color/question_player_progress_bar_gradient_center"
-    android:startColor="@color/question_player_progress_bar_gradient_start"
+    android:endColor="@color/component_color_shared_question_player_progress_bar_gradient_end_color"
+    android:centerColor="@color/component_color_shared_question_player_progress_bar_gradient_center_color"
+    android:startColor="@color/component_color_shared_question_player_progress_bar_gradient_start_color"
     android:type="linear" />
 </shape>
diff --git a/app/src/main/res/drawable/state_button_inactive_background.xml b/app/src/main/res/drawable/state_button_inactive_background.xml
@@ -2,5 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <corners android:radius="@dimen/state_previous_next_button_radius" />
-  <solid android:color="@color/submit_button_inactive" />
+  <solid android:color="@color/component_color_shared_submit_button_inactive_solid_color" />
+  <stroke
+    android:width="1dp"
+    android:color="@color/component_color_shared_submit_button_inactive_stroke_color" />
 </shape>
diff --git a/app/src/main/res/drawable/state_button_orange_background.xml b/app/src/main/res/drawable/state_button_orange_background.xml
@@ -5,5 +5,5 @@
   <corners
     android:radius="@dimen/state_previous_next_button_radius"/>
   <solid
-    android:color="@color/concept_toolbar_background"/>
+    android:color="@color/component_color_shared_replay_button_color"/>
 </shape>
diff --git a/app/src/main/res/layout-land/question_player_fragment.xml b/app/src/main/res/layout-land/question_player_fragment.xml
@@ -180,7 +180,7 @@
         android:lineSpacingExtra="1dp"
         android:text="@string/correct"
         android:textAllCaps="true"
-        android:textColor="@color/color_def_green_shade"
+        android:textColor="@color/component_color_shared_correct_text_color"
         android:textSize="20sp"
         android:visibility="invisible" />
 

diff --git a/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml
@@ -183,7 +183,7 @@
         android:lineSpacingExtra="1dp"
         android:text="@string/correct"
         android:textAllCaps="true"
-        android:textColor="@color/color_def_green_shade"
+        android:textColor="@color/component_color_shared_correct_text_color"
         android:textSize="20sp"
         android:visibility="invisible" />
 

diff --git a/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml
@@ -184,7 +184,7 @@
         android:lineSpacingExtra="1dp"
         android:text="@string/correct"
         android:textAllCaps="true"
-        android:textColor="@color/color_def_green_shade"
+        android:textColor="@color/component_color_shared_correct_text_color"
         android:textSize="20sp"
         android:visibility="invisible" />
 

diff --git a/app/src/main/res/layout/question_player_fragment.xml b/app/src/main/res/layout/question_player_fragment.xml
@@ -183,7 +183,7 @@
         android:lineSpacingExtra="1dp"
         android:text="@string/correct"
         android:textAllCaps="true"
-        android:textColor="@color/color_def_green_shade"
+        android:textColor="@color/component_color_shared_correct_text_color"
         android:textSize="20sp"
         android:visibility="invisible" />
 

diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
@@ -162,7 +162,7 @@
         android:lineSpacingExtra="1dp"
         android:text="@string/correct"
         android:textAllCaps="true"
-        android:textColor="@color/color_def_green_shade"
+        android:textColor="@color/component_color_shared_correct_text_color"
         android:textSize="20sp"
         android:visibility="invisible" />
 

diff --git a/app/src/main/res/layout/submit_button_item.xml b/app/src/main/res/layout/submit_button_item.xml
@@ -54,6 +54,7 @@
       android:enabled="@{buttonViewModel.canSubmitAnswer}"
       android:onClick="@{(v) -> buttonViewModel.submitNavigationButtonListener.onSubmitButtonClicked()}"
       android:text="@string/state_submit_button"
+      android:textColor="@{buttonViewModel.canSubmitAnswer ? @color/component_color_shared_submit_text_active_color : @color/component_color_shared_submit_text_inactive_color}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHeight_min="48dp"

diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
@@ -45,4 +45,20 @@
   <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_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>
+  <color name="color_palette_progress_bar_stroke_color">@color/color_def_light_turquoise</color>
+  <color name="color_palette_progress_bar_solid_color">@color/color_def_oppia_turquoise</color>
+  <color name="color_palette_correct_text_stroke_color">@color/color_def_oppia_turquoise</color>
+  <color name="color_palette_correct_text_solid_color">@color/color_def_oppia_grayish_black</color>
+  <color name="color_palette_correct_text_color">@color/color_def_oppia_turquoise</color>
+  <color name="color_palette_submit_button_inactive_solid_color">@color/color_def_black_grey</color>
+  <color name="color_palette_submit_button_inactive_stroke_color">@color/color_def_bright_turquoise</color>
+  <color name="color_palette_submit_text_inactive_color">@color/color_def_light_grey</color>
+  <color name="color_palette_previous_next_state_image_view_background_color">@color/color_def_oppia_grayish_black</color>
+  <color name="color_palette_progress_bar_gradient_start_color">@color/color_def_dark_mode_question_player_progress_bar_gradient_start</color>
+  <color name="color_palette_progress_bar_gradient_center_color">@color/color_def_dark_mode_question_player_progress_bar_gradient_center</color>
+  <color name="color_palette_progress_bar_gradient_end_color">@color/color_def_dark_mode_question_player_progress_bar_gradient_end</color>
+  <color name="color_palette_submit_text_active_color">@color/color_def_white</color>
 </resources>