agzam/vyatsu-schedule
2
2
Fork 1
Code Issues 3 Pull Requests 1 Actions Packages Projects 1 Releases 15 Wiki Activity

refactor: clenup

Browse Source
This commit is contained in:
Agzamus
2026-09-03 20:54:44 +03:00
parent 32f93197ab
commit 1fc43bb8fc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt
+6 -2
View File
@@ -260,8 +260,12 @@ private fun LessonSlot(slotIndex: Int, slot: TimeSlot) {
style = MaterialTheme.typography.bodyLarge style = MaterialTheme.typography.bodyLarge
) )
Text( Text(
listOf(lesson.type.label, lesson.subgroup, lesson.teacher, lesson.room) listOfNotNull(
.filterNotNull() lesson.type.label,
lesson.subgroup,
lesson.teacher,
lesson.room
)
.filter { it.isNotBlank() } .filter { it.isNotBlank() }
.joinToString(" · "), .joinToString(" · "),
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt
+1 -1
View File
@@ -81,7 +81,7 @@ class ScheduleViewModel(
val dayDate = when { val dayDate = when {
weekDays.any { it.date == current.dayDate } -> current.dayDate weekDays.any { it.date == current.dayDate } -> current.dayDate
weekDays.any { it.date == todayDate && todayDate != null } -> todayDate weekDays.any { it.date == todayDate } -> todayDate
else -> weekDays.firstOrNull()?.date else -> weekDays.firstOrNull()?.date
} }