From 52d08854b6cd67ae997d9ae90d7218c3bb0d28fb Mon Sep 17 00:00:00 2001
From: TM <tjmcard@gmail.com>
Date: Mon, 20 May 2024 16:47:40 -0700
Subject: [PATCH] Update naming convention

---
 .../apps/nowinandroid/navigation/NiaNavHost.kt       |  4 ++--
 .../google/samples/apps/nowinandroid/ui/NiaApp.kt    |  6 +++---
 .../core/ui/{HandledError.kt => SnackbarError.kt}    | 10 +++++-----
 .../ui/{ErrorHandler.kt => SnackbarErrorHandler.kt}  | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)
 rename core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/{HandledError.kt => SnackbarError.kt} (71%)
 rename core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/{ErrorHandler.kt => SnackbarErrorHandler.kt} (76%)

diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
index 81687d08e..b1b62b75d 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt
@@ -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,
 ) {
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 dea1ce211..3d6bb5f29 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
@@ -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,
                     )
                 }
             }
diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/HandledError.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/SnackbarError.kt
similarity index 71%
rename from core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/HandledError.kt
rename to core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/SnackbarError.kt
index 320f59e7d..8642e0d1f 100644
--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/HandledError.kt
+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/SnackbarError.kt
@@ -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>
 }
diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/ErrorHandler.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/SnackbarErrorHandler.kt
similarity index 76%
rename from core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/ErrorHandler.kt
rename to core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/SnackbarErrorHandler.kt
index 1523b2208..26cbea957 100644
--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/ErrorHandler.kt
+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/SnackbarErrorHandler.kt
@@ -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 -> {