Update naming convention

pull/1457/head
TM 1 year ago
parent 2ae5df0be4
commit 52d08854b6

@ -19,7 +19,7 @@ package com.google.samples.apps.nowinandroid.navigation
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.navigation.compose.NavHost
import com.google.samples.apps.nowinandroid.core.ui.ErrorHandler
import com.google.samples.apps.nowinandroid.core.ui.SnackbarErrorHandler
import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_ROUTE
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreen
@ -40,7 +40,7 @@ import com.google.samples.apps.nowinandroid.ui.interests2pane.interestsListDetai
fun NiaNavHost(
appState: NiaAppState,
onShowSnackbar: suspend (String, String?) -> Boolean,
errorHandler: ErrorHandler,
snackbarErrorHandler: SnackbarErrorHandler,
modifier: Modifier = Modifier,
startDestination: String = FOR_YOU_ROUTE,
) {

@ -71,7 +71,7 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAp
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
import com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors
import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors
import com.google.samples.apps.nowinandroid.core.ui.ErrorHandler
import com.google.samples.apps.nowinandroid.core.ui.SnackbarErrorHandler
import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog
import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
@ -130,7 +130,7 @@ internal fun NiaApp(
val unreadDestinations by appState.topLevelDestinationsWithUnreadResources
.collectAsStateWithLifecycle()
val errorHandler = ErrorHandler(snackbarHostState)
val snackbarErrorHandler = SnackbarErrorHandler(snackbarHostState)
if (showSettingsDialog) {
SettingsDialog(
@ -221,7 +221,7 @@ internal fun NiaApp(
duration = Short,
) == ActionPerformed
},
errorHandler = errorHandler,
snackbarErrorHandler = snackbarErrorHandler,
)
}
}

@ -17,9 +17,9 @@
package com.google.samples.apps.nowinandroid.core.ui
// Generic error types
sealed interface HandledError<out T> {
data class Specific<T>(val data: T) : HandledError<T>
data class Exception(val exception: Throwable) : HandledError<Nothing>
data object Default : HandledError<Nothing>
data object Offline : HandledError<Nothing>
sealed interface SnackbarError<out T> {
data class Specific<T>(val data: T) : SnackbarError<T>
data class Exception(val exception: Throwable) : SnackbarError<Nothing>
data object Default : SnackbarError<Nothing>
data object Offline : SnackbarError<Nothing>
}

@ -17,14 +17,14 @@
package com.google.samples.apps.nowinandroid.core.ui
import androidx.compose.material3.SnackbarHostState
import com.google.samples.apps.nowinandroid.core.ui.HandledError.Default
import com.google.samples.apps.nowinandroid.core.ui.HandledError.Exception
import com.google.samples.apps.nowinandroid.core.ui.HandledError.Offline
import com.google.samples.apps.nowinandroid.core.ui.HandledError.Specific
import com.google.samples.apps.nowinandroid.core.ui.SnackbarError.Default
import com.google.samples.apps.nowinandroid.core.ui.SnackbarError.Exception
import com.google.samples.apps.nowinandroid.core.ui.SnackbarError.Offline
import com.google.samples.apps.nowinandroid.core.ui.SnackbarError.Specific
class ErrorHandler(private val snackbarHostState: SnackbarHostState) {
class SnackbarErrorHandler(private val snackbarHostState: SnackbarHostState) {
suspend fun handleError(error: HandledError<*>) {
suspend fun handleError(error: SnackbarError<*>) {
// Log the error or show a generic error message
when (error) {
is Specific -> {
Loading…
Cancel
Save