From d94b3f74de782e1a52583ddbee976ad74097c6d9 Mon Sep 17 00:00:00 2001
From: "Maurice L." <maurice.lariviere@icloud.com>
Date: Fri, 27 Feb 2026 18:15:18 +0100
Subject: [PATCH] Improved account management and navigation

The app now supports adding a new account without logging out of the current session. A `BackHandler` has been implemented in the `LoginScreen` and `DashboardScreen` to improve navigation flow, and the `LoginScreen` now accepts an optional `onBack` callback.
---
 .../shap_planner/activities/MainActivity.kt   | 39 +++++++++++++++++--
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/miaurizius/shap_planner/activities/MainActivity.kt b/app/src/main/java/de/miaurizius/shap_planner/activities/MainActivity.kt
index acac15c..aa8b3fc 100644
--- a/app/src/main/java/de/miaurizius/shap_planner/activities/MainActivity.kt
+++ b/app/src/main/java/de/miaurizius/shap_planner/activities/MainActivity.kt
@@ -2,6 +2,7 @@ package de.miaurizius.shap_planner.activities
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -64,10 +65,28 @@ class MainActivity : ComponentActivity() {
                 val isLoggedIn by loginViewModel.isLoggedIn.collectAsState()
                 val accountList by mainViewModel.accounts.collectAsState()
                 val selectedAccount = mainViewModel.selectedAccount
+                var showLoginForNewAccount by remember { mutableStateOf(false) }
 
                 when {
-                    !isLoggedIn || accountList.isEmpty() -> {
-                        LoginScreen { serverUrl, username, password -> loginViewModel.login(serverUrl, username, password, mainViewModel) }
+
+                    showLoginForNewAccount -> {
+                        LoginScreen(
+                            onLogin = { serverUrl, username, password ->
+                                loginViewModel.login(serverUrl, username, password, mainViewModel)
+                                showLoginForNewAccount = false
+                            },
+                            onBack = {
+                                showLoginForNewAccount = false
+                            }
+                        )
+                    }
+
+                    accountList.isEmpty() -> {
+                        LoginScreen(
+                            onLogin = { serverUrl, username, password ->
+                                loginViewModel.login(serverUrl, username, password, mainViewModel)
+                            }
+                        )
                     }
 
                     selectedAccount != null -> {
@@ -84,7 +103,7 @@ class MainActivity : ComponentActivity() {
                                 mainViewModel.selectAccount(account)
                             },
                             onAddAccountClick = {
-                                loginViewModel.logout()
+                                showLoginForNewAccount = true
                             }
                         )
                     }
@@ -133,7 +152,14 @@ fun AccountSelectionScreen(accounts: List<Account>, onAccountClick: (Account) ->
 }
 
 @Composable
-fun LoginScreen(onLogin: (String, String, String) -> Unit) {
+fun LoginScreen(onLogin: (String, String, String) -> Unit, onBack: (() -> Unit)? = null) {
+
+    if (onBack != null) {
+        BackHandler {
+            onBack()
+        }
+    }
+
     var serverUrl by remember { mutableStateOf("") }
     var username by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
@@ -178,6 +204,11 @@ fun LoginScreen(onLogin: (String, String, String) -> Unit) {
 
 @Composable
 fun DashboardScreen(account: Account, onBack: () -> Unit) {
+
+    BackHandler {
+        onBack()
+    }
+
     Column(
         modifier = Modifier
             .fillMaxSize()