fix: detekt fix and changes according PR review

PavloNetrebchuk · PavloNetrebchuk · commit 8451c0559fdc · 2025-09-12T13:50:41.000+03:00
diff --git a/app/src/main/java/org/openedx/app/AppActivity.kt b/app/src/main/java/org/openedx/app/AppActivity.kt
@@ -2,7 +2,9 @@ package org.openedx.app
 
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Color
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
@@ -158,8 +160,12 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
             WindowCompat.setDecorFitsSystemWindows(this, false)
             val insetsController = WindowInsetsControllerCompat(this, binding.root)
             insetsController.isAppearanceLightStatusBars = !isUsingNightModeResources()
-            insetsController.systemBarsBehavior =
-                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                insetsController.systemBarsBehavior =
+                    WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            } else {
+                window.statusBarColor = Color.TRANSPARENT
+            }
         }
     }
 
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
@@ -80,6 +80,8 @@ data class AppColors(
     val progressBarColor: Color,
     val progressBarBackgroundColor: Color,
     val gradeProgressBarBorder: Color,
+    val gradeProgressBarBackground: Color,
+    val assignmentCardBorder: Color,
 ) {
     val primary: Color get() = material.primary
     val primaryVariant: Color get() = material.primaryVariant
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
@@ -97,7 +97,9 @@ private val DarkColorPalette = AppColors(
 
     progressBarColor = dark_progress_bar_color,
     progressBarBackgroundColor = dark_progress_bar_background_color,
-    gradeProgressBarBorder = dark_grade_progress_bar_color
+    gradeProgressBarBorder = dark_grade_progress_bar_color,
+    gradeProgressBarBackground = dark_grade_progress_bar_background,
+    assignmentCardBorder = dark_assignment_card_border,
 )
 
 private val LightColorPalette = AppColors(
@@ -187,7 +189,9 @@ private val LightColorPalette = AppColors(
 
     progressBarColor = light_progress_bar_color,
     progressBarBackgroundColor = light_progress_bar_background_color,
-    gradeProgressBarBorder = light_grade_progress_bar_color
+    gradeProgressBarBorder = light_grade_progress_bar_color,
+    gradeProgressBarBackground = light_grade_progress_bar_background,
+    assignmentCardBorder = light_assignment_card_border,
 )
 
 val MaterialTheme.appColors: AppColors
diff --git a/core/src/main/java/org/openedx/core/utils/TimeUtils.kt b/core/src/main/java/org/openedx/core/utils/TimeUtils.kt
@@ -97,7 +97,7 @@ object TimeUtils {
         }
     }
 
-    fun formatToDayMonth(date: Date): String {
+    fun formatToMonthDay(date: Date): String {
         val sdf = SimpleDateFormat("MMM dd", Locale.getDefault())
         return sdf.format(date)
     }
diff --git a/core/src/openedx/org/openedx/core/ui/theme/Colors.kt b/core/src/openedx/org/openedx/core/ui/theme/Colors.kt
@@ -75,6 +75,8 @@ val light_settings_title_content = Color.White
 val light_progress_bar_color = light_success_green
 val light_progress_bar_background_color = Color(0xFFCCD4E0)
 val light_grade_progress_bar_color = Color.Black
+val light_grade_progress_bar_background = light_background
+val light_assignment_card_border = Color(0xFFCCD4E0)
 
 val dark_primary = Color(0xFF3F68F8)
 val dark_primary_variant = Color(0xFF3700B3)
@@ -149,3 +151,5 @@ val dark_settings_title_content = Color.White
 val dark_progress_bar_color = dark_success_green
 val dark_progress_bar_background_color = Color(0xFF8E9BAE)
 val dark_grade_progress_bar_color = Color.Transparent
+val dark_grade_progress_bar_background = Color(0xFF8E9BAE)
+val dark_assignment_card_border = Color(0xFF8E9BAE)
diff --git a/course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt b/course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt
@@ -268,7 +268,7 @@ private fun AssignmentGroupSection(
         if (isCompletedShown || progress.value != 1f) {
             if (assignments.size > 1) {
                 LazyRow(
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp),
                     modifier = Modifier.padding(vertical = 8.dp),
                     contentPadding = PaddingValues(horizontal = 24.dp)
                 ) {
@@ -303,7 +303,7 @@ private fun AssignmentGroupSection(
                 AssignmentDetails(
                     modifier = Modifier
                         .padding(horizontal = 24.dp)
-                        .padding(top = 8.dp),
+                        .padding(top = 12.dp),
                     assignment = assignment,
                     sectionName = sectionNames[assignment.id] ?: "",
                     onAssignmentClick = onAssignmentClick
@@ -429,7 +429,7 @@ private fun AssignmentDetails(
     val color = when {
         assignment.isCompleted() -> MaterialTheme.appColors.successGreen
         isDuePast -> MaterialTheme.appColors.warning
-        else -> MaterialTheme.appColors.cardViewBorder
+        else -> MaterialTheme.appColors.assignmentCardBorder
     }
     val label = assignment.assignmentProgress?.label
     val description = when {
@@ -495,12 +495,14 @@ private fun AssignmentDetails(
                         color = MaterialTheme.appColors.textDark
                     )
                     Text(
+                        modifier = Modifier.padding(top = 4.dp),
                         text = assignment.displayName,
                         style = MaterialTheme.appTypography.bodyLarge,
                         color = MaterialTheme.appColors.textDark
                     )
                     if (description.isNotEmpty()) {
                         Text(
+                            modifier = Modifier.padding(top = 6.dp),
                             text = description,
                             style = MaterialTheme.appTypography.bodySmall,
                             color = MaterialTheme.appColors.textDark
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
@@ -483,18 +483,18 @@ private fun DashboardPager(
                     onNavigateToContent = { contentTab ->
                         scope.launch {
                             // First scroll to CONTENT tab
-                            pagerState.animateScrollToPage(
+                            pagerState.scrollToPage(
                                 CourseContainerTab.entries.indexOf(CourseContainerTab.CONTENT)
                             )
                             // Then scroll to the specified content tab
-                            contentTabPagerState.animateScrollToPage(
+                            contentTabPagerState.scrollToPage(
                                 CourseContentTab.entries.indexOf(contentTab)
                             )
                         }
                     },
                     onNavigateToProgress = {
                         scope.launch {
-                            pagerState.animateScrollToPage(
+                            pagerState.scrollToPage(
                                 CourseContainerTab.entries.indexOf(CourseContainerTab.PROGRESS)
                             )
                         }
@@ -582,7 +582,7 @@ private fun DashboardPager(
                     onTabSelected = onContentTabSelected,
                     onNavigateToHome = {
                         scope.launch {
-                            pagerState.animateScrollToPage(
+                            pagerState.scrollToPage(
                                 CourseContainerTab.entries.indexOf(
                                     CourseContainerTab.HOME
                                 )
@@ -711,14 +711,14 @@ private fun SetupCourseAccessErrorButtons(
 @OptIn(ExperimentalFoundationApi::class)
 private fun scrollToDates(scope: CoroutineScope, pagerState: PagerState) {
     scope.launch {
-        pagerState.animateScrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.DATES))
+        pagerState.scrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.DATES))
     }
 }
 
 @OptIn(ExperimentalFoundationApi::class)
 private fun scrollToProgress(scope: CoroutineScope, pagerState: PagerState) {
     scope.launch {
-        pagerState.animateScrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.PROGRESS))
+        pagerState.scrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.PROGRESS))
     }
 }
 
@@ -734,6 +734,7 @@ private fun HomeNavigationRow(homePagerState: PagerState) {
     ) {
         val isPreviousPageEnabled = homePagerState.currentPage > 0
         IconButton(
+            modifier = Modifier.size(60.dp),
             enabled = homePagerState.currentPage > 0,
             onClick = {
                 homeCoroutineScope.launch {
@@ -762,6 +763,7 @@ private fun HomeNavigationRow(homePagerState: PagerState) {
         )
         val isNextPageEnabled = homePagerState.currentPage < CourseHomePagerTab.entries.size - 1
         IconButton(
+            modifier = Modifier.size(60.dp),
             enabled = isNextPageEnabled,
             onClick = {
                 homeCoroutineScope.launch {
diff --git a/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt
@@ -163,7 +163,7 @@ private fun AssignmentCard(
 
     // Due date status text
     val dueDateStatusText = assignment.due?.let { due ->
-        val formattedDate = TimeUtils.formatToDayMonth(due)
+        val formattedDate = TimeUtils.formatToMonthDay(due)
         val daysDifference = ((due.time - Date().time) / MILLISECONDS_PER_DAY).toInt()
         when {
             daysDifference < 0 -> {
diff --git a/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt b/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt
@@ -397,14 +397,14 @@ fun ViewAllButton(
         Icon(
             imageVector = Icons.AutoMirrored.Filled.List,
             contentDescription = null,
-            tint = MaterialTheme.appColors.primary,
+            tint = MaterialTheme.appColors.textAccent,
             modifier = Modifier.size(20.dp)
         )
         Spacer(modifier = Modifier.width(8.dp))
         Text(
             text = text,
             style = MaterialTheme.appTypography.labelLarge,
-            color = MaterialTheme.appColors.primary
+            color = MaterialTheme.appColors.textAccent
         )
     }
 }
diff --git a/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt b/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt
@@ -519,6 +519,7 @@ fun GradeProgressBar(
             Box(
                 modifier = Modifier
                     .weight(notCompletedWeightedGradePercent)
+                    .background(MaterialTheme.appColors.gradeProgressBarBackground)
                     .fillMaxHeight()
             )
         }
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
@@ -855,7 +855,7 @@ fun DownloadIcon(
             val downloadIconTint = if (downloadedState == DownloadedState.DOWNLOADED) {
                 MaterialTheme.appColors.successGreen
             } else {
-                MaterialTheme.appColors.textAccent
+                MaterialTheme.appColors.primary
             }
             IconButton(
                 modifier = iconModifier,
diff --git a/course/src/main/res/values/strings.xml b/course/src/main/res/values/strings.xml
@@ -85,7 +85,7 @@
     <string name="course_completed_of">%1$s/%2$s Completed</string>
     <string name="course_complete_points">Complete - %1$s points</string>
     <string name="course_past_due">Past Due - %1$s points</string>
-    <string name="course_in_progress">In Progress - %1$s points</string>
+    <string name="course_in_progress">- %1$s points</string>
     <string name="course_of_grade">%1$s %% of Grade</string>
     <string name="course_review_grading_policy">Review Course Grading Policy</string>
     <string name="course_return_to_course_home">Return to Course Home</string>
diff --git a/course/src/test/java/org/openedx/course/presentation/home/CourseHomeViewModelTest.kt b/course/src/test/java/org/openedx/course/presentation/home/CourseHomeViewModelTest.kt
@@ -46,14 +46,13 @@ import org.openedx.foundation.system.ResourceManager
 import org.openedx.foundation.utils.FileUtil
 import java.net.UnknownHostException
 
+@Suppress("LargeClass")
 @OptIn(ExperimentalCoroutinesApi::class)
 class CourseHomeViewModelTest {
 
     @get:Rule
     val testInstantTaskExecutorRule: TestRule = InstantTaskExecutorRule()
-
     private val dispatcher = StandardTestDispatcher()
-
     private val courseId = "test-course-id"
     private val courseTitle = "Test Course"
     private val context = mockk<Context>()
@@ -92,8 +91,12 @@ class CourseHomeViewModelTest {
 
         every { resourceManager.getString(R.string.core_error_no_connection) } returns noInternet
         every { resourceManager.getString(R.string.core_error_unknown_error) } returns somethingWrong
-        every { resourceManager.getString(org.openedx.course.R.string.course_can_download_only_with_wifi) } returns cantDownload
-        every { resourceManager.getString(R.string.core_dates_shift_dates_unsuccessful_msg) } returns "Failed to shift dates"
+        every {
+            resourceManager.getString(org.openedx.course.R.string.course_can_download_only_with_wifi)
+        } returns cantDownload
+        every {
+            resourceManager.getString(R.string.core_dates_shift_dates_unsuccessful_msg)
+        } returns "Failed to shift dates"
 
         every { config.getCourseUIConfig().isCourseDropdownNavigationEnabled } returns true
         every { config.getCourseUIConfig().isCourseDownloadQueueEnabled } returns true
@@ -234,14 +237,15 @@ class CourseHomeViewModelTest {
         assertTrue(viewModel.uiState.value !is CourseHomeUIState.CourseData)
     }
 
+    @Suppress("TooGenericExceptionThrown")
     @Test
     fun `getCourseData unknown error`() = runTest {
         coEvery {
             interactor.getCourseStructureFlow(
                 courseId,
                 false
             )
-        } returns flow { throw Exception("Unknown error") }
+        } returns flow { throw Exception() }
         coEvery { interactor.getCourseStatusFlow(courseId) } returns flow {
             emit(
                 courseComponentStatus
@@ -748,7 +752,6 @@ class CourseHomeViewModelTest {
         )
 
         advanceUntilIdle()
-
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ object TimeUtils {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- fun formatToDayMonth(date: Date): String {`
	`100`	`+ fun formatToMonthDay(date: Date): String {`
`101`	`101`	`val sdf = SimpleDateFormat("MMM dd", Locale.getDefault())`
`102`	`102`	`return sdf.format(date)`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -483,18 +483,18 @@ private fun DashboardPager(`
`483`	`483`	`onNavigateToContent = { contentTab ->`
`484`	`484`	`scope.launch {`
`485`	`485`	`// First scroll to CONTENT tab`
`486`		`- pagerState.animateScrollToPage(`
	`486`	`+ pagerState.scrollToPage(`
`487`	`487`	`CourseContainerTab.entries.indexOf(CourseContainerTab.CONTENT)`
`488`	`488`	`)`
`489`	`489`	`// Then scroll to the specified content tab`
`490`		`- contentTabPagerState.animateScrollToPage(`
	`490`	`+ contentTabPagerState.scrollToPage(`
`491`	`491`	`CourseContentTab.entries.indexOf(contentTab)`
`492`	`492`	`)`
`493`	`493`	`}`
`494`	`494`	`},`
`495`	`495`	`onNavigateToProgress = {`
`496`	`496`	`scope.launch {`
`497`		`- pagerState.animateScrollToPage(`
	`497`	`+ pagerState.scrollToPage(`
`498`	`498`	`CourseContainerTab.entries.indexOf(CourseContainerTab.PROGRESS)`
`499`	`499`	`)`
`500`	`500`	`}`
`@@ -582,7 +582,7 @@ private fun DashboardPager(`
`582`	`582`	`onTabSelected = onContentTabSelected,`
`583`	`583`	`onNavigateToHome = {`
`584`	`584`	`scope.launch {`
`585`		`- pagerState.animateScrollToPage(`
	`585`	`+ pagerState.scrollToPage(`
`586`	`586`	`CourseContainerTab.entries.indexOf(`
`587`	`587`	`CourseContainerTab.HOME`
`588`	`588`	`)`
`@@ -711,14 +711,14 @@ private fun SetupCourseAccessErrorButtons(`
`711`	`711`	`@OptIn(ExperimentalFoundationApi::class)`
`712`	`712`	`private fun scrollToDates(scope: CoroutineScope, pagerState: PagerState) {`
`713`	`713`	`scope.launch {`
`714`		`- pagerState.animateScrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.DATES))`
	`714`	`+ pagerState.scrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.DATES))`
`715`	`715`	`}`
`716`	`716`	`}`
`717`	`717`
`718`	`718`	`@OptIn(ExperimentalFoundationApi::class)`
`719`	`719`	`private fun scrollToProgress(scope: CoroutineScope, pagerState: PagerState) {`
`720`	`720`	`scope.launch {`
`721`		`- pagerState.animateScrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.PROGRESS))`
	`721`	`+ pagerState.scrollToPage(CourseContainerTab.entries.indexOf(CourseContainerTab.PROGRESS))`
`722`	`722`	`}`
`723`	`723`	`}`
`724`	`724`
`@@ -734,6 +734,7 @@ private fun HomeNavigationRow(homePagerState: PagerState) {`
`734`	`734`	`) {`
`735`	`735`	`val isPreviousPageEnabled = homePagerState.currentPage > 0`
`736`	`736`	`IconButton(`
	`737`	`+ modifier = Modifier.size(60.dp),`
`737`	`738`	`enabled = homePagerState.currentPage > 0,`
`738`	`739`	`onClick = {`
`739`	`740`	`homeCoroutineScope.launch {`
`@@ -762,6 +763,7 @@ private fun HomeNavigationRow(homePagerState: PagerState) {`
`762`	`763`	`)`
`763`	`764`	`val isNextPageEnabled = homePagerState.currentPage < CourseHomePagerTab.entries.size - 1`
`764`	`765`	`IconButton(`
	`766`	`+ modifier = Modifier.size(60.dp),`
`765`	`767`	`enabled = isNextPageEnabled,`
`766`	`768`	`onClick = {`
`767`	`769`	`homeCoroutineScope.launch {`
Original file line number	Diff line number	Diff line change
`@@ -397,14 +397,14 @@ fun ViewAllButton(`
`397`	`397`	`Icon(`
`398`	`398`	`imageVector = Icons.AutoMirrored.Filled.List,`
`399`	`399`	`contentDescription = null,`
`400`		`- tint = MaterialTheme.appColors.primary,`
	`400`	`+ tint = MaterialTheme.appColors.textAccent,`
`401`	`401`	`modifier = Modifier.size(20.dp)`
`402`	`402`	`)`
`403`	`403`	`Spacer(modifier = Modifier.width(8.dp))`
`404`	`404`	`Text(`
`405`	`405`	`text = text,`
`406`	`406`	`style = MaterialTheme.appTypography.labelLarge,`
`407`		`- color = MaterialTheme.appColors.primary`
	`407`	`+ color = MaterialTheme.appColors.textAccent`
`408`	`408`	`)`
`409`	`409`	`}`
`410`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -519,6 +519,7 @@ fun GradeProgressBar(`
`519`	`519`	`Box(`
`520`	`520`	`modifier = Modifier`
`521`	`521`	`.weight(notCompletedWeightedGradePercent)`
	`522`	`+ .background(MaterialTheme.appColors.gradeProgressBarBackground)`
`522`	`523`	`.fillMaxHeight()`
`523`	`524`	`)`
`524`	`525`	`}`