diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt index 0b73b463d..078aa18cf 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt @@ -110,7 +110,7 @@ fun NiaApp(appState: NiaAppState, modifier: Modifier = Modifier) { val snackBarResult = snackbarHostState.showSnackbar( message = it, actionLabel = "Continue", - duration = Indefinite + duration = Indefinite, ) == ActionPerformed if (snackBarResult) { @@ -232,7 +232,7 @@ internal fun NiaApp( duration = Short, ) == ActionPerformed }, - errorHandler = { message -> appState.addErrorMessage(message) } + errorHandler = { message -> appState.addErrorMessage(message) }, ) } } diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt index c50d90eb3..23e9b91b9 100644 --- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt +++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt @@ -46,14 +46,11 @@ import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.BOOKM import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.FOR_YOU import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.datetime.TimeZone @@ -123,18 +120,18 @@ class NiaAppState( initialValue = false, ) - private val _errorMessages = MutableStateFlow>(emptyList()) - val errorMessage: StateFlow = _errorMessages.map{ it.firstOrNull()?.message }.stateIn( + private val errorMessages = MutableStateFlow>(emptyList()) + val errorMessage: StateFlow = errorMessages.map { it.firstOrNull()?.message }.stateIn( scope = coroutineScope, started = SharingStarted.WhileSubscribed(5_000), initialValue = null, ) fun addErrorMessage(error: String) { - _errorMessages.update { it + ErrorMessage(error) } + errorMessages.update { it + ErrorMessage(error) } } fun clearErrorMessage() { - _errorMessages.update { it.drop(1) } + errorMessages.update { it.drop(1) } } /** diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 885020636..fd0e0585b 100644 --- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -478,6 +478,7 @@ private fun DeepLinkEffect( context = context, uri = Uri.parse(userNewsResource.url), toolbarColor = backgroundColor, + onLaunchFailed = {}, ) } } diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt index 21baf4130..01c4e6728 100644 --- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt +++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt @@ -123,7 +123,7 @@ internal fun SearchRoute( onBackClick = onBackClick, onInterestsClick = onInterestsClick, onTopicClick = onTopicClick, - onLaunchFailed = { errorHandler(launchFailedString) }, + onLaunchFailed = { errorHandler(launchFailedString) }, ) } @@ -371,7 +371,7 @@ private fun SearchResultBody( }, onLaunchFailed = { onLaunchFailed() - } + }, ) } } diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt index 02470b092..3aef2a802 100644 --- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt +++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt @@ -39,7 +39,7 @@ fun NavGraphBuilder.searchScreen( onBackClick = onBackClick, onInterestsClick = onInterestsClick, onTopicClick = onTopicClick, - errorHandler = errorHandler + errorHandler = errorHandler, ) } }