feat: Pin or Bio auth check before navigating to reset

Author: ovitrif

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

@@ -25,7 +25,6 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navOptions
 import androidx.navigation.toRoute
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
@@ -1156,10 +1155,6 @@ fun NavController.navigateToBackupSettings() = navigate(
     route = Routes.BackupSettings,
 )
 
-fun NavController.navigateToResetAndRestoreSettings() = navigate(
-    route = Routes.ResetAndRestoreSettings,
-)
-
 fun NavController.navigateToChannelOrdersSettings() = navigate(
     route = Routes.ChannelOrdersSettings,
 )

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

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
+import androidx.navigation.navOptions
 import to.bitkit.ui.Routes
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.settingsViewModel
@@ -31,26 +32,36 @@ fun AuthCheckScreen(
             when (route.onSuccessActionId) {
                 AuthCheckAction.TOGGLE_BIOMETRICS -> {
                     settings.setIsBiometricEnabled(!isBiometricEnabled)
+                    navController.popBackStack()
                 }
 
                 AuthCheckAction.TOGGLE_PIN_ON_LAUNCH -> {
                     settings.setIsPinOnLaunchEnabled(!isPinOnLaunchEnabled)
+                    navController.popBackStack()
                 }
 
                 AuthCheckAction.TOGGLE_PIN_ON_IDLE -> {
                     settings.setIsPinOnIdleEnabled(!isPinOnIdleEnabled)
+                    navController.popBackStack()
                 }
 
                 AuthCheckAction.TOGGLE_PIN_FOR_PAYMENTS -> {
                     settings.setIsPinForPaymentsEnabled(!isPinForPaymentsEnabled)
+                    navController.popBackStack()
                 }
 
                 AuthCheckAction.DISABLE_PIN -> {
                     app.removePin()
+                    navController.popBackStack()
                 }
-            }
 
-            navController.popBackStack()
+                AuthCheckAction.NAV_TO_RESET -> {
+                    navController.navigate(
+                        route = Routes.ResetAndRestoreSettings,
+                        navOptions = navOptions { popUpTo(Routes.BackupSettings) }
+                    )
+                }
+            }
         },
         onBack = { navController.popBackStack() },
     )
@@ -62,4 +73,5 @@ object AuthCheckAction {
     const val TOGGLE_PIN_ON_IDLE = "TOGGLE_PIN_ON_IDLE"
     const val TOGGLE_PIN_FOR_PAYMENTS = "TOGGLE_PIN_FOR_PAYMENTS"
     const val DISABLE_PIN = "DISABLE_PIN"
+    const val NAV_TO_RESET = "NAV_TO_RESET"
 }

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

@@ -5,18 +5,23 @@ 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.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import to.bitkit.R
+import to.bitkit.ui.Routes
 import to.bitkit.ui.appViewModel
+import to.bitkit.ui.components.AuthCheckAction
 import to.bitkit.ui.components.BottomSheetType
 import to.bitkit.ui.components.settings.SettingsButtonRow
+import to.bitkit.ui.navigateToAuthCheck
 import to.bitkit.ui.navigateToHome
-import to.bitkit.ui.navigateToResetAndRestoreSettings
+import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.CloseNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -33,12 +38,18 @@ fun BackupSettingsScreen(
     navController: NavController,
 ) {
     val app = appViewModel ?: return
+    val settings = settingsViewModel ?: return
+
+    val isPinEnabled by settings.isPinEnabled.collectAsStateWithLifecycle()
 
     BackupSettingsScreenContent(
         onBackupClick = { app.showSheet(BottomSheetType.BackupNavigation) },
         onResetAndRestoreClick = {
-            // TODO: if isPinEnabled guard with authCheck
-            navController.navigateToResetAndRestoreSettings()
+            if (isPinEnabled) {
+                navController.navigateToAuthCheck(onSuccessActionId = AuthCheckAction.NAV_TO_RESET)
+            } else {
+                navController.navigate(Routes.ResetAndRestoreSettings)
+            }
         },
         onBack = { navController.popBackStack() },
         onClose = { navController.navigateToHome() },