Skip to content

Commit 11657ff

Browse files
feat: CaughtUpMessage
1 parent 2ce9ceb commit 11657ff

File tree

4 files changed

+53
-25
lines changed

4 files changed

+53
-25
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ fun AssignmentsHomePagerCardContent(
117117
assignment = firstIncompleteAssignment,
118118
onAssignmentClick = onAssignmentClick
119119
)
120+
} else {
121+
CaughtUpMessage(
122+
message = stringResource(R.string.course_assignments_caught_up)
123+
)
120124
}
121125

122126
Spacer(modifier = Modifier.height(8.dp))

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

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import androidx.compose.ui.platform.AndroidUriHandler
4141
import androidx.compose.ui.platform.LocalContext
4242
import androidx.compose.ui.res.painterResource
4343
import androidx.compose.ui.res.stringResource
44+
import androidx.compose.ui.text.style.TextAlign
4445
import androidx.compose.ui.tooling.preview.Devices
4546
import androidx.compose.ui.tooling.preview.Preview
4647
import androidx.compose.ui.unit.Dp
@@ -367,6 +368,46 @@ fun <T> CourseHomePager(
367368
}
368369
}
369370

371+
@Composable
372+
fun ViewAllButton(
373+
text: String,
374+
onClick: () -> Unit,
375+
modifier: Modifier = Modifier,
376+
) {
377+
TextButton(
378+
onClick = onClick,
379+
modifier = modifier.fillMaxWidth()
380+
) {
381+
Icon(
382+
imageVector = Icons.AutoMirrored.Filled.List,
383+
contentDescription = null,
384+
tint = MaterialTheme.appColors.primary,
385+
modifier = Modifier.size(20.dp)
386+
)
387+
Spacer(modifier = Modifier.width(8.dp))
388+
Text(
389+
text = text,
390+
style = MaterialTheme.appTypography.labelLarge,
391+
color = MaterialTheme.appColors.primary
392+
)
393+
}
394+
}
395+
396+
@Composable
397+
fun CaughtUpMessage(
398+
modifier: Modifier = Modifier,
399+
message: String,
400+
) {
401+
Text(
402+
modifier = modifier
403+
.fillMaxWidth(),
404+
text = message,
405+
color = MaterialTheme.appColors.textPrimary,
406+
style = MaterialTheme.appTypography.bodyLarge,
407+
textAlign = TextAlign.Center
408+
)
409+
}
410+
370411
@Preview(uiMode = UI_MODE_NIGHT_NO)
371412
@Preview(uiMode = UI_MODE_NIGHT_YES)
372413
@Composable
@@ -462,28 +503,3 @@ private fun CourseHomeScreenTabletPreview() {
462503
)
463504
}
464505
}
465-
466-
@Composable
467-
fun ViewAllButton(
468-
text: String,
469-
onClick: () -> Unit,
470-
modifier: Modifier = Modifier,
471-
) {
472-
TextButton(
473-
onClick = onClick,
474-
modifier = modifier.fillMaxWidth()
475-
) {
476-
Icon(
477-
imageVector = Icons.AutoMirrored.Filled.List,
478-
contentDescription = null,
479-
tint = MaterialTheme.appColors.primary,
480-
modifier = Modifier.size(20.dp)
481-
)
482-
Spacer(modifier = Modifier.width(8.dp))
483-
Text(
484-
text = text,
485-
style = MaterialTheme.appTypography.labelLarge,
486-
color = MaterialTheme.appColors.primary
487-
)
488-
}
489-
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ fun VideosHomePagerCardContent(
132132
}
133133
)
134134
}
135+
} else {
136+
CaughtUpMessage(
137+
message = stringResource(R.string.course_videos_caught_up)
138+
)
135139
}
136140

137141
Spacer(modifier = Modifier.height(8.dp))

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,8 @@
109109
<string name="course_grades_title">Grades</string>
110110
<string name="course_grades_description">This represents your weighted grade against the grade needed to pass this course.</string>
111111
<string name="course_view_progress">View Progress</string>
112+
113+
<!-- Caught Up Messages -->
114+
<string name="course_videos_caught_up">You\'re all caught up. Take a breather and relax.</string>
115+
<string name="course_assignments_caught_up">You\'re all caught up on assignments. Take a breather and relax.</string>
112116
</resources>

0 commit comments

Comments
 (0)