refactor: Decouple AuthCheck from onSuccess actions

Author: ovitrif

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -475,8 +475,11 @@ private fun NavGraphBuilder.generalSettings(navController: NavHostController) {
 }
 
 private fun NavGraphBuilder.securitySettings(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.SecuritySettings> {
-        SecuritySettingsScreen(navController)
+    composableWithDefaultTransitions<Routes.SecuritySettings> { backStackEntry ->
+        SecuritySettingsScreen(
+            navController = navController,
+            savedStateHandle = backStackEntry.savedStateHandle,
+        )
     }
 }
 
@@ -630,10 +633,7 @@ private fun NavGraphBuilder.qrScanner(
 private fun NavGraphBuilder.authCheck(
     navController: NavHostController,
 ) {
-    composable<Routes.AuthCheck>(
-        enterTransition = { screenSlideIn },
-        exitTransition = { screenSlideOut },
-    ) { navBackEntry ->
+    composable<Routes.AuthCheck> { navBackEntry ->
         val route = navBackEntry.toRoute<Routes.AuthCheck>()
         AuthCheckScreen(
             route = route,
@@ -692,13 +692,13 @@ fun NavController.navigateToAuthCheck(
     showLogoOnPin: Boolean = false,
     requirePin: Boolean = false,
     requireBiometrics: Boolean = false,
-    onSuccessAction: String,
+    onSuccessActionId: String,
 ) = navigate(
     route = Routes.AuthCheck(
         showLogoOnPin = showLogoOnPin,
         requirePin = requirePin,
         requireBiometrics = requireBiometrics,
-        onSuccessAction = onSuccessAction,
+        onSuccessActionId = onSuccessActionId,
     ),
 )
 
@@ -800,7 +800,7 @@ object Routes {
         val showLogoOnPin: Boolean = false,
         val requirePin: Boolean = false,
         val requireBiometrics: Boolean = false,
-        val onSuccessAction: String,
+        val onSuccessActionId: String,
     )
 
     @Serializable

app/src/main/java/to/bitkit/ui/components/AuthCheckScreen.kt

@@ -1,12 +1,6 @@
 package to.bitkit.ui.components
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import to.bitkit.ui.Routes
 import to.bitkit.ui.appViewModel
@@ -17,31 +11,27 @@ fun AuthCheckScreen(
     route: Routes.AuthCheck,
 ) {
     val app = appViewModel ?: return
-    var isAuthenticated by rememberSaveable { mutableStateOf(false) }
 
-    if (isAuthenticated) {
-        val isPinOnLaunchEnabled by app.isPinOnLaunchEnabled.collectAsStateWithLifecycle()
-        val isBiometricEnabled by app.isBiometricEnabled.collectAsStateWithLifecycle()
+    AuthCheckView(
+        showLogoOnPin = route.showLogoOnPin,
+        appViewModel = app,
+        requireBiometrics = route.requireBiometrics,
+        requirePin = route.requirePin,
+        onSuccess = {
+            navController.previousBackStackEntry
+                ?.savedStateHandle
+                ?.set(AuthCheckAction.KEY, route.onSuccessActionId)
 
-        LaunchedEffect(Unit) {
-            when (route.onSuccessAction) {
-                AuthCheckAction.TOGGLE_PIN_ON_LAUNCH -> app.setIsPinOnLaunchEnabled(!isPinOnLaunchEnabled)
-                AuthCheckAction.TOGGLE_BIOMETRICS -> app.setIsBiometricEnabled(!isBiometricEnabled)
-            }
             navController.popBackStack()
-        }
-    } else {
-        AuthCheckView(
-            showLogoOnPin = route.showLogoOnPin,
-            appViewModel = app,
-            requireBiometrics = route.requireBiometrics,
-            requirePin = route.requirePin,
-            onSuccess = { isAuthenticated = true },
-        )
-    }
+        },
+    )
 }
 
 object AuthCheckAction {
-    const val TOGGLE_PIN_ON_LAUNCH = "toggle_pin_on_launch"
-    const val TOGGLE_BIOMETRICS = "toggle_biometrics"
+    const val KEY = "auth_check_action_key"
+
+    object Id {
+        const val TOGGLE_PIN_ON_LAUNCH = "toggle_pin_on_launch"
+        const val TOGGLE_BIOMETRICS = "toggle_biometrics"
+    }
 }

app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -13,6 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import to.bitkit.R
@@ -34,6 +36,7 @@ import to.bitkit.ui.settings.pin.PinNavigationSheet
 @Composable
 fun SecuritySettingsScreen(
     navController: NavController,
+    savedStateHandle: SavedStateHandle,
 ) {
     val app = appViewModel ?: return
 
@@ -42,6 +45,24 @@ fun SecuritySettingsScreen(
     val isPinOnLaunchEnabled by app.isPinOnLaunchEnabled.collectAsStateWithLifecycle()
     val isBiometricEnabled by app.isBiometricEnabled.collectAsStateWithLifecycle()
 
+    LaunchedEffect(savedStateHandle) {
+        savedStateHandle.getStateFlow<String?>(AuthCheckAction.KEY, null)
+            .collect { actionId ->
+                if (actionId != null) {
+                    when (actionId) {
+                        AuthCheckAction.Id.TOGGLE_BIOMETRICS -> {
+                            app.setIsBiometricEnabled(!isBiometricEnabled)
+                        }
+                        AuthCheckAction.Id.TOGGLE_PIN_ON_LAUNCH -> {
+                            app.setIsPinOnLaunchEnabled(!isPinOnLaunchEnabled)
+                        }
+                    }
+                    // cleanup
+                    savedStateHandle.remove<String>(AuthCheckAction.KEY)
+                }
+            }
+    }
+
     PinNavigationSheet(
         showSheet = showPinSheet,
         showLaterButton = false,
@@ -62,13 +83,13 @@ fun SecuritySettingsScreen(
             },
             onPinOnLaunchClick = {
                 navController.navigateToAuthCheck(
-                    onSuccessAction = AuthCheckAction.TOGGLE_PIN_ON_LAUNCH,
+                    onSuccessActionId = AuthCheckAction.Id.TOGGLE_PIN_ON_LAUNCH,
                 )
             },
             onUseBiometricsClick = {
                 navController.navigateToAuthCheck(
                     requireBiometrics = true,
-                    onSuccessAction = AuthCheckAction.TOGGLE_BIOMETRICS,
+                    onSuccessActionId = AuthCheckAction.Id.TOGGLE_BIOMETRICS,
                 )
             },
             onBackClick = { navController.popBackStack() },