diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 1cb24ab00..c0ec1463e 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -319,6 +319,7 @@ class MainActivity : ComponentActivity() { private var steamChannel by mutableStateOf("steamdeck_publicbeta") private var runSteamAtStartup by mutableStateOf(false) private var theme by mutableStateOf("graphite") + private var appScale by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) private var hdrOn by mutableStateOf(false) private var fpsLimit by mutableStateOf(0) private var upscaler by mutableStateOf(0) @@ -489,6 +490,7 @@ class MainActivity : ComponentActivity() { refreshPhantomStatus() theme = SessionPrefs.theme(this) frameGenLabel = getString(R.string.frame_gen_off) + appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this) // Last start's game list, so the Steam wall is up on the first frame; refresh() replaces it. steamGames = if (shortcutPicker) emptyList() else com.droiddeck.launcher.frontend.LibraryCache.load(this) backActionsInverted = SessionPrefs.backActionsInverted(this) @@ -498,7 +500,7 @@ class MainActivity : ComponentActivity() { applyLauncherFullscreen() updates.start() setContent { - DroidDeckTheme(theme) { + DroidDeckTheme(theme, appScale = appScale) { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { val sm = settingsMode val page: (@Composable () -> Unit)? = when { @@ -526,6 +528,7 @@ class MainActivity : ComponentActivity() { pageKey = sm?.let { "settings:$it" } ?: if (showPerformance) "performance" else if (showProtons) "protons" else if (showComponents) "components" else if (showMapping) "controller-mapping" else null, theme = theme, language = com.droiddeck.launcher.core.AppLanguage.chosen(this), + appScale = appScale, isHomeApp = homeAppSelected, homeScreenEnabled = homeScreenEnabled, defaultHomeLabel = defaultHomeLabel, @@ -662,6 +665,10 @@ class MainActivity : ComponentActivity() { recreate() } }, + onAppScale = { percent -> + com.droiddeck.launcher.core.AppUiPrefs.setScale(this, percent) + appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this) + }, onLauncherFullscreen = { on -> SessionPrefs.setLauncherFullscreen(this, on) launcherFullscreen = on diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt new file mode 100644 index 000000000..3021b7196 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt @@ -0,0 +1,19 @@ +package com.droiddeck.launcher.core + +import android.content.Context + +object AppUiPrefs { + const val DEFAULT_SCALE = 100 + val scales = listOf(75, 85, 100, 115, 125, 150) + + internal fun normalizeScale(percent: Int): Int = percent.takeIf { it in scales } ?: DEFAULT_SCALE + + fun scale(context: Context): Int = normalizeScale( + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).getInt("scale", DEFAULT_SCALE), + ) + + fun setScale(context: Context, percent: Int) { + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit() + .putInt("scale", normalizeScale(percent)).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt index 4a08bcb51..cc0586d6f 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt @@ -27,7 +27,7 @@ class FileManagerActivity : ComponentActivity() { } val initialDir = intent.getStringExtra(EXTRA_START_DIR)?.let(::File) setContent { - DroidDeckTheme { + DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this)) { Surface(modifier = Modifier.fillMaxSize().systemBarsPadding(), color = MaterialTheme.colorScheme.background) { FileManagerScreen(initialDir = initialDir) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt index a36c6cc13..36ec427cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt @@ -49,7 +49,7 @@ class FilePickerActivity : ComponentActivity() { ?.let { File(it) }?.takeIf { it.isDirectory } setContent { - DroidDeckTheme { + DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this)) { Surface(modifier = Modifier.fillMaxSize().systemBarsPadding(), color = MaterialTheme.colorScheme.background) { FileManagerScreen( pickMode = true, diff --git a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt index 9b0834e17..fc6526f59 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt @@ -14,7 +14,7 @@ import kotlin.math.abs * The client reads `/sys/class/power_supply/BAT/...` - a laptop's or a Deck's naming and files * (`energy_now`, `power_now`, `time_to_empty_now`, a `uevent` of `POWER_SUPPLY_*` lines). Android * names its supply `battery` and lays it out differently, and on many phones an app may not read - * it at all, so the client showed no battery. This writes a `BAT0` (and a `BAT1`, the Deck's name) + * it at all, so the client showed no battery. This writes one `BAT1` (the Deck's name) * from Android's own battery API - the same on every device - into a directory the session binds * over `/sys/class/power_supply`, refreshed every few seconds while the session runs. * @@ -31,6 +31,8 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart private var thread: Thread? = null override fun start() { + // Older builds exported the same aggregate battery twice; MangoHud counts both supplies. + File(dir, "BAT0").deleteRecursively() running = true write() thread = Thread({ @@ -39,7 +41,7 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart if (running) write() } }, "battery-sysfs").apply { isDaemon = true; start() } - Log.i(TAG, "battery: BAT0/BAT1 written to ${dir.path} every ${PERIOD_MS / 1000} s") + Log.i(TAG, "battery: BAT1 written to ${dir.path} every ${PERIOD_MS / 1000} s") } override fun stop() { @@ -87,7 +89,7 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart pct <= 15 -> "Low" else -> "Normal" } - for (name in listOf("BAT0", "BAT1")) { + for (name in listOf("BAT1")) { val bat = File(dir, name).apply { mkdirs() } val attrs = linkedMapOf( "type" to "Battery", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AppScale.kt b/app/src/main/java/com/droiddeck/launcher/ui/AppScale.kt new file mode 100644 index 000000000..806ef22cd --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AppScale.kt @@ -0,0 +1,23 @@ +package com.droiddeck.launcher.ui + +import android.content.res.Configuration +import androidx.compose.ui.unit.Density +import com.droiddeck.launcher.core.AppUiPrefs +import kotlin.math.roundToInt + +internal fun scaledAppDensity(base: Density, percent: Int): Density { + val scale = AppUiPrefs.normalizeScale(percent) / 100f + return if (scale == 1f) base else Density(base.density * scale, base.fontScale) +} + +/** Responsive layouts and popup height limits must see the same dp space as the scaled UI. */ +internal fun scaledAppConfiguration(base: Configuration, percent: Int): Configuration { + val scale = AppUiPrefs.normalizeScale(percent) / 100f + if (scale == 1f) return base + return Configuration(base).apply { + if (densityDpi > 0) densityDpi = (densityDpi * scale).roundToInt() + if (screenWidthDp > 0) screenWidthDp = (screenWidthDp / scale).roundToInt() + if (screenHeightDp > 0) screenHeightDp = (screenHeightDp / scale).roundToInt() + if (smallestScreenWidthDp > 0) smallestScreenWidthDp = (smallestScreenWidthDp / scale).roundToInt() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index 33226c3b3..3074257aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -284,7 +284,7 @@ private fun GameRow(g: Library.SteamGame, selected: Boolean, onSelect: () -> Uni } } -/** A page's title, with room at its right for a status chip. */ +/** A page's title, with room at its right for controls or status. */ @Composable internal fun PageHeader(title: String, trailing: @Composable RowScope.() -> Unit = {}) { Row( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 190246128..75eaab152 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -103,6 +103,7 @@ class FrontEndState( val theme: String = Themes.GRAPHITE, /** The language picked in Setup, or AppLanguage.SYSTEM to follow the system. */ val language: String = "", + val appScale: Int = com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE, val isHomeApp: Boolean = false, val homeScreenEnabled: Boolean = false, val defaultHomeLabel: String? = null, @@ -171,6 +172,7 @@ class FrontEndActions( val onPageBack: () -> Unit = {}, val onTheme: (String) -> Unit = {}, val onLanguage: (String) -> Unit = {}, + val onAppScale: (Int) -> Unit = {}, val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onStoreEnabled: (Boolean) -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 5c3394edf..712b6bd58 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -163,8 +163,6 @@ internal fun SetupPanel( val limitBlocks = PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) val signedIn = s.offlineAccount != null var showLimitDetails by rememberSaveable { mutableStateOf(false) } - val checks = 4 - val readyCount = listOf(gpuOk, s.ready && !s.busy, !limitBlocks, signedIn).count { it } // Four tabs instead of one long scroll; LB and RB turn them from anywhere on the page. Build // and credits are on the Updates page. val tabs = listOf(stringResource(R.string.setup_tab_overview), stringResource(R.string.setup_tab_controller), stringResource(R.string.setup_tab_session), stringResource(R.string.setup_tab_launcher)) @@ -188,9 +186,8 @@ internal fun SetupPanel( ), ) { PageHeader(stringResource(R.string.setup_title)) { - Chip(if (readyCount == checks) stringResource(R.string.setup_all_set) else stringResource(R.string.setup_n_ready, readyCount, checks), ok = readyCount == checks) + TabStrip(tabs, tab, pick, Modifier.weight(1f), tabFocus) } - TabStrip(tabs, tab, pick, Modifier.padding(bottom = 4.dp), tabFocus) Column(modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = 24.dp)) { when (tab) { 0 -> { @@ -322,6 +319,15 @@ internal fun SetupPanel( 3 -> { SettingsGroup(stringResource(R.string.setup_launcher)) { LanguageRow(host, s.language, a.onLanguage) + ChoiceRow( + host, "app-scale", stringResource(R.string.setup_app_scale), stringResource(R.string.setup_app_scale_hint), + com.droiddeck.launcher.core.AppUiPrefs.scales.map { percent -> + percent to stringResource( + if (percent == com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) R.string.setup_app_scale_default + else R.string.ctrl_percent, percent, + ) + }, s.appScale, onPick = a.onAppScale, + ) SettingsRow(stringResource(R.string.setup_theme), stringResource(R.string.setup_theme_hint)) { Box { ValueChip(stringResource(Themes.byId(s.theme).label), host.open == "theme") { host.open = if (host.open == "theme") null else "theme" } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 950aebfb1..f330117c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -169,7 +169,7 @@ class ModeSettingsActions( val onDismiss: () -> Unit, ) -private enum class SteamSettingsTab(val label: Int) { +private enum class ModeSettingsTab(val label: Int) { DISPLAY(R.string.drawer_page_display), CONTROLS(R.string.drawer_page_controls), GAMES(R.string.game_settings_title), @@ -185,34 +185,36 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { var confirmDeckyRemoval by remember { mutableStateOf(false) } var explainWifiDiscovery by remember { mutableStateOf(false) } var tabIndex by androidx.compose.runtime.saveable.rememberSaveable(s.mode) { mutableStateOf(0) } - val tabs = SteamSettingsTab.entries + val tabs = if (steam) ModeSettingsTab.entries else listOf( + ModeSettingsTab.DISPLAY, ModeSettingsTab.CONTROLS, ModeSettingsTab.SESSION, + ) val tab = tabs[tabIndex] val scrolls = tabs.map { androidx.compose.foundation.rememberScrollState() } - val tabFocus = remember { tabs.map { androidx.compose.ui.focus.FocusRequester() } } + val tabFocus = remember(s.mode) { tabs.map { androidx.compose.ui.focus.FocusRequester() } } val firstChip = remember { androidx.compose.ui.focus.FocusRequester() } fun selectTab(index: Int) { host.open = null; tabIndex = index } androidx.compose.runtime.LaunchedEffect(steam, tabIndex) { androidx.compose.runtime.withFrameNanos { } runCatching { - if (!steam || tab == SteamSettingsTab.DISPLAY) firstChip.requestFocus() + if (tab == ModeSettingsTab.DISPLAY) firstChip.requestFocus() else tabFocus[tabIndex].requestFocus() } } SettingsPage( host, - title = if (steam) stringResource(R.string.mode_steam_title) else stringResource(R.string.mode_desktop_title), + title = null, onBack = a.onDismiss, scroll = scrolls[tabIndex], - modifier = if (steam) Modifier.bumpers( + modifier = Modifier.bumpers( onPrevious = { selectTab((tabIndex + tabs.size - 1) % tabs.size) }, onNext = { selectTab((tabIndex + 1) % tabs.size) }, - ) else Modifier, - header = if (steam) ({ + ), + header = { TabStrip(tabs.map { stringResource(it.label) }, tabIndex, ::selectTab, - modifier = Modifier.fillMaxWidth().padding(top = 12.dp), focusRequesters = tabFocus) - }) else null, + modifier = Modifier.fillMaxWidth(), focusRequesters = tabFocus) + }, ) { - if (!steam || tab == SteamSettingsTab.DISPLAY) { + if (tab == ModeSettingsTab.DISPLAY) { val displaySize = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(s.panelSize, s.resolution) SettingsGroup(stringResource(R.string.display_session)) { ResolutionRow(host, s.resolution, s.panelSize, a.onResolution, @@ -255,7 +257,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { } } } - if (!steam || tab == SteamSettingsTab.CONTROLS) { + if (tab == ModeSettingsTab.CONTROLS) { SettingsGroup(if (steam) stringResource(R.string.mode_touch_controls) else stringResource(R.string.mode_touch)) { ChoiceRow( host, "touch", stringResource(R.string.mode_touch), null, @@ -291,7 +293,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { ) } } - if (!steam || tab == SteamSettingsTab.SESSION) { + if (tab == ModeSettingsTab.SESSION) { SettingsGroup(stringResource(R.string.mode_session)) { ChoiceRow( host, "suspend", stringResource(R.string.mode_suspend), @@ -318,7 +320,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { ) } } - if (steam && tab == SteamSettingsTab.STEAM) SettingsGroup(stringResource(R.string.mode_decky)) { + if (steam && tab == ModeSettingsTab.STEAM) SettingsGroup(stringResource(R.string.mode_decky)) { val updateAvailable = s.deckyInstalled != null && s.deckyLatestRelease != null && s.deckyInstalled != s.deckyLatestRelease.tag val status = when { @@ -377,7 +379,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { ) } } - if (steam && tab == SteamSettingsTab.STEAM && s.steamChannel != null) SettingsGroup(stringResource(R.string.mode_client)) { + if (steam && tab == ModeSettingsTab.STEAM && s.steamChannel != null) SettingsGroup(stringResource(R.string.mode_client)) { ToggleRow( host, "steamdeck", stringResource(R.string.mode_deck_mode), stringResource(R.string.mode_deck_mode_hint), @@ -403,7 +405,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { SecondaryButton(stringResource(R.string.mode_steam_repair_button), enabled = !s.steamRepairQueued, onClick = a.onSteamRepair) } } - if (steam && tab == SteamSettingsTab.STEAM && s.wifiDiscovery != null) SettingsGroup(stringResource(R.string.mode_network)) { + if (steam && tab == ModeSettingsTab.STEAM && s.wifiDiscovery != null) SettingsGroup(stringResource(R.string.mode_network)) { val hint = when { s.wifiDiscovery && !s.wifiDiscoveryLocation -> stringResource(R.string.mode_wifi_location_off) !s.wifiDiscoveryPermission && s.wifiDiscoveryAsked -> stringResource(R.string.mode_wifi_permission_denied) @@ -422,11 +424,11 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { } } } - if ((!steam || tab == SteamSettingsTab.GAMES) && s.forceFullscreen != null) SettingsGroup(stringResource(R.string.display_window_compatibility)) { + if ((tab == ModeSettingsTab.GAMES || (!steam && tab == ModeSettingsTab.DISPLAY)) && s.forceFullscreen != null) SettingsGroup(stringResource(R.string.display_window_compatibility)) { ToggleRow(host, "fill", stringResource(R.string.display_force_fullscreen), stringResource(R.string.display_force_fullscreen_hint), s.forceFullscreen, onChange = a.onForceFullscreen) } - if (steam && tab == SteamSettingsTab.GAMES && s.addedGamesDirs != null) SettingsGroup(stringResource(R.string.mode_added_games)) { + if (steam && tab == ModeSettingsTab.GAMES && s.addedGamesDirs != null) SettingsGroup(stringResource(R.string.mode_added_games)) { for (dir in s.addedGamesDirs) { val n = s.addedGames.count { it.folderPath.startsWith("$dir/") } ActionRow( @@ -451,7 +453,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { onPick = { path -> if (path == "__pick__") a.onPickAddedGameExe(g.folderPath) else a.onAddedGameExe(g.folderPath, path) }, ) } - if (steam && tab == SteamSettingsTab.GAMES && s.fexPreset != null) SettingsGroup(stringResource(R.string.game_settings_title)) { + if (steam && tab == ModeSettingsTab.GAMES && s.fexPreset != null) SettingsGroup(stringResource(R.string.game_settings_title)) { if (s.syncBackend != null) SettingsRow( stringResource(R.string.sync_backend_title), stringResource(R.string.sync_backend_hint), @@ -474,7 +476,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { GameEnvironmentRow() } - if (steam && tab == SteamSettingsTab.AUDIO && s.directAudio != null && s.mic != null) SettingsGroup(stringResource(R.string.mode_audio)) { + if (steam && tab == ModeSettingsTab.AUDIO && s.directAudio != null && s.mic != null) SettingsGroup(stringResource(R.string.mode_audio)) { ToggleRow(host, "da", stringResource(R.string.mode_directaudio), stringResource(R.string.mode_directaudio_hint), s.directAudio, onChange = a.onDirectAudio) ChoiceRow( host, "clientAudio", stringResource(R.string.mode_client_audio), stringResource(R.string.mode_client_audio_hint), @@ -483,7 +485,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { ) ToggleRow(host, "mic", stringResource(R.string.mode_mic), stringResource(R.string.mode_mic_hint), s.mic, onChange = a.onMic) } - if (steam && tab == SteamSettingsTab.GAMES && s.gameStorage != null) SettingsGroup(stringResource(R.string.mode_storage)) { + if (steam && tab == ModeSettingsTab.GAMES && s.gameStorage != null) SettingsGroup(stringResource(R.string.mode_storage)) { val custom = s.gameStorage.isNotEmpty() && s.gameStorage != "off" && s.storageOptions.none { it.path == s.gameStorage } // Each choice: its path, its menu line, the chip's shorter line, and the label it is saved with. class StorageChoice(val path: String, val label: String, val chip: String, val saved: String) @@ -525,7 +527,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { onChange = a.onStorageDiagnostics, ) } - if (!steam && s.renderer != null) SettingsGroup(stringResource(R.string.mode_renderer)) { + if (!steam && tab == ModeSettingsTab.DISPLAY && s.renderer != null) SettingsGroup(stringResource(R.string.mode_renderer)) { ChoiceRow( host, "renderer", stringResource(R.string.mode_desktop_renderer), stringResource(R.string.mode_renderer_hint), listOf("vulkan" to stringResource(R.string.mode_renderer_vulkan), "gles2" to stringResource(R.string.mode_renderer_gles2), "pixman" to stringResource(R.string.mode_renderer_pixman)), s.renderer, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index f0da2e320..96bd7310a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -308,7 +308,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } } if (open || veil > 0.01f) Box( - modifier = Modifier.fillMaxSize().graphicsLayer { alpha = veil }.background(Color(0x8A000000)) + modifier = Modifier.fillMaxSize() .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { host.open = null; a.onClose() }, ) androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.CenterEnd) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index 50858e992..8821e4381 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -646,7 +646,7 @@ fun ActionRow(label: String, hint: String?, button: String, onClick: () -> Unit) @Composable fun SettingsPage( host: MenuHost, - title: String, + title: String?, onBack: () -> Unit, eyebrow: String? = null, lede: String? = null, @@ -656,7 +656,7 @@ fun SettingsPage( scroll: androidx.compose.foundation.ScrollState? = null, scrollContent: Boolean = true, compactLayout: Boolean = false, - /** Controls that remain below the title while the settings scroll, such as a tab strip. */ + /** Fixed controls below the title, or beside Back when the title is omitted. */ header: (@Composable () -> Unit)? = null, modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit, @@ -672,7 +672,18 @@ fun SettingsPage( ), verticalArrangement = Arrangement.spacedBy(if (compactLayout) 2.dp else 0.dp), ) { - if (narrow) { + if (title == null) { + Rise(0) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth(), + ) { + BackLink(stringResource(R.string.mode_back), compact = true, onClick = onBack) + if (header != null) Box(Modifier.weight(1f)) { header() } + } + } + } else if (narrow) { // Back and the title share one line: a 4:3 screen has no height to spare. Rise(0) { Row( @@ -731,7 +742,7 @@ fun SettingsPage( } } } - if (header != null) header() + if (header != null && title != null) header() Rise(3, Modifier.weight(1f).fillMaxWidth()) { Column( modifier = Modifier diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index f3e5d9525..a7c62ac73 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -6,10 +6,14 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.luminance import androidx.compose.ui.platform.LocalContext import com.droiddeck.launcher.R +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalDensity +import com.droiddeck.launcher.core.AppUiPrefs import com.droiddeck.launcher.session.SessionPrefs class Palette( @@ -69,7 +73,7 @@ val LocalPalette = staticCompositionLocalOf { Themes.byId(Themes.GRAPHITE) } val Palette.onSignal: Color get() = if (signal.luminance() > 0.18f) Color(0xFF03111F) else Color.White @Composable -fun DroidDeckTheme(theme: String? = null, content: @Composable () -> Unit) { +fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCALE, content: @Composable () -> Unit) { val id = theme ?: SessionPrefs.theme(LocalContext.current) val p = Themes.byId(id) val scheme = darkColorScheme( @@ -79,5 +83,13 @@ fun DroidDeckTheme(theme: String? = null, content: @Composable () -> Unit) { surfaceVariant = p.surfaceVariant, onSurfaceVariant = p.onSurfaceVariant, error = p.error, ) - CompositionLocalProvider(LocalPalette provides p) { MaterialTheme(colorScheme = scheme, content = content) } + val baseDensity = LocalDensity.current + val baseConfiguration = LocalConfiguration.current + val density = remember(baseDensity, appScale) { scaledAppDensity(baseDensity, appScale) } + val configuration = remember(baseConfiguration, appScale) { scaledAppConfiguration(baseConfiguration, appScale) } + CompositionLocalProvider( + LocalPalette provides p, + LocalDensity provides density, + LocalConfiguration provides configuration, + ) { MaterialTheme(colorScheme = scheme, content = content) } } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index cbcbe9279..50031bb65 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -602,6 +602,9 @@ Steam también lo usa a partir de su próximo inicio. Predeterminado del sistema (%1$s) Predeterminado del sistema + Escala de la app + Texto y controles de DroidDeck + %1$d%% (predeterminada) Tema Apariencia del launcher Usar como pantalla de inicio diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d4b5ae0cb..e40e936e3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -600,6 +600,9 @@ 次回の起動からSteamにも適用されます。 システムのデフォルト(%1$s) システムのデフォルト + アプリの表示サイズ + DroidDeckの文字とボタン + %1$d%%(デフォルト) テーマ ランチャーの外観 ホーム画面として使用 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2f5e606a8..1820eac33 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -600,6 +600,9 @@ 다음에 Steam을 시작할 때부터 Steam에도 적용됩니다. 시스템 기본값(%1$s) 시스템 기본값 + 앱 크기 + DroidDeck 텍스트 및 컨트롤 + %1$d%%(기본값) 테마 런처 외관 홈 화면으로 사용 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bc3d07e25..f7259916f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -600,6 +600,9 @@ Steam 也会在下次启动时使用此语言。 系统默认(%1$s) 系统默认 + 应用缩放 + DroidDeck 的文字和控件 + %1$d%%(默认) 主题 启动器外观 用作主屏幕 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 3833e5667..e7be9ba83 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -600,6 +600,9 @@ Steam 下次啟動時亦會使用此語言。 系統預設(%1$s) 系統預設 + 應用程式縮放 + DroidDeck 的文字和控制項 + %1$d%%(預設) 主題 啟動器外觀 用作主畫面 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3101ea23b..fb006b855 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -600,6 +600,9 @@ Steam 也會在下次啟動時使用此語言。 系統預設(%1$s) 系統預設 + 應用程式縮放 + DroidDeck 的文字和控制項 + %1$d%%(預設) 佈景主題 啟動器外觀 用作主螢幕 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 21a911892..1e9724f04 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -601,6 +601,9 @@ Steam uses it too, from the next time it starts. System default (%1$s) System default + App scale + DroidDeck text and controls + %1$d%% (Default) Theme Launcher appearance Use as Home screen diff --git a/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt new file mode 100644 index 000000000..fd820e22b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.session + +import android.content.Intent +import android.os.BatteryManager +import java.io.File +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class BatteryComponentTest { + @get:Rule val tmp = TemporaryFolder() + private var battery: BatteryComponent? = null + + @After fun stop() { battery?.stop() } + + @Test fun oneAggregateBatteryKeepsOverlayPowerAndLifetimeConsistentWithQam() { + val supplies = tmp.newFolder("power_supply") + val vpower = tmp.newFolder("vpower") + start(supplies, vpower, -2_000_000L) + assertTelemetry(supplies, vpower) + } + + @Test fun upgradingRemovesTheDuplicateRatherThanLeavingItForOverlayDiscovery() { + val supplies = tmp.newFolder("power_supply") + val vpower = tmp.newFolder("vpower") + val legacy = File(supplies, "BAT0").apply { mkdirs() } + File(legacy, "power_now").writeText("8000000\n") + File(legacy, "charge_now").writeText("4000000\n") + start(supplies, vpower, 2_000_000L) + assertFalse(legacy.exists()) + assertTelemetry(supplies, vpower) + } + + private fun start(supplies: File, vpower: File, currentUa: Long) { + val context = RuntimeEnvironment.getApplication() + context.sendStickyBroadcast(Intent(Intent.ACTION_BATTERY_CHANGED).apply { + putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_DISCHARGING) + putExtra(BatteryManager.EXTRA_LEVEL, 50) + putExtra(BatteryManager.EXTRA_SCALE, 100) + putExtra(BatteryManager.EXTRA_VOLTAGE, 4000) + }) + shadowOf(context.getSystemService(BatteryManager::class.java)).apply { + setLongProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 4_000_000L) + setLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW, currentUa) + setLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, currentUa) + } + battery = BatteryComponent(supplies, vpower).also { it.attach(context); it.start() } + } + + private fun assertTelemetry(supplies: File, vpower: File) { + val discovered = supplies.listFiles()!!.filter { it.name.contains("BAT") } + assertEquals(listOf("BAT1"), discovered.map { it.name }) + fun read(name: String) = File(discovered.single(), name).readText().trim().toLong() + // One 4 Ah battery at 4 V drawing 2 A: 8 W and two hours, regardless of vendor current sign. + assertEquals(8_000_000L, read("power_now")) + assertEquals(16_000_000L, read("energy_now")) + assertEquals(7200L, read("time_to_empty_now")) + assertEquals("7200", File(vpower, "secs_until_shutdown_request").readText().trim()) + assertEquals("50.00", File(vpower, "battery_percent").readText().trim()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt new file mode 100644 index 000000000..56a6db50b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt @@ -0,0 +1,90 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.content.res.Configuration +import androidx.compose.ui.unit.Density +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.core.AppUiPrefs +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class AppScaleTest { + private val context get() = RuntimeEnvironment.getApplication() + + @Before fun clearScale() { + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun defaultsToSystemDensityAndCanRestoreItAfterChoosingAnotherScale() { + assertEquals(100, AppUiPrefs.scale(context)) + AppUiPrefs.setScale(context, 75) + assertEquals(75, AppUiPrefs.scale(context)) + AppUiPrefs.setScale(context, 100) + assertEquals(100, AppUiPrefs.scale(context)) + val density = Density(2f, 1.3f) + val configuration = Configuration(context.resources.configuration) + assertSame(density, scaledAppDensity(density, 100)) + assertSame(configuration, scaledAppConfiguration(configuration, 100)) + } + + @Test fun invalidStoredOrRequestedScaleFallsBackToTheDefault() { + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("scale", 0).commit() + assertEquals(100, AppUiPrefs.scale(context)) + AppUiPrefs.setScale(context, 1000) + assertEquals(100, AppUiPrefs.scale(context)) + } + + @Test fun scalingDoesNotModifySessionPreferencesOrAndroidDisplayMetrics() { + val session = context.getSharedPreferences("session", Context.MODE_PRIVATE) + session.edit().putString("resolution.steam", "1280x720").putInt("upscaler", 2).commit() + val before = session.all.toMap() + val density = context.resources.displayMetrics.density + val configuration = Configuration(context.resources.configuration) + AppUiPrefs.setScale(context, 150) + scaledAppConfiguration(context.resources.configuration, AppUiPrefs.scale(context)) + assertEquals(before, session.all) + assertEquals(density, context.resources.displayMetrics.density, 0f) + assertEquals(configuration, context.resources.configuration) + } + + @Test fun textAndControlsScaleTogetherWhilePreservingAccessibilityFontScale() { + val base = Density(2f, 1.3f) + for (percent in AppUiPrefs.scales) { + val scaled = scaledAppDensity(base, percent) + assertEquals(1.3f, scaled.fontScale, 0f) + assertEquals(base.run { 44.dp.toPx() } * percent / 100f, scaled.run { 44.dp.toPx() }, 0.001f) + assertEquals(base.run { 16.sp.toPx() } * percent / 100f, scaled.run { 16.sp.toPx() }, 0.001f) + } + } + + @Test fun responsiveWidthAndPopupHeightFitTheSamePhysicalWindowAtEveryScale() { + val base = Configuration().apply { + densityDpi = 320 + screenWidthDp = 960 + screenHeightDp = 540 + smallestScreenWidthDp = 540 + fontScale = 1.3f + orientation = Configuration.ORIENTATION_LANDSCAPE + } + for (percent in AppUiPrefs.scales) { + val scaled = scaledAppConfiguration(base, percent) + val density = scaledAppDensity(Density(2f, 1.3f), percent).density + assertEquals(1920f, scaled.screenWidthDp * density, 2f) + assertEquals(1080f, scaled.screenHeightDp * density, 2f) + assertEquals(1080f, scaled.smallestScreenWidthDp * density, 2f) + assertEquals(1.3f, scaled.fontScale, 0f) + assertEquals(base.orientation, scaled.orientation) + } + assertEquals(960, base.screenWidthDp) + assertEquals(540, base.screenHeightDp) + assertEquals(320, base.densityDpi) + } +}