Refactor: resourses

app/src/main/java/org/openedx/app/system/push/OpenEdXFirebaseMessagingService.kt

@@ -3,7 +3,6 @@ package org.openedx.app.system.push
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
-import android.content.Context
 import android.content.Intent
 import android.media.RingtoneManager
 import android.os.Build
@@ -75,7 +74,7 @@ class OpenEdXFirebaseMessagingService : FirebaseMessagingService() {
             .setContentIntent(pendingIntent)
 
         val notificationManager =
-            getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            getSystemService(NOTIFICATION_SERVICE) as NotificationManager
 
         // Since android Oreo notification channel is needed.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

app/src/main/res/values/dimens.xml

@@ -1,3 +1 @@
-<resources>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
+<resources></resources>

app/src/main/res/values/splash.xml

@@ -7,7 +7,7 @@
 
         <!-- Use windowSplashScreenAnimatedIcon to add either a drawable or an
              animated drawable. One of these is required. -->
-        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_inset</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/app_splash_inset</item>
         <!-- Required for animated icons -->
 
         <item name="windowSplashScreenAnimationDuration">300</item>

app/src/main/res/values/strings.xml

@@ -1,11 +1,6 @@
 <resources>
-    <string name="action_settings">Settings</string>
-    <string name="next">Next</string>
-    <string name="previous">Previous</string>
-
     <string name="app_navigation_discovery">Discover</string>
     <string name="app_navigation_learn">Learn</string>
-    <string name="app_navigation_programs">Programs</string>
     <string name="app_navigation_profile">Profile</string>
     <string name="app_navigation_downloads">Downloads</string>
 </resources>

auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt

@@ -186,7 +186,7 @@ private fun RestorePasswordScreen(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(200.dp),
-            painter = painterResource(id = org.openedx.core.R.drawable.core_top_header),
+            painter = painterResource(id = R.drawable.core_top_header),
             contentScale = ContentScale.FillBounds,
             contentDescription = null
         )

auth/src/main/java/org/openedx/auth/presentation/signup/compose/SocialSignedView.kt

@@ -40,7 +40,7 @@ internal fun SocialSignedView(authType: AuthType) {
                 modifier = Modifier
                     .padding(end = 8.dp)
                     .size(20.dp),
-                painter = painterResource(id = coreR.drawable.ic_core_check),
+                painter = painterResource(id = coreR.drawable.core_ic_check),
                 tint = MaterialTheme.appColors.successBackground,
                 contentDescription = ""
             )

auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt

@@ -25,7 +25,7 @@ class BrowserAuthHelper(private val config: Config) {
             .appendQueryParameter("response_type", ApiConstants.BrowserLogin.RESPONSE_TYPE).build()
         val intent =
             CustomTabsIntent.Builder().setUrlBarHidingEnabled(true).setShowTitle(true).build()
-        intent.intent.setFlags(FLAG_ACTIVITY_NEW_TASK)
+        intent.intent.flags = FLAG_ACTIVITY_NEW_TASK
         intent.launchUrl(activityContext, uri)
     }
 

auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt

@@ -54,7 +54,7 @@ internal fun SocialAuthView(
             ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        painter = painterResource(id = R.drawable.ic_auth_google),
+                        painter = painterResource(id = R.drawable.auth_ic_google),
                         contentDescription = null,
                         tint = Color.Unspecified,
                     )
@@ -86,7 +86,7 @@ internal fun SocialAuthView(
             ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        painter = painterResource(id = R.drawable.ic_auth_facebook),
+                        painter = painterResource(id = R.drawable.auth_ic_facebook),
                         contentDescription = null,
                         tint = MaterialTheme.appColors.primaryButtonText,
                     )
@@ -118,7 +118,7 @@ internal fun SocialAuthView(
             ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        painter = painterResource(id = R.drawable.ic_auth_microsoft),
+                        painter = painterResource(id = R.drawable.auth_ic_microsoft),
                         contentDescription = null,
                         tint = Color.Unspecified,
                     )

auth/src/main/res/drawable/auth_ic_microsoft.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M11.406,0H0V11.406H11.406V0Z"
+        android:fillColor="#F25022" />
+    <path
+        android:pathData="M24,0H12.594V11.406H24V0Z"
+        android:fillColor="#7FBA00" />
+    <path
+        android:pathData="M11.406,12.594H0V24H11.406V12.594Z"
+        android:fillColor="#00A4EF" />
+    <path
+        android:pathData="M24,12.594H12.594V24H24V12.594Z"
+        android:fillColor="#FFB900" />
+</vector>

auth/src/main/res/values/strings.xml

@@ -4,7 +4,6 @@
     <string name="pre_auth_search_title" tools:ignore="ExtraTranslation">What do you want to learn?</string>
     <string name="pre_auth_search_hint" tools:ignore="ExtraTranslation">Search our 3000+ courses</string>
     <string name="pre_auth_explore_all_courses" tools:ignore="ExtraTranslation">Explore all courses</string>
-    <string name="auth_sign_up">Sign up</string>
     <string name="auth_forgot_password">Forgot password?</string>
     <string name="auth_email">Email</string>
     <string name="auth_invalid_email">Invalid email</string>

core/src/main/java/org/openedx/core/AppDataConstants.kt

@@ -1,6 +1,6 @@
 package org.openedx.core
 
-import java.util.*
+import java.util.Locale
 
 object AppDataConstants {
     const val USER_MIN_YEAR = 13

core/src/main/java/org/openedx/core/data/model/Media.kt

@@ -14,7 +14,7 @@ data class Media(
     val image: Image?,
 ) {
 
-    fun mapToDomain(): org.openedx.core.domain.model.Media {
+    fun mapToDomain(): Media {
         return Media(
             bannerImage = bannerImage?.mapToDomain(),
             courseImage = courseImage?.mapToDomain(),

core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt

@@ -27,7 +27,7 @@ fun DownloadDialogItem(
     val icon = if (downloadDialogItem.icon != null) {
         rememberVectorPainter(downloadDialogItem.icon)
     } else {
-        painterResource(id = R.drawable.ic_core_chapter_icon)
+        painterResource(id = R.drawable.core_ic_chapter_icon)
     }
     Row(
         modifier = modifier.padding(vertical = 6.dp),

core/src/main/java/org/openedx/core/presentation/dialog/selectorbottomsheet/SelectBottomDialogFragment.kt

@@ -25,7 +25,6 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
-import androidx.fragment.app.DialogFragment
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -47,7 +46,7 @@ class SelectBottomDialogFragment : BottomSheetDialogFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         viewModel.values = requireArguments().parcelableArrayList(ARG_LIST_VALUES)!!
-        setStyle(DialogFragment.STYLE_NORMAL, R.style.BottomSheetDialog)
+        setStyle(STYLE_NORMAL, R.style.BottomSheetDialog)
     }
 
     override fun onCreateView(

core/src/main/res/drawable/core_ic_check.xml

@@ -1,13 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="12dp"
-    android:viewportWidth="18"
-    android:viewportHeight="12">
-  <path
-      android:pathData="M1.5,6L6.5,11L16.5,1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.75"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:pathData="M7.667,1.333C3.987,1.333 1,4.32 1,8C1,11.68 3.987,14.666 7.667,14.666C11.347,14.666 14.333,11.68 14.333,8C14.333,4.32 11.347,1.333 7.667,1.333ZM6.333,11.333L3,8L3.94,7.06L6.333,9.446L11.393,4.386L12.333,5.333L6.333,11.333Z"
+        android:fillColor="#0D7D4D" />
 </vector>

core/src/main/res/values/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">@string/platform_name</string>
 
-    <string name="core_results">Results</string>
     <string name="core_error_invalid_grant">Invalid credentials</string>
     <string name="core_error_no_connection">Slow or no internet connection</string>
     <string name="core_error_unknown_error">Something went wrong</string>
@@ -57,7 +56,6 @@
     <string name="core_settings">Settings</string>
     <string name="core_app_update_required_title">App Update Required</string>
     <string name="core_app_update_required_description">This version of the OpenEdX app is out-of-date. To continue learning and get the latest features and fixes, please upgrade to the latest version.</string>
-    <string name="core_why_do_you_need_update">Why do I need to update?</string>
     <string name="core_version">Version: %1$s</string>
     <string name="core_up_to_date">Up-to-date</string>
     <string name="core_tap_to_update_to_version">Tap to update to version %1$s</string>
@@ -130,12 +128,10 @@
     <string name="core_video_download_quality">Video download quality</string>
     <string name="core_manage_account">Manage Account</string>
 
-    <string name="core_assignment_due_tag" tools:ignore="MissingTranslation">Assignment Due</string>
     <string name="core_title_syncing_calendar" tools:ignore="MissingTranslation">Syncing calendar…</string>
 
     <!-- region: Calendar Sync -->
     <string name="core_header_sync_to_calendar" tools:ignore="MissingTranslation">Sync to calendar</string>
-    <string name="core_body_sync_to_calendar" tools:ignore="MissingTranslation">Automatically sync all deadlines and due dates for this course to your calendar.</string>
 
     <string name="core_title_request_calendar_permission" tools:ignore="MissingTranslation">\“%s\” Would Like to Access Your Calendar</string>
     <string name="core_message_request_calendar_permission" tools:ignore="MissingTranslation">%s would like to use your calendar list to subscribe to your personalized %s calendar for this course.</string>
@@ -157,18 +153,8 @@
     <string name="core_label_update_now" tools:ignore="MissingTranslation">Update Now</string>
     <string name="core_label_remove_course_calendar" tools:ignore="MissingTranslation">Remove Course Calendar</string>
 
-    <string name="core_snackbar_course_calendar_added" tools:ignore="MissingTranslation">Your course calendar has been added.</string>
-    <string name="core_snackbar_course_calendar_removed" tools:ignore="MissingTranslation">Your course calendar has been removed.</string>
-    <string name="core_snackbar_course_calendar_updated" tools:ignore="MissingTranslation">Your course calendar has been updated.</string>
-    <string name="core_snackbar_course_calendar_error" tools:ignore="MissingTranslation">Error Adding Calendar, Please try later</string>
-
     <!-- endregion -->
 
-    <string name="core_course_container_nav_home">Home</string>
-    <string name="core_course_container_nav_videos">Videos</string>
-    <string name="core_course_container_nav_discussions">Discussions</string>
-    <string name="core_course_container_nav_more">More</string>
-    <string name="core_course_container_nav_dates" tools:ignore="MissingTranslation">Dates</string>
     <string name="core_no_course_content">No course content is currently available.</string>
     <string name="core_no_videos">There are currently no videos for this course.</string>
     <string name="core_no_dates">Course dates are currently not available.</string>

core/src/main/res/values/themes.xml

@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.OpenEdX" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
@@ -20,7 +20,4 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="Theme.OpenEdX.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.OpenEdX.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>