From 579bf6bcad0ba191069bb7fb97bde97942adb118 Mon Sep 17 00:00:00 2001
From: Armand <4831c0@proton.me>
Date: Thu, 5 Mar 2026 14:51:06 +0100
Subject: [PATCH] firka(android): make room number chips have the same length

Closes: #13
---
 .../app/firka/naplo/glance/LessonCard.kt      | 25 +++++++++++++------
 .../app/firka/naplo/glance/TimetableWidget.kt | 13 +++++++---
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/firka/android/app/src/main/kotlin/app/firka/naplo/glance/LessonCard.kt b/firka/android/app/src/main/kotlin/app/firka/naplo/glance/LessonCard.kt
index 76b74f5..7d3dad7 100644
--- a/firka/android/app/src/main/kotlin/app/firka/naplo/glance/LessonCard.kt
+++ b/firka/android/app/src/main/kotlin/app/firka/naplo/glance/LessonCard.kt
@@ -16,6 +16,7 @@ import androidx.glance.layout.padding
 import androidx.glance.layout.width
 import androidx.glance.text.FontWeight
 import androidx.glance.text.Text
+import androidx.glance.text.TextAlign
 import androidx.glance.text.TextStyle
 import app.firka.naplo.model.Colors
 import app.firka.naplo.glance.WidgetLesson
@@ -31,6 +32,7 @@ fun LessonCard(
     colors: Colors,
     modifier: GlanceModifier = GlanceModifier,
     roomBadgeWidthDp: Float = 48f,
+    subjectColumnWidthDp: Float = 226f,
 ) {
     Box(modifier =
         modifier
@@ -49,17 +51,21 @@ fun LessonCard(
 
 
         Box(modifier = GlanceModifier.padding(12.dp)) {
-            Row {
+            Row(modifier = GlanceModifier.fillMaxWidth()) {
                 val badgeStyle = TextStyle(
                     color = ColorProvider(colors.textSecondary, colors.textSecondary),
                     fontSize = 14.sp,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
+                    textAlign = TextAlign.Center
                 )
                 val badgePadding = GlanceModifier.padding(8.dp, 4.dp)
                 val lessonNumberBadgeModifier = GlanceModifier.cornerRadius(16.dp).width(24.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) {
                         Box(
                             modifier = lessonNumberBadgeModifier.background(bgColor),
@@ -79,12 +85,14 @@ fun LessonCard(
                     }
                     // TODO: Add subject icons
                     Text(
-                        lesson.name,
+                        text = lesson.name,
                         style = TextStyle(
                             color = ColorProvider(colors.textPrimary, colors.textPrimary),
                             fontSize = 14.sp,
                             fontWeight = FontWeight.Bold
                         ),
+                        maxLines = 1,
+                        modifier = GlanceModifier.fillMaxWidth(),
                     )
                 }
 
@@ -98,15 +106,18 @@ fun LessonCard(
                         ),
                     )
                     Spacer(modifier = GlanceModifier.width(8.dp))
-                    val roomName = (lesson.roomName ?: "N/A").take(5)
+                    val roomName = lesson.roomName ?: "N/A"
                     Box(
                         modifier = roomBadgeModifier.background(colors.a15p),
                         contentAlignment = Alignment.Center,
                     ) {
                         Text(
-                            roomName,
+                            text = roomName,
                             style = badgeStyle,
-                            modifier = GlanceModifier.padding(4.dp, 4.dp),
+                            maxLines = 1,
+                            modifier = GlanceModifier
+                                .fillMaxWidth()
+                                .padding(4.dp, 4.dp),
                         )
                     }
                 }
diff --git a/firka/android/app/src/main/kotlin/app/firka/naplo/glance/TimetableWidget.kt b/firka/android/app/src/main/kotlin/app/firka/naplo/glance/TimetableWidget.kt
index 52a53af..1f3d6d7 100644
--- a/firka/android/app/src/main/kotlin/app/firka/naplo/glance/TimetableWidget.kt
+++ b/firka/android/app/src/main/kotlin/app/firka/naplo/glance/TimetableWidget.kt
@@ -116,8 +116,10 @@ class TimetableWidget : GlanceAppWidget() {
         val displayLessons = data.lessons.take(maxLessons)
         val lessonChunks = displayLessons.chunked(2)
         val showDate = maxLessons > 1
-        val maxRoomNameLen = displayLessons.maxOfOrNull { (it.roomName ?: "N/A").take(5).length } ?: 0
-        val roomBadgeWidthDp = if (maxRoomNameLen <= 3) 28f else 48f
+        val roomBadgeWidthDp = 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 lessonListHeight = when (val n = displayLessons.size) {
             0 -> 0f
@@ -148,7 +150,12 @@ class TimetableWidget : GlanceAppWidget() {
                 for (chunk in lessonChunks) {
                     Column {
                         for (lesson in chunk) {
-                            LessonCard(lesson, data.colors, roomBadgeWidthDp = roomBadgeWidthDp)
+                            LessonCard(
+                                lesson,
+                                data.colors,
+                                roomBadgeWidthDp = roomBadgeWidthDp,
+                                subjectColumnWidthDp = subjectColumnWidthDp,
+                            )
                             Spacer(modifier = GlanceModifier.height(spacerDp.dp))
                         }
                     }