From 2eb88430f15cd2e2f8c22a6b84a834a27ee64d04 Mon Sep 17 00:00:00 2001 From: Stefan Mogeritsch Date: Sat, 21 Mar 2026 14:00:15 +0100 Subject: [PATCH] refactor(ui): replace TabRow with PrimaryTabRow and improve toggle state handling in MainApp Signed-off-by: Stefan Mogeritsch --- .../mocode/nennung/feature/presentation/NennungsMaske.kt | 4 ++-- .../meldestelle-portal/src/commonMain/kotlin/MainApp.kt | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/features/nennung-feature/src/commonMain/kotlin/at/mocode/nennung/feature/presentation/NennungsMaske.kt b/frontend/features/nennung-feature/src/commonMain/kotlin/at/mocode/nennung/feature/presentation/NennungsMaske.kt index 84d1456e..7f6ffe05 100644 --- a/frontend/features/nennung-feature/src/commonMain/kotlin/at/mocode/nennung/feature/presentation/NennungsMaske.kt +++ b/frontend/features/nennung-feature/src/commonMain/kotlin/at/mocode/nennung/feature/presentation/NennungsMaske.kt @@ -427,7 +427,7 @@ private fun NennungenTabelle( ) { Column(modifier = Modifier.fillMaxSize()) { // Tabs - TabRow(selectedTabIndex = state.activeNennungTab.ordinal, modifier = Modifier.height(32.dp)) { + PrimaryTabRow(selectedTabIndex = state.activeNennungTab.ordinal, modifier = Modifier.height(32.dp)) { NennungTab.entries.forEach { tab -> Tab( selected = state.activeNennungTab == tab, @@ -681,7 +681,7 @@ private fun VerkaufBuchungenPanel( onMengeChanged: (VerkaufArtikel, Int) -> Unit, ) { Column(modifier = Modifier.fillMaxSize()) { - TabRow(selectedTabIndex = state.activeVerkaufTab.ordinal, modifier = Modifier.height(32.dp)) { + PrimaryTabRow(selectedTabIndex = state.activeVerkaufTab.ordinal, modifier = Modifier.height(32.dp)) { VerkaufTab.entries.forEach { tab -> Tab( selected = state.activeVerkaufTab == tab, diff --git a/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt b/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt index e02ebfab..756c0ecc 100644 --- a/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt +++ b/frontend/shells/meldestelle-portal/src/commonMain/kotlin/MainApp.kt @@ -616,9 +616,12 @@ private fun DashboardScreen( // Right Side: Toggles (Statusanzeigen für den Admin) Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.width(300.dp)) { - ToggleRow("Meldestelle-Desktop online", isOnline = true, isInteractive = false) - ToggleRow("Nennsystem online", isOnline = true, isInteractive = true) - ToggleRow("Start- Ergebnislisten online", isOnline = true, isInteractive = true) + var meldestelleOnline by remember { mutableStateOf(true) } + var nennsystemOnline by remember { mutableStateOf(true) } + var startlisteOnline by remember { mutableStateOf(true) } + ToggleRow("Meldestelle-Desktop online", isOnline = meldestelleOnline, isInteractive = false) + ToggleRow("Nennsystem online", isOnline = nennsystemOnline, isInteractive = true) + ToggleRow("Start- Ergebnislisten online", isOnline = startlisteOnline, isInteractive = true) Spacer(modifier = Modifier.height(4.dp)) OutlinedButton(