Skip to content

Commit e8b13cd

Browse files
fix: changes according designer review
1 parent 5f23bf3 commit e8b13cd

File tree

1 file changed

+14
-39
lines changed

1 file changed

+14
-39
lines changed

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

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.openedx.course.presentation.home
22

3-
import androidx.compose.foundation.BorderStroke
43
import androidx.compose.foundation.layout.Column
54
import androidx.compose.foundation.layout.Row
65
import androidx.compose.foundation.layout.Spacer
@@ -10,7 +9,6 @@ import androidx.compose.foundation.layout.padding
109
import androidx.compose.foundation.layout.size
1110
import androidx.compose.foundation.layout.width
1211
import androidx.compose.foundation.shape.CircleShape
13-
import androidx.compose.material.Card
1412
import androidx.compose.material.Icon
1513
import androidx.compose.material.LinearProgressIndicator
1614
import androidx.compose.material.MaterialTheme
@@ -26,9 +24,7 @@ import androidx.compose.ui.semantics.semantics
2624
import androidx.compose.ui.text.font.FontWeight
2725
import androidx.compose.ui.unit.dp
2826
import org.openedx.core.domain.model.Block
29-
import org.openedx.core.extension.getUnitChapter
3027
import org.openedx.core.ui.theme.appColors
31-
import org.openedx.core.ui.theme.appShapes
3228
import org.openedx.core.ui.theme.appTypography
3329
import org.openedx.course.R
3430
import org.openedx.course.presentation.contenttab.CourseContentVideoEmptyState
@@ -131,42 +127,21 @@ fun VideosHomePagerCardContent(
131127
Spacer(modifier = Modifier.height(8.dp))
132128

133129
// Video card using CourseVideoItem
134-
Card(
130+
CourseVideoItem(
135131
modifier = Modifier
136-
.fillMaxWidth(),
137-
backgroundColor = MaterialTheme.appColors.cardViewBackground,
138-
shape = MaterialTheme.appShapes.videoPreviewShape,
139-
elevation = 0.dp,
140-
border = BorderStroke(
141-
width = 1.dp,
142-
color = MaterialTheme.appColors.cardViewBorder
143-
)
144-
) {
145-
Column {
146-
CourseVideoItem(
147-
modifier = Modifier
148-
.fillMaxWidth()
149-
.height(180.dp),
150-
videoBlock = firstIncompleteVideo,
151-
preview = uiState.videoPreview,
152-
progress = videoProgress,
153-
onClick = {
154-
onVideoClick(firstIncompleteVideo)
155-
},
156-
titleStyle = MaterialTheme.appTypography.titleMedium,
157-
contentModifier = Modifier
158-
.padding(horizontal = 16.dp, vertical = 8.dp),
159-
progressModifier = Modifier.height(8.dp),
160-
)
161-
Text(
162-
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
163-
text = uiState.courseStructure.blockData
164-
.getUnitChapter(firstIncompleteVideo.id)?.displayName ?: "",
165-
style = MaterialTheme.appTypography.labelMedium,
166-
color = MaterialTheme.appColors.textPrimary,
167-
)
168-
}
169-
}
132+
.fillMaxWidth()
133+
.height(180.dp),
134+
videoBlock = firstIncompleteVideo,
135+
preview = uiState.videoPreview,
136+
progress = videoProgress,
137+
onClick = {
138+
onVideoClick(firstIncompleteVideo)
139+
},
140+
titleStyle = MaterialTheme.appTypography.titleMedium,
141+
contentModifier = Modifier
142+
.padding(horizontal = 16.dp, vertical = 8.dp),
143+
progressModifier = Modifier.height(8.dp),
144+
)
170145
} else {
171146
CaughtUpMessage(
172147
message = stringResource(R.string.course_videos_caught_up)

0 commit comments

Comments
 (0)