Skip to content

Commit 40aa01f

Browse files
fix: detekt fix and changes according PR review
1 parent a408106 commit 40aa01f

File tree

8 files changed

+27
-12
lines changed

8 files changed

+27
-12
lines changed

app/src/main/java/org/openedx/app/AppActivity.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package org.openedx.app
22

33
import android.content.Intent
44
import android.content.res.Configuration
5+
import android.graphics.Color
56
import android.net.Uri
7+
import android.os.Build
68
import android.os.Bundle
79
import android.view.View
810
import android.view.WindowManager
@@ -158,8 +160,12 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
158160
WindowCompat.setDecorFitsSystemWindows(this, false)
159161
val insetsController = WindowInsetsControllerCompat(this, binding.root)
160162
insetsController.isAppearanceLightStatusBars = !isUsingNightModeResources()
161-
insetsController.systemBarsBehavior =
162-
WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
163+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
164+
insetsController.systemBarsBehavior =
165+
WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
166+
} else {
167+
window.statusBarColor = Color.TRANSPARENT
168+
}
163169
}
164170
}
165171

core/src/main/java/org/openedx/core/ui/theme/AppColors.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ data class AppColors(
8080
val progressBarColor: Color,
8181
val progressBarBackgroundColor: Color,
8282
val gradeProgressBarBorder: Color,
83+
val gradeProgressBarBackground: Color,
8384
) {
8485
val primary: Color get() = material.primary
8586
val primaryVariant: Color get() = material.primaryVariant

core/src/main/java/org/openedx/core/ui/theme/Theme.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ private val DarkColorPalette = AppColors(
9797

9898
progressBarColor = dark_progress_bar_color,
9999
progressBarBackgroundColor = dark_progress_bar_background_color,
100-
gradeProgressBarBorder = dark_grade_progress_bar_color
100+
gradeProgressBarBorder = dark_grade_progress_bar_color,
101+
gradeProgressBarBackground = dark_grade_progress_bar_background,
101102
)
102103

103104
private val LightColorPalette = AppColors(
@@ -187,7 +188,8 @@ private val LightColorPalette = AppColors(
187188

188189
progressBarColor = light_progress_bar_color,
189190
progressBarBackgroundColor = light_progress_bar_background_color,
190-
gradeProgressBarBorder = light_grade_progress_bar_color
191+
gradeProgressBarBorder = light_grade_progress_bar_color,
192+
gradeProgressBarBackground = light_grade_progress_bar_background
191193
)
192194

193195
val MaterialTheme.appColors: AppColors

core/src/main/java/org/openedx/core/utils/TimeUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ object TimeUtils {
9797
}
9898
}
9999

100-
fun formatToDayMonth(date: Date): String {
100+
fun formatToMonthDay(date: Date): String {
101101
val sdf = SimpleDateFormat("MMM dd", Locale.getDefault())
102102
return sdf.format(date)
103103
}

core/src/openedx/org/openedx/core/ui/theme/Colors.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ val light_settings_title_content = Color.White
7575
val light_progress_bar_color = light_success_green
7676
val light_progress_bar_background_color = Color(0xFFCCD4E0)
7777
val light_grade_progress_bar_color = Color.Black
78+
val light_grade_progress_bar_background = light_background
7879

7980
val dark_primary = Color(0xFF3F68F8)
8081
val dark_primary_variant = Color(0xFF3700B3)
@@ -149,3 +150,4 @@ val dark_settings_title_content = Color.White
149150
val dark_progress_bar_color = dark_success_green
150151
val dark_progress_bar_background_color = Color(0xFF8E9BAE)
151152
val dark_grade_progress_bar_color = Color.Transparent
153+
val dark_grade_progress_bar_background = Color(0xFF8E9BAE)

course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private fun AssignmentCard(
163163

164164
// Due date status text
165165
val dueDateStatusText = assignment.due?.let { due ->
166-
val formattedDate = TimeUtils.formatToDayMonth(due)
166+
val formattedDate = TimeUtils.formatToMonthDay(due)
167167
val daysDifference = ((due.time - Date().time) / MILLISECONDS_PER_DAY).toInt()
168168
when {
169169
daysDifference < 0 -> {

course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ fun GradeProgressBar(
519519
Box(
520520
modifier = Modifier
521521
.weight(notCompletedWeightedGradePercent)
522+
.background(MaterialTheme.appColors.gradeProgressBarBackground)
522523
.fillMaxHeight()
523524
)
524525
}

course/src/test/java/org/openedx/course/presentation/home/CourseHomeViewModelTest.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,13 @@ import org.openedx.foundation.system.ResourceManager
4646
import org.openedx.foundation.utils.FileUtil
4747
import java.net.UnknownHostException
4848

49+
@Suppress("LargeClass")
4950
@OptIn(ExperimentalCoroutinesApi::class)
5051
class CourseHomeViewModelTest {
5152

5253
@get:Rule
5354
val testInstantTaskExecutorRule: TestRule = InstantTaskExecutorRule()
54-
5555
private val dispatcher = StandardTestDispatcher()
56-
5756
private val courseId = "test-course-id"
5857
private val courseTitle = "Test Course"
5958
private val context = mockk<Context>()
@@ -92,8 +91,12 @@ class CourseHomeViewModelTest {
9291

9392
every { resourceManager.getString(R.string.core_error_no_connection) } returns noInternet
9493
every { resourceManager.getString(R.string.core_error_unknown_error) } returns somethingWrong
95-
every { resourceManager.getString(org.openedx.course.R.string.course_can_download_only_with_wifi) } returns cantDownload
96-
every { resourceManager.getString(R.string.core_dates_shift_dates_unsuccessful_msg) } returns "Failed to shift dates"
94+
every {
95+
resourceManager.getString(org.openedx.course.R.string.course_can_download_only_with_wifi)
96+
} returns cantDownload
97+
every {
98+
resourceManager.getString(R.string.core_dates_shift_dates_unsuccessful_msg)
99+
} returns "Failed to shift dates"
97100

98101
every { config.getCourseUIConfig().isCourseDropdownNavigationEnabled } returns true
99102
every { config.getCourseUIConfig().isCourseDownloadQueueEnabled } returns true
@@ -234,14 +237,15 @@ class CourseHomeViewModelTest {
234237
assertTrue(viewModel.uiState.value !is CourseHomeUIState.CourseData)
235238
}
236239

240+
@Suppress("TooGenericExceptionThrown")
237241
@Test
238242
fun `getCourseData unknown error`() = runTest {
239243
coEvery {
240244
interactor.getCourseStructureFlow(
241245
courseId,
242246
false
243247
)
244-
} returns flow { throw Exception("Unknown error") }
248+
} returns flow { throw Exception() }
245249
coEvery { interactor.getCourseStatusFlow(courseId) } returns flow {
246250
emit(
247251
courseComponentStatus
@@ -748,7 +752,6 @@ class CourseHomeViewModelTest {
748752
)
749753

750754
advanceUntilIdle()
751-
752755
}
753756

754757
@Test

0 commit comments

Comments
 (0)