refactor: download icon configurable

Farhan Arshad · Farhan Arshad · commit c5dc98c20cee · 2024-12-04T15:24:58.000+05:00
- Minor UI improvements.

fixes: LEARNER-10140
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,8 +34,8 @@ android {
         applicationId appId
         minSdk 24
         targetSdk 34
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 6000006
+        versionName "6.0.6"
 
         resourceConfigurations += ["en", "uk"]
 
diff --git a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
@@ -35,6 +35,9 @@ data class AppColors(
     val secondaryButtonBorderedText: Color,
     val secondaryButtonBorderedBackground: Color,
 
+    val downloadingSuccess: Color,
+    val downloadingNotStarted: Color,
+
     val cardViewBackground: Color,
     val cardViewBorder: Color,
     val divider: Color,
diff --git a/core/src/main/java/org/openedx/core/ui/theme/Theme.kt b/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
@@ -52,6 +52,9 @@ private val DarkColorPalette = AppColors(
     secondaryButtonBorderedText = dark_secondary_button_bordered_text,
     secondaryButtonBorderedBackground = dark_secondary_button_bordered_background,
 
+    downloadingSuccess = dark_downloading_success,
+    downloadingNotStarted = dark_downloading_not_started,
+
     cardViewBackground = dark_card_view_background,
     cardViewBorder = dark_card_view_border,
     divider = dark_divider,
@@ -142,6 +145,9 @@ private val LightColorPalette = AppColors(
     secondaryButtonBorderedBackground = light_secondary_button_bordered_background,
     secondaryButtonBorderedText = light_secondary_button_bordered_text,
 
+    downloadingSuccess = light_downloading_success,
+    downloadingNotStarted = light_downloading_not_started,
+
     cardViewBackground = light_card_view_background,
     cardViewBorder = light_card_view_border,
     divider = light_divider,
diff --git a/core/src/openedx/org/openedx/core/ui/theme/Colors.kt b/core/src/openedx/org/openedx/core/ui/theme/Colors.kt
@@ -43,6 +43,9 @@ val light_secondary_button_border = light_primary_button_border
 val light_secondary_button_bordered_text = light_primary_button_bordered_text
 val light_secondary_button_bordered_background = light_primary_button_bordered_background
 
+val light_downloading_success = Color(0xFF198571)
+val light_downloading_not_started = Color(0xFF3C68FF)
+
 val light_card_view_background = Color(0xFFF9FAFB)
 val light_card_view_border = Color(0xFFCCD4E0)
 val light_divider = Color(0xFFCCD4E0)
@@ -114,6 +117,9 @@ val dark_secondary_button_border = dark_primary_button_border
 val dark_secondary_button_bordered_text = dark_primary_button_bordered_text
 val dark_secondary_button_bordered_background = dark_primary_button_bordered_background
 
+val dark_downloading_success = Color(0xFF198571)
+val dark_downloading_not_started = Color(0xFF879FF5)
+
 val dark_card_view_background = Color(0xFF273346)
 val dark_card_view_border = Color(0xFF4E5A70)
 val dark_divider = Color(0xFF4E5A70)
diff --git a/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineScreen.kt b/course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineScreen.kt
@@ -59,6 +59,7 @@ import org.openedx.core.ui.CircularProgress
 import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.NoContentScreen
 import org.openedx.core.ui.OpenEdXPrimaryButton
+import org.openedx.core.ui.OpenEdXSecondaryButton
 import org.openedx.core.ui.TextIcon
 import org.openedx.core.ui.displayCutoutForLandscape
 import org.openedx.core.ui.theme.OpenEdXTheme
@@ -389,7 +390,7 @@ private fun ResumeCourse(
             )
         }
         Spacer(Modifier.height(24.dp))
-        OpenEdXPrimaryButton(
+        OpenEdXSecondaryButton(
             text = stringResource(id = R.string.course_resume),
             onClick = {
                 onResumeClick(block.id)
@@ -398,7 +399,7 @@ private fun ResumeCourse(
                 TextIcon(
                     text = stringResource(id = R.string.course_resume),
                     painter = painterResource(id = CoreR.drawable.core_ic_forward),
-                    color = MaterialTheme.appColors.primaryButtonText,
+                    color = MaterialTheme.appColors.secondaryButtonText,
                     textStyle = MaterialTheme.appTypography.labelLarge
                 )
             }
@@ -457,7 +458,7 @@ private fun ResumeCourseTablet(
                 TextIcon(
                     text = stringResource(id = R.string.course_resume),
                     painter = painterResource(id = CoreR.drawable.core_ic_forward),
-                    color = MaterialTheme.appColors.primaryButtonText,
+                    color = MaterialTheme.appColors.secondaryButtonText,
                     textStyle = MaterialTheme.appTypography.labelLarge
                 )
             }
diff --git a/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt b/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
@@ -89,8 +89,8 @@ import org.openedx.core.module.db.DownloadedState
 import org.openedx.core.module.db.FileType
 import org.openedx.core.ui.BackBtn
 import org.openedx.core.ui.IconText
-import org.openedx.core.ui.OpenEdXPrimaryButton
 import org.openedx.core.ui.OpenEdXPrimaryOutlinedButton
+import org.openedx.core.ui.OpenEdXSecondaryButton
 import org.openedx.core.ui.displayCutoutForLandscape
 import org.openedx.core.ui.noRippleClickable
 import org.openedx.core.ui.theme.OpenEdXTheme
@@ -725,9 +725,9 @@ fun CourseExpandableChapterCard(
                     stringResource(id = R.string.course_accessibility_download_course_section)
                 }
                 val downloadIconTint = if (downloadedState == DownloadedState.DOWNLOADED) {
-                    MaterialTheme.appColors.successGreen
+                    MaterialTheme.appColors.downloadingSuccess
                 } else {
-                    MaterialTheme.appColors.textAccent
+                    MaterialTheme.appColors.downloadingNotStarted
                 }
                 IconButton(
                     modifier = iconModifier,
@@ -1061,7 +1061,7 @@ fun CourseDatesBanner(
         }
 
         banner.bannerType.buttonResId.nonZero()?.let {
-            OpenEdXPrimaryButton(
+            OpenEdXSecondaryButton(
                 text = stringResource(id = it),
                 onClick = resetDates,
             )
@@ -1115,7 +1115,7 @@ fun CourseDatesBannerTablet(
             }
         }
         banner.bannerType.buttonResId.nonZero()?.let {
-            OpenEdXPrimaryButton(
+            OpenEdXSecondaryButton(
                 modifier = Modifier.width(210.dp),
                 text = stringResource(id = it),
                 onClick = resetDates,
diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt b/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
@@ -662,7 +662,7 @@ private fun ResumeButton(
             .fillMaxWidth()
             .clickable { onClick() }
             .heightIn(min = 60.dp)
-            .background(MaterialTheme.appColors.primary)
+            .background(MaterialTheme.appColors.primaryButtonBackground)
             .padding(12.dp),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(12.dp)

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ import org.openedx.core.ui.CircularProgress`
`59`	`59`	`import org.openedx.core.ui.HandleUIMessage`
`60`	`60`	`import org.openedx.core.ui.NoContentScreen`
`61`	`61`	`import org.openedx.core.ui.OpenEdXPrimaryButton`
	`62`	`+import org.openedx.core.ui.OpenEdXSecondaryButton`
`62`	`63`	`import org.openedx.core.ui.TextIcon`
`63`	`64`	`import org.openedx.core.ui.displayCutoutForLandscape`
`64`	`65`	`import org.openedx.core.ui.theme.OpenEdXTheme`
`@@ -389,7 +390,7 @@ private fun ResumeCourse(`
`389`	`390`	`)`
`390`	`391`	`}`
`391`	`392`	`Spacer(Modifier.height(24.dp))`
`392`		`- OpenEdXPrimaryButton(`
	`393`	`+ OpenEdXSecondaryButton(`
`393`	`394`	`text = stringResource(id = R.string.course_resume),`
`394`	`395`	`onClick = {`
`395`	`396`	`onResumeClick(block.id)`
`@@ -398,7 +399,7 @@ private fun ResumeCourse(`
`398`	`399`	`TextIcon(`
`399`	`400`	`text = stringResource(id = R.string.course_resume),`
`400`	`401`	`painter = painterResource(id = CoreR.drawable.core_ic_forward),`
`401`		`- color = MaterialTheme.appColors.primaryButtonText,`
	`402`	`+ color = MaterialTheme.appColors.secondaryButtonText,`
`402`	`403`	`textStyle = MaterialTheme.appTypography.labelLarge`
`403`	`404`	`)`
`404`	`405`	`}`
`@@ -457,7 +458,7 @@ private fun ResumeCourseTablet(`
`457`	`458`	`TextIcon(`
`458`	`459`	`text = stringResource(id = R.string.course_resume),`
`459`	`460`	`painter = painterResource(id = CoreR.drawable.core_ic_forward),`
`460`		`- color = MaterialTheme.appColors.primaryButtonText,`
	`461`	`+ color = MaterialTheme.appColors.secondaryButtonText,`
`461`	`462`	`textStyle = MaterialTheme.appTypography.labelLarge`
`462`	`463`	`)`
`463`	`464`	`}`