From 06e7efe55eac7d6cff93d1357f3c1deecdcd0b10 Mon Sep 17 00:00:00 2001 From: odweta Date: Thu, 2 Oct 2025 19:45:02 +0200 Subject: [PATCH] fixed the free lecture time showing wrong (i removed it) --- mobile/app/src/main/java/com/odweta/solon/Parsing.kt | 7 ++++--- mobile/app/src/main/java/com/odweta/solon/Timetable.kt | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) 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 51bb107..b55999c 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Parsing.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Parsing.kt @@ -267,9 +267,6 @@ class Parsing { ) n -= 1 } - val finalSubjects: MutableList = mutableListOf() - finalSubjects.addAll(newSubjects.reversed()) - finalSubjects.addAll(auxSubjects) for ((i, s) in auxSubjects.withIndex()) { if (s.free) { @@ -278,6 +275,10 @@ class Parsing { } } + val finalSubjects: MutableList = mutableListOf() + finalSubjects.addAll(newSubjects.reversed()) + finalSubjects.addAll(auxSubjects) + val day = Day() day.name = name day.date = date 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 869eb39..c34cb74 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt @@ -492,7 +492,7 @@ private fun DayScreen(day: Day) { Column( modifier = Modifier .fillMaxHeight() - .padding(start = 10.dp), + .padding(start = 10.dp), // same as on the right verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.Start ) { @@ -576,8 +576,8 @@ private fun DayScreen(day: Day) { verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.End ) { - // show only for non prepended free lectures - if ((subject.free && subject.start != "00:00" && subject.end != "00:00") || !subject.free) { + // show only for non free lectures + if (!subject.free) { Text( text = "${subject.start}–${subject.end}", color = Color.White,