Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

fix: storage slider discrete values and terminal theme/font persistence

ExTvd7a9baa27de8
diff --git a/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt b/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
index 1d9ff18..205537c 100644
--- a/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
+++ b/app/src/main/java/com/excp/podroid/ui/navigation/NavGraph.kt
@@ -85,6 +85,9 @@ fun PodroidNavGraph(
}
}
},
+ onThemeOrFontChanged = {
+ terminalViewModel.invalidateTerminalView()
+ },
)
}
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
index ffd1550..cf42ae7 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsScreen.kt
@@ -87,6 +87,7 @@ private val servicePresets = listOf(
@Composable
fun SettingsScreen(
onNavigateBack: () -> Unit,
+ onThemeOrFontChanged: () -> Unit = {},
viewModel: SettingsViewModel = hiltViewModel(),
) {
val darkTheme by viewModel.darkTheme.collectAsStateWithLifecycle(false)
@@ -140,7 +141,10 @@ fun SettingsScreen(
)
Slider(
value = terminalFontSize.toFloat(),
- onValueChange = { viewModel.setTerminalFontSize(it.toInt()) },
+ onValueChange = {
+ viewModel.setTerminalFontSize(it.toInt())
+ onThemeOrFontChanged()
+ },
valueRange = 12f..40f,
steps = 13,
modifier = Modifier.fillMaxWidth(),
@@ -458,6 +462,7 @@ fun SettingsScreen(
}
}
viewModel.setTerminalColorTheme(theme)
+ onThemeOrFontChanged()
}
showColorThemeDialog = false
}
@@ -509,6 +514,7 @@ fun SettingsScreen(
}
}
viewModel.setTerminalFont(font)
+ onThemeOrFontChanged()
}
showFontDialog = false
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
index 567e8cb..7e26df6 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/setup/SetupScreen.kt
@@ -264,7 +264,7 @@ private fun StoragePage(
value = sliderPosition,
onValueChange = onSliderChange,
valueRange = 0f..(storageSizes.lastIndex.toFloat()),
- steps = storageSizes.size - 2,
+ steps = 4,
modifier = Modifier.fillMaxWidth(),
)
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
index 097e669..534fd0e 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt
@@ -62,6 +62,20 @@ class TerminalViewModel @Inject constructor(
val terminalFontSize: StateFlow<Int> = settingsRepository.terminalFontSize
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 20)
+ val terminalColorTheme: StateFlow<String> = settingsRepository.terminalColorTheme
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "default")
+
+ val terminalFont: StateFlow<String> = settingsRepository.terminalFont
+ .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), "default")
+
+ /**
+ * Forces recreation of the terminal view on next call.
+ * Call when theme/font/size settings change.
+ */
+ fun invalidateTerminalView() {
+ terminalView = null
+ }
+
@SuppressLint("StaticFieldLeak") // created once per ViewModel lifetime; ViewModel is nav-scoped
private var terminalView: TerminalView? = null
private var attached = false