Update Compose BOM to 2024.02.00. Fixes #1218

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

@@ -1,56 +1,58 @@
 androidx.activity:activity-compose:1.8.0
 androidx.activity:activity-ktx:1.8.0
 androidx.activity:activity:1.8.0
-androidx.annotation:annotation-experimental:1.3.1
+androidx.annotation:annotation-experimental:1.4.0
 androidx.annotation:annotation-jvm:1.7.0
 androidx.annotation:annotation:1.7.0
 androidx.appcompat:appcompat-resources:1.6.1
 androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
 androidx.autofill:autofill:1.0.0
 androidx.browser:browser:1.6.0
-androidx.collection:collection-jvm:1.3.0
-androidx.collection:collection:1.3.0
-androidx.compose.animation:animation-android:1.5.4
-androidx.compose.animation:animation-core-android:1.5.4
-androidx.compose.animation:animation-core:1.5.4
-androidx.compose.animation:animation:1.5.4
-androidx.compose.foundation:foundation-android:1.5.4
-androidx.compose.foundation:foundation-layout-android:1.5.4
-androidx.compose.foundation:foundation-layout:1.5.4
-androidx.compose.foundation:foundation:1.5.4
-androidx.compose.material3:material3:1.1.2
-androidx.compose.material:material-icons-core-android:1.5.4
-androidx.compose.material:material-icons-core:1.5.4
-androidx.compose.material:material-icons-extended-android:1.5.4
-androidx.compose.material:material-icons-extended:1.5.4
-androidx.compose.material:material-ripple-android:1.5.4
-androidx.compose.material:material-ripple:1.5.4
-androidx.compose.runtime:runtime-android:1.5.4
-androidx.compose.runtime:runtime-saveable-android:1.5.4
-androidx.compose.runtime:runtime-saveable:1.5.4
-androidx.compose.runtime:runtime:1.5.4
-androidx.compose.ui:ui-android:1.5.4
-androidx.compose.ui:ui-geometry-android:1.5.4
-androidx.compose.ui:ui-geometry:1.5.4
-androidx.compose.ui:ui-graphics-android:1.5.4
-androidx.compose.ui:ui-graphics:1.5.4
-androidx.compose.ui:ui-text-android:1.5.4
-androidx.compose.ui:ui-text:1.5.4
-androidx.compose.ui:ui-tooling-preview-android:1.5.4
-androidx.compose.ui:ui-tooling-preview:1.5.4
-androidx.compose.ui:ui-unit-android:1.5.4
-androidx.compose.ui:ui-unit:1.5.4
-androidx.compose.ui:ui-util-android:1.5.4
-androidx.compose.ui:ui-util:1.5.4
-androidx.compose.ui:ui:1.5.4
-androidx.compose:compose-bom:2023.10.01
+androidx.collection:collection-jvm:1.4.0
+androidx.collection:collection-ktx:1.4.0
+androidx.collection:collection:1.4.0
+androidx.compose.animation:animation-android:1.6.1
+androidx.compose.animation:animation-core-android:1.6.1
+androidx.compose.animation:animation-core:1.6.1
+androidx.compose.animation:animation:1.6.1
+androidx.compose.foundation:foundation-android:1.6.1
+androidx.compose.foundation:foundation-layout-android:1.6.1
+androidx.compose.foundation:foundation-layout:1.6.1
+androidx.compose.foundation:foundation:1.6.1
+androidx.compose.material3:material3-android:1.2.0
+androidx.compose.material3:material3:1.2.0
+androidx.compose.material:material-icons-core-android:1.6.1
+androidx.compose.material:material-icons-core:1.6.1
+androidx.compose.material:material-icons-extended-android:1.6.1
+androidx.compose.material:material-icons-extended:1.6.1
+androidx.compose.material:material-ripple-android:1.6.1
+androidx.compose.material:material-ripple:1.6.1
+androidx.compose.runtime:runtime-android:1.6.1
+androidx.compose.runtime:runtime-saveable-android:1.6.1
+androidx.compose.runtime:runtime-saveable:1.6.1
+androidx.compose.runtime:runtime:1.6.1
+androidx.compose.ui:ui-android:1.6.1
+androidx.compose.ui:ui-geometry-android:1.6.1
+androidx.compose.ui:ui-geometry:1.6.1
+androidx.compose.ui:ui-graphics-android:1.6.1
+androidx.compose.ui:ui-graphics:1.6.1
+androidx.compose.ui:ui-text-android:1.6.1
+androidx.compose.ui:ui-text:1.6.1
+androidx.compose.ui:ui-tooling-preview-android:1.6.1
+androidx.compose.ui:ui-tooling-preview:1.6.1
+androidx.compose.ui:ui-unit-android:1.6.1
+androidx.compose.ui:ui-unit:1.6.1
+androidx.compose.ui:ui-util-android:1.6.1
+androidx.compose.ui:ui-util:1.6.1
+androidx.compose.ui:ui:1.6.1
+androidx.compose:compose-bom:2024.02.00
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.12.0
 androidx.core:core:1.12.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
