diff --git a/app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt b/app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt index 12c245122..e0003e134 100644 --- a/app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt +++ b/app/src/debug/java/com/droiddeck/launcher/ui/LauncherPreviews.kt @@ -1,6 +1,13 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.SecondScreenMode /** The launcher as a whole: rail and page, opened on each tab through FrontEndState.navigate. */ @Composable @@ -27,6 +34,28 @@ private fun SessionMenu(page: SessionDrawerPage, steam: Boolean = true, desktop: @DroidDeckPreviews @Composable private fun SessionMenuSessionPreview() = SessionMenu(SessionDrawerPage.SESSION) @DroidDeckPreviews @Composable private fun SessionMenuDesktopPreview() = SessionMenu(SessionDrawerPage.CONTROLLER, steam = false, desktop = true) +/** The in-game menu docked on the bottom screen, with the screen picker in its header. */ +@Composable +private fun DockedMenu(page: SessionDrawerPage) = PreviewHost { + SessionDrawer(true, page, controllerActive = false, onPageChange = {}, + a = sampleDrawerActions(secondScreen = SecondScreenMode.KEYBOARD_TRACKPAD), docked = true) +} + +/** The bottom screen's bar on a panel: the panel's name is the screen picker. */ +@Composable +private fun BottomPanelBar() = PreviewHost { + val modes = secondScreenModes(false, deckPad = false, dashboard = true, desktop = false) + Column(Modifier.fillMaxSize().background(Color.Black)) { + BottomScreenBar(BottomBarModel("Keyboard + trackpad", {}, {}, {}, {}, + listOf(BarExtra("Keyboard", icon = R.drawable.ic_bottom_keyboard) {}), + picker = ScreenPicker(modes, SecondScreenMode.KEYBOARD_TRACKPAD, {}, onMenu = {}))) + } +} + +@DroidDeckPreviews @Composable private fun SessionMenuDockedPreview() = DockedMenu(SessionDrawerPage.CONTROLLER) +@DroidDeckPreviews @Composable private fun SessionMenuDockedDisplayPreview() = DockedMenu(SessionDrawerPage.DISPLAY) +@DroidDeckPreviews @Composable private fun BottomPanelBarPreview() = BottomPanelBar() + /** The Library and Stores tabs read store accounts, which load on a background thread. */ private val storesLoaded = { com.droiddeck.launcher.stores.StoresState.accountsLoaded } @@ -44,4 +73,7 @@ internal val previewCases: List = listOf( PreviewCase("session-menu-hud") { SessionMenu(SessionDrawerPage.HUD) }, PreviewCase("session-menu-session") { SessionMenu(SessionDrawerPage.SESSION) }, PreviewCase("session-menu-desktop") { SessionMenu(SessionDrawerPage.CONTROLLER, steam = false, desktop = true) }, + PreviewCase("session-menu-docked") { DockedMenu(SessionDrawerPage.CONTROLLER) }, + PreviewCase("session-menu-docked-display") { DockedMenu(SessionDrawerPage.DISPLAY) }, + PreviewCase("bottom-panel-bar") { BottomPanelBar() }, ) diff --git a/app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt b/app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt index 4e8ae8094..fc83727e1 100644 --- a/app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt +++ b/app/src/debug/java/com/droiddeck/launcher/ui/PreviewSupport.kt @@ -10,6 +10,7 @@ import androidx.compose.ui.tooling.preview.Preview import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.gpu.FrameGen import com.droiddeck.launcher.gpu.Lossless +import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.session.SessionPrefs @@ -64,7 +65,9 @@ internal val sampleActions: FrontEndActions = FrontEndActions( ) /** The in-game menu's actions with settled sample values; its switches do nothing. */ -internal fun sampleDrawerActions(steam: Boolean = true, desktop: Boolean = false): DrawerActions = DrawerActions( +internal fun sampleDrawerActions( + steam: Boolean = true, desktop: Boolean = false, secondScreen: SecondScreenMode? = null, +): DrawerActions = DrawerActions( steam = steam, desktop = desktop, title = if (!steam && !desktop) "Hades" else null, isHomeApp = false, androidApps = emptyList(), hudOn = true, onHud = {}, @@ -75,8 +78,10 @@ internal fun sampleDrawerActions(steam: Boolean = true, desktop: Boolean = false backActionsInverted = false, onBackActionsInverted = {}, touchMode = SessionPrefs.TOUCH_AUTO, onTouch = {}, touchAuto = "Auto (direct)", fexPreset = "", onFexPreset = {}, - secondScreenMode = SecondScreenMode.NONE, onSecondScreenMode = {}, - secondScreenDisplays = emptyList(), selectedSecondScreenDisplay = -1, onSecondScreenDisplay = {}, + secondScreenMode = secondScreen ?: SecondScreenMode.NONE, onSecondScreenMode = {}, secondScreenNone = secondScreen == null, + secondScreenDisplays = listOfNotNull(secondScreen?.let { SecondScreenDisplay(2, "Built-in · 1240×1080") }), + selectedSecondScreenDisplay = if (secondScreen != null) 2 else -1, onSecondScreenDisplay = {}, + gameSwapAvailable = secondScreen != null, dashboardAvailable = secondScreen != null, onImportLossless = {}, onKeyboard = {}, onHardwareKeyboard = {}, onSteamMenu = if (steam) ({}) else null, onQam = if (steam) ({}) else null, onLaunchAndroidApp = { _, _ -> }, onBackground = {}, onShareLogs = {}, onStop = {}, onClose = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index b50175f60..d31fc101d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1759,10 +1759,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() }, onSecondScreenMode = { mode -> if (docked) drawerOpen = false - typingReturnMode = null - automaticPanel = false - if (mode != SecondScreenMode.NONE) SessionPrefs.setSecondScreenPanel(this@SessionActivity, desktopSession, mode.id) - selectSecondScreenMode(mode) + pickSecondScreenMode(mode) }, onSecondScreenDisplay = ::selectSecondScreenDisplay, onLaunchAndroidApp = { app, displayId -> @@ -3497,7 +3494,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (drawerOpen) { if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { - drawerPage = sessionDrawerPages(secondScreenDisplays.isNotEmpty(), glasses.present) + drawerPage = sessionDrawerPages(glasses.present) .step(drawerPage, if (event.keyCode == KeyEvent.KEYCODE_BUTTON_R1) 1 else -1) releaseDrawerDirection() } @@ -4232,6 +4229,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } + private fun pickSecondScreenMode(mode: SecondScreenMode) { + typingReturnMode = null + automaticPanel = false + if (mode != SecondScreenMode.NONE) SessionPrefs.setSecondScreenPanel(this, desktopSession, mode.id) + selectSecondScreenMode(mode) + } + + private fun bottomScreenPicker(mode: SecondScreenMode) = com.droiddeck.launcher.ui.ScreenPicker( + com.droiddeck.launcher.ui.secondScreenModes(false, SessionState.deckPad, bottomPages().isNotEmpty(), + com.droiddeck.launcher.session.BottomDesktop.available()), + mode, ::pickSecondScreenMode, onMenu = { drawerOpen = true }, + ) + private fun secondScreenPresentation(target: Display) = SecondScreenPresentation( this, target, onSteamMenu = ::tapSteamButton, @@ -4240,6 +4250,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde pad = padBridge, onKeyboardClosed = ::bottomKeyboardClosed, onMenu = { drawerOpen = true }, + picker = ::bottomScreenPicker, onMenuTouched = { if (drawerPinned) { drawerPinned = false diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt index a0033d81a..c9e8362c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt @@ -38,6 +38,7 @@ class BottomDesktopPanel( steamButtons: Pair<() -> Unit, () -> Unit>?, onSwap: (() -> Unit)? = null, private val fullResolution: Boolean = false, + picker: (() -> ScreenPicker?)? = null, ) : LinearLayout(context), SurfaceHolder.Callback { private lateinit var surfaceView: SurfaceView private val area = FrameLayout(context).apply { clipChildren = true } @@ -67,7 +68,7 @@ class BottomDesktopPanel( setBackgroundColor(Color.BLACK) isFocusable = true isFocusableInTouchMode = true - addView(bar(onClose, onMenu, steamButtons, onSwap), LayoutParams(-1, -2)) + addView(bar(onClose, onMenu, steamButtons, onSwap, picker), LayoutParams(-1, -2)) area.addView(keyboardHost) addSurface() area.addView(status, FrameLayout.LayoutParams(-1, -1)) @@ -84,7 +85,8 @@ class BottomDesktopPanel( area.addView(surfaceView, 1, FrameLayout.LayoutParams(fullWidth.takeIf { it > 0 } ?: -1, fullHeight.takeIf { it > 0 } ?: -1)) } - private fun bar(onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, onSwap: (() -> Unit)?): View = + private fun bar(onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, onSwap: (() -> Unit)?, + picker: (() -> ScreenPicker?)?): View = bottomScreenBarView(context) { val touch = touchMode.value BottomBarModel( @@ -97,6 +99,7 @@ class BottomDesktopPanel( BarExtra(context.getString(R.string.second_show_keyboard), icon = R.drawable.ic_bottom_keyboard) { keyboardHost.toggle() }, onSwap?.let { BarExtra(context.getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, onClick = it) }, ), + picker = picker?.invoke(), ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenBar.kt index e4715b6a1..0fbbcf3f3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenBar.kt @@ -24,12 +24,24 @@ import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Dashboard +import androidx.compose.material.icons.outlined.DesktopAccessDisabled +import androidx.compose.material.icons.outlined.DesktopWindows +import androidx.compose.material.icons.outlined.ExpandLess +import androidx.compose.material.icons.outlined.ExpandMore +import androidx.compose.material.icons.outlined.Keyboard import androidx.compose.material.icons.outlined.MoreHoriz +import androidx.compose.material.icons.outlined.SportsEsports +import androidx.compose.material.icons.outlined.Terminal +import androidx.compose.material.icons.outlined.Tune import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.foundation.rememberScrollState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -49,6 +61,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R import com.droiddeck.launcher.input.DeckPanel +import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState @@ -61,6 +74,15 @@ internal class BarExtra( val onClick: () -> Unit, ) +/** What the bottom screen shows: the DroidDeck menu or one of the panels, picked from the bar's dropdown. */ +class ScreenPicker( + val modes: List, + val current: SecondScreenMode, + val onPick: (SecondScreenMode) -> Unit, + val onMenu: (() -> Unit)? = null, + val menuShown: Boolean = false, +) + internal class BarTabs(val labels: List, val selected: Int, val onSelect: (Int) -> Unit) internal class BottomBarModel( @@ -72,6 +94,7 @@ internal class BottomBarModel( val extras: List = emptyList(), val menuActive: Boolean = false, val tabs: BarTabs? = null, + val picker: ScreenPicker? = null, ) @Composable @@ -89,9 +112,15 @@ internal fun BottomScreenBar(model: BottomBarModel, modifier: Modifier = Modifie private fun BarRow(model: BottomBarModel, modifier: Modifier = Modifier) { val colors = MaterialTheme.colorScheme BoxWithConstraints(modifier.fillMaxWidth().height(BAR_HEIGHT).blockTouches()) { - val buttons = listOfNotNull(model.onClose, model.onMenu, model.onQam).size + model.extras.size + val picker = model.picker + val onMenu = model.onMenu.takeIf { picker == null } + val buttons = listOfNotNull(model.onClose, onMenu, model.onQam).size + model.extras.size val steamWidth = if (model.onSteam != null) STEAM_WIDTH + BAR_GAP else 0.dp - val titleWidth = if (model.title != null) MIN_TITLE + BAR_GAP else 0.dp + val titleWidth = when { + picker != null -> PICKER_WIDTH + BAR_GAP + model.title != null -> MIN_TITLE + BAR_GAP + else -> 0.dp + } val needed = BAR_PAD * 2 + BUTTON * buttons + BAR_GAP * (buttons - 1).coerceAtLeast(0) + steamWidth + titleWidth val fits = maxWidth >= needed Row( @@ -103,7 +132,9 @@ private fun BarRow(model: BottomBarModel, modifier: Modifier = Modifier) { model.onClose?.let { BarButton(stringResource(R.string.common_close), Modifier.testTag("bottom-bar-close"), vector = Icons.Outlined.Close, onClick = it) } - if (model.title != null) Text( + if (picker != null) Box(if (fits) Modifier.weight(1f) else Modifier) { + ScreenPickerChip(picker, Modifier.testTag("bottom-bar-screen")) + } else if (model.title != null) Text( model.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = (if (fits) Modifier.weight(1f) else Modifier).padding(start = 4.dp), @@ -112,7 +143,7 @@ private fun BarRow(model: BottomBarModel, modifier: Modifier = Modifier) { BarButton(extra.description, extra.tag?.let { Modifier.testTag(it) } ?: Modifier, icon = extra.icon, vector = extra.vector, active = extra.active, onClick = extra.onClick) } - BarActions(model.onMenu, model.menuActive, model.onSteam, model.onQam) + BarActions(onMenu, model.menuActive, model.onSteam, model.onQam) } } } @@ -197,12 +228,94 @@ internal fun BarButton( } } +internal val SecondScreenMode.icon: ImageVector get() = when (this) { + SecondScreenMode.NONE -> Icons.Outlined.DesktopAccessDisabled + SecondScreenMode.KEYBOARD_TRACKPAD -> Icons.Outlined.Keyboard + SecondScreenMode.TERMINAL -> Icons.Outlined.Terminal + SecondScreenMode.DECK_CONTROLS -> Icons.Outlined.SportsEsports + SecondScreenMode.CUSTOM_CONTROLS -> Icons.Outlined.Tune + SecondScreenMode.DASHBOARD -> Icons.Outlined.Dashboard + SecondScreenMode.DESKTOP -> Icons.Outlined.DesktopWindows +} + +@Composable +internal fun ScreenPickerChip(picker: ScreenPicker, modifier: Modifier = Modifier) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var open by remember { mutableStateOf(false) } + val source = remember { MutableInteractionSource() } + val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value + val shape = RoundedCornerShape(22.dp) + val label = if (picker.menuShown) stringResource(R.string.touch_droiddeck_menu) else stringResource(picker.current.label) + val description = stringResource(R.string.screen_picker_description, label) + val toggle = { open = !open } + Box(modifier) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.height(44.dp).widthIn(max = PICKER_MAX_WIDTH) + .semantics { contentDescription = description } + .clip(shape).background(if (hot || open) pal.signal.copy(alpha = 0.14f) else colors.surfaceVariant) + .glideBorder(hot || open, shape, pal.signal, pal.line2) + .hoverable(source) + .clickable(role = Role.Button, interactionSource = source, indication = LocalIndication.current, onClick = toggle) + .controllerConfirm(onClick = toggle) + .padding(start = 14.dp, end = 10.dp), + ) { + if (picker.menuShown) Icon(painterResource(R.drawable.ic_stat_session), contentDescription = null, tint = colors.onBackground, + modifier = Modifier.size(18.dp)) + else Icon(picker.current.icon, contentDescription = null, tint = colors.onBackground, modifier = Modifier.size(18.dp)) + Text(label, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) + Icon(if (open) Icons.Outlined.ExpandLess else Icons.Outlined.ExpandMore, contentDescription = null, + tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + } + ScreenPickerMenu(picker, open) { open = false } + } +} + +/** On a panel, focus starts on the menu entry; from the menu (or with no menu entry), on the panel in use. */ +internal fun ScreenPicker.focusTarget(): SecondScreenMode? = + if (onMenu != null && !menuShown) null else current.takeIf { it in modes } ?: modes.firstOrNull() + +@Composable +private fun ScreenPickerMenu(picker: ScreenPicker, open: Boolean, dismiss: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val target = picker.focusTarget() + AnchoredMenu(open, dismiss, compact = true, minWidth = 240.dp) { first -> + picker.onMenu?.let { menu -> + MenuItem( + stringResource(R.string.touch_droiddeck_menu), checked = picker.menuShown, + leading = { Icon(painterResource(R.drawable.ic_stat_session), contentDescription = null, tint = colors.onBackground, modifier = Modifier.size(18.dp)) }, + focusRequester = first.takeIf { target == null }, modifier = Modifier.testTag("screen-picker-menu"), + ) { dismiss(); menu() } + Box(Modifier.fillMaxWidth().padding(vertical = 4.dp).height(1.dp).background(pal.line)) + Text( + stringResource(R.string.drawer_second_screen).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, + color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 10.dp, top = 6.dp, bottom = 4.dp), + ) + } + picker.modes.forEach { mode -> + val current = mode == picker.current + MenuItem( + stringResource(mode.label), checked = current && !picker.menuShown, + detail = if (current && picker.menuShown) stringResource(R.string.screen_picker_last_used) else null, + leading = { Icon(mode.icon, contentDescription = null, tint = colors.onBackground, modifier = Modifier.size(18.dp)) }, + focusRequester = first.takeIf { mode == target }, modifier = Modifier.testTag("screen-picker:${mode.id}"), + ) { dismiss(); picker.onPick(mode) } + } + } +} + internal val BAR_HEIGHT = 64.dp private val BAR_PAD = 12.dp private val BAR_GAP = 8.dp private val BUTTON = 44.dp private val STEAM_WIDTH = 80.dp private val MIN_TITLE = 72.dp +private val PICKER_WIDTH = 180.dp +private val PICKER_MAX_WIDTH = 240.dp internal fun sessionBarModel( title: String?, @@ -212,9 +325,10 @@ internal fun sessionBarModel( onQam: () -> Unit, extras: List = emptyList(), tabs: BarTabs? = null, + picker: ScreenPicker? = null, ): BottomBarModel { val steam = SessionState.mode == SessionService.MODE_STEAM - return BottomBarModel(title, onClose, onMenu, onSteam.takeIf { steam }, onQam.takeIf { steam }, extras, tabs = tabs) + return BottomBarModel(title, onClose, onMenu, onSteam.takeIf { steam }, onQam.takeIf { steam }, extras, tabs = tabs, picker = picker) } internal fun deckPanelTabs(context: Context, selected: DeckPanel, onSelect: (DeckPanel) -> Unit) = diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt b/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt index c13faceff..21057d1de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt @@ -175,7 +175,7 @@ internal fun SessionDrawerPreview(secondScreens: List) { val code = e.nativeKeyEvent.keyCode if (code != android.view.KeyEvent.KEYCODE_BUTTON_L1 && code != android.view.KeyEvent.KEYCODE_BUTTON_R1) return@onPreviewKeyEvent false if (e.type == KeyEventType.KeyDown && e.nativeKeyEvent.repeatCount == 0) { - page = sessionDrawerPages(secondScreens.isNotEmpty()).step(page, if (code == android.view.KeyEvent.KEYCODE_BUTTON_R1) 1 else -1) + page = sessionDrawerPages().step(page, if (code == android.view.KeyEvent.KEYCODE_BUTTON_R1) 1 else -1) } true } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index 62f3c61f6..6944d5a30 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -42,6 +42,7 @@ class SecondScreenPresentation( private val onSwap: (() -> Unit)? = null, private val onMenuTouched: () -> Unit = {}, private val onDeckPanel: (DeckPanel) -> Unit = { SessionPrefs.setDeckPanel(sessionActivity, it) }, + private val picker: ((SecondScreenMode) -> ScreenPicker?)? = null, ) : Presentation(sessionActivity, display) { private val frame = FrameLayout(context) private var menuView: androidx.compose.ui.platform.ComposeView? = null @@ -301,7 +302,8 @@ class SecondScreenPresentation( SecondScreenMode.DASHBOARD -> renderDashboard() SecondScreenMode.DESKTOP -> { root.addView(BottomDesktopPanel(context, onClose, onMenu, - (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }, onSwap), weightParams()) + (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }, onSwap, + picker = picker?.let { pick -> { pick(SecondScreenMode.DESKTOP) } }), weightParams()) } SecondScreenMode.NONE -> Unit } @@ -318,15 +320,15 @@ class SecondScreenPresentation( internal fun barModel(mode: SecondScreenMode): BottomBarModel? { val swap = listOfNotNull(onSwap?.let { BarExtra(context.getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, tag = "bottom-swap", onClick = it) }) fun model(extras: List, tabs: BarTabs? = null) = - sessionBarModel(context.getString(mode.label), onClose, onMenu, onSteamMenu, onQam, extras, tabs) + sessionBarModel(context.getString(mode.label), onClose, onMenu, onSteamMenu, onQam, extras, tabs, picker?.invoke(mode)) return when (mode) { SecondScreenMode.KEYBOARD_TRACKPAD -> model(listOf(BarExtra( context.getString(if (keyboardShown.value) R.string.second_hide_keyboard else R.string.second_show_keyboard), - icon = R.drawable.ic_bottom_keyboard, active = keyboardShown.value, tag = "bottom-keyboard") { showKeyboard() })) + icon = R.drawable.ic_bottom_keyboard, active = keyboardShown.value, tag = "bottom-keyboard") { showKeyboard() }) + swap) SecondScreenMode.DECK_CONTROLS -> model(swap, deckPanelTabs(context, deckPanel.value, ::selectDeckPanel)) SecondScreenMode.DASHBOARD, SecondScreenMode.CUSTOM_CONTROLS -> model(swap) SecondScreenMode.TERMINAL -> model(listOf(BarExtra(context.getString(R.string.drawer_keyboard), icon = R.drawable.ic_bottom_keyboard, - tag = "bottom-keyboard") { terminalPanel?.showKeyboard() })) + tag = "bottom-keyboard") { terminalPanel?.showKeyboard() }) + swap) else -> null } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index d65852ece..375170289 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -3,7 +3,6 @@ package com.droiddeck.launcher.ui internal enum class SessionDrawerPage(val firstControl: String) { CONTROLLER("input-profile"), GLASSES("glasses-game"), - SECOND_SCREEN("second-screen:custom-controls"), DISPLAY("fg"), HUD("hud"), EFFECTS("look"), @@ -14,10 +13,10 @@ internal enum class SessionDrawerPage(val firstControl: String) { } internal fun sessionDrawerPages( - hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentTab.shown, + hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentTab.shown, ): List = SessionDrawerPage.entries.filter { - (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) && + (hasGlasses || it != SessionDrawerPage.GLASSES) && (hasAgent || it != SessionDrawerPage.AGENT) } 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 49bf44892..09e169e73 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -43,7 +43,6 @@ import androidx.compose.material.icons.outlined.PowerSettingsNew import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers -import androidx.compose.material.icons.outlined.ScreenShare import androidx.compose.material.icons.outlined.Pause import androidx.compose.material.icons.outlined.PictureInPictureAlt import androidx.compose.material.icons.automirrored.outlined.ExitToApp @@ -166,7 +165,6 @@ import java.util.Locale private val SessionDrawerPage.title: Int get() = when (this) { SessionDrawerPage.CONTROLLER -> R.string.drawer_page_controller SessionDrawerPage.GLASSES -> R.string.drawer_page_glasses - SessionDrawerPage.SECOND_SCREEN -> R.string.drawer_second_screen SessionDrawerPage.DISPLAY -> R.string.drawer_page_display SessionDrawerPage.HUD -> R.string.drawer_hud SessionDrawerPage.VR -> R.string.vr_title @@ -179,7 +177,6 @@ private val SessionDrawerPage.title: Int get() = when (this) { private val SessionDrawerPage.icon get() = when (this) { SessionDrawerPage.CONTROLLER -> Icons.Outlined.SportsEsports SessionDrawerPage.GLASSES -> GlassesIcon - SessionDrawerPage.SECOND_SCREEN -> Icons.Outlined.ScreenShare SessionDrawerPage.DISPLAY -> Icons.Outlined.DesktopWindows SessionDrawerPage.HUD -> Icons.Outlined.Speed SessionDrawerPage.VR -> VrHeadsetIcon @@ -386,7 +383,7 @@ class DrawerActions( @Composable internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions, docked: Boolean = false, backRequest: Int = 0, onLayerChange: (Boolean) -> Unit = {}) { - val pages = sessionDrawerPages(a.secondScreenDisplays.isNotEmpty(), a.glassesPresent) + val pages = sessionDrawerPages(a.glassesPresent) val page = requestedPage.takeIf { it in pages } ?: SessionDrawerPage.CONTROLLER LaunchedEffect(requestedPage, pages) { if (page != requestedPage) onPageChange(page) } val colors = MaterialTheme.colorScheme @@ -460,8 +457,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont val first = when { page == SessionDrawerPage.GLASSES -> "glasses-tab-$glassesTab" page == SessionDrawerPage.SESSION && a.isHomeApp -> "apps" - page == SessionDrawerPage.SECOND_SCREEN -> "second-screen:" + - (if (a.secondScreenMode == SecondScreenMode.NONE && !a.secondScreenNone) SecondScreenMode.KEYBOARD_TRACKPAD else a.secondScreenMode).id else -> page.firstControl } if (turned) focus.forget(page) @@ -510,7 +505,8 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } .padding(12.dp), ) { - val roomyHeader = sheetWidth >= 408.dp + val showPicker = a.secondScreenDisplays.isNotEmpty() + val roomyHeader = sheetWidth >= if (showPicker) 560.dp else 408.dp Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), @@ -520,7 +516,16 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont SteamActionPill( stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"), ) { host.open = null; (a.onDismissScreen ?: a.onClose)() } - if (roomyHeader) Spacer(Modifier.weight(1f)) + if (showPicker) Box(if (roomyHeader) Modifier.weight(1f) else Modifier) { + ScreenPickerChip( + ScreenPicker( + secondScreenModes(a.secondScreenNone, com.droiddeck.launcher.session.SessionState.deckPad, a.dashboardAvailable, a.desktopAvailable), + a.secondScreenMode, onPick = { host.open = null; a.onSecondScreenMode(it) }, + onMenu = if (docked) ({ host.open = null }) else null, menuShown = docked, + ), + focus.track(page, "screen").testTag("drawer-screen-picker"), + ) + } else if (roomyHeader) Spacer(Modifier.weight(1f)) SteamActionPill( stringResource(R.string.stores_dl_pause), Icons.Outlined.Pause, focus.track(page, "pause"), ) { host.open = null; a.onPause() } @@ -543,7 +548,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } } BarActions( - onMenu = if (docked) ({ host.open = null; a.onClose() }) else null, menuActive = true, + onMenu = null, menuActive = false, onSteam = if (steamActions) ({ host.open = null; a.onSteamMenu?.invoke() }) else null, onQam = if (steamActions) ({ host.open = null @@ -650,6 +655,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont stringResource(R.string.display_sharpness), null, a.upscaleSharpness, 0..100, step = 5, format = { "$it%" }, modifier = focus.track(page, "upscale-sharpness"), onChange = a.onUpscaleSharpness) } + SecondScreenGroup(host, a) { key -> focus.track(page, key) } } SessionDrawerPage.EFFECTS -> { ScreenEffectsGroup(host, a, advancedEffectsExpanded, @@ -796,9 +802,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont onToggle = { id, on -> PcKeyboardPrefs.toggleHiddenKey(keyboardContext, PC_KEY_GROUP_IDS.getValue(id), on) }) } } - SessionDrawerPage.SECOND_SCREEN -> { - SecondScreenGroup(host, a) { key -> focus.track(page, key) } - } SessionDrawerPage.GLASSES -> if (glassesTab == GlassesTab.CONTROLLERS) { VrControllerGroups(host) { key -> focus.track(page, key) } } else { @@ -1284,43 +1287,17 @@ internal fun secondScreenModes(none: Boolean, deckPad: Boolean, dashboard: Boole @Composable private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) -> Modifier) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val modes = secondScreenModes(a.secondScreenNone, com.droiddeck.launcher.session.SessionState.deckPad, a.dashboardAvailable, a.desktopAvailable) - SettingsGroup(stringResource(R.string.drawer_second_screen_mode)) { - Text(stringResource(R.string.input_second_mode_hint), Modifier.padding(14.dp), - style = MaterialTheme.typography.bodySmall, color = colors.onSurfaceVariant) - Column(Modifier.fillMaxWidth().selectableGroup()) { - modes.forEach { mode -> - val selected = a.secondScreenMode == mode - val source = remember { MutableInteractionSource() } - val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value - val pick = { host.open = null; a.onSecondScreenMode(mode) } - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = track("second-screen:${mode.id}").fillMaxWidth().heightIn(min = 56.dp) - .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) - .glideBorder(hot, RoundedCornerShape(8.dp), pal.signal) - .hoverable(source) - .selectable(selected, interactionSource = source, indication = null, role = Role.RadioButton, onClick = pick) - .controllerConfirm(onClick = pick) - .padding(horizontal = 14.dp, vertical = 8.dp), - ) { - Text(stringResource(mode.label), fontSize = 15.sp, color = colors.onBackground, modifier = Modifier.weight(1f)) - RadioButton(selected, onClick = null, - colors = RadioButtonDefaults.colors(selectedColor = pal.signal, unselectedColor = colors.onSurfaceVariant)) - } - } - } - if (a.secondScreenDisplays.size > 1) ChoiceRow(host, "second-screen-display", stringResource(R.string.drawer_page_display), null, - a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, - chipModifier = track("second-screen-display"), onPick = a.onSecondScreenDisplay) - } - if (a.gameSwapAvailable || a.gameOnBottom) SettingsGroup(stringResource(R.string.swap_game_screen_group)) { - ChoiceRow(host, "game-screen", stringResource(R.string.swap_game_screen), null, + val choosesDisplay = a.secondScreenDisplays.size > 1 + val swapsGame = a.gameSwapAvailable || a.gameOnBottom + if (!choosesDisplay && !swapsGame) return + SettingsGroup(stringResource(R.string.drawer_second_screen)) { + if (swapsGame) ChoiceRow(host, "game-screen", stringResource(R.string.swap_game_screen), null, if (a.gameSwapBuiltIn) listOf(false to stringResource(R.string.swap_game_screen_top), true to stringResource(R.string.swap_game_screen_bottom)) else listOf(false to stringResource(R.string.main_primary), true to stringResource(R.string.main_secondary)), a.gameOnBottom, chipModifier = track("game-screen"), onPick = a.onGameOnBottom) + if (choosesDisplay) ChoiceRow(host, "second-screen-display", stringResource(R.string.drawer_page_display), null, + a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, + chipModifier = track("second-screen-display"), onPick = a.onSecondScreenDisplay) } } diff --git a/app/src/main/res/values-ar/input_library.xml b/app/src/main/res/values-ar/input_library.xml index 68f65da57..4a9493908 100644 --- a/app/src/main/res/values-ar/input_library.xml +++ b/app/src/main/res/values-ar/input_library.xml @@ -103,7 +103,6 @@ رجوع · مرتان في Steam ومرة في سطح المكتب في وضع Steam. الاستمرار بالضغط على رجوع يفتح الوصول السريع أيضًا. الاستعادة إلى الافتراضي - يتم تذكر اختيار اللوحة. يفتح سطح المكتب مساحة عمل ثانية؛ ولا يغيّر الجلسة أو ملف تعريف الإدخال. وحدة تحكم افتراضية نوع وحدة التحكم التي يراها Steam أو اللعبة. شاشة لمس diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 52c5f64a1..643394391 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -812,7 +812,6 @@ لوحة مفاتيح الكمبيوتر Android الشاشة الثانية - الوضع يعرض تطبيقات Android تشغيل تطبيق diff --git a/app/src/main/res/values-b+es+419/input_library.xml b/app/src/main/res/values-b+es+419/input_library.xml index 7769845d3..82305bea9 100644 --- a/app/src/main/res/values-b+es+419/input_library.xml +++ b/app/src/main/res/values-b+es+419/input_library.xml @@ -103,7 +103,6 @@ Atrás · dos veces en Steam, una en escritorio En modo Steam. Mantener Atrás también abre el acceso rápido. Restaurar valores predeterminados - Tu elección de panel se recuerda. Escritorio abre un segundo espacio de trabajo; no cambia la sesión ni su perfil de entrada. Control virtual El tipo de control que ven Steam o el juego. Pantalla táctil 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 6bb03b842..922b1407f 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -830,7 +830,6 @@ Teclado de PC Android Segunda pantalla - Modo Muestra Apps de Android Abrir una app diff --git a/app/src/main/res/values-bg/input_library.xml b/app/src/main/res/values-bg/input_library.xml index 53f210315..31967ac49 100644 --- a/app/src/main/res/values-bg/input_library.xml +++ b/app/src/main/res/values-bg/input_library.xml @@ -103,7 +103,6 @@ Назад · два пъти в Steam, веднъж в работен плот В режим Steam. Задържането на Назад отваря и бързия достъп. Връщане към подразбирането - Изборът на панел се запомня. Работният плот отваря второ работно пространство; не сменя сесията или профила ѝ за вход. Виртуален контролер Типът контролер, който Steam или играта виждат. Сензорен екран diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index cc99224c9..57566ec95 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -804,7 +804,6 @@ Клавиатура за компютър Android Втори екран - Режим Показва Приложения за Android Стартиране на приложение diff --git a/app/src/main/res/values-cs/input_library.xml b/app/src/main/res/values-cs/input_library.xml index 10783695c..6ba6584e5 100644 --- a/app/src/main/res/values-cs/input_library.xml +++ b/app/src/main/res/values-cs/input_library.xml @@ -103,7 +103,6 @@ Zpět · dvakrát v Steam, jednou na ploše V režimu Steam. Podržením Zpět se také otevře rychlý přístup. Obnovit výchozí - Volba panelu se pamatuje. Plocha otevře druhý pracovní prostor; nepřepíná relaci ani její vstupní profil. Virtuální ovladač Typ ovladače, který vidí Steam nebo hra. Dotyková obrazovka diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 15df9624b..c2b89c6e1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -808,7 +808,6 @@ Klávesnice PC Android Druhá obrazovka - Režim Zobrazuje Aplikace Android Spustit aplikaci diff --git a/app/src/main/res/values-da/input_library.xml b/app/src/main/res/values-da/input_library.xml index f3fd6e80a..3ba74431e 100644 --- a/app/src/main/res/values-da/input_library.xml +++ b/app/src/main/res/values-da/input_library.xml @@ -103,7 +103,6 @@ Tilbage · to gange i Steam, én gang på skrivebordet I Steam-tilstand. Hvis du holder Tilbage, åbnes hurtigadgang også. Gendan standard - Dit panelvalg huskes. Skrivebord åbner et andet arbejdsområde; det skifter ikke sessionen eller dens inputprofil. Virtuel controller Den controllertype, som Steam eller spillet ser. Berøringsskærm diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4a5dac730..67037ab95 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -804,7 +804,6 @@ PC-tastatur Android Anden skærm - Tilstand Viser Android-apps Start en app diff --git a/app/src/main/res/values-de/input_library.xml b/app/src/main/res/values-de/input_library.xml index 8ba2b07f5..754679261 100644 --- a/app/src/main/res/values-de/input_library.xml +++ b/app/src/main/res/values-de/input_library.xml @@ -103,7 +103,6 @@ Zurück · zweimal in Steam, einmal im Desktop Im Steam-Modus. Halten von Zurück öffnet auch den Schnellzugriff. Auf Standard zurücksetzen - Ihre Panel-Auswahl wird gespeichert. Desktop öffnet einen zweiten Arbeitsbereich; es wechselt weder die Sitzung noch ihr Eingabeprofil. Virtueller Controller Der von Steam oder dem Spiel erkannte Controller-Typ. Touchscreen diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 068f519c5..c913e57c7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -804,7 +804,6 @@ PC-Tastatur Android Zweiter Bildschirm - Modus Zeigt Android-Apps App starten diff --git a/app/src/main/res/values-el/input_library.xml b/app/src/main/res/values-el/input_library.xml index c9f40579e..d10081271 100644 --- a/app/src/main/res/values-el/input_library.xml +++ b/app/src/main/res/values-el/input_library.xml @@ -103,7 +103,6 @@ Πίσω · δύο φορές στο Steam, μία στην επιφάνεια εργασίας Σε λειτουργία Steam. Το κράτημα του Πίσω ανοίγει και τη γρήγορη πρόσβαση. Επαναφορά στις προεπιλογές - Η επιλογή πίνακα απομνημονεύεται. Η επιφάνεια εργασίας ανοίγει δεύτερο χώρο εργασίας· δεν αλλάζει τη συνεδρία ούτε το προφίλ εισόδου της. Εικονικό χειριστήριο Ο τύπος χειριστηρίου που βλέπουν το Steam ή το παιχνίδι. Οθόνη αφής diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f4873ceb7..c1e1ffcb7 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -804,7 +804,6 @@ Πληκτρολόγιο PC Android Δεύτερη οθόνη - Λειτουργία Εμφανίζει Εφαρμογές Android Εκκίνηση εφαρμογής diff --git a/app/src/main/res/values-es/input_library.xml b/app/src/main/res/values-es/input_library.xml index fe2ee1789..a2271204a 100644 --- a/app/src/main/res/values-es/input_library.xml +++ b/app/src/main/res/values-es/input_library.xml @@ -103,7 +103,6 @@ Atrás · dos veces en Steam, una en escritorio En modo Steam. Mantener Atrás también abre el acceso rápido. Restaurar valores predeterminados - Tu elección de panel se recuerda. Escritorio abre un segundo espacio de trabajo; no cambia la sesión ni su perfil de entrada. Mando virtual El tipo de mando que ven Steam o el juego. Pantalla táctil diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e39fae7b8..124192c1a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -806,7 +806,6 @@ Teclado de PC Android Segunda pantalla - Modo Muestra Apps de Android Abrir una app diff --git a/app/src/main/res/values-fi/input_library.xml b/app/src/main/res/values-fi/input_library.xml index 846dae260..8fd745f70 100644 --- a/app/src/main/res/values-fi/input_library.xml +++ b/app/src/main/res/values-fi/input_library.xml @@ -103,7 +103,6 @@ Takaisin · kahdesti Steamissa, kerran työpöydällä Steam-tilassa. Takaisin-painikkeen pitäminen avaa myös pikakäytön. Palauta oletukset - Paneelivalintasi muistetaan. Työpöytä avaa toisen työtilan; se ei vaihda istuntoa tai sen syöttöprofiilia. Virtuaaliohjain Ohjaintyyppi, jonka Steam tai peli näkee. Kosketusnäyttö diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index e9dacd8e0..2d7ea36c7 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -804,7 +804,6 @@ PC-näppäimistö Android Toinen näyttö - Tila Näyttää Android-sovellukset Käynnistä sovellus diff --git a/app/src/main/res/values-fr/input_library.xml b/app/src/main/res/values-fr/input_library.xml index 4e899b637..0dbdf5dbc 100644 --- a/app/src/main/res/values-fr/input_library.xml +++ b/app/src/main/res/values-fr/input_library.xml @@ -103,7 +103,6 @@ Retour · deux fois dans Steam, une fois sur le bureau En mode Steam. Maintenir Retour ouvre aussi l\'accès rapide. Rétablir par défaut - Votre choix de panneau est mémorisé. Le bureau ouvre un second espace de travail ; il ne change ni la session ni son profil d\'entrée. Manette virtuelle Le type de manette vu par Steam ou le jeu. Écran tactile diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e76d3e6da..f21ab1e3a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -806,7 +806,6 @@ Clavier PC Android Deuxième écran - Mode Afficher Applications Android Lancer l\'application diff --git a/app/src/main/res/values-hi/input_library.xml b/app/src/main/res/values-hi/input_library.xml index 81147024d..7ba543850 100644 --- a/app/src/main/res/values-hi/input_library.xml +++ b/app/src/main/res/values-hi/input_library.xml @@ -103,7 +103,6 @@ वापस · Steam में दो बार, डेस्कटॉप में एक बार Steam मोड में। वापस दबाए रखने से क्विक एक्सेस भी खुलता है। डिफ़ॉल्ट पर पुनर्स्थापित करें - आपका पैनल चयन याद रखा जाता है। डेस्कटॉप दूसरा कार्यक्षेत्र खोलता है; यह सत्र या उसका इनपुट प्रोफ़ाइल नहीं बदलता। वर्चुअल कंट्रोलर Steam या गेम द्वारा देखा जाने वाला कंट्रोलर प्रकार। टचस्क्रीन diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 2f5d3957f..d322fa0d0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -804,7 +804,6 @@ पीसी कीबोर्ड Android दूसरी स्क्रीन - मोड दिखाता है Android ऐप ऐप लॉन्च करें diff --git a/app/src/main/res/values-hu/input_library.xml b/app/src/main/res/values-hu/input_library.xml index ceeaeaf94..a02e75885 100644 --- a/app/src/main/res/values-hu/input_library.xml +++ b/app/src/main/res/values-hu/input_library.xml @@ -103,7 +103,6 @@ Vissza · kétszer Steam módban, egyszer asztali módban Steam módban. A Vissza nyomva tartása a gyorselérést is megnyitja. Visszaállítás alapértelmezettre - A panelválasztás megjegyződik. Az asztali mód második munkateret nyit; nem váltja a munkamenetet vagy annak beviteli profilját. Virtuális vezérlő A Steam vagy a játék által látott vezérlőtípus. Érintőképernyő diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 50d616a3c..4f7ad2c7c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -804,7 +804,6 @@ PC-billentyűzet Android Második képernyő - Mód Megjelenít Android-alkalmazások Alkalmazás indítása diff --git a/app/src/main/res/values-in/input_library.xml b/app/src/main/res/values-in/input_library.xml index f24780d5c..28025b107 100644 --- a/app/src/main/res/values-in/input_library.xml +++ b/app/src/main/res/values-in/input_library.xml @@ -103,7 +103,6 @@ Kembali · dua kali di Steam, sekali di desktop Di mode Steam. Menahan Kembali juga membuka akses cepat. Pulihkan ke bawaan - Pilihan panel Anda diingat. Desktop membuka ruang kerja kedua; tidak mengganti sesi atau profil inputnya. Pengontrol virtual Jenis pengontrol yang dilihat Steam atau game. Layar sentuh diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1191dc3ac..4ea3788f5 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -802,7 +802,6 @@ Keyboard PC Android Layar kedua - Mode Menampilkan Aplikasi Android Luncurkan aplikasi diff --git a/app/src/main/res/values-it/input_library.xml b/app/src/main/res/values-it/input_library.xml index 87061db29..b825c1fb9 100644 --- a/app/src/main/res/values-it/input_library.xml +++ b/app/src/main/res/values-it/input_library.xml @@ -103,7 +103,6 @@ Indietro · due volte in Steam, una su desktop In modalità Steam. Tenere premuto Indietro apre anche l\'accesso rapido. Ripristina i valori predefiniti - La scelta del pannello viene ricordata. Desktop apre un secondo spazio di lavoro; non cambia la sessione né il suo profilo di input. Controller virtuale Il tipo di controller visto da Steam o dal gioco. Touchscreen diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 66fcd52a1..4e7fdf08d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -806,7 +806,6 @@ Tastiera PC Android Secondo schermo - Modalità Mostra App Android Avvia un\'app diff --git a/app/src/main/res/values-ja/input_library.xml b/app/src/main/res/values-ja/input_library.xml index ecf218c49..f4294982b 100644 --- a/app/src/main/res/values-ja/input_library.xml +++ b/app/src/main/res/values-ja/input_library.xml @@ -103,7 +103,6 @@ 戻る · Steam では 2 回、デスクトップでは 1 回 Steam モード時。戻るを長押しするとクイックアクセスも開きます。 既定に戻す - パネルの選択は記憶されます。デスクトップは 2 つ目のワークスペースを開くだけで、セッションやその入力プロファイルを切り替えません。 仮想コントローラー Steam またはゲームが認識するコントローラーの種類。 タッチスクリーン diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a274e0c63..e74e3e706 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -802,7 +802,6 @@ PCキーボード Android セカンドスクリーン - モード 表示 Androidアプリ アプリを起動 diff --git a/app/src/main/res/values-ko/input_library.xml b/app/src/main/res/values-ko/input_library.xml index d19c198c7..c5030b829 100644 --- a/app/src/main/res/values-ko/input_library.xml +++ b/app/src/main/res/values-ko/input_library.xml @@ -103,7 +103,6 @@ 뒤로 · Steam에서는 두 번, 데스크톱에서는 한 번 Steam 모드에서. 뒤로를 길게 누르면 빠른 액세스도 열립니다. 기본값으로 복원 - 패널 선택이 기억됩니다. 데스크톱은 두 번째 작업 공간을 열 뿐 세션이나 입력 프로필을 전환하지 않습니다. 가상 컨트롤러 Steam 또는 게임이 인식하는 컨트롤러 유형입니다. 터치스크린 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c3bd68537..557cabab2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -802,7 +802,6 @@ PC 키보드 Android 보조 화면 - 모드 표시 Android 앱 앱 실행 diff --git a/app/src/main/res/values-ms/input_library.xml b/app/src/main/res/values-ms/input_library.xml index bd4b45512..e14f8a425 100644 --- a/app/src/main/res/values-ms/input_library.xml +++ b/app/src/main/res/values-ms/input_library.xml @@ -103,7 +103,6 @@ Kembali · dua kali dalam Steam, sekali di desktop Dalam mod Steam. Menahan Kembali juga membuka akses pantas. Pulihkan kepada lalai - Pilihan panel anda diingati. Desktop membuka ruang kerja kedua; ia tidak menukar sesi atau profil inputnya. Pengawal maya Jenis pengawal yang dilihat oleh Steam atau permainan. Skrin sentuh diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 134f1702c..168ceaa97 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -802,7 +802,6 @@ Papan kekunci PC Android Skrin kedua - Mod Memaparkan Apl Android Lancarkan apl diff --git a/app/src/main/res/values-nb/input_library.xml b/app/src/main/res/values-nb/input_library.xml index e810fed5a..340337947 100644 --- a/app/src/main/res/values-nb/input_library.xml +++ b/app/src/main/res/values-nb/input_library.xml @@ -103,7 +103,6 @@ Tilbake · to ganger i Steam, én gang på skrivebordet I Steam-modus. Å holde Tilbake åpner også hurtigtilgang. Tilbakestill til standard - Panelvalget ditt huskes. Skrivebord åpner et andre arbeidsområde; det bytter ikke økten eller inndataprofilen. Virtuell kontroller Kontrollertypen som Steam eller spillet ser. Berøringsskjerm diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index de0bac7fc..e5115e83a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -804,7 +804,6 @@ PC-tastatur Android Andre skjerm - Modus Viser Android-apper Start en app diff --git a/app/src/main/res/values-nl/input_library.xml b/app/src/main/res/values-nl/input_library.xml index 80f96a853..48db0c68e 100644 --- a/app/src/main/res/values-nl/input_library.xml +++ b/app/src/main/res/values-nl/input_library.xml @@ -103,7 +103,6 @@ Terug · twee keer in Steam, één keer op bureaublad In spelmodus Steam. Terug ingedrukt houden opent ook snelle toegang. Terugzetten naar standaard - Je paneelkeuze wordt onthouden. Bureaublad opent een tweede werkruimte; het wisselt de sessie of het invoerprofiel niet. Virtuele controller Het controllertype dat Steam of het spel ziet. Touchscreen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 16b5a74ec..9151d3b21 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -804,7 +804,6 @@ Pc-toetsenbord Android Tweede scherm - Modus Toont Android-apps Een app starten diff --git a/app/src/main/res/values-pl/input_library.xml b/app/src/main/res/values-pl/input_library.xml index 1193c2a12..02c4db578 100644 --- a/app/src/main/res/values-pl/input_library.xml +++ b/app/src/main/res/values-pl/input_library.xml @@ -103,7 +103,6 @@ Wstecz · dwa razy w Steam, raz na pulpicie W trybie Steam. Przytrzymanie Wstecz otwiera też szybki dostęp. Przywróć domyślne - Wybór panelu jest zapamiętywany. Pulpit otwiera drugą przestrzeń roboczą; nie przełącza sesji ani jej profilu wejścia. Wirtualny kontroler Typ kontrolera widziany przez Steam lub grę. Ekran dotykowy diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8b624db10..31742655a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -808,7 +808,6 @@ Klawiatura PC Android Drugi ekran - Tryb Pokazuje Aplikacje Android Uruchom aplikację diff --git a/app/src/main/res/values-pt-rPT/input_library.xml b/app/src/main/res/values-pt-rPT/input_library.xml index 498a7442e..ec8835726 100644 --- a/app/src/main/res/values-pt-rPT/input_library.xml +++ b/app/src/main/res/values-pt-rPT/input_library.xml @@ -103,7 +103,6 @@ Voltar · duas vezes no Steam, uma no ambiente de trabalho No modo Steam. Manter Voltar também abre o acesso rápido. Repor predefinições - A sua escolha de painel é memorizada. O ambiente de trabalho abre um segundo espaço de trabalho; não muda a sessão nem o seu perfil de entrada. Comando virtual O tipo de comando visto pelo Steam ou pelo jogo. Ecrã tátil diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 732df24c4..a5745195b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -806,7 +806,6 @@ Teclado de PC Android Segundo ecrã - Modo Mostra Apps Android Iniciar uma app diff --git a/app/src/main/res/values-pt/input_library.xml b/app/src/main/res/values-pt/input_library.xml index ae84ba99c..93dd70368 100644 --- a/app/src/main/res/values-pt/input_library.xml +++ b/app/src/main/res/values-pt/input_library.xml @@ -103,7 +103,6 @@ Voltar · duas vezes no Steam, uma no desktop No modo Steam. Manter Voltar também abre o acesso rápido. Restaurar o padrão - Sua escolha de painel é lembrada. O desktop abre um segundo espaço de trabalho; não troca a sessão nem o perfil de entrada. Controle virtual O tipo de controle visto pelo Steam ou pelo jogo. Tela sensível ao toque diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index f0814f45b..f5eca4b04 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -813,7 +813,6 @@ Teclado de PC Android Segunda tela - Modo Mostra Apps Android Abrir um app diff --git a/app/src/main/res/values-ro/input_library.xml b/app/src/main/res/values-ro/input_library.xml index 5a3648d50..7f2b80491 100644 --- a/app/src/main/res/values-ro/input_library.xml +++ b/app/src/main/res/values-ro/input_library.xml @@ -103,7 +103,6 @@ Înapoi · de două ori în Steam, o dată pe desktop În modul Steam. Ținerea butonului Înapoi deschide și accesul rapid. Restabilește implicit - Alegerea panoului este reținută. Desktopul deschide un al doilea spațiu de lucru; nu schimbă sesiunea sau profilul ei de intrare. Controller virtual Tipul de controller văzut de Steam sau de joc. Ecran tactil diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c22897954..cc7a55a18 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -806,7 +806,6 @@ Tastatură de PC Android Al doilea ecran - Mod Arată Aplicații Android Lansează o aplicație diff --git a/app/src/main/res/values-ru/input_library.xml b/app/src/main/res/values-ru/input_library.xml index d02df2ffe..b4b9cfd9f 100644 --- a/app/src/main/res/values-ru/input_library.xml +++ b/app/src/main/res/values-ru/input_library.xml @@ -103,7 +103,6 @@ Назад · дважды в Steam, один раз в рабочем столе В режиме Steam. Удержание «Назад» также открывает быстрый доступ. Вернуть по умолчанию - Выбор панели запоминается. Рабочий стол открывает второе рабочее пространство; он не переключает сеанс или его профиль ввода. Виртуальный контроллер Тип контроллера, который видят Steam или игра. Сенсорный экран diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 58a3c4e74..a5f31948a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -808,7 +808,6 @@ Клавиатура ПК Android Второй экран - Режим Показывать Приложения Android Запустить приложение diff --git a/app/src/main/res/values-sv/input_library.xml b/app/src/main/res/values-sv/input_library.xml index dfe410236..15e3e12e0 100644 --- a/app/src/main/res/values-sv/input_library.xml +++ b/app/src/main/res/values-sv/input_library.xml @@ -103,7 +103,6 @@ Tillbaka · två gånger i Steam, en gång på skrivbordet I Steam-läge. Att hålla Tillbaka öppnar även snabbåtkomst. Återställ till standard - Ditt panelval kommer ihåg. Skrivbord öppnar en andra arbetsyta; det byter inte sessionen eller dess inmatningsprofil. Virtuell handkontroll Den handkontrolltyp som Steam eller spelet ser. Pekskärm diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 73c1f9dbe..9bc129df9 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -804,7 +804,6 @@ PC-tangentbord Android Andra skärmen - Läge Visar Android-appar Starta en app diff --git a/app/src/main/res/values-th/input_library.xml b/app/src/main/res/values-th/input_library.xml index 944a4aaa7..ef2ae2702 100644 --- a/app/src/main/res/values-th/input_library.xml +++ b/app/src/main/res/values-th/input_library.xml @@ -103,7 +103,6 @@ ย้อนกลับ · สองครั้งใน Steam หนึ่งครั้งบนเดสก์ท็อป ในโหมด Steam การกดย้อนกลับค้างจะเปิดการเข้าถึงด่วนด้วย คืนค่าเริ่มต้น - ตัวเลือกแผงของคุณจะถูกจำไว้ เดสก์ท็อปจะเปิดพื้นที่ทำงานที่สอง ไม่ได้สลับเซสชันหรือโปรไฟล์อินพุต คอนโทรลเลอร์เสมือน ชนิดคอนโทรลเลอร์ที่ Steam หรือเกมมองเห็น หน้าจอสัมผัส diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 43c49d86f..2402c15f8 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -802,7 +802,6 @@ แป้นพิมพ์พีซี Android หน้าจอที่สอง - โหมด แสดง แอป Android เปิดแอป diff --git a/app/src/main/res/values-tr/input_library.xml b/app/src/main/res/values-tr/input_library.xml index 12d264ee8..563657c5d 100644 --- a/app/src/main/res/values-tr/input_library.xml +++ b/app/src/main/res/values-tr/input_library.xml @@ -103,7 +103,6 @@ Geri · Steam\'de iki kez, masaüstünde bir kez Steam modunda. Geri tuşunu basılı tutmak hızlı erişimi de açar. Varsayılana sıfırla - Panel seçiminiz hatırlanır. Masaüstü ikinci bir çalışma alanı açar; oturumu veya giriş profilini değiştirmez. Sanal denetleyici Steam veya oyunun gördüğü denetleyici türü. Dokunmatik ekran diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7fd0d204d..bdcb3b8b0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -804,7 +804,6 @@ PC klavyesi Android İkinci ekran - Mod Gösterilen Android uygulamaları Uygulama başlat diff --git a/app/src/main/res/values-uk/input_library.xml b/app/src/main/res/values-uk/input_library.xml index f2504dde5..9993d25a5 100644 --- a/app/src/main/res/values-uk/input_library.xml +++ b/app/src/main/res/values-uk/input_library.xml @@ -103,7 +103,6 @@ Назад · двічі в Steam, один раз у робочому столі У режимі Steam. Утримання «Назад» також відкриває швидкий доступ. Відновити типове - Ваш вибір панелі запам\'ятовується. Робочий стіл відкриває другий робочий простір; він не перемикає сеанс або його профіль введення. Віртуальний контролер Тип контролера, який бачать Steam або гра. Сенсорний екран diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index be20c1fb0..625916040 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -808,7 +808,6 @@ Клавіатура ПК Android Другий екран - Режим Показує Додатки Android Запустити додаток diff --git a/app/src/main/res/values-vi/input_library.xml b/app/src/main/res/values-vi/input_library.xml index 6b75fe7fd..71e6b034c 100644 --- a/app/src/main/res/values-vi/input_library.xml +++ b/app/src/main/res/values-vi/input_library.xml @@ -103,7 +103,6 @@ Quay lại · hai lần trong Steam, một lần trên máy tính Ở chế độ Steam. Giữ Quay lại cũng mở truy cập nhanh. Khôi phục mặc định - Lựa chọn bảng của bạn được ghi nhớ. Máy tính mở không gian làm việc thứ hai; không chuyển phiên hay hồ sơ đầu vào của nó. Tay cầm ảo Loại tay cầm mà Steam hoặc trò chơi thấy. Màn hình cảm ứng diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 33796ad9c..424ff42df 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -802,7 +802,6 @@ Bàn phím PC Android Màn hình thứ hai - Chế độ Hiển thị Ứng dụng Android Khởi chạy một ứng dụng diff --git a/app/src/main/res/values-zh-rCN/input_library.xml b/app/src/main/res/values-zh-rCN/input_library.xml index 00c716c4c..921f57c80 100644 --- a/app/src/main/res/values-zh-rCN/input_library.xml +++ b/app/src/main/res/values-zh-rCN/input_library.xml @@ -103,7 +103,6 @@ 返回 · Steam 里两下,桌面上一下 Steam 模式下。按住返回也会打开快捷菜单。 恢复默认 - 面板选择会被记住。桌面会打开第二个工作区,不切换会话或它的输入配置。 虚拟手柄 Steam 或游戏看到的手柄类型。 触摸屏 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 667f1cb9c..4343a946b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -802,7 +802,6 @@ PC 键盘 Android 副屏 - 模式 显示 Android 应用 启动应用 diff --git a/app/src/main/res/values-zh-rHK/input_library.xml b/app/src/main/res/values-zh-rHK/input_library.xml index 20930002a..d997b2e0c 100644 --- a/app/src/main/res/values-zh-rHK/input_library.xml +++ b/app/src/main/res/values-zh-rHK/input_library.xml @@ -103,7 +103,6 @@ 返回 · Steam 裡兩下,桌面上一下 Steam 模式下。按住返回也會開啟快速選單。 恢復預設 - 面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。 虛擬控制器 Steam 或遊戲看到的控制器類型。 觸控螢幕 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 2ec673e61..71ec80c4d 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -802,7 +802,6 @@ 電腦鍵盤 Android 第二螢幕 - 模式 顯示 Android 應用程式 啟動應用程式 diff --git a/app/src/main/res/values-zh-rTW/input_library.xml b/app/src/main/res/values-zh-rTW/input_library.xml index 20930002a..d997b2e0c 100644 --- a/app/src/main/res/values-zh-rTW/input_library.xml +++ b/app/src/main/res/values-zh-rTW/input_library.xml @@ -103,7 +103,6 @@ 返回 · Steam 裡兩下,桌面上一下 Steam 模式下。按住返回也會開啟快速選單。 恢復預設 - 面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。 虛擬控制器 Steam 或遊戲看到的控制器類型。 觸控螢幕 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d6d003730..105d095c9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -802,7 +802,6 @@ 電腦鍵盤 Android 第二螢幕 - 模式 顯示 Android 應用程式 啟動應用程式 diff --git a/app/src/main/res/values/input_library.xml b/app/src/main/res/values/input_library.xml index 27d018b6e..b2969a042 100644 --- a/app/src/main/res/values/input_library.xml +++ b/app/src/main/res/values/input_library.xml @@ -103,7 +103,6 @@ Back · twice in Steam, once in Desktop In Steam mode. Holding Back also opens quick access. Restore to default - Your panel choice is remembered. Desktop opens a second workspace; it does not switch the session or its input profile. Virtual controller The controller type seen by Steam or the game. Touchscreen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2fcff59c4..a2e6d905e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -865,7 +865,6 @@ PC keyboard Android Second screen - Mode Shows Android apps Launch an app @@ -2260,6 +2259,8 @@ Deck grips + trackpads Dashboard Desktop + Second screen: %1$s + Last used Start the desktop Desktop · %1$s Trackpad diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenBarTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenBarTest.kt index 97389fa28..2af8942ca 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenBarTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenBarTest.kt @@ -1,8 +1,11 @@ package com.droiddeck.launcher.ui import androidx.compose.ui.test.onNodeWithContentDescription +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import org.junit.After @@ -75,4 +78,35 @@ class BottomScreenBarTest { compose.onNodeWithContentDescription(context.getString(R.string.drawer_steam_menu)).assertDoesNotExist() compose.onNodeWithContentDescription(context.getString(R.string.drawer_open_qam)).assertDoesNotExist() } + + @Test fun thePanelNameOpensTheScreenPickerInsteadOfAMenuButton() { + var menus = 0 + val picked = mutableListOf() + val modes = listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL, SecondScreenMode.CUSTOM_CONTROLS) + compose.setContent { + DroidDeckTheme { + BottomScreenBar(BottomBarModel("Trackpad", {}, { menus++ }, null, null, + picker = ScreenPicker(modes, SecondScreenMode.KEYBOARD_TRACKPAD, { picked += it }, onMenu = { menus++ }))) + } + } + compose.onNodeWithTag("bottom-bar-menu").assertDoesNotExist() + compose.onNodeWithText(context.getString(R.string.second_mode_keyboard_trackpad)).assertExists() + compose.onNodeWithTag("bottom-bar-screen").performClick() + compose.onNodeWithTag("screen-picker:${SecondScreenMode.TERMINAL.id}").performClick() + compose.waitForIdle() + assertEquals(listOf(SecondScreenMode.TERMINAL), picked) + compose.onNodeWithTag("screen-picker:${SecondScreenMode.TERMINAL.id}").assertDoesNotExist() + compose.onNodeWithTag("bottom-bar-screen").performClick() + compose.onNodeWithTag("screen-picker-menu").performClick() + compose.waitForIdle() + assertEquals(1, menus) + } + + @Test fun focusStartsOnTheMenuFromAPanelAndOnThePanelFromTheMenu() { + val modes = listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL) + assertNull(ScreenPicker(modes, SecondScreenMode.TERMINAL, {}, onMenu = {}).focusTarget()) + assertEquals(SecondScreenMode.TERMINAL, ScreenPicker(modes, SecondScreenMode.TERMINAL, {}, onMenu = {}, menuShown = true).focusTarget()) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, ScreenPicker(modes, SecondScreenMode.NONE, {}, onMenu = {}, menuShown = true).focusTarget()) + assertEquals(SecondScreenMode.TERMINAL, ScreenPicker(modes, SecondScreenMode.TERMINAL, {}).focusTarget()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SecondScreenBarTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SecondScreenBarTest.kt index 477984315..a2e7f61c3 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SecondScreenBarTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SecondScreenBarTest.kt @@ -76,9 +76,10 @@ class SecondScreenBarTest { return (0 until root.childCount).map { root.getChildAt(it) } } - @Test fun trackpadPanelHasTheBarWithTheKeyboardToggleState() { + @Test fun trackpadPanelHasTheBarWithTheKeyboardToggleStateAndSwap() { SessionState.mode = SessionService.MODE_STEAM - val panel = presentation() + var swaps = 0 + val panel = presentation { swaps++ } try { panel.show() panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) @@ -89,11 +90,15 @@ class SecondScreenBarTest { assertEquals(context.getString(R.string.second_mode_keyboard_trackpad), bar.title) assertNotNull(bar.onClose); assertNotNull(bar.onMenu); assertNotNull(bar.onSteam); assertNotNull(bar.onQam) assertNull(bar.tabs) - val keyboard = bar.extras.single() + assertEquals(listOf("bottom-keyboard", "bottom-swap"), bar.extras.map { it.tag }) + val keyboard = bar.extras.first() assertEquals(context.getString(R.string.second_show_keyboard), keyboard.description) assertFalse(keyboard.active) + bar.extras.last().onClick() + assertEquals(1, swaps) + assertEquals(listOf("bottom-keyboard", "bottom-swap"), panel.barModel(SecondScreenMode.TERMINAL)!!.extras.map { it.tag }) ReflectionHelpers.getField>(panel, "keyboardShown").value = true - val shown = panel.barModel(SecondScreenMode.KEYBOARD_TRACKPAD)!!.extras.single() + val shown = panel.barModel(SecondScreenMode.KEYBOARD_TRACKPAD)!!.extras.first() assertEquals(context.getString(R.string.second_hide_keyboard), shown.description) assertTrue(shown.active) } finally { panel.closeControls() } @@ -130,6 +135,8 @@ class SecondScreenBarTest { noSwap.show() noSwap.showMode(SecondScreenMode.DECK_CONTROLS) assertTrue(noSwap.barModel(SecondScreenMode.DECK_CONTROLS)!!.extras.isEmpty()) + assertEquals(listOf("bottom-keyboard"), noSwap.barModel(SecondScreenMode.TERMINAL)!!.extras.map { it.tag }) + assertEquals(listOf("bottom-keyboard"), noSwap.barModel(SecondScreenMode.KEYBOARD_TRACKPAD)!!.extras.map { it.tag }) } finally { noSwap.closeControls() } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt index 58b8ba055..adbbbe248 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt @@ -4,33 +4,29 @@ import org.junit.Assert.* import org.junit.Test class SessionDrawerPageTest { - @Test fun singleScreenNavigationStartsWithControllerAndSkipsSecondScreen() { - val pages = sessionDrawerPages(false, hasAgent = false) + @Test fun navigationStartsWithControllerAndGoesStraightToDisplay() { + val pages = sessionDrawerPages(hasAgent = false) assertEquals(SessionDrawerPage.CONTROLLER, pages.first()) - assertFalse(SessionDrawerPage.SECOND_SCREEN in pages) assertEquals(SessionDrawerPage.DISPLAY, pages.step(SessionDrawerPage.CONTROLLER, 1)) assertEquals(SessionDrawerPage.SESSION, pages.step(SessionDrawerPage.CONTROLLER, -1)) assertEquals(SessionDrawerPage.CONTROLLER, pages.step(SessionDrawerPage.SESSION, 1)) + assertEquals(SessionDrawerPage.HUD, pages.step(SessionDrawerPage.DISPLAY, 1)) + assertEquals(SessionDrawerPage.EFFECTS, pages.step(SessionDrawerPage.HUD, 1)) + assertEquals(SessionDrawerPage.VR, pages.step(SessionDrawerPage.EFFECTS, 1)) + assertEquals(SessionDrawerPage.GAMES, pages.step(SessionDrawerPage.VR, 1)) + assertEquals(SessionDrawerPage.SESSION, pages.step(SessionDrawerPage.GAMES, 1)) } - @Test fun connectedSecondaryDisplayAddsItsPageAfterControllerAndPreservesOtherPages() { - val connected = sessionDrawerPages(true, hasAgent = false) - assertEquals(SessionDrawerPage.SECOND_SCREEN, connected.step(SessionDrawerPage.CONTROLLER, 1)) - assertEquals(SessionDrawerPage.DISPLAY, connected.step(SessionDrawerPage.SECOND_SCREEN, 1)) - assertEquals(sessionDrawerPages(false, hasAgent = false), connected.filter { it != SessionDrawerPage.SECOND_SCREEN }) - for (pages in listOf(connected, sessionDrawerPages(false, hasAgent = false))) { - assertEquals(SessionDrawerPage.HUD, pages.step(SessionDrawerPage.DISPLAY, 1)) - assertEquals(SessionDrawerPage.EFFECTS, pages.step(SessionDrawerPage.HUD, 1)) - assertEquals(SessionDrawerPage.VR, pages.step(SessionDrawerPage.EFFECTS, 1)) - assertEquals(SessionDrawerPage.GAMES, pages.step(SessionDrawerPage.VR, 1)) - assertEquals(SessionDrawerPage.SESSION, pages.step(SessionDrawerPage.GAMES, 1)) - } + @Test fun glassesAddTheirPageAfterController() { + val pages = sessionDrawerPages(hasGlasses = true, hasAgent = false) + assertEquals(SessionDrawerPage.GLASSES, pages.step(SessionDrawerPage.CONTROLLER, 1)) + assertEquals(sessionDrawerPages(hasAgent = false), pages.filter { it != SessionDrawerPage.GLASSES }) } @Test fun theAgentPageComesBeforeSessionOnlyWhenTheTabIsShown() { - val with = sessionDrawerPages(false, hasAgent = true) + val with = sessionDrawerPages(hasAgent = true) assertEquals(SessionDrawerPage.AGENT, with.step(SessionDrawerPage.GAMES, 1)) assertEquals(SessionDrawerPage.SESSION, with.step(SessionDrawerPage.AGENT, 1)) - assertFalse(SessionDrawerPage.AGENT in sessionDrawerPages(false, hasAgent = false)) + assertFalse(SessionDrawerPage.AGENT in sessionDrawerPages(hasAgent = false)) } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt index dc2ff1cc6..c45b32d23 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -83,7 +83,7 @@ class SessionSecondScreenTest { var selected = SecondScreenMode.CUSTOM_CONTROLS compose.setContent { DroidDeckTheme { - SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, + SessionDrawer(true, SessionDrawerPage.CONTROLLER, false, {}, actions(true, listOf(SecondScreenDisplay(1, "Bottom screen")), onClose = { closes++ }, select = { selected = it }), docked = true) } @@ -93,18 +93,47 @@ class SessionSecondScreenTest { assertEquals(SecondScreenMode.CUSTOM_CONTROLS, selected) } - @Test fun desktopWithoutASecondDisplayFallsBackToController() { + @Test fun desktopWithoutASecondDisplayHasNoScreenPicker() { SessionState.mode = SessionService.MODE_DESKTOP - var page = SessionDrawerPage.SECOND_SCREEN compose.setContent { DroidDeckTheme { - SessionDrawer(true, page, false, { page = it }, actions(false, emptyList())) + SessionDrawer(true, SessionDrawerPage.CONTROLLER, false, {}, actions(false, emptyList())) } } - compose.runOnIdle { assertEquals(SessionDrawerPage.CONTROLLER, page) } + compose.onNodeWithTag("drawer-screen-picker").assertDoesNotExist() compose.onNodeWithText(context.getString(R.string.second_mode_keyboard_trackpad)).assertDoesNotExist() } + @Test fun dockedMenuPickerReturnsToThePanelAndHasNoMenuButton() { + SessionState.mode = SessionService.MODE_STEAM + val selected = mutableListOf() + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, SessionDrawerPage.CONTROLLER, false, {}, + actions(true, listOf(SecondScreenDisplay(1, "Bottom screen")), mode = SecondScreenMode.TERMINAL) { selected += it }, + docked = true) + } + } + compose.onNodeWithTag("bottom-bar-menu").assertDoesNotExist() + compose.onNodeWithContentDescription(context.getString(R.string.screen_picker_description, + context.getString(R.string.touch_droiddeck_menu))).performClick() + compose.onNodeWithTag("screen-picker-menu").assertExists() + compose.onNodeWithTag("screen-picker:${SecondScreenMode.TERMINAL.id}").performClick() + assertEquals(listOf(SecondScreenMode.TERMINAL), selected) + } + + @Test fun displayPageCarriesTheGameScreenAndDisplayChoices() { + SessionState.mode = SessionService.MODE_STEAM + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, SessionDrawerPage.DISPLAY, false, {}, + actions(true, listOf(SecondScreenDisplay(1, "Bottom screen"), SecondScreenDisplay(2, "Monitor")), gameSwap = true)) + } + } + compose.onNodeWithText(context.getString(R.string.swap_game_screen)).performScrollTo().assertIsDisplayed() + compose.onNodeWithText("Bottom screen").performScrollTo().assertIsDisplayed() + } + @Test fun provisionalBottomScreenPanelSettlesOnlyOnceTheSessionIsInFront() { SessionState.mode = SessionService.MODE_STEAM val previousMode = SessionState.secondScreenMode @@ -236,7 +265,7 @@ class SessionSecondScreenTest { state("drawerOpenState").value = true state("drawerControllerActive").value = true state>("secondScreenDisplays").value = listOf(SecondScreenDisplay(1, "Bottom screen")) - for ((button, page) in listOf(KeyEvent.KEYCODE_BUTTON_R1 to SessionDrawerPage.SECOND_SCREEN, + for ((button, page) in listOf(KeyEvent.KEYCODE_BUTTON_R1 to SessionDrawerPage.DISPLAY, KeyEvent.KEYCODE_BUTTON_L1 to SessionDrawerPage.CONTROLLER)) { assertTrue(activity.dispatchKeyEvent(KeyEvent(0L, 0L, KeyEvent.ACTION_DOWN, button, 0, 0, device.id, 0, 0, InputDevice.SOURCE_GAMEPAD))) @@ -351,14 +380,16 @@ class SessionSecondScreenTest { val displays = listOf(SecondScreenDisplay(1, "Bottom screen")) compose.setContent { DroidDeckTheme { - SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, actions(steam, displays) { selected += it }) + SessionDrawer(true, SessionDrawerPage.CONTROLLER, false, {}, actions(steam, displays) { selected += it }) } } val modes = listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL, SecondScreenMode.CUSTOM_CONTROLS) for (mode in modes) { - compose.onNodeWithText(context.getString(mode.label)).performScrollTo().assertIsDisplayed().performClick() + compose.onNodeWithTag("drawer-screen-picker").performClick() + compose.onNodeWithTag("screen-picker-menu").assertDoesNotExist() + compose.onNodeWithTag("screen-picker:${SecondScreenMode.DECK_CONTROLS.id}").assertDoesNotExist() + compose.onNodeWithTag("screen-picker:${mode.id}").assertIsDisplayed().performClick() } - compose.onNodeWithText(context.getString(SecondScreenMode.DECK_CONTROLS.label)).assertDoesNotExist() assertEquals(modes, selected) } @@ -370,7 +401,7 @@ class SessionSecondScreenTest { private fun actions(steam: Boolean, displays: List, micAvailable: Boolean = false, micEnabled: Boolean = false, onMic: (Boolean) -> Unit = {}, desktop: Boolean = !steam, direct: Boolean = false, onInputSelection: (InputRole?) -> Unit = {}, - onClose: () -> Unit = {}, + onClose: () -> Unit = {}, mode: SecondScreenMode = SecondScreenMode.NONE, gameSwap: Boolean = false, select: (SecondScreenMode) -> Unit = {}) = DrawerActions(steam = steam, desktop = desktop, direct = direct, onInputSelection = onInputSelection, isHomeApp = false, androidApps = emptyList(), hudOn = false, @@ -378,7 +409,7 @@ class SessionSecondScreenTest { frameGen = FrameGen.Mode.OFF, lossless = Lossless.State.NONE, oscMode = "never", suspendPolicy = "auto", backActionsInverted = false, touchMode = "auto", touchAuto = "trackpad", fexPreset = "default", - secondScreenMode = SecondScreenMode.NONE, secondScreenDisplays = displays, selectedSecondScreenDisplay = 1, + secondScreenMode = mode, secondScreenDisplays = displays, selectedSecondScreenDisplay = 1, gameSwapAvailable = gameSwap, onHud = {}, onFrameGenPick = {}, onImportLossless = {}, onKeyboard = {}, onHardwareKeyboard = {}, onSteamMenu = null, onQam = null, onOsc = {}, onSuspendPolicy = {}, onBackActionsInverted = {}, onTouch = {}, onFexPreset = {}, onSecondScreenMode = select, onSecondScreenDisplay = {},