Bug fixes

Author: bashpsk

gradle/libs.versions.toml

@@ -6,16 +6,16 @@ junit = "4.13.2"
 junit-version = "1.3.0"
 espresso-core = "3.7.0"
 lifecycle-runtime = "2.10.0"
-activity-compose = "1.12.2"
-compose-bom = "2026.01.00"
+activity-compose = "1.12.3"
+compose-bom = "2026.01.01"
 material-icons = "1.7.8"
 graphics-shapes = "1.1.0"
 kotlinx-serialization-json = "1.10.0"
 kotlinx-collections-immutable = "0.4.0"
 kotlinx-datetime = "0.7.1"
 kotlinx-io = "0.8.2"
 datastore-preferences = "1.2.0"
-navigation-compose = "2.9.6"
+navigation-compose = "2.9.7"
 coil-kt = "3.3.0"
 
 [libraries]

jetpack-ui/src/main/kotlin/io/bashpsk/emptylibs/jetpackui/optionbar/BottomOptionBar.kt

@@ -59,26 +59,17 @@ fun BottomOptionBar(
         derivedStateOf { optionList.subList(shownItemCount, optionList.size) }
     }
 
-    val onOptionItemClick = remember<(OptionBarData) -> Unit> {
-        { option ->
-
-            onOptionClick(option)
-            isMoreOptionMenuExpanded = false
-        }
-    }
-
-    val onMoreOptionItemClick = remember<(OptionBarData) -> Unit> {
-        { option ->
-
-            onOptionClick(option)
-            isMoreOptionMenuExpanded = true
-        }
-    }
-
     val expandIndicator = @Composable { scope: ContextualFlowRowOverflowScope ->
 
         shownItemCount = scope.shownItemCount
-        OptionBarItem(optionData = moreOption, onClick = onMoreOptionItemClick)
+        OptionBarItem(
+            optionData = moreOption,
+            onClick = {
+
+                onOptionClick(moreOption)
+                isMoreOptionMenuExpanded = true
+            }
+        )
     }
 
     Box(
@@ -115,7 +106,14 @@ fun BottomOptionBar(
 
             option?.let { optionItem ->
 
-                OptionBarItem(optionData = optionItem, onClick = onOptionItemClick)
+                OptionBarItem(
+                    optionData = optionItem,
+                    onClick = {
+
+                        onOptionClick(optionItem)
+                        isMoreOptionMenuExpanded = false
+                    }
+                )
             }
         }
 
@@ -130,9 +128,16 @@ fun BottomOptionBar(
 
             HorizontalDivider()
 
-            remainingItems.forEach { item ->
+            remainingItems.forEach { optionItem ->
+
+                OptionMenuItem(
+                    optionData = optionItem,
+                    onClick = {
 
-                OptionMenuItem(optionData = item, onClick = onOptionItemClick)
+                        onOptionClick(optionItem)
+                        isMoreOptionMenuExpanded = false
+                    }
+                )
             }
 
             HorizontalDivider()

jetpack-ui/src/main/kotlin/io/bashpsk/emptylibs/jetpackui/optionbar/OptionBarItem.kt

@@ -8,11 +8,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -30,17 +30,14 @@ import androidx.compose.ui.unit.dp
  * @param optionData The [OptionBarData] object containing the icon, label, and enabled state for
  * this item.
  * @param onClick A lambda function that will be invoked when this option item is clicked.
- * It receives the [OptionBarData] of the clicked item as a parameter.
  */
 @Composable
 internal fun OptionBarItem(
     modifier: Modifier = Modifier,
     optionData: OptionBarData,
-    onClick: (option: OptionBarData) -> Unit = {}
+    onClick: () -> Unit = {}
 ) {
 
-    val onOptionClick = remember(optionData) { { onClick(optionData) } }
-
     val cardColors = CardDefaults.cardColors(
         containerColor = Color.Transparent,
         contentColor = MaterialTheme.colorScheme.onSurface,
@@ -53,7 +50,7 @@ internal fun OptionBarItem(
         shape = MaterialTheme.shapes.extraSmall,
         enabled = optionData.enabled,
         colors = cardColors,
-        onClick = onOptionClick
+        onClick = onClick
     ) {
 
         Column(
@@ -79,4 +76,47 @@ internal fun OptionBarItem(
             )
         }
     }
+}
+
+/**
+ * A composable function that displays a single option item within a dropdown menu.
+ *
+ * This item typically consists of an icon, a label, and an action to be performed on click.
+ * It's designed to be used as part of an `OptionBar` or similar dropdown structure.
+ *
+ * @param modifier Optional [Modifier] to be applied to the `DropdownMenuItem`.
+ * @param optionData The [OptionBarData] containing the information for this menu item,
+ * such as its label, icon, and enabled state.
+ * @param onClick A lambda function that will be invoked when this menu item is clicked.
+ */
+@Composable
+internal fun OptionMenuItem(
+    modifier: Modifier = Modifier,
+    optionData: OptionBarData,
+    onClick: () -> Unit = {}
+) {
+
+    DropdownMenuItem(
+        modifier = modifier,
+        enabled = optionData.enabled,
+        text = {
+
+            Text(
+                text = optionData.label,
+                textAlign = TextAlign.Start,
+                maxLines = 1,
+                style = MaterialTheme.typography.bodyMedium,
+                overflow = TextOverflow.Ellipsis
+            )
+        },
+        leadingIcon = {
+
+            Icon(
+                modifier = Modifier.size(size = 20.dp),
+                imageVector = optionData.icon,
+                contentDescription = optionData.label
+            )
+        },
+        onClick = onClick
+    )
 }