A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update Compose BOM to 2024.02.00. Fixes #1218
Don Turner522efac8c0e9
diff --git a/core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt b/core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.ktindex 4f1229e9d..2c3c7b763 100644--- a/core/common/src/test/kotlin/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt+++ b/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,diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.ktindex 106f0b839..9497bd92d 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt+++ b/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(diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.ktindex 21dfbc8c3..ca168b4be 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt+++ b/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),diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.ktindex 92cd9aa8f..74753ca9b 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt+++ b/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,diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.ktindex 8db20689f..8d8a46424 100644--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt@@ -17,6 +17,7 @@package com.google.samples.apps.nowinandroid.core.designsystem.iconimport androidx.compose.material.icons.Icons+import androidx.compose.material.icons.automirrored.rounded.ArrowBackimport androidx.compose.material.icons.filled.MoreVertimport androidx.compose.material.icons.outlined.Bookmarksimport androidx.compose.material.icons.outlined.Upcoming@@ -31,7 +32,6 @@ import androidx.compose.material.icons.rounded.Grid3x3import androidx.compose.material.icons.rounded.Personimport androidx.compose.material.icons.rounded.Searchimport androidx.compose.material.icons.rounded.Settings-import androidx.compose.material.icons.rounded.ShortTextimport androidx.compose.material.icons.rounded.Upcomingimport androidx.compose.material.icons.rounded.ViewDayimport androidx.compose.ui.graphics.vector.ImageVector@@ -41,7 +41,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.ArrowBackval Bookmark = Icons.Rounded.Bookmarkval BookmarkBorder = Icons.Rounded.BookmarkBorderval Bookmarks = Icons.Rounded.Bookmarks@@ -53,7 +53,7 @@ object NiaIcons {val Person = Icons.Rounded.Personval Search = Icons.Rounded.Searchval Settings = Icons.Rounded.Settings- val ShortText = Icons.Rounded.ShortText+ val ShortText = Icons.AutoMirrored.Rounded.ArrowBackval Upcoming = Icons.Rounded.Upcomingval UpcomingBorder = Icons.Outlined.Upcomingval ViewDay = Icons.Rounded.ViewDaydiff --git a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt b/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.ktindex fc9c20549..6bbaf46d2 100644--- a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt+++ b/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt@@ -99,7 +99,7 @@ class SearchViewModelTest {searchContentsRepository.addNewsResources(newsResourcesTestData)searchContentsRepository.addTopics(topicsTestData)- val result = viewModel.searchResultUiState.value+ // val result = viewModel.searchResultUiState.value// TODO: Figure out to get the latest emitted ui State? The result is emitted as EmptyQuery// assertIs<Success>(result)diff --git a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.ktindex 032515c53..db60a6447 100644--- a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt+++ b/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt@@ -37,7 +37,7 @@ import androidx.compose.foundation.selection.selectableimport androidx.compose.foundation.selection.selectableGroupimport androidx.compose.foundation.verticalScrollimport androidx.compose.material3.AlertDialog-import androidx.compose.material3.Divider+import androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.RadioButtonimport androidx.compose.material3.Text@@ -115,7 +115,7 @@ fun SettingsDialog()},text = {- Divider()+ HorizontalDivider()Column(Modifier.verticalScroll(rememberScrollState())) {when (settingsUiState) {Loading -> {@@ -135,7 +135,7 @@ fun SettingsDialog()}}- Divider(Modifier.padding(top = 8.dp))+ HorizontalDivider(Modifier.padding(top = 8.dp))LinksPanel()}TrackScreenViewEvent(screenName = "Settings")diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 7e0380cab..eeee36003 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -7,7 +7,7 @@ androidTools = "31.2.0"androidxActivity = "1.8.0"androidxAppCompat = "1.6.1"androidxBrowser = "1.6.0"-androidxComposeBom = "2023.10.01"+androidxComposeBom = "2024.02.00"androidxComposeCompiler = "1.5.7"androidxComposeRuntimeTracing = "1.0.0-beta01"androidxCore = "1.12.0"