Merge pull request #412 from d4rken-org/fix/settings-category-ordering

fix(settings): Move monitor and scanner mode out of appearance category
This commit is contained in:
Matthias Urhahn
2026-02-25 10:20:29 +01:00
committed by GitHub
2 changed files with 20 additions and 16 deletions
@@ -127,6 +127,25 @@ fun GeneralSettingsScreen(
},
) { innerPadding ->
LazyColumn(modifier = Modifier.padding(innerPadding)) {
item {
SettingsCategoryHeader(text = stringResource(R.string.settings_category_monitoring_label))
}
item {
SettingsBaseItem(
title = stringResource(R.string.settings_monitor_mode_label),
subtitle = stringResource(state.monitorMode.labelRes),
icon = Icons.TwoTone.DisabledVisible,
onClick = { showMonitorModeDialog = true },
)
}
item {
SettingsBaseItem(
title = stringResource(R.string.settings_scanner_mode_label),
subtitle = stringResource(state.scannerMode.labelRes),
icon = Icons.TwoTone.SettingsBluetooth,
onClick = { showScannerModeDialog = true },
)
}
item {
SettingsCategoryHeader(text = stringResource(R.string.settings_category_appearance_label))
}
@@ -163,22 +182,6 @@ fun GeneralSettingsScreen(
enabled = !isMaterialYouActive,
)
}
item {
SettingsBaseItem(
title = stringResource(R.string.settings_monitor_mode_label),
subtitle = stringResource(state.monitorMode.labelRes),
icon = Icons.TwoTone.DisabledVisible,
onClick = { showMonitorModeDialog = true },
)
}
item {
SettingsBaseItem(
title = stringResource(R.string.settings_scanner_mode_label),
subtitle = stringResource(state.scannerMode.labelRes),
icon = Icons.TwoTone.SettingsBluetooth,
onClick = { showScannerModeDialog = true },
)
}
item {
SettingsCategoryHeader(text = stringResource(R.string.settings_category_other_label))
}
+1
View File
@@ -292,6 +292,7 @@
<string name="ui_theme_color_disabled_materialyou">Uses wallpaper colors</string>
<!-- Settings categories -->
<string name="settings_category_monitoring_label">Monitoring</string>
<string name="settings_category_appearance_label">Appearance</string>
<!-- Unsaved changes dialog -->