diff --git a/mobile/app/src/main/java/com/odweta/solon/Parsing.kt b/mobile/app/src/main/java/com/odweta/solon/Parsing.kt index 647eb97..c882182 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Parsing.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Parsing.kt @@ -286,7 +286,6 @@ class Parsing { finalSubjects.addAll(newSubjects.reversed()) finalSubjects.addAll(auxSubjects) - for ((i, s) in auxSubjects.withIndex()) { if (s.free) { s.start = auxSubjects[i-1].end diff --git a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt index 05d75db..9dd5497 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt @@ -268,12 +268,31 @@ private fun DayScreen(day: Day) { horizontalAlignment = Alignment.Start ) { if (!subject.free) { - Text( - text = subject.name.uppercase(), - color = Color.White, - fontSize = 25.sp, - fontWeight = FontWeight.Bold - ) + if (subject.substitute == "1") { + Row { + Text( + text = subject.name.uppercase(), + color = Color.White, + fontSize = 25.sp, + fontWeight = FontWeight.Bold + ) + + Spacer(modifier = Modifier.width(10.dp)) + + Text( + text = " supl ", + color = Color.Black, + modifier = Modifier.background(color = Color.White) + ) + } + } else { + Text( + text = subject.name.uppercase(), + color = Color.White, + fontSize = 25.sp, + fontWeight = FontWeight.Bold + ) + } } Text(