From 0d411b4cb67bd8e582b275bd7508b9f0f248f973 Mon Sep 17 00:00:00 2001
From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com>
Date: Mon, 5 Oct 2026 11:25:51 -0400
Subject: [PATCH] Add app UI scale presets to Setup (#272)
---
.../com/droiddeck/launcher/MainActivity.kt | 9 +-
.../com/droiddeck/launcher/core/AppUiPrefs.kt | 19 ++++
.../launcher/files/FileManagerActivity.kt | 2 +-
.../launcher/files/FilePickerActivity.kt | 2 +-
.../com/droiddeck/launcher/ui/AppScale.kt | 23 +++++
.../droiddeck/launcher/ui/FrontEndScreen.kt | 2 +
.../droiddeck/launcher/ui/FrontEndSetup.kt | 9 ++
.../java/com/droiddeck/launcher/ui/Theme.kt | 16 +++-
app/src/main/res/values/strings.xml | 3 +
.../com/droiddeck/launcher/ui/AppScaleTest.kt | 90 +++++++++++++++++++
10 files changed, 170 insertions(+), 5 deletions(-)
create mode 100644 app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt
create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AppScale.kt
create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt
diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt
index 41e8241baa..0df7b586fd 100644
--- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt
@@ -311,6 +311,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)
@@ -480,6 +481,7 @@ class MainActivity : ComponentActivity() {
displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager
refreshPhantomStatus()
theme = SessionPrefs.theme(this)
+ 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)
@@ -489,7 +491,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 {
@@ -516,6 +518,7 @@ class MainActivity : ComponentActivity() {
lossless = lossless,
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,
+ appScale = appScale,
isHomeApp = homeAppSelected,
homeScreenEnabled = homeScreenEnabled,
defaultHomeLabel = defaultHomeLabel,
@@ -645,6 +648,10 @@ class MainActivity : ComponentActivity() {
},
onPageBack = { settingsMode = null; showPerformance = false; showProtons = false; showComponents = false; showMapping = false },
onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id },
+ 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 0000000000..3021b7196d
--- /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 88c2462ed0..c0a4bcec3b 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt
@@ -22,7 +22,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 d892c12410..2e66d4daa1 100644
--- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt
@@ -43,7 +43,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/ui/AppScale.kt b/app/src/main/java/com/droiddeck/launcher/ui/AppScale.kt
new file mode 100644
index 0000000000..806ef22cd9
--- /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/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt
index d8f8b2275c..49f72e124b 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt
@@ -101,6 +101,7 @@ class FrontEndState(
val gameSyncFolder: String? = null,
val pageKey: String? = null,
val theme: String = Themes.GRAPHITE,
+ val appScale: Int = com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE,
val isHomeApp: Boolean = false,
val homeScreenEnabled: Boolean = false,
val defaultHomeLabel: String? = null,
@@ -168,6 +169,7 @@ class FrontEndActions(
val onOffline: () -> Unit,
val onPageBack: () -> Unit = {},
val onTheme: (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 d5d4084146..e6b1777f2d 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
@@ -311,6 +311,15 @@ internal fun SetupPanel(
}
3 -> {
SettingsGroup(stringResource(R.string.setup_launcher)) {
+ 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(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/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt
index 331ad95077..45f9e4e35e 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt
@@ -5,9 +5,13 @@ 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 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(
@@ -67,7 +71,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(
@@ -77,5 +81,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/strings.xml b/app/src/main/res/values/strings.xml
index 19f259ef23..b75e9c932e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -595,6 +595,9 @@
Offline mode
Sign in to Steam first
Launcher
+ 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/ui/AppScaleTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppScaleTest.kt
new file mode 100644
index 0000000000..56a6db50b5
--- /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)
+ }
+}