-androidx.emoji2:emoji2:1.4.0
+androidx.emoji2:emoji2:1.3.0
 androidx.exifinterface:exifinterface:1.3.6
 androidx.fragment:fragment:1.5.1
 androidx.interpolator:interpolator:1.0.0

app/dependencies/prodReleaseRuntimeClasspath.txt

@@ -1,7 +1,7 @@
 androidx.activity:activity-compose:1.8.0
 androidx.activity:activity-ktx:1.8.0
 androidx.activity:activity:1.8.0
-androidx.annotation:annotation-experimental:1.3.1
+androidx.annotation:annotation-experimental:1.4.0
 androidx.annotation:annotation-jvm:1.7.0
 androidx.annotation:annotation:1.7.0
 androidx.appcompat:appcompat-resources:1.6.1
@@ -10,44 +10,46 @@ androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
 androidx.autofill:autofill:1.0.0
 androidx.browser:browser:1.6.0
-androidx.collection:collection-jvm:1.3.0
-androidx.collection:collection-ktx:1.3.0
-androidx.collection:collection:1.3.0
-androidx.compose.animation:animation-android:1.5.4
-androidx.compose.animation:animation-core-android:1.5.4
-androidx.compose.animation:animation-core:1.5.4
-androidx.compose.animation:animation:1.5.4
-androidx.compose.foundation:foundation-android:1.5.4
-androidx.compose.foundation:foundation-layout-android:1.5.4
-androidx.compose.foundation:foundation-layout:1.5.4
-androidx.compose.foundation:foundation:1.5.4
-androidx.compose.material3:material3-window-size-class:1.1.2
-androidx.compose.material3:material3:1.1.2
-androidx.compose.material:material-icons-core-android:1.5.4
-androidx.compose.material:material-icons-core:1.5.4
-androidx.compose.material:material-icons-extended-android:1.5.4
-androidx.compose.material:material-icons-extended:1.5.4
-androidx.compose.material:material-ripple-android:1.5.4
-androidx.compose.material:material-ripple:1.5.4
-androidx.compose.runtime:runtime-android:1.5.4
-androidx.compose.runtime:runtime-saveable-android:1.5.4
-androidx.compose.runtime:runtime-saveable:1.5.4
-androidx.compose.runtime:runtime:1.5.4
-androidx.compose.ui:ui-android:1.5.4
-androidx.compose.ui:ui-geometry-android:1.5.4
-androidx.compose.ui:ui-geometry:1.5.4
-androidx.compose.ui:ui-graphics-android:1.5.4
-androidx.compose.ui:ui-graphics:1.5.4
-androidx.compose.ui:ui-text-android:1.5.4
-androidx.compose.ui:ui-text:1.5.4
-androidx.compose.ui:ui-tooling-preview-android:1.5.4
-androidx.compose.ui:ui-tooling-preview:1.5.4
-androidx.compose.ui:ui-unit-android:1.5.4
-androidx.compose.ui:ui-unit:1.5.4
-androidx.compose.ui:ui-util-android:1.5.4
-androidx.compose.ui:ui-util:1.5.4
-androidx.compose.ui:ui:1.5.4
-androidx.compose:compose-bom:2023.10.01
+androidx.collection:collection-jvm:1.4.0
+androidx.collection:collection-ktx:1.4.0
+androidx.collection:collection:1.4.0
+androidx.compose.animation:animation-android:1.6.1
+androidx.compose.animation:animation-core-android:1.6.1
+androidx.compose.animation:animation-core:1.6.1
+androidx.compose.animation:animation:1.6.1
+androidx.compose.foundation:foundation-android:1.6.1
+androidx.compose.foundation:foundation-layout-android:1.6.1
+androidx.compose.foundation:foundation-layout:1.6.1
+androidx.compose.foundation:foundation:1.6.1
+androidx.compose.material3:material3-android:1.2.0
+androidx.compose.material3:material3-window-size-class-android:1.2.0
+androidx.compose.material3:material3-window-size-class:1.2.0
+androidx.compose.material3:material3:1.2.0
+androidx.compose.material:material-icons-core-android:1.6.1
+androidx.compose.material:material-icons-core:1.6.1
+androidx.compose.material:material-icons-extended-android:1.6.1
+androidx.compose.material:material-icons-extended:1.6.1
+androidx.compose.material:material-ripple-android:1.6.1
+androidx.compose.material:material-ripple:1.6.1
+androidx.compose.runtime:runtime-android:1.6.1
+androidx.compose.runtime:runtime-saveable-android:1.6.1
+androidx.compose.runtime:runtime-saveable:1.6.1
+androidx.compose.runtime:runtime:1.6.1
+androidx.compose.ui:ui-android:1.6.1
+androidx.compose.ui:ui-geometry-android:1.6.1
+androidx.compose.ui:ui-geometry:1.6.1
+androidx.compose.ui:ui-graphics-android:1.6.1
+androidx.compose.ui:ui-graphics:1.6.1
+androidx.compose.ui:ui-text-android:1.6.1
+androidx.compose.ui:ui-text:1.6.1
+androidx.compose.ui:ui-tooling-preview-android:1.6.1
+androidx.compose.ui:ui-tooling-preview:1.6.1
+androidx.compose.ui:ui-unit-android:1.6.1
+androidx.compose.ui:ui-unit:1.6.1
+androidx.compose.ui:ui-util-android:1.6.1
+androidx.compose.ui:ui-util:1.6.1
+androidx.compose.ui:ui:1.6.1
+androidx.compose:compose-bom:2024.02.00
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.12.0
 androidx.core:core-splashscreen:1.0.1
