From 4b2bb87ecfa52ab4566f2c3f29f4a1a6513cdf43 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 25 Oct 2024 23:02:35 -0500
Subject: [PATCH] Minor drawer item fixes

---
 .../kotlin/org/tasks/previews/TaskListDrawerPreview.kt     | 7 +++++++
 .../kotlin/org/tasks/compose/drawer/TaskListDrawer.kt      | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/kmp/src/androidMain/kotlin/org/tasks/previews/TaskListDrawerPreview.kt b/kmp/src/androidMain/kotlin/org/tasks/previews/TaskListDrawerPreview.kt
index 608889bb2..4af9f0f7f 100644
--- a/kmp/src/androidMain/kotlin/org/tasks/previews/TaskListDrawerPreview.kt
+++ b/kmp/src/androidMain/kotlin/org/tasks/previews/TaskListDrawerPreview.kt
@@ -34,6 +34,7 @@ fun MenuPreview() {
                     title = "My Tasks",
                     icon = TasksIcons.ALL_INBOX,
                     filter = FilterImpl(),
+                    count = 100
                 ),
                 DrawerItem.Header(
                     title = "Filters",
@@ -47,6 +48,12 @@ fun MenuPreview() {
                         NavigationDrawerSubheader.SubheaderType.PREFERENCE,
                         "",
                     ),
+                ),
+                DrawerItem.Filter(
+                    title = "A really really really really really really really really really really really really really long title",
+                    icon = TasksIcons.CLOUD,
+                    filter = FilterImpl(),
+                    count = 123456,
                 )
             ),
             onClick = {},
diff --git a/kmp/src/commonMain/kotlin/org/tasks/compose/drawer/TaskListDrawer.kt b/kmp/src/commonMain/kotlin/org/tasks/compose/drawer/TaskListDrawer.kt
index 9e6d681b6..c86b52d07 100644
--- a/kmp/src/commonMain/kotlin/org/tasks/compose/drawer/TaskListDrawer.kt
+++ b/kmp/src/commonMain/kotlin/org/tasks/compose/drawer/TaskListDrawer.kt
@@ -52,6 +52,7 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.layout
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import kotlinx.collections.immutable.ImmutableList
 import org.jetbrains.compose.resources.stringResource
@@ -189,7 +190,9 @@ internal fun FilterItem(
         Text(
             text = item.title,
             color = MaterialTheme.colorScheme.onSurface,
-            modifier = Modifier.weight(1f),
+            modifier = Modifier.weight(1f).padding(end = 8.dp),
+            overflow = TextOverflow.Ellipsis,
+            maxLines = 1,
         )
         if (item.shareCount > 0) {
             Icon(
@@ -202,7 +205,6 @@ internal fun FilterItem(
             )
         }
         Box(
-            modifier = Modifier.width(48.dp),
             contentAlignment = Alignment.CenterEnd,
         ) {
             if (item.count > 0) {