refactor(ui): replace TabRow with PrimaryTabRow and improve toggle state handling in MainApp
Build and Publish Docker Images / build-and-push (., backend/infrastructure/gateway/Dockerfile, api-gateway, api-gateway) (push) Failing after 2m41s
Build and Publish Docker Images / build-and-push (., backend/services/ping/Dockerfile, ping-service, ping-service) (push) Failing after 2m55s
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Successful in 4m19s
Build and Publish Docker Images / build-and-push (., config/docker/keycloak/Dockerfile, keycloak, keycloak) (push) Successful in 1m46s
Build and Publish Docker Images / build-and-push (., backend/infrastructure/gateway/Dockerfile, api-gateway, api-gateway) (push) Failing after 2m41s
Build and Publish Docker Images / build-and-push (., backend/services/ping/Dockerfile, ping-service, ping-service) (push) Failing after 2m55s
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Successful in 4m19s
Build and Publish Docker Images / build-and-push (., config/docker/keycloak/Dockerfile, keycloak, keycloak) (push) Successful in 1m46s
Signed-off-by: Stefan Mogeritsch <stefan.mo.co@gmail.com>
This commit is contained in:
+2
-2
@@ -427,7 +427,7 @@ private fun NennungenTabelle(
|
|||||||
) {
|
) {
|
||||||
Column(modifier = Modifier.fillMaxSize()) {
|
Column(modifier = Modifier.fillMaxSize()) {
|
||||||
// Tabs
|
// 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 ->
|
NennungTab.entries.forEach { tab ->
|
||||||
Tab(
|
Tab(
|
||||||
selected = state.activeNennungTab == tab,
|
selected = state.activeNennungTab == tab,
|
||||||
@@ -681,7 +681,7 @@ private fun VerkaufBuchungenPanel(
|
|||||||
onMengeChanged: (VerkaufArtikel, Int) -> Unit,
|
onMengeChanged: (VerkaufArtikel, Int) -> Unit,
|
||||||
) {
|
) {
|
||||||
Column(modifier = Modifier.fillMaxSize()) {
|
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 ->
|
VerkaufTab.entries.forEach { tab ->
|
||||||
Tab(
|
Tab(
|
||||||
selected = state.activeVerkaufTab == tab,
|
selected = state.activeVerkaufTab == tab,
|
||||||
|
|||||||
@@ -616,9 +616,12 @@ private fun DashboardScreen(
|
|||||||
|
|
||||||
// Right Side: Toggles (Statusanzeigen für den Admin)
|
// Right Side: Toggles (Statusanzeigen für den Admin)
|
||||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.width(300.dp)) {
|
Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.width(300.dp)) {
|
||||||
ToggleRow("Meldestelle-Desktop online", isOnline = true, isInteractive = false)
|
var meldestelleOnline by remember { mutableStateOf(true) }
|
||||||
ToggleRow("Nennsystem online", isOnline = true, isInteractive = true)
|
var nennsystemOnline by remember { mutableStateOf(true) }
|
||||||
ToggleRow("Start- Ergebnislisten online", isOnline = true, isInteractive = 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))
|
Spacer(modifier = Modifier.height(4.dp))
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
|
|||||||
Reference in New Issue
Block a user