fixed the free lecture time showing wrong (i removed it)
This commit is contained in:
@@ -267,9 +267,6 @@ class Parsing {
|
|||||||
)
|
)
|
||||||
n -= 1
|
n -= 1
|
||||||
}
|
}
|
||||||
val finalSubjects: MutableList<Subject> = mutableListOf()
|
|
||||||
finalSubjects.addAll(newSubjects.reversed())
|
|
||||||
finalSubjects.addAll(auxSubjects)
|
|
||||||
|
|
||||||
for ((i, s) in auxSubjects.withIndex()) {
|
for ((i, s) in auxSubjects.withIndex()) {
|
||||||
if (s.free) {
|
if (s.free) {
|
||||||
@@ -278,6 +275,10 @@ class Parsing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val finalSubjects: MutableList<Subject> = mutableListOf()
|
||||||
|
finalSubjects.addAll(newSubjects.reversed())
|
||||||
|
finalSubjects.addAll(auxSubjects)
|
||||||
|
|
||||||
val day = Day()
|
val day = Day()
|
||||||
day.name = name
|
day.name = name
|
||||||
day.date = date
|
day.date = date
|
||||||
|
|||||||
@@ -492,7 +492,7 @@ private fun DayScreen(day: Day) {
|
|||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxHeight()
|
.fillMaxHeight()
|
||||||
.padding(start = 10.dp),
|
.padding(start = 10.dp), // same as on the right
|
||||||
verticalArrangement = Arrangement.Center,
|
verticalArrangement = Arrangement.Center,
|
||||||
horizontalAlignment = Alignment.Start
|
horizontalAlignment = Alignment.Start
|
||||||
) {
|
) {
|
||||||
@@ -576,8 +576,8 @@ private fun DayScreen(day: Day) {
|
|||||||
verticalArrangement = Arrangement.Center,
|
verticalArrangement = Arrangement.Center,
|
||||||
horizontalAlignment = Alignment.End
|
horizontalAlignment = Alignment.End
|
||||||
) {
|
) {
|
||||||
// show only for non prepended free lectures
|
// show only for non free lectures
|
||||||
if ((subject.free && subject.start != "00:00" && subject.end != "00:00") || !subject.free) {
|
if (!subject.free) {
|
||||||
Text(
|
Text(
|
||||||
text = "${subject.start}–${subject.end}",
|
text = "${subject.start}–${subject.end}",
|
||||||
color = Color.White,
|
color = Color.White,
|
||||||
|
|||||||
Reference in New Issue
Block a user