Enum value view to safe args

erikeelde · Sep 21, 2024 · 13ab8e5 · 13ab8e5
1 parent 0083b48
commit 13ab8e5
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 22 deletions.
diff --git a/...leanconfiguration/src/main/java/se/eelde/toggles/booleanconfiguration/BooleanValueView.kt b/...leanconfiguration/src/main/java/se/eelde/toggles/booleanconfiguration/BooleanValueView.kt
@@ -57,7 +57,7 @@ fun BooleanValueView(
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "LongMethod")
 fun BooleanValueView(
     viewState: ViewState,
     save: () -> Unit,

diff --git a/modules/enumconfiguration/src/main/java/se/eelde/toggles/enumconfiguration/EnumValueView.kt b/modules/enumconfiguration/src/main/java/se/eelde/toggles/enumconfiguration/EnumValueView.kt
@@ -33,7 +33,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun EnumValueView(
     modifier: Modifier = Modifier,
-    viewModel: FragmentEnumValueViewModel = hiltViewModel(),
+    viewModel: EnumValueViewModel = hiltViewModel(),
     back: () -> Unit,
 ) {
     val viewState by viewModel.state.collectAsStateWithLifecycle()

diff --git a/.../enumconfiguration/src/main/java/se/eelde/toggles/enumconfiguration/EnumValueViewModel.kt b/.../enumconfiguration/src/main/java/se/eelde/toggles/enumconfiguration/EnumValueViewModel.kt
@@ -1,9 +1,11 @@
 package se.eelde.toggles.enumconfiguration
 
 import android.app.Application
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -19,8 +21,8 @@ import se.eelde.toggles.database.dao.application.TogglesConfigurationValueDao
 import se.eelde.toggles.database.dao.application.TogglesPredefinedConfigurationValueDao
 import se.eelde.toggles.provider.notifyInsert
 import se.eelde.toggles.provider.notifyUpdate
+import se.eelde.toggles.routes.EnumConfiguration
 import java.util.Date
-import javax.inject.Inject
 
 data class ViewState(
     val title: String? = null,
@@ -43,22 +45,29 @@ internal sealed class PartialViewState {
     data object Reverting : PartialViewState()
 }
 
-@HiltViewModel
-class FragmentEnumValueViewModel @Inject internal constructor(
-    private val savedStateHandle: SavedStateHandle,
+@HiltViewModel(assistedFactory = EnumValueViewModel.Factory::class)
+class EnumValueViewModel @AssistedInject internal constructor(
     private val application: Application,
     private val configurationDao: TogglesConfigurationDao,
     private val configurationValueDao: TogglesConfigurationValueDao,
-    private val predefinedConfigurationValueDao: TogglesPredefinedConfigurationValueDao
+    private val predefinedConfigurationValueDao: TogglesPredefinedConfigurationValueDao,
+    @Assisted enumConfiguration: EnumConfiguration,
 ) : ViewModel() {
 
+    @AssistedFactory
+    interface Factory {
+        fun create(
+            enumConfiguration: EnumConfiguration
+        ): EnumValueViewModel
+    }
+
     private val _state = MutableStateFlow(reduce(ViewState(), PartialViewState.Empty))
 
     val state: StateFlow<ViewState>
         get() = _state
 
-    private val configurationId: Long = savedStateHandle.get<Long>("configurationId")!!
-    private val scopeId: Long = savedStateHandle.get<Long>("scopeId")!!
+    private val configurationId: Long = enumConfiguration.configurationId
+    private val scopeId: Long = enumConfiguration.scopeId
 
     private var selectedConfigurationValue: WrenchConfigurationValue? = null
 

diff --git a/...egerconfiguration/src/main/java/se/eelde/toggles/integerconfiguration/IntegerValueView.kt b/...egerconfiguration/src/main/java/se/eelde/toggles/integerconfiguration/IntegerValueView.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.launch
 
 @Preview
 @Composable
-private fun IntegerValueViewPreview() {
+internal fun IntegerValueViewPreview() {
     IntegerValueView(
         uiState = ViewState(
             title = "Integer value",

diff --git a/modules/routes/src/main/java/se/eelde/toggles/routes/Routes.kt b/modules/routes/src/main/java/se/eelde/toggles/routes/Routes.kt
@@ -28,4 +28,3 @@ data class StringConfiguration(val configurationId: Long, val scopeId: Long)
 
 @Serializable
 data class Scope(val applicationId: Long)
-
diff --git a/...stringconfiguration/src/main/java/se/eelde/toggles/stringconfiguration/StringValueView.kt b/...stringconfiguration/src/main/java/se/eelde/toggles/stringconfiguration/StringValueView.kt
@@ -32,7 +32,7 @@ import se.eelde.toggles.routes.StringConfiguration
 
 @Preview
 @Composable
-private fun StringValueViewPreview() {
+internal fun StringValueViewPreview() {
     TogglesTheme {
         StringValueView(
             viewState = ViewState(title = "The title", stringValue = "This is value"),

diff --git a/toggles-app/src/main/java/se/eelde/toggles/MainActivity.kt b/toggles-app/src/main/java/se/eelde/toggles/MainActivity.kt
@@ -31,13 +31,15 @@ import se.eelde.toggles.composetheme.TogglesTheme
 import se.eelde.toggles.configurations.configurationsNavigations
 import se.eelde.toggles.dialogs.scope.ScopeValueView
 import se.eelde.toggles.enumconfiguration.EnumValueView
+import se.eelde.toggles.enumconfiguration.EnumValueViewModel
 import se.eelde.toggles.help.HelpView
 import se.eelde.toggles.integerconfiguration.IntegerValueView
 import se.eelde.toggles.integerconfiguration.IntegerValueViewModel
 import se.eelde.toggles.oss.OssView
 import se.eelde.toggles.routes.Applications
 import se.eelde.toggles.routes.BooleanConfiguration
 import se.eelde.toggles.routes.Configurations
+import se.eelde.toggles.routes.EnumConfiguration
 import se.eelde.toggles.routes.Help
 import se.eelde.toggles.routes.IntegerConfiguration
 import se.eelde.toggles.routes.Oss
@@ -80,7 +82,7 @@ fun Navigation(
                 )
             },
             navigateToEnumConfiguration = { scopeId: Long, configurationId: Long ->
-                navController.navigate("configuration/$configurationId/$scopeId/enum")
+                navController.navigate(EnumConfiguration(configurationId, scopeId))
             },
             navigateToScopeView = { applicationId: Long ->
                 navController.navigate("scopes/$applicationId")
@@ -112,14 +114,16 @@ fun Navigation(
 
             StringValueView(stringConfiguration) { navController.popBackStack() }
         }
-        composable(
-            "configuration/{configurationId}/{scopeId}/enum",
-            arguments = listOf(
-                navArgument("configurationId") { type = NavType.LongType },
-                navArgument("scopeId") { type = NavType.LongType }
-            )
-        ) {
-            EnumValueView { navController.popBackStack() }
+        composable<EnumConfiguration> { backStackEntry ->
+            val enumConfiguration: EnumConfiguration = backStackEntry.toRoute()
+
+            EnumValueView(
+                viewModel = hiltViewModel<EnumValueViewModel, EnumValueViewModel.Factory>(
+                    creationCallback = { factory ->
+                        factory.create(enumConfiguration)
+                    }
+                )
+            ) { navController.popBackStack() }
         }
         composable<Oss> {
             Scaffold(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@ data class StringConfiguration(val configurationId: Long, val scopeId: Long)

		@Serializable
		data class Scope(val applicationId: Long)