tim/karoo-powerbar
1
0
Fork 0
Code Issues Actions Releases 5 Activity

Compare commits

base: tim:1.4.1
Branches Tags
tim:master
tim:feat/workout-range-distance
tim:1.5.7
tim:1.5.6
tim:1.5.5
tim:1.5.4
tim:1.5.3
tim:1.5.2
tim:1.5.1
tim:1.5
tim:1.4.2
tim:1.4.1
tim:1.4.0
tim:1.4.0-beta-8
..
compare: tim:master
Branches Tags
tim:master
tim:feat/workout-range-distance
tim:1.5.7
tim:1.5.6
tim:1.5.5
tim:1.5.4
tim:1.5.3
tim:1.5.2
tim:1.5.1
tim:1.5
tim:1.4.2
tim:1.4.1
tim:1.4.0
tim:1.4.0-beta-8

No commits in common. "1.4.1" and "master" have entirely different histories.
1.4.1 ... master

1 changed files with 20 additions and 20 deletions
Show Stats Expand all files Collapse all files

40
app/src/main/kotlin/de/timklge/karoopowerbar/screens/MainScreen.kt
View File

@ -276,25 +276,6 @@ fun MainScreen(onFinish: () -> Unit) {
.verticalScroll(rememberScrollState())
.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)) {
FilledTonalButton(modifier = Modifier
.fillMaxWidth()
.height(60.dp),
onClick = {
topBarDialogVisible = true
}) {
Icon(Icons.Default.Build, contentDescription = "Select", modifier = Modifier.size(20.dp))
Spacer(modifier = Modifier.width(5.dp))
Text("Top Bar: ${topSelectedSource.label}", modifier = Modifier.weight(1.0f))
}
if (topBarDialogVisible){
BarSelectDialog(topSelectedSource, onHide = { topBarDialogVisible = false }, onSelect = { selected ->
topSelectedSource = selected
coroutineScope.launch { updateSettings() }
topBarDialogVisible = false
})
}
FilledTonalButton(modifier = Modifier
.fillMaxWidth()
.height(60.dp),
@ -314,6 +295,25 @@ fun MainScreen(onFinish: () -> Unit) {
})
}
FilledTonalButton(modifier = Modifier
.fillMaxWidth()
.height(60.dp),
onClick = {
topBarDialogVisible = true
}) {
Icon(Icons.Default.Build, contentDescription = "Select", modifier = Modifier.size(20.dp))
Spacer(modifier = Modifier.width(5.dp))
Text("Top Bar: ${topSelectedSource.label}", modifier = Modifier.weight(1.0f))
}
if (topBarDialogVisible){
BarSelectDialog(topSelectedSource, onHide = { topBarDialogVisible = false }, onSelect = { selected ->
topSelectedSource = selected
coroutineScope.launch { updateSettings() }
topBarDialogVisible = false
})
}
apply {
val dropdownOptions = CustomProgressBarBarSize.entries.toList().map { unit -> DropdownOption(unit.id, unit.label) }
val dropdownInitialSelection by remember(barBarSize) {
@ -494,7 +494,7 @@ fun MainScreen(onFinish: () -> Unit) {
coroutineScope.launch { updateSettings() }
})
Spacer(modifier = Modifier.width(10.dp))
Text("Solid background")
Text("Opaque background")
}
Row(verticalAlignment = Alignment.CenterVertically) {