Browse Source

Fix cut off labels in reader sheet toggles

arkon 1 year ago
parent
commit
f9754f4f58

+ 1 - 1
app/src/main/java/eu/kanade/presentation/reader/OrientationModeSelectDialog.kt

@@ -45,7 +45,7 @@ fun OrientationModeSelectDialog(
                         },
                         modifier = Modifier.fillMaxWidth(),
                         imageVector = ImageVector.vectorResource(mode.iconRes),
-                        label = stringResource(stringRes),
+                        title = stringResource(stringRes),
                     )
                 }
             }

+ 1 - 1
app/src/main/java/eu/kanade/presentation/reader/ReadingModeSelectDialog.kt

@@ -46,7 +46,7 @@ fun ReadingModeSelectDialog(
                         },
                         modifier = Modifier.fillMaxWidth(),
                         imageVector = ImageVector.vectorResource(mode.iconRes),
-                        label = stringResource(stringRes),
+                        title = stringResource(stringRes),
                     )
                 }
             }

+ 11 - 3
presentation-core/src/main/java/tachiyomi/presentation/core/components/material/IconToggleButton.kt

@@ -3,6 +3,7 @@ package tachiyomi.presentation.core.components.material
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.FilledIconToggleButton
 import androidx.compose.material3.Icon
@@ -12,6 +13,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
 
 @Composable
 fun IconToggleButton(
@@ -19,12 +22,13 @@ fun IconToggleButton(
     onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
     imageVector: ImageVector,
-    label: String,
+    title: String,
 ) {
     FilledIconToggleButton(
         checked = checked,
         onCheckedChange = onCheckedChange,
-        modifier = modifier,
+        modifier = modifier
+            .height(48.dp),
     ) {
         Row(
             horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
@@ -38,7 +42,11 @@ fun IconToggleButton(
                 contentDescription = null,
             )
 
-            Text(label)
+            Text(
+                text = title,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
         }
     }
 }