mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-09 22:07:23 +00:00
feat(settings,ui): custom-source toggles default off; new UI Settings card; bump to 4.4.9
Two changes per user request: 1. Data source toggles default OFF with legacy-URL migration (continuation of the 4.4.8 fix, now also in the dialog): old example.com placeholder URLs are replaced by the real defaults and the custom toggles stay off, so the online update never points at a dead source after upgrading. 2. New "UI Settings" card between Other Settings and Credits: one switch per bottom-navigation page (卫星/过境/雷达/匹配/漫游/地图/设置 in fixed order). Turning a page off removes it from the nav bar and the remaining items close up automatically; order is never rearranged. The Settings entry is always visible (switch disabled) so the user can never lose access to settings. Persisted via OtherSettings.hiddenScreens (StringSet of Screen.screenId; screenId added to the Screen sealed class - simpleName is unsafe under R8). Version bump per fork convention: 4.4.8 -> 4.4.9, versionCode 449. What's-new updated in en/zh/tr. Verified: core:data + core:domain tests pass, all modules compile.
This commit is contained in:
1 parent
9a4ceddcb0
commit
c101870b71
10 files changed
+79
-12
No files matched your search
+46
-1
@@ -300,6 +300,12 @@ private fun SettingsScreen(uiState: SettingsState, onAction: (SettingsAction) ->
|
||||
)
|
||||
}
|
||||
item { OtherCard(uiState.otherSettings, onAction) }
|
||||
item {
|
||||
UiSettingsCard(
|
||||
hiddenScreens = uiState.otherSettings.hiddenScreens,
|
||||
onToggle = { name -> onAction(SettingsAction.ToggleScreen(name)) }
|
||||
)
|
||||
}
|
||||
item { CardCredits() }
|
||||
}
|
||||
}
|
||||
@@ -516,8 +522,47 @@ private fun OtherCard(settings: OtherSettings, onAction: (SettingsAction) -> Uni
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* UI 设置卡片: 控制底部菜单栏各页面显示/隐藏。
|
||||
* 顺序固定(卫星/过境/雷达/匹配/漫游/地图/设置), 关闭后其余自动靠拢;
|
||||
* "设置"页固定显示(防止失去设置入口)。
|
||||
*/
|
||||
@Composable
|
||||
private fun SwitchRow(labelResId: Int, checked: Boolean, onCheckedChange: (Boolean) -> Unit) {
|
||||
private fun UiSettingsCard(hiddenScreens: List<String>, onToggle: (String) -> Unit) {
|
||||
val screens = listOf(
|
||||
R.string.nav_sat to "Satellites",
|
||||
R.string.nav_pass to "Passes",
|
||||
R.string.nav_radar to "Radar",
|
||||
R.string.nav_mutual to "Mutual",
|
||||
R.string.nav_roaming to "Roaming",
|
||||
R.string.nav_map to "Map",
|
||||
R.string.nav_prefs to "Settings"
|
||||
) // name 必须与 Screen.screenId 一致 (R8 安全)
|
||||
ElevatedCard(modifier = Modifier.fillMaxWidth()) {
|
||||
Column(
|
||||
modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(4.dp)
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(id = R.string.prefs_ui_title),
|
||||
color = MaterialTheme.colorScheme.primary
|
||||
)
|
||||
screens.forEach { (labelRes, name) ->
|
||||
if (name == "Settings") {
|
||||
// 设置页固定显示, 开关禁用
|
||||
SwitchRow(labelRes, true, null)
|
||||
} else {
|
||||
SwitchRow(labelRes, name !in hiddenScreens) {
|
||||
onToggle(name)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun SwitchRow(labelResId: Int, checked: Boolean, onCheckedChange: ((Boolean) -> Unit)?) {
|
||||
Row(
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
|
||||
@@ -64,6 +64,8 @@ sealed interface SettingsAction {
|
||||
data class ToggleSensor(val value: Boolean) : SettingsAction
|
||||
data class ToggleLightTheme(val value: Boolean) : SettingsAction
|
||||
data class ToggleNightMode(val value: Boolean) : SettingsAction
|
||||
// UI 设置: 切换底部导航栏页面的隐藏状态(Screen simpleName)
|
||||
data class ToggleScreen(val screenName: String) : SettingsAction
|
||||
|
||||
// Remote control
|
||||
data class UpdateRC(val settings: RCSettings) : SettingsAction
|
||||
|
||||
+5
@@ -121,6 +121,11 @@ class SettingsViewModel(
|
||||
is SettingsAction.ToggleSensor -> settingsRepo.updateOtherSettings { it.copy(stateOfSensors = action.value) }
|
||||
is SettingsAction.ToggleLightTheme -> settingsRepo.updateOtherSettings { it.copy(stateOfLightTheme = action.value) }
|
||||
is SettingsAction.ToggleNightMode -> settingsRepo.updateOtherSettings { it.copy(stateOfNightMode = action.value) }
|
||||
is SettingsAction.ToggleScreen -> settingsRepo.updateOtherSettings { current ->
|
||||
val hidden = current.hiddenScreens.toMutableList()
|
||||
if (action.screenName in hidden) hidden.remove(action.screenName) else hidden.add(action.screenName)
|
||||
current.copy(hiddenScreens = hidden)
|
||||
}
|
||||
// Remote control & data sources
|
||||
is SettingsAction.UpdateRC -> settingsRepo.updateRCSettings(action.settings)
|
||||
is SettingsAction.UpdateRadioControl -> settingsRepo.updateRadioControlSettings(action.settings)
|
||||
|
||||
Reference in new issue
Block a user