Merge branch 'develop' into feat/selection-ui-empty-answer-support

oppia · Feb 21, 2024 · 5d106e7 · 5d106e7
2 parents 0d57e29 + 58845ad
commit 5d106e7
Show file tree

Hide file tree

Showing 115 changed files with 1,652 additions and 1,475 deletions.
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <dimen name="home_padding_end">64dp</dimen>
-  <dimen name="home_padding_start">96dp</dimen>
-  <dimen name="home_outer_margin">96dp</dimen>
-  <dimen name="home_welcome_outer_padding">96dp</dimen>
+  <dimen name="home_padding_start">72dp</dimen>
+  <dimen name="home_outer_margin">72dp</dimen>
+  <dimen name="home_welcome_outer_padding">72dp</dimen>
   <dimen name="home_welcome_text_view_margin_end">8dp</dimen>
-  <dimen name="home_inner_margin">64dp</dimen>
+  <dimen name="home_inner_margin">48dp</dimen>
   <dimen name="recently_played_margin_max">96dp</dimen>
   <dimen name="recently_played_margin_min">64dp</dimen>
   <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
@@ -276,7 +276,7 @@
   <dimen name="concept_card_explanation_text_margin_end">176dp</dimen>
 
   <!-- All Topics -->
-  <dimen name="all_topics_text_margin_start">96dp</dimen>
+  <dimen name="all_topics_text_margin_start">72dp</dimen>
   <dimen name="all_topics_text_margin_top">68dp</dimen>
   <dimen name="all_topics_text_margin_end">76dp</dimen>
   <dimen name="all_topics_text_margin_bottom">24dp</dimen>
@@ -444,8 +444,8 @@
   <dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>
 
   <!--  PromotedStoryList-->
-  <dimen name="promoted_story_list_layout_margin_end">96dp</dimen>
-  <dimen name="promoted_story_list_layout_margin_start">96dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_end">72dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_start">72dp</dimen>
 
   <!-- AudioLanguageFragment -->
   <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>

diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <dimen name="home_padding_end">96dp</dimen>
-  <dimen name="home_padding_start">120dp</dimen>
-  <dimen name="home_outer_margin">120dp</dimen>
-  <dimen name="home_welcome_outer_padding">120dp</dimen>
+  <dimen name="home_padding_start">56dp</dimen>
+  <dimen name="home_outer_margin">64dp</dimen>
+  <dimen name="home_welcome_outer_padding">60dp</dimen>
   <dimen name="home_welcome_text_view_margin_end">8dp</dimen>
-  <dimen name="home_inner_margin">60dp</dimen>
+  <dimen name="home_inner_margin">32dp</dimen>
   <dimen name="recently_played_margin_max">120dp</dimen>
   <dimen name="recently_played_margin_min">60dp</dimen>
   <dimen name="drag_drop_item_exploration_split_view_margin_start">32dp</dimen>
@@ -281,10 +281,10 @@
   <dimen name="concept_card_explanation_text_margin_end">128dp</dimen>
 
   <!-- All Topics -->
-  <dimen name="all_topics_text_margin_start">120dp</dimen>
-  <dimen name="all_topics_text_margin_top">68dp</dimen>
+  <dimen name="all_topics_text_margin_start">60dp</dimen>
+  <dimen name="all_topics_text_margin_top">52dp</dimen>
   <dimen name="all_topics_text_margin_end">76dp</dimen>
-  <dimen name="all_topics_text_margin_bottom">24dp</dimen>
+  <dimen name="all_topics_text_margin_bottom">16dp</dimen>
 
   <!-- Coming Soon Topic List -->
   <dimen name="coming_soon_topic_list_constraint_layout_padding_start">120dp</dimen>
@@ -441,8 +441,8 @@
   <dimen name="topic_practice_fragment_padding_bottom">112dp</dimen>
 
   <!--  PromotedStoryList-->
-  <dimen name="promoted_story_list_layout_margin_end">120dp</dimen>
-  <dimen name="promoted_story_list_layout_margin_start">120dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_end">60dp</dimen>
+  <dimen name="promoted_story_list_layout_margin_start">60dp</dimen>
 
   <!-- AudioLanguageFragment -->
   <dimen name="audio_language_recycler_view_padding_bottom">132dp</dimen>

diff --git a/.../sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel b/.../sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/BUILD.bazel
@@ -51,6 +51,7 @@ app_test(
         "//app/src/main/java/org/oppia/android/app/translation/testing:test_module",
         "//testing",
         "//testing/src/main/java/org/oppia/android/testing/junit:initialize_default_locale_rule",
+        "//testing/src/main/java/org/oppia/android/testing/logging:event_log_subject",
         "//testing/src/main/java/org/oppia/android/testing/logging:sync_status_test_module",
         "//testing/src/main/java/org/oppia/android/testing/platformparameter:test_module",
         "//testing/src/main/java/org/oppia/android/testing/robolectric:test_module",