From 54ba82ebeb5c2423cc22144e8a3e139598fd4db5 Mon Sep 17 00:00:00 2001
From: Eric85710 <ericchen87887@gmail.com>
Date: Thu, 14 May 2026 13:47:37 +0800
Subject: [PATCH] auth to server-V96

---
 .../auth/SwitchAccount/Add_Account_Page.kt        |  3 ++-
 .../example/login_v3/navigation/nav_controller.kt | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/login_v3/auth/SwitchAccount/Add_Account_Page.kt b/app/src/main/java/com/example/login_v3/auth/SwitchAccount/Add_Account_Page.kt
index a996e34..73ffeb5 100644
--- a/app/src/main/java/com/example/login_v3/auth/SwitchAccount/Add_Account_Page.kt
+++ b/app/src/main/java/com/example/login_v3/auth/SwitchAccount/Add_Account_Page.kt
@@ -63,7 +63,8 @@ import kotlin.text.ifEmpty
 @Composable
 fun AddAccountScreen(
     paddingValues: PaddingValues,
-    viewModel: AuthViewModel = hiltViewModel()
+    viewModel: AuthViewModel = hiltViewModel(),
+    onBack: () -> Unit,
 ){
 
     val uiState by viewModel.loginState.collectAsStateWithLifecycle()
diff --git a/app/src/main/java/com/example/login_v3/navigation/nav_controller.kt b/app/src/main/java/com/example/login_v3/navigation/nav_controller.kt
index a5c870b..0e822ad 100644
--- a/app/src/main/java/com/example/login_v3/navigation/nav_controller.kt
+++ b/app/src/main/java/com/example/login_v3/navigation/nav_controller.kt
@@ -46,9 +46,15 @@ fun AppNavGraph(
             paddingValues = paddingValues
         )
 
-        AppScreen.AddAccount -> AddAccountScreen(
-            paddingValues = paddingValues
-        )
+        AppScreen.AddAccount -> {
+            BackHandler {
+                appViewModel.goTo(AppScreen.ScreensTab)
+            }
+            AddAccountScreen(
+                paddingValues = paddingValues,
+                onBack = { appViewModel.goTo(AppScreen.ScreensTab) }
+            )
+        }
 
         AppScreen.Register -> {
             //back to pre_reg
@@ -72,6 +78,9 @@ fun AppNavGraph(
         AppScreen.ScreensTab -> MainScreen_tab()
 
         AppScreen.AccountSwitch -> {
+            BackHandler {
+                appViewModel.goTo(AppScreen.ScreensTab)
+            }
             AccountSwitchScreen(
                 // 點擊「登入另一個帳號」就跳轉到 Login 頁面
                 onAddAccountClick = { appViewModel.goTo(AppScreen.AddAccount) },