diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt index b0f32422..3764ef21 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt @@ -45,7 +45,7 @@ fun rememberPostActions( viewModel.markPostAsRead(postId) val currentRoute = navController.currentDestination?.route val newRoute = - Destinations.Comments.route.replace(Destinations.Comments.placeholder, postId) + Destinations.Comments.route.replace(Destinations.Comments.PLACEHOLDER, postId) if (currentRoute != Destinations.Comments.route) navController.navigate(newRoute) } diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt index fad7491d..487f027e 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt @@ -9,34 +9,34 @@ package dev.msfjarvis.claw.android.ui.navigation sealed class Destinations { abstract val route: String - object Hottest : Destinations() { + data object Hottest : Destinations() { override val route = "hottest" } - object Newest : Destinations() { + data object Newest : Destinations() { override val route = "newest" } - object Saved : Destinations() { + data object Saved : Destinations() { override val route = "saved" } - object Comments : Destinations() { - const val placeholder = "{postId}" - override val route = "comments/$placeholder" + data object Comments : Destinations() { + const val PLACEHOLDER = "{postId}" + override val route = "comments/$PLACEHOLDER" } - object User : Destinations() { - const val placeholder = "{username}" - override val route = "user/$placeholder" + data object User : Destinations() { + const val PLACEHOLDER = "{username}" + override val route = "user/$PLACEHOLDER" } - object DataTransfer : Destinations() { - override val route: String = "datatransfer" + data object DataTransfer : Destinations() { + override val route = "datatransfer" } - object Search : Destinations() { - override val route: String = "search" + data object Search : Destinations() { + override val route = "search" } companion object { diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt index 9db1e56b..e1ca3c98 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt @@ -120,7 +120,7 @@ fun LobstersPostsScreen( LaunchedEffect(false) { if (postIdOverride != null) { navController.navigate( - Destinations.Comments.route.replace(Destinations.Comments.placeholder, postIdOverride) + Destinations.Comments.route.replace(Destinations.Comments.PLACEHOLDER, postIdOverride) ) } } @@ -284,8 +284,8 @@ fun LobstersPostsScreen( arguments = listOf(navArgument("postId") { type = NavType.StringType }), deepLinks = listOf( - navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}/.*" }, - navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}" }, + navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.PLACEHOLDER}/.*" }, + navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.PLACEHOLDER}" }, ), ) { backStackEntry -> val postId = @@ -305,7 +305,7 @@ fun LobstersPostsScreen( route = Destinations.User.route, arguments = listOf(navArgument("username") { type = NavType.StringType }), deepLinks = - listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.placeholder}" }), + listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.PLACEHOLDER}" }), ) { backStackEntry -> val username = requireNotNull(backStackEntry.arguments?.getString("username")) { diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt index 96446295..3305b9aa 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt @@ -11,5 +11,5 @@ internal sealed class NetworkState { class Error(val error: Throwable, val description: String) : NetworkState() - object Loading : NetworkState() + data object Loading : NetworkState() }