Merge branch 'develop' of https://github.com/oppia/oppia-android into…

… After-deleting-a-profile-Deleted-successfully-message-should-be-displayed
oppia · Mar 2, 2023 · 8257029 · 8257029
2 parents c8b91a4 + 2eed01e
commit 8257029
Show file tree

Hide file tree

Showing 48 changed files with 284 additions and 284 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -37,6 +37,7 @@ gradlew.bat @BenHenning
 .gitignore @BenHenning
 /.github/*.md @BenHenning
 /.github/ISSUE_TEMPLATE @BenHenning
+/.github/DISCUSSION_TEMPLATE/q-a-installation.yml @BenHenning
 
 # Git secret files & related configurations.
 /.gitsecret/ @BenHenning
@@ -53,7 +54,6 @@ gradlew.bat @BenHenning
 # All resource files.
 /app/src/main/res/**/*.xml @rt4914
 /utility/src/main/res/**/*.xml @rt4914
-/app/src/main/res/values/colors_migrating.xml @rt4914
 
 # App UI strings.
 /app/src/main/res/values*/strings.xml @BenHenning

diff --git a/.github/DISCUSSION_TEMPLATE/q-a-installation.yml b/.github/DISCUSSION_TEMPLATE/q-a-installation.yml
@@ -0,0 +1,59 @@
+body:
+  - type: input
+    attributes:
+      label: Operating System
+      description: "What operating system (OS) your development environment is using?"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Android Studio Version
+      description: "What Android Studio version are you using?"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: RAM size
+      description: "How much RAM does your computer have?"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Free disk space
+      description: "How much free on-disk storage does your computer have?"
+    validations:
+      required: true    
+  - type: textarea
+    id: steps
+    attributes:
+      label: Which step are you stuck on?
+      description: |
+        If you encountered this error while following a wiki page, provide a link to the page and specify which step failed.
+        Otherwise, list what steps caused the error.
+        These should be detailed enough for someone else to follow them.
+    validations:
+      required: true
+  - type: textarea
+    id: error
+    attributes:
+      label: Error Log
+      description: "Please copy and paste the error log."
+      render: bash
+    validations:
+      required: true
+  - type: textarea
+    id: approaches
+    attributes:
+      label: Approaches already used to resolve the issue
+      description: "What appoaches have you tried to resolve the above issue?"
+    validations:
+      required: false
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional information
+      description: |
+        Add any other context about the problem here.
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false
diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
@@ -419,7 +419,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
           super.onDrawerOpened(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
           StatusBarColor.statusBarColorUpdate(
-            R.color.slide_drawer_open_status_bar,
+            R.color.component_color_shared_slide_drawer_open_status_bar_color,
             activity,
             false
           )
@@ -429,7 +429,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
           super.onDrawerClosed(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
           StatusBarColor.statusBarColorUpdate(
-            R.color.oppia_primary_dark,
+            R.color.component_color_shared_activity_status_bar_color,
             activity,
             false
           )
@@ -456,7 +456,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
           super.onDrawerOpened(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
           StatusBarColor.statusBarColorUpdate(
-            R.color.slide_drawer_open_status_bar,
+            R.color.component_color_shared_slide_drawer_open_status_bar_color,
             activity,
             false
           )
@@ -466,7 +466,7 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
           super.onDrawerClosed(drawerView)
           fragment.activity!!.invalidateOptionsMenu()
           StatusBarColor.statusBarColorUpdate(
-            R.color.oppia_primary_dark,
+            R.color.component_color_shared_activity_status_bar_color,
             activity,
             false
           )

diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
@@ -169,27 +169,27 @@ class OnboardingFragmentPresenter @Inject constructor(
   private fun onboardingStatusBarColorUpdate(position: Int) {
     when (position) {
       0 -> StatusBarColor.statusBarColorUpdate(
-        R.color.onboarding_1_status_bar,
+        R.color.component_color_onboarding_1_status_bar_color,
         activity,
         false
       )
       1 -> StatusBarColor.statusBarColorUpdate(
-        R.color.onboarding_2_status_bar,
+        R.color.component_color_onboarding_2_status_bar_color,
         activity,
         false
       )
       2 -> StatusBarColor.statusBarColorUpdate(
-        R.color.onboarding_3_status_bar,
+        R.color.component_color_onboarding_3_status_bar_color,
         activity,
         false
       )
       3 -> StatusBarColor.statusBarColorUpdate(
-        R.color.onboarding_4_status_bar,
+        R.color.component_color_onboarding_4_status_bar_color,
         activity,
         false
       )
       else -> StatusBarColor.statusBarColorUpdate(
-        R.color.oppia_primary_dark,
+        R.color.component_color_shared_activity_status_bar_color,
         activity,
         false
       )

diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt
@@ -105,7 +105,11 @@ class AddProfileActivityPresenter @Inject constructor(
           isFirstResource: Boolean
         ): Boolean {
           uploadImageView.setColorFilter(
-            ResourcesCompat.getColor(activity.resources, R.color.avatar_background_11, null),
+            ResourcesCompat.getColor(
+              activity.resources,
+              R.color.color_def_avatar_background_11,
+              null
+            ),
             PorterDuff.Mode.DST_OVER
           )
           return false

diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt
@@ -31,30 +31,30 @@ import org.oppia.android.util.statusbar.StatusBarColor
 import javax.inject.Inject
 
 private val COLORS_LIST = listOf(
-  R.color.avatar_background_1,
-  R.color.avatar_background_2,
-  R.color.avatar_background_3,
-  R.color.avatar_background_4,
-  R.color.avatar_background_5,
-  R.color.avatar_background_6,
-  R.color.avatar_background_7,
-  R.color.avatar_background_8,
-  R.color.avatar_background_9,
-  R.color.avatar_background_10,
-  R.color.avatar_background_11,
-  R.color.avatar_background_12,
-  R.color.avatar_background_13,
-  R.color.avatar_background_14,
-  R.color.avatar_background_15,
-  R.color.avatar_background_16,
-  R.color.avatar_background_17,
-  R.color.avatar_background_18,
-  R.color.avatar_background_19,
-  R.color.avatar_background_20,
-  R.color.avatar_background_21,
-  R.color.avatar_background_22,
-  R.color.avatar_background_23,
-  R.color.avatar_background_24
+  R.color.color_def_avatar_background_1,
+  R.color.color_def_avatar_background_2,
+  R.color.color_def_avatar_background_3,
+  R.color.color_def_avatar_background_4,
+  R.color.color_def_avatar_background_5,
+  R.color.color_def_avatar_background_6,
+  R.color.color_def_avatar_background_7,
+  R.color.color_def_avatar_background_8,
+  R.color.color_def_avatar_background_9,
+  R.color.color_def_avatar_background_10,
+  R.color.color_def_avatar_background_11,
+  R.color.color_def_avatar_background_12,
+  R.color.color_def_avatar_background_13,
+  R.color.color_def_avatar_background_14,
+  R.color.color_def_avatar_background_15,
+  R.color.color_def_avatar_background_16,
+  R.color.color_def_avatar_background_17,
+  R.color.color_def_avatar_background_18,
+  R.color.color_def_avatar_background_19,
+  R.color.color_def_avatar_background_20,
+  R.color.color_def_avatar_background_21,
+  R.color.color_def_avatar_background_22,
+  R.color.color_def_avatar_background_23,
+  R.color.color_def_avatar_background_24
 )
 
 /** The presenter for [ProfileChooserFragment]. */
@@ -77,7 +77,9 @@ class ProfileChooserFragmentPresenter @Inject constructor(
 
   /** Binds ViewModel and sets up RecyclerView Adapter. */
   fun handleCreateView(inflater: LayoutInflater, container: ViewGroup?): View? {
-    StatusBarColor.statusBarColorUpdate(R.color.profile_status_bar, activity, false)
+    StatusBarColor.statusBarColorUpdate(
+      R.color.component_color_shared_profile_status_bar_color, activity, false
+    )
     binding = ProfileChooserFragmentBinding.inflate(
       inflater,
       container,

diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt
@@ -31,7 +31,9 @@ class ProfilePictureActivityPresenter @Inject constructor(
   private lateinit var profileId: ProfileId
 
   fun handleOnCreate(internalProfileId: Int) {
-    StatusBarColor.statusBarColorUpdate(R.color.profile_status_bar, activity, false)
+    StatusBarColor.statusBarColorUpdate(
+      R.color.component_color_shared_profile_status_bar_color, activity, false
+    )
     val binding = DataBindingUtil
       .setContentView<ProfilePictureActivityBinding>(
         activity,

diff --git a/app/src/main/java/org/oppia/android/app/spotlight/SpotlightFragment.kt b/app/src/main/java/org/oppia/android/app/spotlight/SpotlightFragment.kt
@@ -154,7 +154,7 @@ class SpotlightFragment : InjectableFragment(), SpotlightNavigationListener, Spo
     if (targetList.isNullOrEmpty()) return
     spotlight = Spotlight.Builder(activity)
       .setTargets(targetList)
-      .setBackgroundColorRes(R.color.spotlight_overlay_background)
+      .setBackgroundColorRes(R.color.component_color_shared_close_spotlight_button_color)
       .setDuration(500L)
       .setAnimation(AccelerateInterpolator(0.5f))
       .setOnSpotlightListener(object : OnSpotlightListener {

diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt
@@ -29,7 +29,11 @@ class WalkthroughActivityPresenter @Inject constructor(
       presenter = this@WalkthroughActivityPresenter
       lifecycleOwner = activity
     }
-    StatusBarColor.statusBarColorUpdate(R.color.walkthrough_status_bar, activity, true)
+    StatusBarColor.statusBarColorUpdate(
+      R.color.component_color_walkthrough_activity_status_bar_color,
+      activity,
+      true
+    )
     val currentFragmentIndex = getWalkthroughViewModel().currentProgress.get()?.minus(1)
 
     if (currentFragmentIndex == -1 && getWalkthroughWelcomeFragment() == null) {

diff --git a/app/src/main/res/drawable-ldrtl/bottom_left_rounded_rect_coming_soon_background.xml b/app/src/main/res/drawable-ldrtl/bottom_left_rounded_rect_coming_soon_background.xml
@@ -7,7 +7,7 @@
     android:topRightRadius="0dp" />
   <gradient
     android:angle="360"
-    android:endColor="@color/coming_soon_end"
-    android:startColor="@color/coming_soon_start"
+    android:endColor="@color/component_color_coming_soon_rect_background_end_color"
+    android:startColor="@color/component_color_coming_soon_rect_background_start_color"
     android:type="linear" />
 </shape>
diff --git a/app/src/main/res/drawable/bottom_left_rounded_rect_coming_soon_background.xml b/app/src/main/res/drawable/bottom_left_rounded_rect_coming_soon_background.xml
@@ -7,7 +7,7 @@
     android:topRightRadius="4dp" />
   <gradient
     android:angle="360"
-    android:endColor="@color/coming_soon_end"
-    android:startColor="@color/coming_soon_start"
+    android:endColor="@color/component_color_coming_soon_rect_background_end_color"
+    android:startColor="@color/component_color_coming_soon_rect_background_start_color"
     android:type="linear" />
 </shape>
diff --git a/app/src/main/res/drawable/bottom_left_rounded_rect_primary_background.xml b/app/src/main/res/drawable/bottom_left_rounded_rect_primary_background.xml
diff --git a/app/src/main/res/drawable/edit_text_red_border.xml b/app/src/main/res/drawable/edit_text_red_border.xml
diff --git a/app/src/main/res/drawable/lesson_thumbnail_default.xml b/app/src/main/res/drawable/lesson_thumbnail_default.xml
diff --git a/app/src/main/res/drawable/profile_chooser_divider.xml b/app/src/main/res/drawable/profile_chooser_divider.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <size android:height="1dp" />
-  <solid android:color="@color/oppia_profile_chooser_divider" />
+  <solid android:color="@color/component_color_shared_divider_color" />
 </shape>
diff --git a/app/src/main/res/drawable/reading_text_size_seekbar_thumb.xml b/app/src/main/res/drawable/reading_text_size_seekbar_thumb.xml
diff --git a/app/src/main/res/drawable/rounded_corners_progress_bar.xml b/app/src/main/res/drawable/rounded_corners_progress_bar.xml
@@ -3,7 +3,7 @@
   <item android:id="@android:id/background">
     <shape>
       <corners android:radius="8dp"/>
-      <solid android:color="@color/color_def_grey"/>
+      <solid android:color="@color/component_color_walkthrough_activity_rounded_corners_color"/>
     </shape>
   </item>
 
@@ -16,7 +16,7 @@
     <scale android:scaleWidth="100%">
       <shape>
         <corners android:radius="8dp"/>
-        <solid android:color="@color/oppia_primary_dark"/>
+        <solid android:color="@color/component_color_shared_dialogs_secondary_color"/>
       </shape>
     </scale>
   </item>

diff --git a/app/src/main/res/drawable/seekbar_progress.xml b/app/src/main/res/drawable/seekbar_progress.xml
@@ -3,5 +3,5 @@
   android:shape="line">
   <stroke
     android:width="4dp"
-    android:color="@color/oppia_primary" />
+    android:color="@color/component_color_shared_secondary_6_text_color" />
 </shape>
diff --git a/app/src/main/res/drawable/start_button_primary_background.xml b/app/src/main/res/drawable/start_button_primary_background.xml