From 807623d04abb78e88e260202fef6cafc6e663068 Mon Sep 17 00:00:00 2001 From: timklge <2026103+timklge@users.noreply.github.com> Date: Mon, 2 Jun 2025 20:02:22 +0200 Subject: [PATCH] Swap top and bar bottom buttons in settings (#39) --- .../karoopowerbar/screens/MainScreen.kt | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/kotlin/de/timklge/karoopowerbar/screens/MainScreen.kt b/app/src/main/kotlin/de/timklge/karoopowerbar/screens/MainScreen.kt index 2947f6c..1b0c18b 100644 --- a/app/src/main/kotlin/de/timklge/karoopowerbar/screens/MainScreen.kt +++ b/app/src/main/kotlin/de/timklge/karoopowerbar/screens/MainScreen.kt @@ -276,25 +276,6 @@ fun MainScreen(onFinish: () -> Unit) { .verticalScroll(rememberScrollState()) .fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)) { - FilledTonalButton(modifier = Modifier - .fillMaxWidth() - .height(60.dp), - onClick = { - bottomBarDialogVisible = true - }) { - Icon(Icons.Default.Build, contentDescription = "Select", modifier = Modifier.size(20.dp)) - Spacer(modifier = Modifier.width(5.dp)) - Text("Bottom Bar: ${bottomSelectedSource.label}", modifier = Modifier.weight(1.0f)) - } - - if (bottomBarDialogVisible){ - BarSelectDialog(bottomSelectedSource, onHide = { bottomBarDialogVisible = false }, onSelect = { selected -> - bottomSelectedSource = selected - coroutineScope.launch { updateSettings() } - bottomBarDialogVisible = false - }) - } - FilledTonalButton(modifier = Modifier .fillMaxWidth() .height(60.dp), @@ -314,6 +295,25 @@ fun MainScreen(onFinish: () -> Unit) { }) } + FilledTonalButton(modifier = Modifier + .fillMaxWidth() + .height(60.dp), + onClick = { + bottomBarDialogVisible = true + }) { + Icon(Icons.Default.Build, contentDescription = "Select", modifier = Modifier.size(20.dp)) + Spacer(modifier = Modifier.width(5.dp)) + Text("Bottom Bar: ${bottomSelectedSource.label}", modifier = Modifier.weight(1.0f)) + } + + if (bottomBarDialogVisible){ + BarSelectDialog(bottomSelectedSource, onHide = { bottomBarDialogVisible = false }, onSelect = { selected -> + bottomSelectedSource = selected + coroutineScope.launch { updateSettings() } + bottomBarDialogVisible = false + }) + } + apply { val dropdownOptions = CustomProgressBarBarSize.entries.toList().map { unit -> DropdownOption(unit.id, unit.label) } val dropdownInitialSelection by remember(barBarSize) {