Fix text overflow on long alarm labels (closes #27)

you-apps · Apr 12, 2023 · 9967f33 · 9967f33
1 parent 8db0045
commit 9967f33
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 2,
-      "versionName": "2.0",
+      "versionCode": 3,
+      "versionName": "2.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/bnyro/clock/ui/screens/AlarmScreen.kt b/app/src/main/java/com/bnyro/clock/ui/screens/AlarmScreen.kt
@@ -55,6 +55,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.bnyro.clock.R
@@ -126,21 +127,26 @@ fun AlarmScreen(alarmModel: AlarmModel) {
                                 ) {
                                     val interactionSource = remember { MutableInteractionSource() }
 
-                                    Column {
+                                    Column(
+                                        modifier = Modifier.weight(1f)
+                                    ) {
                                         Row(
                                             modifier = Modifier
                                                 .clip(RoundedCornerShape(20.dp))
                                                 .clickable {
                                                     showLabelDialog = true
                                                 }
                                                 .padding(start = 5.dp, end = 10.dp)
-                                                .alpha(if (label != null) 1f else 0.5f),
+                                                .alpha(if (label != null) 1f else 0.5f)
+                                                .fillMaxWidth(),
                                             verticalAlignment = Alignment.CenterVertically
                                         ) {
                                             Icon(Icons.Default.Label, null)
                                             Spacer(modifier = Modifier.width(5.dp))
                                             Text(
-                                                text = label ?: stringResource(R.string.label)
+                                                text = label ?: stringResource(R.string.label),
+                                                overflow = TextOverflow.Ellipsis,
+                                                maxLines = 1
                                             )
                                         }
                                         Spacer(modifier = Modifier.height(5.dp))
@@ -265,7 +271,8 @@ fun AlarmScreen(alarmModel: AlarmModel) {
                             Spacer(modifier = Modifier.height(10.dp))
                             OutlinedTextField(
                                 value = newLabel.orEmpty(),
-                                onValueChange = { text -> newLabel = text }
+                                onValueChange = { text -> newLabel = text },
+                                singleLine = true
                             )
                         },
                         confirmButton = {