feat: color coding, detekt fixes

Author: PavloNetrebchuk

app/src/main/java/org/openedx/app/di/ScreenModule.kt

@@ -542,7 +542,9 @@ val screenModule = module {
             courseId = courseId,
             courseName = courseName,
             interactor = get(),
-            courseRouter = get()
+            courseRouter = get(),
+            courseNotifier = get(),
+            analytics = get()
         )
     }
 }

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

@@ -4,6 +4,8 @@ import com.google.gson.annotations.SerializedName
 import org.openedx.core.data.model.room.AssignmentProgressDb
 import org.openedx.core.domain.model.AssignmentProgress
 
+private const val DEFAULT_LABEL_LENGTH = 5
+
 data class AssignmentProgress(
     @SerializedName("assignment_type")
     val assignmentType: String?,
@@ -18,7 +20,7 @@ data class AssignmentProgress(
         assignmentType = assignmentType ?: "",
         numPointsEarned = numPointsEarned ?: 0f,
         numPointsPossible = numPointsPossible ?: 0f,
-        label = label ?: displayName.take(5)
+        label = label ?: displayName.take(DEFAULT_LABEL_LENGTH)
     )
 
     fun mapToRoomEntity() = AssignmentProgressDb(

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

@@ -157,6 +157,7 @@ data class CourseProgressResponse(
             displayName = displayName ?: "",
             subsections = subsections?.map { it.mapToDomain() } ?: emptyList()
         )
+
         data class Subsection(
             @SerializedName("assignment_type") val assignmentType: String?,
             @SerializedName("block_key") val blockKey: String?,
@@ -203,6 +204,7 @@ data class CourseProgressResponse(
                 showGrades = showGrades ?: false,
                 url = url ?: ""
             )
+
             data class ProblemScore(
                 @SerializedName("earned") val earned: Double?,
                 @SerializedName("possible") val possible: Double?

core/src/main/java/org/openedx/core/data/model/room/CourseProgressEntity.kt

@@ -131,6 +131,7 @@ data class GradingPolicyDb(
             Color(colorString.toColorInt())
         }
     )
+
     data class AssignmentPolicyDb(
         @ColumnInfo("numDroppable")
         val numDroppable: Int,
@@ -163,6 +164,7 @@ data class SectionScoreDb(
         displayName = displayName,
         subsections = subsections.map { it.mapToDomain() }
     )
+
     data class SubsectionDb(
         @ColumnInfo("assignmentType")
         val assignmentType: String,
@@ -206,6 +208,7 @@ data class SectionScoreDb(
             showGrades = showGrades,
             url = url
         )
+
         data class ProblemScoreDb(
             @ColumnInfo("earned")
             val earned: Double,

core/src/main/java/org/openedx/core/data/storage/CourseDao.kt

@@ -42,6 +42,9 @@ interface CourseDao {
     suspend fun getCourseEnrollmentDetailsById(id: String): CourseEnrollmentDetailsEntity?
 
 
+    @Query("DELETE FROM course_progress_table")
+    suspend fun clearCourseProgressData()
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertVideoProgressEntity(vararg videoProgressEntity: VideoProgressEntity)
 

core/src/main/java/org/openedx/core/domain/model/AssignmentProgress.kt

@@ -14,5 +14,9 @@ data class AssignmentProgress(
 ) : Parcelable {
 
     @IgnoredOnParcel
-    val value: Float = numPointsEarned.toFloat().safeDivBy(numPointsPossible.toFloat())
+    val value: Float = numPointsEarned.safeDivBy(numPointsPossible)
+
+    override fun toString(): String {
+        return "${numPointsEarned.toInt()}/${numPointsPossible.toInt()}"
+    }
 }

core/src/main/java/org/openedx/core/module/download/BaseDownloadViewModel.kt

@@ -34,7 +34,6 @@ abstract class BaseDownloadViewModel(
     private val _downloadModelsStatusFlow = MutableSharedFlow<HashMap<String, DownloadedState>>()
     protected val downloadModelsStatusFlow = _downloadModelsStatusFlow.asSharedFlow()
 
-    private var downloadingModelsList = listOf<DownloadModel>()
     private val _downloadingModelsFlow = MutableSharedFlow<List<DownloadModel>>()
     protected val downloadingModelsFlow = _downloadingModelsFlow.asSharedFlow()
 

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

@@ -12,28 +12,31 @@ object PreviewHelper {
 
     private fun extractYouTubeVideoId(url: String): String {
         val regex = Regex(
-            "^(?:https?://)?(?:www\\.)?(?:youtube\\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)|.*[?&]v=)|youtu\\.be/)([^\"&?/\\s]{11})",
+            "^(?:https?://)?(?:www\\.)?(?:youtube\\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)|.*[?&]v=)|youtu\\.be/)" +
+                    "([^\"&?/\\s]{11})",
             RegexOption.IGNORE_CASE
         )
         val matchResult = regex.find(url)
         return matchResult?.groups?.get(1)?.value ?: ""
     }
 
-
     fun getVideoFrameBitmap(isOnline: Boolean, videoUrl: String): Bitmap? {
+        if (!isOnline && !isLocalFile(videoUrl)) {
+            return null
+        }
+
         val retriever = MediaMetadataRetriever()
-        try {
-            if (!isOnline && !isLocalFile(videoUrl)) return null
+        return try {
             if (isLocalFile(videoUrl)) {
                 retriever.setDataSource(videoUrl)
             } else {
                 retriever.setDataSource(videoUrl, HashMap())
             }
-            return retriever.getFrameAtTime(0)
+            retriever.getFrameAtTime(0)
         } catch (e: Exception) {
             // Log the exception for debugging but don't crash
             e.printStackTrace()
-            return null
+            null
         } finally {
             try {
                 retriever.release()
@@ -47,4 +50,4 @@ object PreviewHelper {
     private fun isLocalFile(url: String): Boolean {
         return url.startsWith("/") || url.startsWith("file://")
     }
-}
+}

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

@@ -77,6 +77,25 @@ object TimeUtils {
             }
         }
     }
+    fun formatToDueInString(context: Context, date: Date): String {
+        val now = Calendar.getInstance()
+        val dueDate = Calendar.getInstance().apply { time = date }
+        now.set(Calendar.HOUR_OF_DAY, 0)
+        now.set(Calendar.MINUTE, 0)
+        now.set(Calendar.SECOND, 0)
+        now.set(Calendar.MILLISECOND, 0)
+        dueDate.set(Calendar.HOUR_OF_DAY, 0)
+        dueDate.set(Calendar.MINUTE, 0)
+        dueDate.set(Calendar.SECOND, 0)
+        dueDate.set(Calendar.MILLISECOND, 0)
+        val daysDifference =
+            ((dueDate.timeInMillis - now.timeInMillis) / (24 * 60 * 60 * 1000)).toInt()
+        return when {
+            daysDifference < 0 -> context.getString(R.string.core_date_type_past_due)
+            daysDifference == 0 -> context.getString(R.string.core_date_type_today)
+            else -> context.getString(R.string.core_date_format_due_in_days, daysDifference)
+        }
+    }
 
     fun getCurrentTime(): Long {
         return Calendar.getInstance().timeInMillis

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

@@ -87,11 +87,13 @@
     <string name="core_date_type_completed" tools:ignore="MissingTranslation">Completed</string>
     <string name="core_date_type_past_due" tools:ignore="MissingTranslation">Past Due</string>
     <string name="core_date_type_today" tools:ignore="MissingTranslation">Today</string>
+    <string name="core_date_type_tomorrow" tools:ignore="MissingTranslation">Due Tomorrow</string>
     <string name="core_date_type_this_week" tools:ignore="MissingTranslation">This Week</string>
     <string name="core_date_type_next_week" tools:ignore="MissingTranslation">Next Week</string>
     <string name="core_date_type_upcoming" tools:ignore="MissingTranslation">Upcoming</string>
     <string name="core_date_type_none" tools:ignore="MissingTranslation">None</string>
     <string name="core_date_format_assignment_due" tools:ignore="MissingTranslation">Due %1$s</string>
+    <string name="core_date_format_due_in_days" tools:ignore="MissingTranslation">Due in %1$d days</string>
     <plurals name="core_date_items_hidden" tools:ignore="MissingTranslation">
         <item quantity="one">%d Item Hidden</item>
         <item quantity="other">%d Items Hidden</item>