Fixes #3122, #4600: Dark mode implementation - Home Screen, Recently Played Screen, Promotional Cards, Profile Progress, Ongoing Topic List, Completed Story List

app/src/main/res/drawable/bottom_rounded_rect_white_background.xml

@@ -5,5 +5,5 @@
     android:bottomRightRadius="4dp"
     android:topLeftRadius="0dp"
     android:topRightRadius="0dp" />
-  <solid android:color="@color/color_def_white" />
+  <solid android:color="@color/component_color_shared_rounded_rect_background_color" />
 </shape>

app/src/main/res/layout-land/profile_progress_header.xml

@@ -24,7 +24,6 @@
       android:id="@+id/profile_edit_image"
       android:layout_width="160dp"
       android:layout_height="160dp"
-      android:background="@color/color_def_white_light"
       android:clickable="true"
       android:contentDescription="@string/current_profile_picture_content_description"
       android:focusable="true"
@@ -56,7 +55,7 @@
       android:layout_marginTop="12dp"
       android:fontFamily="sans-serif-medium"
       android:text="@{viewModel.profile.name}"
-      android:textColor="@color/component_color_profile_progress_activity_profile_name_text_color"
+      android:textColor="@color/component_color_shared_content_item_text_view_color"
       android:textSize="28sp"
       app:layout_constraintEnd_toEndOf="@id/completed_stories_container"
       app:layout_constraintStart_toStartOf="@+id/ongoing_topics_container"
@@ -70,17 +69,18 @@
       android:layout_marginTop="20dp"
       android:layout_marginEnd="20dp"
       android:layout_weight="1"
-      android:background="@drawable/grey_card_rounded_border"
       android:clickable="@{viewModel.ongoingTopicCount > 0}"
       android:importantForAccessibility="yes"
       android:onClick="@{() -> viewModel.clickOnOngoingTopicCount()}"
-      app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color"
+      app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color"
       app:cardElevation="4dp"
       app:contentPadding="8dp"
       app:layout_constraintEnd_toStartOf="@+id/completed_stories_container"
       app:layout_constraintHorizontal_weight="1"
       app:layout_constraintStart_toEndOf="@+id/profile_edit_image"
-      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view">
+      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view"
+      app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color"
+      app:strokeWidth="0.5dp">
 
       <LinearLayout
         android:layout_width="match_parent"
@@ -97,7 +97,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{Integer.toString(viewModel.ongoingTopicCount)}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="24sp" />
 
         <TextView
@@ -107,7 +107,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="12sp" />
       </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
@@ -119,17 +119,18 @@
       android:layout_marginTop="20dp"
       android:layout_marginEnd="4dp"
       android:layout_weight="1"
-      android:background="@drawable/grey_card_rounded_border"
       android:clickable="@{viewModel.completedStoryCount > 0}"
       android:importantForAccessibility="yes"
       android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}"
-      app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color"
+      app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color"
       app:cardElevation="4dp"
       app:contentPadding="8dp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_weight="1"
       app:layout_constraintStart_toEndOf="@+id/ongoing_topics_container"
-      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view">
+      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view"
+      app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color"
+      app:strokeWidth="0.5dp">
 
       <LinearLayout
         android:layout_width="match_parent"
@@ -146,7 +147,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{Integer.toString(viewModel.completedStoryCount)}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="24sp" />
 
         <TextView
@@ -156,7 +157,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="12sp" />
       </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
@@ -170,7 +171,7 @@
       android:fontFamily="sans-serif-medium"
       android:minHeight="48dp"
       android:text="@string/recently_played_stories"
-      android:textColor="@color/component_color_profile_progress_activity_recently_played_stories_text_color"
+      android:textColor="@color/component_color_shared_content_item_text_view_color"
       android:textSize="18sp"
       android:visibility="@{viewModel.headerTextVisibility}"
       app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout-sw600dp/profile_progress_header.xml

@@ -23,7 +23,6 @@
       android:layout_width="160dp"
       android:layout_height="160dp"
       android:layout_marginStart="@dimen/profile_edit_image_layout_margin_start"
-      android:background="@color/color_def_white_light"
       android:clickable="true"
       android:contentDescription="@string/current_profile_picture_content_description"
       android:focusable="true"
@@ -58,7 +57,7 @@
       android:layout_marginEnd="@dimen/profile_name_text_view_layout_margin_end"
       android:fontFamily="sans-serif-medium"
       android:text="@{viewModel.profile.name}"
-      android:textColor="@color/component_color_profile_progress_activity_profile_name_text_color"
+      android:textColor="@color/component_color_shared_content_item_text_view_color"
       android:textSize="28sp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toEndOf="@+id/profile_edit_image"
@@ -71,17 +70,18 @@
       android:layout_marginTop="20dp"
       android:layout_marginEnd="24dp"
       android:layout_weight="1"
-      android:background="@drawable/grey_card_rounded_border"
       android:clickable="@{viewModel.ongoingTopicCount > 0}"
       android:importantForAccessibility="yes"
       android:onClick="@{() -> viewModel.clickOnOngoingTopicCount()}"
-      app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color"
+      app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color"
       app:cardElevation="4dp"
       app:contentPadding="8dp"
       app:layout_constraintEnd_toStartOf="@+id/completed_stories_container"
       app:layout_constraintHorizontal_weight="1"
       app:layout_constraintStart_toStartOf="@+id/profile_name_text_view"
-      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view">
+      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view"
+      app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color"
+      app:strokeWidth="0.5dp">
 
       <LinearLayout
         android:layout_width="match_parent"
@@ -98,7 +98,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{Integer.toString(viewModel.ongoingTopicCount)}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="24sp" />
 
         <TextView
