From 15cadb76c64124637bd9508424af174ad7ba8821 Mon Sep 17 00:00:00 2001 From: matthias Date: Sun, 9 Jun 2024 13:22:00 +0200 Subject: [PATCH] Minor appearance adjustments added scaling with 1.1f(lesson indexes & "Pause") / 0.8f(times) --- .../cleverclass/StundenplanActivity.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/schoolapp/cleverclass/StundenplanActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/StundenplanActivity.kt index 2b78efe..3208e28 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/StundenplanActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/StundenplanActivity.kt @@ -39,6 +39,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.scale import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat.startActivity @@ -212,7 +213,7 @@ fun StundenplanContent(activity: ComponentActivity, loadedLessons: List()) { + else if (dailyLessons != emptyList() && dailyLessons.size != extraIndex) { LessonBox(subject = dailyLessons[extraIndex].subject, teacher = dailyLessons[extraIndex].teacher, room = dailyLessons[extraIndex].room) //ExtraIndex counted up only here as it does only index the lessons and NOT the breaks extraIndex++ @@ -371,7 +372,9 @@ fun InfoColumn(loadedLessons: List>, breakAmnt: Int, breaksStar ) { //"Pause" String instead of indexing Text( - modifier = Modifier.align(Alignment.Center), + modifier = Modifier + .align(Alignment.Center) + .scale(1.1f), text = "Pause", textDecoration = TextDecoration.Underline, style = MaterialTheme.typography.labelLarge @@ -380,7 +383,8 @@ fun InfoColumn(loadedLessons: List>, breakAmnt: Int, breaksStar Text( modifier = Modifier .align(Alignment.BottomCenter) - .padding(3.dp), + .padding(3.dp) + .scale(0.8f), text = formattedBreakTime, style = MaterialTheme.typography.labelMedium ) @@ -407,7 +411,9 @@ fun InfoColumn(loadedLessons: List>, breakAmnt: Int, breaksStar ) { //String with the indexing of the lessons Text( - modifier = Modifier.align(Alignment.Center), + modifier = Modifier + .align(Alignment.Center) + .scale(1.1f), text = "${i + 1 - lessonNegIncrement}:", textDecoration = TextDecoration.Underline, style = MaterialTheme.typography.labelLarge @@ -416,7 +422,8 @@ fun InfoColumn(loadedLessons: List>, breakAmnt: Int, breaksStar Text( modifier = Modifier .align(Alignment.BottomCenter) - .padding(3.dp), + .padding(3.dp) + .scale(0.8f), text = substringHelper(extraIndex, firstLesson, lessonLength, lessonTimeIncrement), style = MaterialTheme.typography.labelMedium )