feat: [FC-0092]: Video navigation

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

@@ -29,6 +29,7 @@ import org.openedx.course.presentation.outline.CourseContentAllViewModel
 import org.openedx.course.presentation.progress.CourseProgressViewModel
 import org.openedx.course.presentation.section.CourseSectionViewModel
 import org.openedx.course.presentation.unit.container.CourseUnitContainerViewModel
+import org.openedx.course.presentation.unit.container.CourseViewMode
 import org.openedx.course.presentation.unit.html.HtmlUnitViewModel
 import org.openedx.course.presentation.unit.video.BaseVideoViewModel
 import org.openedx.course.presentation.unit.video.EncodedVideoUnitViewModel
@@ -340,10 +341,12 @@ val screenModule = module {
             get(),
         )
     }
-    viewModel { (courseId: String, unitId: String) ->
+    viewModel { (courseId: String, unitId: String, mode: CourseViewMode) ->
         CourseUnitContainerViewModel(
             courseId,
             unitId,
+            mode,
+            get(),
             get(),
             get(),
             get(),

app/src/main/java/org/openedx/app/room/AppDatabase.kt

@@ -23,7 +23,7 @@ import org.openedx.discovery.data.converter.DiscoveryConverter
 import org.openedx.discovery.data.model.room.CourseEntity
 import org.openedx.discovery.data.storage.DiscoveryDao
 
-const val DATABASE_VERSION = 4
+const val DATABASE_VERSION = 5
 const val DATABASE_NAME = "OpenEdX_db"
 
 @Suppress("MagicNumber")
@@ -44,7 +44,8 @@ const val DATABASE_NAME = "OpenEdX_db"
     autoMigrations = [
         AutoMigration(1, 2),
         AutoMigration(2, 3),
-        AutoMigration(3, DATABASE_VERSION),
+        AutoMigration(3, 4),
+        AutoMigration(4, DATABASE_VERSION),
     ],
     version = DATABASE_VERSION
 )

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

@@ -51,13 +51,13 @@ data class CourseInfoOverviewDb(
     val number: String,
     @ColumnInfo("org")
     val org: String,
-    @Embedded
+    @ColumnInfo("start")
     val start: Date?,
     @ColumnInfo("startDisplay")
     val startDisplay: String,
     @ColumnInfo("startType")
     val startType: String,
-    @Embedded
+    @ColumnInfo("end")
     val end: Date?,
     @ColumnInfo("isSelfPaced")
     val isSelfPaced: Boolean,

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

@@ -16,25 +16,25 @@ val light_onSurface = Color.Black
 val light_onError = Color.White
 val light_onWarning = Color.White
 val light_onInfo = Color.White
-val light_info_variant = Color(0xFF3C68FF)
+val light_info_variant = light_primary
 val light_text_primary = Color(0xFF212121)
 val light_text_primary_variant = Color(0xFF3D4964)
 val light_text_primary_light = light_text_primary
 val light_text_secondary = Color(0xFFB3B3B3)
 val light_text_dark = Color(0xFF19212F)
-val light_text_accent = Color(0xFF3C68FF)
+val light_text_accent = light_primary
 val light_text_warning = Color(0xFF19212F)
 val light_text_field_background = Color(0xFFF7F7F8)
 val light_text_field_background_variant = Color.White
 val light_text_field_border = Color(0xFF97A5BB)
 val light_text_field_text = Color(0xFF3D4964)
 val light_text_field_hint = Color(0xFF97A5BB)
-val light_text_hyper_link = Color(0xFF3C68FF)
+val light_text_hyper_link = light_primary
 
-val light_primary_button_background = Color(0xFF3C68FF)
+val light_primary_button_background = light_primary
 val light_primary_button_border = Color(0xFF97A5BB)
 val light_primary_button_text = Color.White
-val light_primary_button_bordered_text = Color(0xFF3C68FF)
+val light_primary_button_bordered_text = light_primary
 
 val light_secondary_button_background = light_primary_button_background
 val light_secondary_button_text = light_primary_button_text
@@ -102,12 +102,12 @@ val dark_text_field_background_variant = Color(0xFF273346)
 val dark_text_field_border = Color(0xFF4E5A70)
 val dark_text_field_text = Color.White
 val dark_text_field_hint = Color(0xFF79889F)
-val dark_text_hyper_link = Color(0xFF5478F9)
+val dark_text_hyper_link = dark_primary
 
-val dark_primary_button_background = Color(0xFF5478F9)
+val dark_primary_button_background = dark_primary
 val dark_primary_button_text = Color.White
 val dark_primary_button_border = Color(0xFF4E5A70)
-val dark_primary_button_bordered_text = Color(0xFF5478F9)
+val dark_primary_button_bordered_text = dark_primary
 
 val dark_secondary_button_background = dark_primary_button_background
 val dark_secondary_button_text = dark_primary_button_text

course/src/main/java/org/openedx/course/data/storage/CourseConverter.kt

@@ -8,9 +8,20 @@ import org.openedx.core.data.model.room.GradingPolicyDb
 import org.openedx.core.data.model.room.SectionScoreDb
 import org.openedx.core.data.model.room.discovery.CourseDateBlockDb
 import org.openedx.foundation.extension.genericType
+import java.util.Date
 
 class CourseConverter {
 
+    @TypeConverter
+    fun fromDate(value: Date?): Long? {
+        return value?.time
+    }
+
+    @TypeConverter
+    fun toDate(value: Long?): Date? {
+        return value?.let { Date(it) }
+    }
+
     @TypeConverter
     fun fromListOfString(value: List<String>): String {
         val json = Gson().toJson(value)

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

@@ -1,6 +1,5 @@
 package org.openedx.course.presentation.home
 
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -10,7 +9,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Card
 import androidx.compose.material.Icon
 import androidx.compose.material.LinearProgressIndicator
 import androidx.compose.material.MaterialTheme
@@ -26,9 +24,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import org.openedx.core.domain.model.Block
-import org.openedx.core.extension.getUnitChapter
 import org.openedx.core.ui.theme.appColors
-import org.openedx.core.ui.theme.appShapes
 import org.openedx.core.ui.theme.appTypography
 import org.openedx.course.R
 import org.openedx.course.presentation.contenttab.CourseContentVideoEmptyState
@@ -131,42 +127,21 @@ fun VideosHomePagerCardContent(
             Spacer(modifier = Modifier.height(8.dp))
 
             // Video card using CourseVideoItem
-            Card(
+            CourseVideoItem(
                 modifier = Modifier
-                    .fillMaxWidth(),
-                backgroundColor = MaterialTheme.appColors.cardViewBackground,
-                shape = MaterialTheme.appShapes.videoPreviewShape,
-                elevation = 0.dp,
-                border = BorderStroke(
-                    width = 1.dp,
-                    color = MaterialTheme.appColors.cardViewBorder
-                )
-            ) {
-                Column {
-                    CourseVideoItem(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(180.dp),
-                        videoBlock = firstIncompleteVideo,
-                        preview = uiState.videoPreview,
-                        progress = videoProgress,
-                        onClick = {
-                            onVideoClick(firstIncompleteVideo)
-                        },
-                        titleStyle = MaterialTheme.appTypography.titleMedium,
-                        contentModifier = Modifier
-                            .padding(horizontal = 16.dp, vertical = 8.dp),
-                        progressModifier = Modifier.height(8.dp),
-                    )
-                    Text(
-                        modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-                        text = uiState.courseStructure.blockData
-                            .getUnitChapter(firstIncompleteVideo.id)?.displayName ?: "",
-                        style = MaterialTheme.appTypography.labelMedium,
-                        color = MaterialTheme.appColors.textPrimary,
-                    )
-                }
-            }
+                    .fillMaxWidth()
+                    .height(180.dp),
+                videoBlock = firstIncompleteVideo,
+                preview = uiState.videoPreview,
+                progress = videoProgress,
+                onClick = {
+                    onVideoClick(firstIncompleteVideo)
+                },
+                titleStyle = MaterialTheme.appTypography.titleMedium,
+                contentModifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp),
+                progressModifier = Modifier.height(8.dp),
+            )
         } else {
             CaughtUpMessage(
                 message = stringResource(R.string.course_videos_caught_up)

course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt

@@ -51,6 +51,7 @@ import androidx.compose.material.Snackbar
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.Close
@@ -338,6 +339,7 @@ fun NavigationUnitsButtons(
     nextButtonText: String,
     hasPrevBlock: Boolean,
     hasNextBlock: Boolean,
+    showFinishButton: Boolean = true,
     isVerticalNavigation: Boolean,
     onPrevClick: () -> Unit,
     onNextClick: () -> Unit,
@@ -375,7 +377,7 @@ fun NavigationUnitsButtons(
                 colors = ButtonDefaults.outlinedButtonColors(
                     backgroundColor = MaterialTheme.appColors.background
                 ),
-                border = BorderStroke(1.dp, MaterialTheme.appColors.primaryButtonBorder),
+                border = BorderStroke(1.dp, MaterialTheme.appColors.textAccent),
                 elevation = null,
                 shape = MaterialTheme.appShapes.navigationButtonShape,
                 onClick = onPrevClick,
@@ -384,48 +386,66 @@ fun NavigationUnitsButtons(
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.Center
                 ) {
+                    if (!isVerticalNavigation) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = null,
+                            tint = MaterialTheme.appColors.textAccent
+                        )
+                        Spacer(Modifier.width(8.dp))
+                    }
                     Text(
                         text = stringResource(R.string.course_navigation_prev),
-                        color = MaterialTheme.appColors.primary,
+                        color = MaterialTheme.appColors.textAccent,
                         style = MaterialTheme.appTypography.labelLarge
                     )
-                    Spacer(Modifier.width(8.dp))
-                    Icon(
-                        modifier = Modifier.rotate(if (isVerticalNavigation) 0f else -90f),
-                        painter = painterResource(id = coreR.drawable.core_ic_up),
-                        contentDescription = null,
-                        tint = MaterialTheme.appColors.primary
-                    )
+                    if (isVerticalNavigation) {
+                        Spacer(Modifier.width(8.dp))
+                        Icon(
+                            painter = painterResource(id = coreR.drawable.core_ic_up),
+                            contentDescription = null,
+                            tint = MaterialTheme.appColors.textAccent
+                        )
+                    }
                 }
             }
             Spacer(Modifier.width(16.dp))
         }
-        Button(
-            modifier = Modifier
-                .height(42.dp),
-            colors = ButtonDefaults.buttonColors(
-                backgroundColor = MaterialTheme.appColors.primaryButtonBackground
-            ),
-            elevation = null,
-            shape = MaterialTheme.appShapes.navigationButtonShape,
-            onClick = onNextClick
-        ) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Center
+        if (hasNextBlock || showFinishButton) {
+            Button(
+                modifier = Modifier
+                    .height(42.dp),
+                colors = ButtonDefaults.buttonColors(
+                    backgroundColor = MaterialTheme.appColors.primaryButtonBackground
+                ),
+                elevation = null,
+                shape = MaterialTheme.appShapes.navigationButtonShape,
+                onClick = onNextClick
             ) {
-                Text(
-                    text = nextButtonText,
-                    color = MaterialTheme.appColors.primaryButtonText,
-                    style = MaterialTheme.appTypography.labelLarge
-                )
-                Spacer(Modifier.width(8.dp))
-                Icon(
-                    modifier = Modifier.rotate(if (isVerticalNavigation || !hasNextBlock) 0f else -90f),
-                    painter = nextButtonIcon,
-                    contentDescription = null,
-                    tint = MaterialTheme.appColors.primaryButtonText
-                )
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    Text(
+                        text = nextButtonText,
+                        color = MaterialTheme.appColors.primaryButtonText,
+                        style = MaterialTheme.appTypography.labelLarge
+                    )
+                    Spacer(Modifier.width(8.dp))
+                    if (isVerticalNavigation || !hasNextBlock) {
+                        Icon(
+                            painter = nextButtonIcon,
+                            contentDescription = null,
+                            tint = MaterialTheme.appColors.primaryButtonText
+                        )
+                    } else {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowForward,
+                            contentDescription = null,
+                            tint = MaterialTheme.appColors.primaryButtonText
+                        )
+                    }
+                }
             }
         }
     }
@@ -700,20 +720,23 @@ fun CourseVideoItem(
     titleStyle: TextStyle = MaterialTheme.appTypography.bodySmall,
     contentModifier: Modifier = Modifier.padding(8.dp),
     progressModifier: Modifier = Modifier.height(4.dp),
+    playButtonSize: Dp = 32.dp,
+    borderColor: Color? = null,
+    borderWidth: Dp = 3.dp,
 ) {
+    val borderColor = borderColor ?: if (videoBlock.isCompleted()) {
+        MaterialTheme.appColors.successGreen
+    } else {
+        Color.Transparent
+    }
     Box(
         modifier = modifier
-            .let {
-                if (videoBlock.isCompleted()) {
-                    it.border(
-                        width = 3.dp,
-                        color = MaterialTheme.appColors.successGreen,
-                        shape = MaterialTheme.appShapes.videoPreviewShape
-                    )
-                } else {
-                    it
-                }
-            }
+            .clip(MaterialTheme.appShapes.videoPreviewShape)
+            .border(
+                width = borderWidth,
+                color = borderColor,
+                shape = MaterialTheme.appShapes.videoPreviewShape
+            )
             .clickable { onClick() }
     ) {
         AsyncImage(
@@ -748,7 +771,7 @@ fun CourseVideoItem(
         ) {
             Image(
                 modifier = Modifier
-                    .size(32.dp)
+                    .size(playButtonSize)
                     .align(Alignment.Center),
                 painter = painterResource(id = R.drawable.course_video_play_button),
                 contentDescription = null,
@@ -761,7 +784,7 @@ fun CourseVideoItem(
                 style = titleStyle,
                 modifier = Modifier
                     .align(Alignment.TopStart),
-                maxLines = 2,
+                maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )