diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 87f28dc8e..c3ce0da60 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1313,7 +1313,7 @@ object SessionPrefs { return parseOrientedResolution(value)?.let { "${it.first}x${it.second}" } ?: SessionDisplay.LINK_LANDSCAPE } - private fun parseOrientedResolution(text: String): Pair? = + fun parseOrientedResolution(text: String): Pair? = parseResolution(text) ?: text.trim().split('x', 'X', '×', '*').takeIf { it.size == 2 } ?.let { parseResolution("${it[1]}x${it[0]}") }?.let { it.second to it.first } 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 dda562a58..3218579f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -720,10 +720,10 @@ internal fun SgdbKeyDialog(hasKey: Boolean, onSave: (String) -> Unit, onDismiss: @OptIn(androidx.compose.foundation.layout.ExperimentalLayoutApi::class) @Composable -internal fun CustomResolutionDialog(initial: Pair?, onSave: (Pair) -> Unit, onDismiss: () -> Unit) { +internal fun CustomResolutionDialog(initial: Pair?, onSave: (Pair) -> Unit, onDismiss: () -> Unit, portrait: Boolean = false) { var w by remember { mutableStateOf(initial?.first?.toString() ?: "") } var h by remember { mutableStateOf(initial?.second?.toString() ?: "") } - val parsed = SessionPrefs.parseResolution("${w}x$h") + val parsed = if (portrait) SessionPrefs.parseOrientedResolution("${w}x$h") else SessionPrefs.parseResolution("${w}x$h") com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.mode_custom_res_title)) }, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt index 9a84adbe0..ca9ca5976 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -51,7 +51,7 @@ fun ResolutionRow( else onPick(value) }) if (editCustom) CustomResolutionDialog(size, onSave = { value -> editCustom = false; onPick("${value.first}x${value.second}") }, - onDismiss = { editCustom = false }) + onDismiss = { editCustom = false }, portrait = portrait) if (editFollow) CustomFollowScaleDialog(SessionDisplay.followScale(choice)?.takeIf { it > 1f }, onSave = { value -> editFollow = false; onPick(SessionDisplay.followScaled(value)) }, onDismiss = { editFollow = false }) diff --git a/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt index 503e26086..fb9199157 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt @@ -65,6 +65,15 @@ class PortraitResolutionTest { SessionPrefs.displayMode(app, SessionService.MODE_RUN, com.droiddeck.launcher.runtime.UserApps.SCRIPT_LAUNCHER)) } + @Test fun portraitInputAcceptsTallSizesLandscapeInputDoesNot() { + assertNull(SessionPrefs.parseResolution("1440x2560")) + assertEquals(1440 to 2560, SessionPrefs.parseOrientedResolution("1440x2560")) + assertEquals(1280 to 720, SessionPrefs.parseOrientedResolution("1280x720")) + assertNull(SessionPrefs.parseOrientedResolution("100x100")) + SessionPrefs.setResolutionChoice(app, "steam", "1440x2560", portrait = true) + assertEquals("1440x2560", SessionPrefs.resolutionStored(app, "steam", panel, true)) + } + @Test fun modesKeepSeparateChoices() { SessionPrefs.setResolutionChoice(app, "steam", "1080p", portrait = true) assertEquals(SessionDisplay.LINK_LANDSCAPE, SessionPrefs.resolutionStored(app, "lxqt", panel, true))