@@ -61,8 +63,8 @@ androidx.datastore:datastore-preferences:1.0.0
 androidx.datastore:datastore:1.0.0
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
-androidx.emoji2:emoji2-views-helper:1.4.0
-androidx.emoji2:emoji2:1.4.0
+androidx.emoji2:emoji2-views-helper:1.3.0
+androidx.emoji2:emoji2:1.3.0
 androidx.exifinterface:exifinterface:1.3.6
 androidx.fragment:fragment:1.5.1
 androidx.hilt:hilt-common:1.1.0

core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt

@@ -38,7 +38,7 @@ class ResultKtTest {
                 when (val errorResult = awaitItem()) {
                     is Result.Error -> assertEquals(
                         "Test Done",
-                        errorResult.exception?.message,
+                        errorResult.exception.message,
                     )
                     Result.Loading,
                     is Result.Success,

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt

@@ -285,16 +285,6 @@ fun NiaOutlinedButtonPreview() {
     }
 }
 
-@ThemePreviews
-@Composable
-fun NiaButtonPreview2() {
-    NiaTheme {
-        NiaBackground(modifier = Modifier.size(150.dp, 50.dp)) {
-            NiaButton(onClick = {}, text = { Text("Test button") })
-        }
-    }
-}
-
 @ThemePreviews
 @Composable
 fun NiaButtonLeadingIconPreview() {

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt

@@ -73,6 +73,8 @@ fun NiaFilterChip(
         },
         shape = CircleShape,
         border = FilterChipDefaults.filterChipBorder(
+            enabled = enabled,
+            selected = selected,
             borderColor = MaterialTheme.colorScheme.onBackground,
             selectedBorderColor = MaterialTheme.colorScheme.onBackground,
             disabledBorderColor = MaterialTheme.colorScheme.onBackground.copy(

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt

@@ -96,8 +96,8 @@ fun NiaLoadingWheel(
             animationSpec = infiniteRepeatable(
                 animation = keyframes {
                     durationMillis = ROTATION_TIME / 2
-                    progressLineColor at ROTATION_TIME / NUM_OF_LINES / 2 with LinearEasing
-                    baseLineColor at ROTATION_TIME / NUM_OF_LINES with LinearEasing
+                    progressLineColor at ROTATION_TIME / NUM_OF_LINES / 2 using LinearEasing
+                    baseLineColor at ROTATION_TIME / NUM_OF_LINES using LinearEasing
                 },
                 repeatMode = RepeatMode.Restart,
                 initialStartOffset = StartOffset(ROTATION_TIME / NUM_OF_LINES / 2 * index),

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt

@@ -167,7 +167,7 @@ fun NiaNavigationRail(
 
 @ThemePreviews
 @Composable
-fun NiaNavigationPreview() {
+fun NiaNavigationBarPreview() {
     val items = listOf("For you", "Saved", "Interests")
     val icons = listOf(
         NiaIcons.UpcomingBorder,
@@ -205,6 +205,46 @@ fun NiaNavigationPreview() {
     }
 }
 
+@ThemePreviews
+@Composable
+fun NiaNavigationRailPreview() {
+    val items = listOf("For you", "Saved", "Interests")
+    val icons = listOf(
+        NiaIcons.UpcomingBorder,
+        NiaIcons.BookmarksBorder,
+        NiaIcons.Grid3x3,
+    )
+    val selectedIcons = listOf(
+        NiaIcons.Upcoming,
+        NiaIcons.Bookmarks,
+        NiaIcons.Grid3x3,
+    )
+
+    NiaTheme {
+        NiaNavigationRail {
+            items.forEachIndexed { index, item ->
+                NiaNavigationRailItem(
+                    icon = {
+                        Icon(
+                            imageVector = icons[index],
+                            contentDescription = item,
+                        )
+                    },
+                    selectedIcon = {
+                        Icon(
+                            imageVector = selectedIcons[index],
+                            contentDescription = item,
+                        )
+                    },
+                    label = { Text(item) },
+                    selected = index == 0,
+                    onClick = { },
+                )
+            }
+        }
+    }
+}
+
 /**
  * Now in Android navigation default values.
  */

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt

@@ -91,7 +91,7 @@ fun NiaTabRow(
         containerColor = Color.Transparent,
         contentColor = MaterialTheme.colorScheme.onSurface,
         indicator = { tabPositions ->
-            TabRowDefaults.Indicator(
+            TabRowDefaults.SecondaryIndicator(
                 modifier = Modifier.tabIndicatorOffset(tabPositions[selectedTabIndex]),
                 height = 2.dp,
                 color = MaterialTheme.colorScheme.onSurface,

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt

@@ -34,6 +34,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
+import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -77,11 +78,13 @@ fun NiaTopAppBar(
 @Preview("Top App Bar")
 @Composable
 private fun NiaTopAppBarPreview() {
-    NiaTopAppBar(
-        titleRes = android.R.string.untitled,
-        navigationIcon = NiaIcons.Search,
-        navigationIconContentDescription = "Navigation icon",
-        actionIcon = NiaIcons.MoreVert,
-        actionIconContentDescription = "Action icon",
-    )
+    NiaTheme {
+        NiaTopAppBar(
+            titleRes = android.R.string.untitled,
+            navigationIcon = NiaIcons.Search,
+            navigationIconContentDescription = "Navigation icon",
+            actionIcon = NiaIcons.MoreVert,
+            actionIconContentDescription = "Action icon",
+        )
+    }
 }

core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt

@@ -17,6 +17,8 @@
 package com.google.samples.apps.nowinandroid.core.designsystem.icon
 
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material.icons.automirrored.rounded.ShortText
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.Bookmarks
 import androidx.compose.material.icons.outlined.Upcoming
@@ -41,7 +43,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
  */
 object NiaIcons {
     val Add = Icons.Rounded.Add
-    val ArrowBack = Icons.Rounded.ArrowBack
+    val ArrowBack = Icons.AutoMirrored.Rounded.ArrowBack
     val Bookmark = Icons.Rounded.Bookmark
     val BookmarkBorder = Icons.Rounded.BookmarkBorder
     val Bookmarks = Icons.Rounded.Bookmarks
@@ -53,7 +55,7 @@ object NiaIcons {
     val Person = Icons.Rounded.Person
     val Search = Icons.Rounded.Search
     val Settings = Icons.Rounded.Settings
-    val ShortText = Icons.Rounded.ShortText
+    val ShortText = Icons.AutoMirrored.Rounded.ShortText
     val Upcoming = Icons.Rounded.Upcoming
     val UpcomingBorder = Icons.Outlined.Upcoming
     val ViewDay = Icons.Rounded.ViewDay