@@ -108,7 +108,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="12sp" />
       </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
@@ -119,17 +119,18 @@
       android:layout_height="wrap_content"
       android:layout_marginTop="20dp"
       android:layout_weight="1"
-      android:background="@drawable/grey_card_rounded_border"
       android:clickable="@{viewModel.completedStoryCount > 0}"
       android:importantForAccessibility="yes"
       android:onClick="@{() -> viewModel.clickOnCompletedStoryCount()}"
-      app:cardBackgroundColor="@color/component_color_profile_progress_activity_stories_progress_background_color"
+      app:cardBackgroundColor="@color/component_color_shared_rounded_rect_background_color"
       app:cardElevation="4dp"
       app:contentPadding="8dp"
       app:layout_constraintEnd_toEndOf="@+id/profile_name_text_view"
       app:layout_constraintHorizontal_weight="1"
       app:layout_constraintStart_toEndOf="@+id/ongoing_topics_container"
-      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view">
+      app:layout_constraintTop_toBottomOf="@+id/profile_name_text_view"
+      app:strokeColor="@color/component_color_profile_progress_activity_story_count_card_stroke_color"
+      app:strokeWidth="0.5dp">
 
       <LinearLayout
         android:layout_width="match_parent"
@@ -146,7 +147,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{Integer.toString(viewModel.completedStoryCount)}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="24sp" />
 
         <TextView
@@ -156,7 +157,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
-          android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="12sp" />
       </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
@@ -171,7 +172,7 @@
       android:fontFamily="sans-serif-medium"
       android:minHeight="48dp"
       android:text="@string/recently_played_stories"
-      android:textColor="@color/component_color_profile_progress_activity_stories_progress_text_color"
+      android:textColor="@color/component_color_shared_content_item_text_view_color"
       android:textSize="18sp"
       android:visibility="@{viewModel.headerTextVisibility}"
       app:layout_constraintEnd_toStartOf="@+id/view_all_text_view"

app/src/main/res/layout/completed_story_item.xml

@@ -49,7 +49,7 @@
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/component_color_completed_progress_activity_completed_story_card_color"
+        android:background="@color/component_color_shared_rounded_rect_background_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -69,7 +69,7 @@
           android:maxLines="2"
           android:minLines="2"
           android:text="@{viewModel.completedStoryName}"
-          android:textColor="@color/component_color_completed_progress_activity_completed_story_card_text_color"
+          android:textColor="@color/component_color_shared_content_item_text_view_color"
           android:textSize="14sp"
           android:textStyle="bold"
           app:layout_constraintStart_toStartOf="parent"
@@ -90,7 +90,7 @@
           android:paddingBottom="12dp"
           android:text="@{viewModel.topicName}"
           android:textAllCaps="true"
-          android:textColor="@color/component_color_completed_progress_activity_completed_story_card_text_color"
+          android:textColor="@color/component_color_shared_story_card_topic_name_text_color"
           android:textSize="14sp"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@+id/completed_story_name_text_view" />

app/src/main/res/layout/completed_story_list_fragment.xml

@@ -12,7 +12,7 @@
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/component_color_completed_progress_activity_background_color">
+    android:background="@color/component_color_shared_screen_primary_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/completed_story_list_app_bar_layout"
@@ -27,7 +27,7 @@
         android:id="@+id/completed_story_list_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/component_color_completed_progress_activity_toolbar_color"
+        android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         app:navigationContentDescription="@string/navigate_up"

app/src/main/res/layout/home_fragment.xml

@@ -14,7 +14,7 @@
   <FrameLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/component_color_home_activity_background_color"
+    android:background="@color/component_color_shared_screen_primary_background_color"
     android:gravity="center">
 
     <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/ongoing_topic_item.xml

@@ -48,7 +48,7 @@
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/topic_title_background"
+        android:background="@color/component_color_shared_topic_card_item_background_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -67,7 +67,7 @@
           android:gravity="start"
           android:lines="2"
           android:text="@{viewModel.topicTitle}"
-          android:textColor="@color/color_def_white"
+          android:textColor="@color/component_color_shared_topic_card_primary_text_view_color"
           android:textSize="14sp"
           android:textStyle="bold"
           app:layout_constraintStart_toStartOf="parent"
@@ -82,7 +82,7 @@
           android:fontFamily="sans-serif-light"
           android:paddingBottom="12dp"
           android:text="@{viewModel.computeStoryCountText()}"
-          android:textColor="@color/color_def_white_80"
+          android:textColor="@color/component_color_shared_topic_card_primary_text_view_color"
           android:textSize="14sp"
           android:textStyle="italic"
           app:layout_constraintEnd_toEndOf="@id/topic_name_text_view"

app/src/main/res/layout/ongoing_topic_list_fragment.xml

@@ -12,7 +12,7 @@
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/component_color_ongoing_progress_activity_background_color">
+    android:background="@color/component_color_shared_screen_primary_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/ongoing_topic_list_app_bar_layout"
@@ -27,7 +27,7 @@
         android:id="@+id/ongoing_topic_list_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/component_color_ongoing_progress_activity_toolbar_color"
+        android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         app:navigationContentDescription="@string/navigate_up"

app/src/main/res/layout/profile_progress_fragment.xml

@@ -12,7 +12,7 @@
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/component_color_profile_progress_activity_background_color">
+    android:background="@color/component_color_shared_screen_primary_background_color">
 
     <FrameLayout
       android:layout_width="match_parent"
@@ -23,7 +23,7 @@
 
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/profile_progress_list"
-        android:background="@color/color_def_transparent"
+        android:background="@color/component_color_shared_transparent_background_color"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="@dimen/profile_progress_fragment_margin_start"