Explorar o código

Fixed long server names

Vadik Sirekanyan %!s(int64=2) %!d(string=hai) anos
pai
achega
ab5f80956f

+ 15 - 2
app/src/main/java/org/sirekanyan/outline/MainContent.kt

@@ -40,6 +40,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 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 org.sirekanyan.outline.ext.plus
 import org.sirekanyan.outline.ext.rememberFlowAsState
@@ -102,7 +103,13 @@ fun MainContent(state: MainState) {
                             )
                         }
                     MainTopAppBar(
-                        title = { Text(stringResource(R.string.outln_app_name)) },
+                        title = {
+                            Text(
+                                text = stringResource(R.string.outln_app_name),
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        },
                         onMenuClick = state::openDrawer,
                         visibleItems = menuItems,
                     )
@@ -157,7 +164,13 @@ fun MainContent(state: MainState) {
                     state.refreshCurrentKeys(showLoading = true)
                 }
                 MainTopAppBar(
-                    title = { Text(page.server.name) },
+                    title = {
+                        Text(
+                            text = page.server.name,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    },
                     onMenuClick = state::openDrawer,
                     visibleItems = listOf(
                         MenuItem("Sort by…", IconSort) {

+ 9 - 1
app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt

@@ -33,6 +33,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 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 kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
@@ -153,7 +154,14 @@ fun DrawerItem(
 ) {
     NavigationDrawerItem(
         icon = { Icon(icon, null) },
-        label = { Text(label, style = MaterialTheme.typography.labelLarge) },
+        label = {
+            Text(
+                text = label,
+                style = MaterialTheme.typography.labelLarge,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        },
         badge = badge,
         modifier = Modifier.padding(horizontal = 12.dp),
         selected = selected,