diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index dd1a4cd5f4..7ba6f5243d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -607,7 +607,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { fpsLimit = 0 } applyOutputPacing() - if (!SessionState.running) SessionState.followScreen = followChoice() + if (!SessionState.running) { + SessionState.followScreen = followChoice() + SessionState.followScale = followScale() + } applyFollowOrientation(resources.configuration) goFullscreen() volumeControlStream = android.media.AudioManager.STREAM_MUSIC @@ -2168,7 +2171,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun windowOutputSize(width: Int, height: Int): Pair? { if (isInPictureInPictureMode || width <= 0 || height <= 0) return null return if (SessionState.followScreen) - com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted()) + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted(), SessionState.followScale) else if (glassesScreen == null) outputSize() else null } @@ -2183,10 +2186,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { WaylandCompositor.nativeResizeOutput(size.first, size.second) } + private fun followScale(): Float { + val mode = displayMode() + val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) + return com.droiddeck.launcher.session.SessionDisplay.followScale(choice) ?: 1f + } + private fun followChoice(): Boolean { val mode = displayMode() - return SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) == - com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN + return com.droiddeck.launcher.session.SessionDisplay.isFollow( + SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this))) } private fun applyFollowOrientation(config: android.content.res.Configuration) { @@ -4395,7 +4404,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val display = com.droiddeck.launcher.session.SessionDisplay val choice = SessionPrefs.resolutionChoice(this, mode, panel) val size = display.resolveChoice(panel, choice) - val fixed = choice != display.MATCH_SCREEN && choice != display.FOLLOW_SCREEN && display.presetHeight(choice) == null + val fixed = choice != display.MATCH_SCREEN && !display.isFollow(choice) && display.presetHeight(choice) == null return if (fixed) display.resolve(panel, minOf(size.first, size.second), SessionPrefs.SHAPE_AUTO) else size } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index 31b9b10988..1cb526c90d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -7,6 +7,10 @@ object SessionDisplay { const val MATCH_SCREEN = "screen" const val FOLLOW_SCREEN = "follow" const val FOLLOW_MIN_SIDE = 480 + val FOLLOW_SCALES = listOf(1.5f, 2f, 2.5f, 3f, 4f) + const val FOLLOW_CUSTOM = "follow/custom" + const val FOLLOW_SCALE_MAX = 8f + private const val FOLLOW_SCALED_PREFIX = "follow/" const val DEFAULT_RESOLUTION = "720p" private val PRESET_HEIGHTS = listOf(720, 900, 1080) @@ -14,12 +18,30 @@ object SessionDisplay { fun presetHeight(choice: String): Int? = if (choice.endsWith("p")) choice.dropLast(1).toIntOrNull()?.takeIf { it > 0 } else null + fun followScaled(scale: Float): String = FOLLOW_SCALED_PREFIX + formatScale(scale) + + fun formatScale(scale: Float): String = + (Math.round(scale * 10) / 10f).let { if (it % 1f == 0f) it.toInt().toString() else it.toString() } + + fun parseFollowScale(text: String): Float? = + text.trim().replace(',', '.').toFloatOrNull() + ?.let { Math.round(it * 10) / 10f }?.takeIf { it > 1f && it <= FOLLOW_SCALE_MAX } + + fun isFollow(choice: String): Boolean = followScale(choice) != null + + fun followScale(choice: String): Float? = when { + choice == FOLLOW_SCREEN -> 1f + choice.startsWith(FOLLOW_SCALED_PREFIX) -> parseFollowScale(choice.removePrefix(FOLLOW_SCALED_PREFIX)) + else -> null + } + fun screenSize(panel: Pair): Pair = (maxOf(panel.first, panel.second) and 1.inv()) to (minOf(panel.first, panel.second) and 1.inv()) fun resolveChoice(panel: Pair, choice: String, portrait: Boolean = false): Pair { fun orient(size: Pair) = if (portrait) size.second to size.first else size - if (choice == MATCH_SCREEN || choice == FOLLOW_SCREEN) return orient(screenSize(panel)) + if (choice == MATCH_SCREEN) return orient(screenSize(panel)) + followScale(choice)?.let { return orient(scaledDown(screenSize(panel), it)) } presetHeight(choice)?.let { return orient(resolve(panel, it, SessionPrefs.SHAPE_AUTO)) } val parts = choice.split('x').map { it.toIntOrNull() } return if (parts.size == 2 && parts.all { it != null && it > 0 }) parts[0]!! to parts[1]!! @@ -29,13 +51,16 @@ object SessionDisplay { fun resolutionOptions(panel: Pair): List { val panelHeight = minOf(panel.first, panel.second) return PRESET_HEIGHTS.filter { it <= panelHeight }.map { "${it}p" } - .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN + .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN + FOLLOW_SCALES.map(::followScaled) } - fun followSize(width: Int, height: Int, controlsBelow: Boolean = false): Pair? = + fun followSize(width: Int, height: Int, controlsBelow: Boolean = false, scale: Float = 1f): Pair? = if (width <= 0 || height <= 0 || (if (controlsBelow) width else minOf(width, height)) < FOLLOW_MIN_SIDE) null - else (width and 1.inv()) to (height and 1.inv()) + else scaledDown(width to height, scale) + + private fun scaledDown(size: Pair, scale: Float): Pair = + (Math.round(size.first / scale) and 1.inv()) to (Math.round(size.second / scale) and 1.inv()) const val UNFOLDED_MAX_GAME_SHARE = 0.8f 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 fafd7202cf..d49230f503 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -874,7 +874,7 @@ object SessionPrefs { fun resolutionChoice(context: Context, mode: String, panel: Pair): String { val saved = prefs(context) saved.getString("displayResolution.$mode", null)?.let { value -> - if (value == SessionDisplay.MATCH_SCREEN || value == SessionDisplay.FOLLOW_SCREEN || + if (value == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(value) || SessionDisplay.presetHeight(value) != null) return value parseResolution(value)?.let { return "${it.first}x${it.second}" } } @@ -887,7 +887,7 @@ object SessionPrefs { } fun setResolutionChoice(context: Context, mode: String, choice: String) { - val value = if (choice == SessionDisplay.MATCH_SCREEN || choice == SessionDisplay.FOLLOW_SCREEN || + val value = if (choice == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(choice) || SessionDisplay.presetHeight(choice) != null) choice else { val size = requireNotNull(parseResolution(choice)) { "Invalid resolution" } "${size.first}x${size.second}" diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 3cf93a322d..947948f168 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -105,6 +105,7 @@ object SessionState { @Volatile var followScreen = false + var followScale = 1f @Volatile var refreshHz: Float = 60f 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 cd37ebc08f..8abc5ff93d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -225,7 +225,7 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } if (s.stretch16x9 != null && (com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(s.panelSize) || com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize))) { - val canStretch = s.resolution != com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN && + val canStretch = !com.droiddeck.launcher.session.SessionDisplay.isFollow(s.resolution) && com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize) ChoiceRow(host, "game-fit", stringResource(R.string.display_game_fit), stringResource(if (canStretch) R.string.display_game_fit_hint else R.string.display_game_fit_unavailable), @@ -671,3 +671,23 @@ internal fun CustomResolutionDialog(initial: Pair?, onSave: (Pair Unit, onDismiss: () -> Unit) { + var text by remember { mutableStateOf(initial?.let(com.droiddeck.launcher.session.SessionDisplay::formatScale) ?: "") } + val parsed = com.droiddeck.launcher.session.SessionDisplay.parseFollowScale(text) + com.droiddeck.launcher.ui.GlideAlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.display_follow_screen_scaled, "…")) }, + text = { + androidx.compose.material3.OutlinedTextField( + text, { v -> text = v.filter { it.isDigit() || it == '.' || it == ',' }.take(4) }, + label = { Text("÷") }, singleLine = true, isError = parsed == null && text.isNotEmpty(), + keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(keyboardType = androidx.compose.ui.text.input.KeyboardType.Decimal), + modifier = Modifier.focusGlide(), + ) + }, + confirmButton = { androidx.compose.material3.TextButton(enabled = parsed != null, onClick = { parsed?.let(onSave) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_use)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) +} 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 8db8910a80..7112d4f399 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -20,22 +20,34 @@ fun ResolutionRow( val size = SessionDisplay.resolveChoice(panel, choice, portrait) val screen = SessionDisplay.resolveChoice(panel, SessionDisplay.MATCH_SCREEN, portrait) val choices = SessionDisplay.resolutionOptions(panel) - val selected = if (choice == SessionDisplay.FOLLOW_SCREEN) choice + val customFollow = SessionDisplay.isFollow(choice) && choice !in choices + val selected = if (SessionDisplay.isFollow(choice)) choice else if (size == screen) SessionDisplay.MATCH_SCREEN else choice var editCustom by remember { mutableStateOf(false) } + var editFollow by remember { mutableStateOf(false) } val options = choices.map { value -> val dimensions = SessionDisplay.resolveChoice(panel, value, portrait) value to if (value == SessionDisplay.MATCH_SCREEN) stringResource(R.string.display_match_screen, screen.first, screen.second) else if (value == SessionDisplay.FOLLOW_SCREEN) stringResource(R.string.display_follow_screen) + else if (SessionDisplay.isFollow(value)) stringResource(R.string.display_follow_screen_scaled, + SessionDisplay.formatScale(SessionDisplay.followScale(value) ?: 1f)) + " (${dimensions.first}×${dimensions.second})" else if (value == SessionDisplay.DEFAULT_RESOLUTION) stringResource(R.string.mode_res_default, "${dimensions.first}×${dimensions.second}") else "${dimensions.first}×${dimensions.second}" - } + (custom to if (selected in choices) stringResource(R.string.mode_res_custom) + } + listOf(SessionDisplay.FOLLOW_CUSTOM to stringResource(R.string.display_follow_screen_scaled, + if (customFollow) SessionDisplay.formatScale(SessionDisplay.followScale(choice) ?: 1f) else "…" + ) + if (customFollow) " (${size.first}×${size.second})" else "") + (custom to if (selected in choices) stringResource(R.string.mode_res_custom) else stringResource(R.string.mode_res_custom_value, size.first, size.second)) ChoiceRow(host, "resolution", stringResource(R.string.display_resolution), stringResource(R.string.common_applies_next_session), - options, if (selected in choices) selected else custom, chipModifier = chipModifier, - onPick = { value -> if (value == custom) editCustom = true else onPick(value) }) + options, if (selected in choices) selected else if (customFollow) SessionDisplay.FOLLOW_CUSTOM else custom, chipModifier = chipModifier, + onPick = { value -> + if (value == custom) editCustom = true + else if (value == SessionDisplay.FOLLOW_CUSTOM) editFollow = true + else onPick(value) }) if (editCustom) CustomResolutionDialog(size, onSave = { value -> editCustom = false; onPick("${value.first}x${value.second}") }, onDismiss = { editCustom = false }) + 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/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9713cd4633..152a0d732c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2198,6 +2198,7 @@ %1$s يضبط أسلوب التكبير على %2$s. مطابقة الشاشة (%1$d×%2$d) اتباع الشاشة (يُغيَّر الحجم عند الطي أو الفتح) + مقياس %1$s Steam إظهار تفاصيل الجهاز إخفاء تفاصيل الجهاز diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 588972b081..3f959fe51d 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2174,6 +2174,7 @@ %1$s Cambia el escalado a %2$s. Igual a la pantalla (%1$d×%2$d) Seguir la pantalla (cambia de tamaño al plegar o desplegar) + Escalado %1$s Steam Mostrar detalles del dispositivo Ocultar detalles del dispositivo diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6ed8e2b25b..eff7ca9b65 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2106,6 +2106,7 @@ %1$s Задава мащабиране на %2$s. Напасване на екрана (%1$d×%2$d) Следване на екрана (преоразмерява при сгъване или разгъване) + Мащабирано %1$s Steam Покажи данните за устройството Скрий данните за устройството diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e089858a88..272aa9171b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2152,6 +2152,7 @@ %1$s Nastaví škálování na %2$s. Podle obrazovky (%1$d×%2$d) Sledovat obrazovku (změní velikost při složení nebo rozložení) + Zmenšeno %1$s Steam Zobrazit podrobnosti o zařízení Skrýt podrobnosti o zařízení diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index db489b5c7f..eb774419e7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2106,6 +2106,7 @@ %1$s Indstiller skalering til %2$s. Match skærm (%1$d×%2$d) Følg skærm (ændrer størrelse ved fold/udfold) + Skaleret %1$s Steam Vis enhedsoplysninger Skjul enhedsoplysninger diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5f6ea9a06b..559a2f727a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2098,6 +2098,7 @@ %1$s Stellt die Skalierung auf %2$s. An Bildschirm anpassen (%1$d×%2$d) Bildschirm folgen (passt sich beim Auf- und Zuklappen an) + Skaliert %1$s Steam Gerätedetails anzeigen Gerätedetails ausblenden diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0ed66d718c..739608d370 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2106,6 +2106,7 @@ %1$s Ορίζει την κλιμάκωση σε %2$s. Αντιστοίχιση οθόνης (%1$d×%2$d) Ακολούθηση οθόνης (αλλάζει μέγεθος όταν διπλώνει ή ξεδιπλώνει) + Κλιμάκωση %1$s Steam Εμφάνιση στοιχείων συσκευής Απόκρυψη στοιχείων συσκευής diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 353f4b71d5..302930a535 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2129,6 +2129,7 @@ %1$s Cambia el escalado a %2$s. Igual a la pantalla (%1$d×%2$d) Seguir la pantalla (cambia de tamaño al plegar o desplegar) + Escalado %1$s Steam Mostrar detalles del dispositivo Ocultar detalles del dispositivo diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 3419239731..a6e509511b 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2106,6 +2106,7 @@ %1$s Asettaa skaalauksen tilaan %2$s. Sovita näyttöön (%1$d×%2$d) Seuraa näyttöä (koko muuttuu taitettuna tai avattuna) + Skaalattu %1$s Steam Näytä laitteen tiedot Piilota laitteen tiedot diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5c2a780050..f9827384bc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2129,6 +2129,7 @@ %1$s Règle la mise à l\'échelle sur %2$s. Adapter à l\'écran (%1$d×%2$d) Suivre l\'écran (s\'adapte au pliage et au dépliage) + Mis à l\'échelle %1$s Steam Afficher les détails de l\'appareil Masquer les détails de l\'appareil diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index ab6577dedc..ddac601c32 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2106,6 +2106,7 @@ %1$s स्केलिंग को %2$s पर सेट करता है। स्क्रीन से मिलाएँ (%1$d×%2$d) Follow screen (खुलने या बंद होने पर आकार बदलता है) + स्केल %1$s Steam डिवाइस जानकारी दिखाएं डिवाइस जानकारी छिपाएं diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9a783c5c6e..da127047e3 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2106,6 +2106,7 @@ %1$s A méretezést erre állítja: %2$s. Képernyőhöz illesztés (%1$d×%2$d) Képernyő követése (átméreteződik össze- vagy kinyitáskor) + Skálázva %1$s Steam Eszközrészletek megjelenítése Eszközrészletek elrejtése diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index e63446f2cf..960dddb10b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2083,6 +2083,7 @@ %1$s Mengatur skala ke %2$s. Sesuaikan layar (%1$d×%2$d) Ikuti layar (ukuran berubah saat dilipat atau dibuka) + Diskalakan %1$s Steam Tampilkan detail perangkat Sembunyikan detail perangkat diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 59998204bb..81706b171a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2121,6 +2121,7 @@ %1$s Imposta il ridimensionamento su %2$s. Adatta allo schermo (%1$d×%2$d) Segui lo schermo (si ridimensiona quando lo pieghi o lo apri) + Scalato %1$s Steam Mostra dettagli dispositivo Nascondi dettagli dispositivo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7a836a27b8..432caa1991 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2053,6 +2053,7 @@ %1$s スケーリングを%2$sに設定します。 画面に合わせる(%1$d×%2$d) 画面に追従(開閉時にサイズを変更) + スケール %1$s Steam デバイスの詳細を表示 デバイスの詳細を非表示 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3c0461dfee..cf5a1a723c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2083,6 +2083,7 @@ %1$s 스케일링을 %2$s(으)로 설정합니다. 화면에 맞춤(%1$d×%2$d) 화면 따라가기(접거나 펼치면 크기 변경) + 배율 %1$s Steam 기기 세부 정보 표시 기기 세부 정보 숨기기 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index fa214eb0e4..466180f524 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2083,6 +2083,7 @@ %1$s Menetapkan penskalaan ke %2$s. Sepadan skrin (%1$d×%2$d) Ikut skrin (mengubah saiz apabila dilipat atau dibuka) + Diskalakan %1$s Steam Papar butiran peranti Sembunyikan butiran peranti diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index d4ac2bf8d2..f2e20bbe2e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2106,6 +2106,7 @@ %1$s Setter skalering til %2$s. Tilpass skjerm (%1$d×%2$d) Følg skjermen (endrer størrelse ved sammenslåing eller utbretting) + Skalert %1$s Steam Vis enhetsdetaljer Skjul enhetsdetaljer diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3a572a5cd4..a5f072b2ee 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2106,6 +2106,7 @@ %1$s Zet schaling op %2$s. Schermformaat (%1$d×%2$d) Scherm volgen (past formaat aan bij vouwen of uitvouwen) + Geschaald %1$s Steam Apparaatgegevens tonen Apparaatgegevens verbergen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a74569a2c9..1e58d4ff25 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2152,6 +2152,7 @@ %1$s Ustawia skalowanie na %2$s. Dopasuj do ekranu (%1$d×%2$d) Dopasuj do ekranu (zmienia rozmiar po złożeniu lub rozłożeniu) + Skalowanie %1$s Steam Pokaż szczegóły urządzenia Skryj szczegóły urządzenia diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index b681280f6f..04cf83fede 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2121,6 +2121,7 @@ %1$s Define a escala como %2$s. Igual ao ecrã (%1$d×%2$d) Seguir o ecrã (redimensiona ao dobrar ou desdobrar) + Escalado %1$s Steam Mostrar detalhes do dispositivo Ocultar detalhes do dispositivo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 55174b6a88..661354b3a3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2121,6 +2121,7 @@ %1$s Define a escala como %2$s. Igual à tela (%1$d×%2$d) Seguir a tela (redimensiona ao dobrar ou desdobrar) + Escalado %1$s Steam Mostrar detalhes do dispositivo Ocultar detalhes do dispositivo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d089650b64..92e37b8ab9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2129,6 +2129,7 @@ %1$s Setează scalarea la %2$s. Potrivire ecran (%1$d×%2$d) Urmărește ecranul (se redimensionează la împăturire sau desfacere) + Scalat %1$s Steam Arată detaliile dispozitivului Ascunde detaliile dispozitivului diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0464dd5586..211c1df959 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2152,6 +2152,7 @@ %1$s Устанавливает масштабирование: %2$s. По размеру экрана (%1$d×%2$d) По экрану (меняется при складывании и раскладывании) + Масштаб %1$s Steam Показать сведения об устройстве Скрыть сведения об устройстве diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index bf5fd29aea..86cd982e7a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2106,6 +2106,7 @@ %1$s Ställer in skalning till %2$s. Matcha skärmen (%1$d×%2$d) Följ skärmen (ändrar storlek vid vikning) + Skalad %1$s Steam Visa enhetsinformation Dölj enhetsinformation diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index fe417b62d9..83c02b1c1b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2083,6 +2083,7 @@ %1$s ตั้งการปรับขนาดเป็น %2$s พอดีหน้าจอ (%1$d×%2$d) ตามหน้าจอ (ปรับขนาดเมื่อพับหรือกาง) + ปรับสเกล %1$s Steam แสดงรายละเอียดอุปกรณ์ ซ่อนรายละเอียดอุปกรณ์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 09255f6ee1..555cccde8a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2098,6 +2098,7 @@ %1$s Ölçeklemeyi %2$s olarak ayarlar. Ekrana Uydur (%1$d×%2$d) Ekranı takip et (katlanıp açıldığında yeniden boyutlanır) + Ölçekli %1$s Steam Cihaz ayrıntılarını göster Cihaz ayrıntılarını gizle diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 66462283e4..4e3a617d45 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2152,6 +2152,7 @@ %1$s Встановлює масштабування на %2$s. Під екран (%1$d×%2$d) Слідувати за екраном (змінює розмір при згортанні чи розгортанні) + Масштаб %1$s Steam Показати відомості про пристрій Сховати відомості про пристрій diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 4a9ad4a123..931860a605 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2083,6 +2083,7 @@ %1$s Đặt chia tỷ lệ thành %2$s. Khớp màn hình (%1$d×%2$d) Theo màn hình (đổi kích thước khi gập hoặc mở) + Thu nhỏ %1$s Steam Hiện chi tiết thiết bị Ẩn chi tiết thiết bị diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bca2f369d0..8cde3f2caf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2131,6 +2131,7 @@ %1$s 将缩放设为 %2$s。 匹配屏幕(%1$d×%2$d) 跟随屏幕(折叠或展开时调整大小) + 缩放 %1$s Steam 显示设备详情 隐藏设备详情 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8b95bd4866..4aa76ab642 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2054,6 +2054,7 @@ %1$s 將縮放設為 %2$s。 配合螢幕(%1$d×%2$d) 跟隨螢幕(摺疊或展開時調整大小) + 縮放 %1$s Steam 顯示裝置詳情 隱藏裝置詳情 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8329c167f3..53e263b3f5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2054,6 +2054,7 @@ %1$s 將縮放設為 %2$s。 符合螢幕(%1$d×%2$d) 跟隨螢幕(摺疊或展開時調整大小) + 縮放 %1$s Steam 顯示裝置詳細資料 隱藏裝置詳細資料 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 36fcfc6504..d0e4aaa158 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2298,6 +2298,7 @@ %1$s Sets scaling to %2$s. Match screen (%1$d×%2$d) Follow screen (resizes when folded or unfolded) + Scaled %1$s Steam Show device details Hide device details diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 5d51028b05..82512c0b91 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -4,6 +4,8 @@ import org.junit.Assert.* import org.junit.Test class SessionDisplayTest { + private val scaledFollow = listOf("follow/1.5", "follow/2", "follow/2.5", "follow/3", "follow/4") + @Test fun portraitPresetsSwapTheOutputAndRetainTheResolutionCap() { assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "720p", portrait = true)) assertEquals(900 to 1600, SessionDisplay.resolveChoice(1080 to 1920, "900p", portrait = true)) @@ -40,13 +42,13 @@ class SessionDisplayTest { @Test fun optionsListTheHeightsThePanelCanShowThenThePanel() { val thor = SessionDisplay.resolutionOptions(1920 to 1080) - assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), thor) - assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), + assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, thor) + assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, SessionDisplay.resolutionOptions(2400 to 1080)) - assertEquals(listOf("720p", "900p", "1080p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), + assertEquals(listOf("720p", "900p", "1080p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, SessionDisplay.resolutionOptions(3120 to 1440)) val small = SessionDisplay.resolutionOptions(1280 to 720) - assertEquals(listOf(SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), small) + assertEquals(listOf(SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, small) assertEquals(1280 to 720, SessionDisplay.resolveChoice(1280 to 720, SessionDisplay.MATCH_SCREEN)) assertEquals(2560 to 1440, SessionDisplay.resolveChoice(2560 to 1440, SessionDisplay.MATCH_SCREEN)) } @@ -105,6 +107,31 @@ class SessionDisplayTest { assertNull(SessionDisplay.followSize(640, 360)) } + @Test fun scaledFollowDividesTheWindowAndStaysEven() { + assertEquals(1260 to 540, SessionDisplay.resolveChoice(1080 to 2520, "follow/2")) + assertEquals(540 to 1260, SessionDisplay.resolveChoice(2520 to 1080, "follow/2", portrait = true)) + assertEquals(1092 to 984, SessionDisplay.followSize(2185, 1969, scale = 2f)) + assertEquals(656 to 728, SessionDisplay.followSize(1968, 2184, scale = 3f)) + assertNull(SessionDisplay.followSize(640, 360, scale = 2f)) + assertEquals(720 to 1600, SessionDisplay.resolveChoice(2400 to 1080, "follow/1.5", portrait = true)) + assertEquals(1600 to 720, SessionDisplay.resolveChoice(1080 to 2400, "follow/1.5")) + assertNull(SessionDisplay.followScale("follow/1.0")) + } + + @Test fun onlyKnownFollowChoicesCountAsFollow() { + assertEquals(1f, SessionDisplay.followScale(SessionDisplay.FOLLOW_SCREEN)) + assertEquals(3f, SessionDisplay.followScale("follow/3")) + assertEquals(1.3f, SessionDisplay.followScale("follow/1.3")) + assertEquals(1.3f, SessionDisplay.followScale("follow/1.26")) + assertEquals("follow/1.3", SessionDisplay.followScaled(1.3f)) + assertEquals("follow/2", SessionDisplay.followScaled(2f)) + assertNull(SessionDisplay.followScale("follow/1")) + assertNull(SessionDisplay.followScale("follow/x")) + assertNull(SessionDisplay.followScale("follow/9")) + assertNull(SessionDisplay.followScale("720p")) + assertFalse(SessionDisplay.isFollow(SessionDisplay.MATCH_SCREEN)) + } + @Test fun aPhoneCanFollowTheShortGameAreaAboveItsControls() { assertNull(SessionDisplay.followSize(720, 404)) assertEquals(720 to 404, SessionDisplay.followSize(720, 404, controlsBelow = true))