balint1414/firka
1
0
Fork 0
forked from firka/firka
Code Pull Requests Activity

firka(android): make room number chips have the same length

Browse Source 
Closes: #13
This commit is contained in:
4831c0
2026-03-05 14:51:06 +01:00
parent 4ecf0d1a3f
commit 579bf6bcad
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
firka/android/app/src/main/kotlin/app/firka/naplo/glance/LessonCard.kt
View File

@@ -16,6 +16,7 @@ import androidx.glance.layout.padding
import androidx.glance.layout.width import androidx.glance.layout.width
import androidx.glance.text.FontWeight import androidx.glance.text.FontWeight
import androidx.glance.text.Text import androidx.glance.text.Text
import androidx.glance.text.TextAlign
import androidx.glance.text.TextStyle import androidx.glance.text.TextStyle
import app.firka.naplo.model.Colors import app.firka.naplo.model.Colors
import app.firka.naplo.glance.WidgetLesson import app.firka.naplo.glance.WidgetLesson
@@ -31,6 +32,7 @@ fun LessonCard(
colors: Colors, colors: Colors,
modifier: GlanceModifier = GlanceModifier, modifier: GlanceModifier = GlanceModifier,
roomBadgeWidthDp: Float = 48f, roomBadgeWidthDp: Float = 48f,
subjectColumnWidthDp: Float = 226f,
) { ) {
Box(modifier = Box(modifier =
modifier modifier
@@ -49,17 +51,21 @@ fun LessonCard(
Box(modifier = GlanceModifier.padding(12.dp)) { Box(modifier = GlanceModifier.padding(12.dp)) {
Row { Row(modifier = GlanceModifier.fillMaxWidth()) {
val badgeStyle = TextStyle( val badgeStyle = TextStyle(
color = ColorProvider(colors.textSecondary, colors.textSecondary), color = ColorProvider(colors.textSecondary, colors.textSecondary),
fontSize = 14.sp, fontSize = 14.sp,
fontWeight = FontWeight.Bold fontWeight = FontWeight.Bold,
textAlign = TextAlign.Center
) )
val badgePadding = GlanceModifier.padding(8.dp, 4.dp) val badgePadding = GlanceModifier.padding(8.dp, 4.dp)
val lessonNumberBadgeModifier = GlanceModifier.cornerRadius(16.dp).width(24.dp) val lessonNumberBadgeModifier = GlanceModifier.cornerRadius(16.dp).width(24.dp)
val roomBadgeModifier = GlanceModifier.cornerRadius(16.dp).width(roomBadgeWidthDp.dp) val roomBadgeModifier = GlanceModifier.cornerRadius(16.dp).width(roomBadgeWidthDp.dp)
Row(modifier = GlanceModifier.width(226.dp), verticalAlignment = Alignment.CenterVertically) { Row(
modifier = GlanceModifier.width(subjectColumnWidthDp.dp),
verticalAlignment = Alignment.CenterVertically,
) {
if (lesson.lessonNumber != null) { if (lesson.lessonNumber != null) {
Box( Box(
modifier = lessonNumberBadgeModifier.background(bgColor), modifier = lessonNumberBadgeModifier.background(bgColor),
@@ -79,12 +85,14 @@ fun LessonCard(
} }
// TODO: Add subject icons // TODO: Add subject icons
Text( Text(
lesson.name, text = lesson.name,
style = TextStyle( style = TextStyle(
color = ColorProvider(colors.textPrimary, colors.textPrimary), color = ColorProvider(colors.textPrimary, colors.textPrimary),
fontSize = 14.sp, fontSize = 14.sp,
fontWeight = FontWeight.Bold fontWeight = FontWeight.Bold
), ),
maxLines = 1,
modifier = GlanceModifier.fillMaxWidth(),
) )
} }
@@ -98,15 +106,18 @@ fun LessonCard(
), ),
) )
Spacer(modifier = GlanceModifier.width(8.dp)) Spacer(modifier = GlanceModifier.width(8.dp))
val roomName = (lesson.roomName ?: "N/A").take(5) val roomName = lesson.roomName ?: "N/A"
Box( Box(
modifier = roomBadgeModifier.background(colors.a15p), modifier = roomBadgeModifier.background(colors.a15p),
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
) { ) {
Text( Text(
roomName, text = roomName,
style = badgeStyle, style = badgeStyle,
modifier = GlanceModifier.padding(4.dp, 4.dp), maxLines = 1,
modifier = GlanceModifier
.fillMaxWidth()
.padding(4.dp, 4.dp),
) )
} }
} }

13
firka/android/app/src/main/kotlin/app/firka/naplo/glance/TimetableWidget.kt
View File

@@ -116,8 +116,10 @@ class TimetableWidget : GlanceAppWidget() {
val displayLessons = data.lessons.take(maxLessons) val displayLessons = data.lessons.take(maxLessons)
val lessonChunks = displayLessons.chunked(2) val lessonChunks = displayLessons.chunked(2)
val showDate = maxLessons > 1 val showDate = maxLessons > 1
val maxRoomNameLen = displayLessons.maxOfOrNull { (it.roomName ?: "N/A").take(5).length } ?: 0 val roomBadgeWidthDp = 48f
val roomBadgeWidthDp = if (maxRoomNameLen <= 3) 28f else 48f val minWidthForTimeAndChipDp = 8f + 40f + roomBadgeWidthDp
val subjectColumnWidthDp = (size.width.value - 2 * paddingDp - 32f - minWidthForTimeAndChipDp)
.coerceIn(80f, 226f)
val dateSectionHeight = if (showDate) headerHeightDp + spacerDp else 0f val dateSectionHeight = if (showDate) headerHeightDp + spacerDp else 0f
val lessonListHeight = when (val n = displayLessons.size) { val lessonListHeight = when (val n = displayLessons.size) {
0 -> 0f 0 -> 0f
@@ -148,7 +150,12 @@ class TimetableWidget : GlanceAppWidget() {
for (chunk in lessonChunks) { for (chunk in lessonChunks) {
Column { Column {
for (lesson in chunk) { for (lesson in chunk) {
LessonCard(lesson, data.colors, roomBadgeWidthDp = roomBadgeWidthDp) LessonCard(
lesson,
data.colors,
roomBadgeWidthDp = roomBadgeWidthDp,
subjectColumnWidthDp = subjectColumnWidthDp,
)
Spacer(modifier = GlanceModifier.height(spacerDp.dp)) Spacer(modifier = GlanceModifier.height(spacerDp.dp))
} }
} }