mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 13:26:02 +00:00
feat(ui): one screen picker replaces the D button and the Second screen tab (#2912)
* feat(ui): one screen picker replaces the D button and the Second screen tab The bottom screen's bar showed the panel's name as plain text, a D button opened the menu, and the menu's Second screen tab picked the panel. Now the panel's name is a dropdown right of the X. It lists "DroidDeck menu" first, then the panels, with a check on the one in use, so switching panels takes two taps instead of three. The docked menu's header shows the same dropdown, labelled "DroidDeck menu", in place of the highlighted D button. Opened there, focus starts on the last panel, so one press of A goes back to it. When the menu is on the top screen, the dropdown lists None and the panels without the menu entry. The Second screen tab is gone. Its "Show the game on" and display choices are a Second screen group at the end of the Display tab. The mode list's hint and its Mode heading are removed with their strings. Previews of the docked menu (Controller and Display) and of a panel's bar are added to the rendered preview cases. * feat(ui): the swap button on the Keyboard + trackpad and Terminal panels Every bottom-screen panel now has the swap button when the game can move to the bottom screen; it was only on Deck grips, Profile controls, Dashboard and Desktop. The swapped top-screen view already shows both panels.
This commit is contained in:
1 parent
5051fc8b32
commit
fccd13689c
79 files changed
+314
-167
No files matched your search
@@ -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<PreviewCase> = 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() },
|
||||
)
|
||||
@@ -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 = {},
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -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<SecondScreenMode>,
|
||||
val current: SecondScreenMode,
|
||||
val onPick: (SecondScreenMode) -> Unit,
|
||||
val onMenu: (() -> Unit)? = null,
|
||||
val menuShown: Boolean = false,
|
||||
)
|
||||
|
||||
internal class BarTabs(val labels: List<String>, val selected: Int, val onSelect: (Int) -> Unit)
|
||||
|
||||
internal class BottomBarModel(
|
||||
@@ -72,6 +94,7 @@ internal class BottomBarModel(
|
||||
val extras: List<BarExtra> = 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<BarExtra> = 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) =
|
||||
|
||||
@@ -175,7 +175,7 @@ internal fun SessionDrawerPreview(secondScreens: List<SecondScreenDisplay>) {
|
||||
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
|
||||
}
|
||||
|
||||
@@ -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<BarExtra>, 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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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> =
|
||||
SessionDrawerPage.entries.filter {
|
||||
(hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) &&
|
||||
(hasGlasses || it != SessionDrawerPage.GLASSES) &&
|
||||
(hasAgent || it != SessionDrawerPage.AGENT)
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">رجوع · مرتان في Steam ومرة في سطح المكتب</string>
|
||||
<string name="input_shortcut_hold_hint">في وضع Steam. الاستمرار بالضغط على رجوع يفتح الوصول السريع أيضًا.</string>
|
||||
<string name="input_restore_shortcut">الاستعادة إلى الافتراضي</string>
|
||||
<string name="input_second_mode_hint">يتم تذكر اختيار اللوحة. يفتح سطح المكتب مساحة عمل ثانية؛ ولا يغيّر الجلسة أو ملف تعريف الإدخال.</string>
|
||||
<string name="input_virtual_controller">وحدة تحكم افتراضية</string>
|
||||
<string name="input_virtual_controller_hint">نوع وحدة التحكم التي يراها Steam أو اللعبة.</string>
|
||||
<string name="input_touchscreen">شاشة لمس</string>
|
||||
|
||||
@@ -812,7 +812,6 @@
|
||||
<string name="drawer_pc_keyboard">لوحة مفاتيح الكمبيوتر</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">الشاشة الثانية</string>
|
||||
<string name="drawer_second_screen_mode">الوضع</string>
|
||||
<string name="drawer_second_screen_shows">يعرض</string>
|
||||
<string name="drawer_android_apps">تطبيقات Android</string>
|
||||
<string name="drawer_launch_app">تشغيل تطبيق</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Atrás · dos veces en Steam, una en escritorio</string>
|
||||
<string name="input_shortcut_hold_hint">En modo Steam. Mantener Atrás también abre el acceso rápido.</string>
|
||||
<string name="input_restore_shortcut">Restaurar valores predeterminados</string>
|
||||
<string name="input_second_mode_hint">Tu elección de panel se recuerda. Escritorio abre un segundo espacio de trabajo; no cambia la sesión ni su perfil de entrada.</string>
|
||||
<string name="input_virtual_controller">Control virtual</string>
|
||||
<string name="input_virtual_controller_hint">El tipo de control que ven Steam o el juego.</string>
|
||||
<string name="input_touchscreen">Pantalla táctil</string>
|
||||
|
||||
@@ -830,7 +830,6 @@
|
||||
<string name="drawer_pc_keyboard">Teclado de PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Segunda pantalla</string>
|
||||
<string name="drawer_second_screen_mode">Modo</string>
|
||||
<string name="drawer_second_screen_shows">Muestra</string>
|
||||
<string name="drawer_android_apps">Apps de Android</string>
|
||||
<string name="drawer_launch_app">Abrir una app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Назад · два пъти в Steam, веднъж в работен плот</string>
|
||||
<string name="input_shortcut_hold_hint">В режим Steam. Задържането на Назад отваря и бързия достъп.</string>
|
||||
<string name="input_restore_shortcut">Връщане към подразбирането</string>
|
||||
<string name="input_second_mode_hint">Изборът на панел се запомня. Работният плот отваря второ работно пространство; не сменя сесията или профила ѝ за вход.</string>
|
||||
<string name="input_virtual_controller">Виртуален контролер</string>
|
||||
<string name="input_virtual_controller_hint">Типът контролер, който Steam или играта виждат.</string>
|
||||
<string name="input_touchscreen">Сензорен екран</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">Клавиатура за компютър</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Втори екран</string>
|
||||
<string name="drawer_second_screen_mode">Режим</string>
|
||||
<string name="drawer_second_screen_shows">Показва</string>
|
||||
<string name="drawer_android_apps">Приложения за Android</string>
|
||||
<string name="drawer_launch_app">Стартиране на приложение</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Zpět · dvakrát v Steam, jednou na ploše</string>
|
||||
<string name="input_shortcut_hold_hint">V režimu Steam. Podržením Zpět se také otevře rychlý přístup.</string>
|
||||
<string name="input_restore_shortcut">Obnovit výchozí</string>
|
||||
<string name="input_second_mode_hint">Volba panelu se pamatuje. Plocha otevře druhý pracovní prostor; nepřepíná relaci ani její vstupní profil.</string>
|
||||
<string name="input_virtual_controller">Virtuální ovladač</string>
|
||||
<string name="input_virtual_controller_hint">Typ ovladače, který vidí Steam nebo hra.</string>
|
||||
<string name="input_touchscreen">Dotyková obrazovka</string>
|
||||
|
||||
@@ -808,7 +808,6 @@
|
||||
<string name="drawer_pc_keyboard">Klávesnice PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Druhá obrazovka</string>
|
||||
<string name="drawer_second_screen_mode">Režim</string>
|
||||
<string name="drawer_second_screen_shows">Zobrazuje</string>
|
||||
<string name="drawer_android_apps">Aplikace Android</string>
|
||||
<string name="drawer_launch_app">Spustit aplikaci</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Tilbage · to gange i Steam, én gang på skrivebordet</string>
|
||||
<string name="input_shortcut_hold_hint">I Steam-tilstand. Hvis du holder Tilbage, åbnes hurtigadgang også.</string>
|
||||
<string name="input_restore_shortcut">Gendan standard</string>
|
||||
<string name="input_second_mode_hint">Dit panelvalg huskes. Skrivebord åbner et andet arbejdsområde; det skifter ikke sessionen eller dens inputprofil.</string>
|
||||
<string name="input_virtual_controller">Virtuel controller</string>
|
||||
<string name="input_virtual_controller_hint">Den controllertype, som Steam eller spillet ser.</string>
|
||||
<string name="input_touchscreen">Berøringsskærm</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">PC-tastatur</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Anden skærm</string>
|
||||
<string name="drawer_second_screen_mode">Tilstand</string>
|
||||
<string name="drawer_second_screen_shows">Viser</string>
|
||||
<string name="drawer_android_apps">Android-apps</string>
|
||||
<string name="drawer_launch_app">Start en app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Zurück · zweimal in Steam, einmal im Desktop</string>
|
||||
<string name="input_shortcut_hold_hint">Im Steam-Modus. Halten von Zurück öffnet auch den Schnellzugriff.</string>
|
||||
<string name="input_restore_shortcut">Auf Standard zurücksetzen</string>
|
||||
<string name="input_second_mode_hint">Ihre Panel-Auswahl wird gespeichert. Desktop öffnet einen zweiten Arbeitsbereich; es wechselt weder die Sitzung noch ihr Eingabeprofil.</string>
|
||||
<string name="input_virtual_controller">Virtueller Controller</string>
|
||||
<string name="input_virtual_controller_hint">Der von Steam oder dem Spiel erkannte Controller-Typ.</string>
|
||||
<string name="input_touchscreen">Touchscreen</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">PC-Tastatur</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Zweiter Bildschirm</string>
|
||||
<string name="drawer_second_screen_mode">Modus</string>
|
||||
<string name="drawer_second_screen_shows">Zeigt</string>
|
||||
<string name="drawer_android_apps">Android-Apps</string>
|
||||
<string name="drawer_launch_app">App starten</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Πίσω · δύο φορές στο Steam, μία στην επιφάνεια εργασίας</string>
|
||||
<string name="input_shortcut_hold_hint">Σε λειτουργία Steam. Το κράτημα του Πίσω ανοίγει και τη γρήγορη πρόσβαση.</string>
|
||||
<string name="input_restore_shortcut">Επαναφορά στις προεπιλογές</string>
|
||||
<string name="input_second_mode_hint">Η επιλογή πίνακα απομνημονεύεται. Η επιφάνεια εργασίας ανοίγει δεύτερο χώρο εργασίας· δεν αλλάζει τη συνεδρία ούτε το προφίλ εισόδου της.</string>
|
||||
<string name="input_virtual_controller">Εικονικό χειριστήριο</string>
|
||||
<string name="input_virtual_controller_hint">Ο τύπος χειριστηρίου που βλέπουν το Steam ή το παιχνίδι.</string>
|
||||
<string name="input_touchscreen">Οθόνη αφής</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">Πληκτρολόγιο PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Δεύτερη οθόνη</string>
|
||||
<string name="drawer_second_screen_mode">Λειτουργία</string>
|
||||
<string name="drawer_second_screen_shows">Εμφανίζει</string>
|
||||
<string name="drawer_android_apps">Εφαρμογές Android</string>
|
||||
<string name="drawer_launch_app">Εκκίνηση εφαρμογής</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Atrás · dos veces en Steam, una en escritorio</string>
|
||||
<string name="input_shortcut_hold_hint">En modo Steam. Mantener Atrás también abre el acceso rápido.</string>
|
||||
<string name="input_restore_shortcut">Restaurar valores predeterminados</string>
|
||||
<string name="input_second_mode_hint">Tu elección de panel se recuerda. Escritorio abre un segundo espacio de trabajo; no cambia la sesión ni su perfil de entrada.</string>
|
||||
<string name="input_virtual_controller">Mando virtual</string>
|
||||
<string name="input_virtual_controller_hint">El tipo de mando que ven Steam o el juego.</string>
|
||||
<string name="input_touchscreen">Pantalla táctil</string>
|
||||
|
||||
@@ -806,7 +806,6 @@
|
||||
<string name="drawer_pc_keyboard">Teclado de PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Segunda pantalla</string>
|
||||
<string name="drawer_second_screen_mode">Modo</string>
|
||||
<string name="drawer_second_screen_shows">Muestra</string>
|
||||
<string name="drawer_android_apps">Apps de Android</string>
|
||||
<string name="drawer_launch_app">Abrir una app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Takaisin · kahdesti Steamissa, kerran työpöydällä</string>
|
||||
<string name="input_shortcut_hold_hint">Steam-tilassa. Takaisin-painikkeen pitäminen avaa myös pikakäytön.</string>
|
||||
<string name="input_restore_shortcut">Palauta oletukset</string>
|
||||
<string name="input_second_mode_hint">Paneelivalintasi muistetaan. Työpöytä avaa toisen työtilan; se ei vaihda istuntoa tai sen syöttöprofiilia.</string>
|
||||
<string name="input_virtual_controller">Virtuaaliohjain</string>
|
||||
<string name="input_virtual_controller_hint">Ohjaintyyppi, jonka Steam tai peli näkee.</string>
|
||||
<string name="input_touchscreen">Kosketusnäyttö</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">PC-näppäimistö</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Toinen näyttö</string>
|
||||
<string name="drawer_second_screen_mode">Tila</string>
|
||||
<string name="drawer_second_screen_shows">Näyttää</string>
|
||||
<string name="drawer_android_apps">Android-sovellukset</string>
|
||||
<string name="drawer_launch_app">Käynnistä sovellus</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Retour · deux fois dans Steam, une fois sur le bureau</string>
|
||||
<string name="input_shortcut_hold_hint">En mode Steam. Maintenir Retour ouvre aussi l\'accès rapide.</string>
|
||||
<string name="input_restore_shortcut">Rétablir par défaut</string>
|
||||
<string name="input_second_mode_hint">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.</string>
|
||||
<string name="input_virtual_controller">Manette virtuelle</string>
|
||||
<string name="input_virtual_controller_hint">Le type de manette vu par Steam ou le jeu.</string>
|
||||
<string name="input_touchscreen">Écran tactile</string>
|
||||
|
||||
@@ -806,7 +806,6 @@
|
||||
<string name="drawer_pc_keyboard">Clavier PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Deuxième écran</string>
|
||||
<string name="drawer_second_screen_mode">Mode</string>
|
||||
<string name="drawer_second_screen_shows">Afficher</string>
|
||||
<string name="drawer_android_apps">Applications Android</string>
|
||||
<string name="drawer_launch_app">Lancer l\'application</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">वापस · Steam में दो बार, डेस्कटॉप में एक बार</string>
|
||||
<string name="input_shortcut_hold_hint">Steam मोड में। वापस दबाए रखने से क्विक एक्सेस भी खुलता है।</string>
|
||||
<string name="input_restore_shortcut">डिफ़ॉल्ट पर पुनर्स्थापित करें</string>
|
||||
<string name="input_second_mode_hint">आपका पैनल चयन याद रखा जाता है। डेस्कटॉप दूसरा कार्यक्षेत्र खोलता है; यह सत्र या उसका इनपुट प्रोफ़ाइल नहीं बदलता।</string>
|
||||
<string name="input_virtual_controller">वर्चुअल कंट्रोलर</string>
|
||||
<string name="input_virtual_controller_hint">Steam या गेम द्वारा देखा जाने वाला कंट्रोलर प्रकार।</string>
|
||||
<string name="input_touchscreen">टचस्क्रीन</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">पीसी कीबोर्ड</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">दूसरी स्क्रीन</string>
|
||||
<string name="drawer_second_screen_mode">मोड</string>
|
||||
<string name="drawer_second_screen_shows">दिखाता है</string>
|
||||
<string name="drawer_android_apps">Android ऐप</string>
|
||||
<string name="drawer_launch_app">ऐप लॉन्च करें</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Vissza · kétszer Steam módban, egyszer asztali módban</string>
|
||||
<string name="input_shortcut_hold_hint">Steam módban. A Vissza nyomva tartása a gyorselérést is megnyitja.</string>
|
||||
<string name="input_restore_shortcut">Visszaállítás alapértelmezettre</string>
|
||||
<string name="input_second_mode_hint">A panelválasztás megjegyződik. Az asztali mód második munkateret nyit; nem váltja a munkamenetet vagy annak beviteli profilját.</string>
|
||||
<string name="input_virtual_controller">Virtuális vezérlő</string>
|
||||
<string name="input_virtual_controller_hint">A Steam vagy a játék által látott vezérlőtípus.</string>
|
||||
<string name="input_touchscreen">Érintőképernyő</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">PC-billentyűzet</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Második képernyő</string>
|
||||
<string name="drawer_second_screen_mode">Mód</string>
|
||||
<string name="drawer_second_screen_shows">Megjelenít</string>
|
||||
<string name="drawer_android_apps">Android-alkalmazások</string>
|
||||
<string name="drawer_launch_app">Alkalmazás indítása</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Kembali · dua kali di Steam, sekali di desktop</string>
|
||||
<string name="input_shortcut_hold_hint">Di mode Steam. Menahan Kembali juga membuka akses cepat.</string>
|
||||
<string name="input_restore_shortcut">Pulihkan ke bawaan</string>
|
||||
<string name="input_second_mode_hint">Pilihan panel Anda diingat. Desktop membuka ruang kerja kedua; tidak mengganti sesi atau profil inputnya.</string>
|
||||
<string name="input_virtual_controller">Pengontrol virtual</string>
|
||||
<string name="input_virtual_controller_hint">Jenis pengontrol yang dilihat Steam atau game.</string>
|
||||
<string name="input_touchscreen">Layar sentuh</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">Keyboard PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Layar kedua</string>
|
||||
<string name="drawer_second_screen_mode">Mode</string>
|
||||
<string name="drawer_second_screen_shows">Menampilkan</string>
|
||||
<string name="drawer_android_apps">Aplikasi Android</string>
|
||||
<string name="drawer_launch_app">Luncurkan aplikasi</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Indietro · due volte in Steam, una su desktop</string>
|
||||
<string name="input_shortcut_hold_hint">In modalità Steam. Tenere premuto Indietro apre anche l\'accesso rapido.</string>
|
||||
<string name="input_restore_shortcut">Ripristina i valori predefiniti</string>
|
||||
<string name="input_second_mode_hint">La scelta del pannello viene ricordata. Desktop apre un secondo spazio di lavoro; non cambia la sessione né il suo profilo di input.</string>
|
||||
<string name="input_virtual_controller">Controller virtuale</string>
|
||||
<string name="input_virtual_controller_hint">Il tipo di controller visto da Steam o dal gioco.</string>
|
||||
<string name="input_touchscreen">Touchscreen</string>
|
||||
|
||||
@@ -806,7 +806,6 @@
|
||||
<string name="drawer_pc_keyboard">Tastiera PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Secondo schermo</string>
|
||||
<string name="drawer_second_screen_mode">Modalità</string>
|
||||
<string name="drawer_second_screen_shows">Mostra</string>
|
||||
<string name="drawer_android_apps">App Android</string>
|
||||
<string name="drawer_launch_app">Avvia un\'app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">戻る · Steam では 2 回、デスクトップでは 1 回</string>
|
||||
<string name="input_shortcut_hold_hint">Steam モード時。戻るを長押しするとクイックアクセスも開きます。</string>
|
||||
<string name="input_restore_shortcut">既定に戻す</string>
|
||||
<string name="input_second_mode_hint">パネルの選択は記憶されます。デスクトップは 2 つ目のワークスペースを開くだけで、セッションやその入力プロファイルを切り替えません。</string>
|
||||
<string name="input_virtual_controller">仮想コントローラー</string>
|
||||
<string name="input_virtual_controller_hint">Steam またはゲームが認識するコントローラーの種類。</string>
|
||||
<string name="input_touchscreen">タッチスクリーン</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">PCキーボード</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">セカンドスクリーン</string>
|
||||
<string name="drawer_second_screen_mode">モード</string>
|
||||
<string name="drawer_second_screen_shows">表示</string>
|
||||
<string name="drawer_android_apps">Androidアプリ</string>
|
||||
<string name="drawer_launch_app">アプリを起動</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">뒤로 · Steam에서는 두 번, 데스크톱에서는 한 번</string>
|
||||
<string name="input_shortcut_hold_hint">Steam 모드에서. 뒤로를 길게 누르면 빠른 액세스도 열립니다.</string>
|
||||
<string name="input_restore_shortcut">기본값으로 복원</string>
|
||||
<string name="input_second_mode_hint">패널 선택이 기억됩니다. 데스크톱은 두 번째 작업 공간을 열 뿐 세션이나 입력 프로필을 전환하지 않습니다.</string>
|
||||
<string name="input_virtual_controller">가상 컨트롤러</string>
|
||||
<string name="input_virtual_controller_hint">Steam 또는 게임이 인식하는 컨트롤러 유형입니다.</string>
|
||||
<string name="input_touchscreen">터치스크린</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">PC 키보드</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">보조 화면</string>
|
||||
<string name="drawer_second_screen_mode">모드</string>
|
||||
<string name="drawer_second_screen_shows">표시</string>
|
||||
<string name="drawer_android_apps">Android 앱</string>
|
||||
<string name="drawer_launch_app">앱 실행</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Kembali · dua kali dalam Steam, sekali di desktop</string>
|
||||
<string name="input_shortcut_hold_hint">Dalam mod Steam. Menahan Kembali juga membuka akses pantas.</string>
|
||||
<string name="input_restore_shortcut">Pulihkan kepada lalai</string>
|
||||
<string name="input_second_mode_hint">Pilihan panel anda diingati. Desktop membuka ruang kerja kedua; ia tidak menukar sesi atau profil inputnya.</string>
|
||||
<string name="input_virtual_controller">Pengawal maya</string>
|
||||
<string name="input_virtual_controller_hint">Jenis pengawal yang dilihat oleh Steam atau permainan.</string>
|
||||
<string name="input_touchscreen">Skrin sentuh</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">Papan kekunci PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Skrin kedua</string>
|
||||
<string name="drawer_second_screen_mode">Mod</string>
|
||||
<string name="drawer_second_screen_shows">Memaparkan</string>
|
||||
<string name="drawer_android_apps">Apl Android</string>
|
||||
<string name="drawer_launch_app">Lancarkan apl</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Tilbake · to ganger i Steam, én gang på skrivebordet</string>
|
||||
<string name="input_shortcut_hold_hint">I Steam-modus. Å holde Tilbake åpner også hurtigtilgang.</string>
|
||||
<string name="input_restore_shortcut">Tilbakestill til standard</string>
|
||||
<string name="input_second_mode_hint">Panelvalget ditt huskes. Skrivebord åpner et andre arbeidsområde; det bytter ikke økten eller inndataprofilen.</string>
|
||||
<string name="input_virtual_controller">Virtuell kontroller</string>
|
||||
<string name="input_virtual_controller_hint">Kontrollertypen som Steam eller spillet ser.</string>
|
||||
<string name="input_touchscreen">Berøringsskjerm</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">PC-tastatur</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Andre skjerm</string>
|
||||
<string name="drawer_second_screen_mode">Modus</string>
|
||||
<string name="drawer_second_screen_shows">Viser</string>
|
||||
<string name="drawer_android_apps">Android-apper</string>
|
||||
<string name="drawer_launch_app">Start en app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Terug · twee keer in Steam, één keer op bureaublad</string>
|
||||
<string name="input_shortcut_hold_hint">In spelmodus Steam. Terug ingedrukt houden opent ook snelle toegang.</string>
|
||||
<string name="input_restore_shortcut">Terugzetten naar standaard</string>
|
||||
<string name="input_second_mode_hint">Je paneelkeuze wordt onthouden. Bureaublad opent een tweede werkruimte; het wisselt de sessie of het invoerprofiel niet.</string>
|
||||
<string name="input_virtual_controller">Virtuele controller</string>
|
||||
<string name="input_virtual_controller_hint">Het controllertype dat Steam of het spel ziet.</string>
|
||||
<string name="input_touchscreen">Touchscreen</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">Pc-toetsenbord</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Tweede scherm</string>
|
||||
<string name="drawer_second_screen_mode">Modus</string>
|
||||
<string name="drawer_second_screen_shows">Toont</string>
|
||||
<string name="drawer_android_apps">Android-apps</string>
|
||||
<string name="drawer_launch_app">Een app starten</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Wstecz · dwa razy w Steam, raz na pulpicie</string>
|
||||
<string name="input_shortcut_hold_hint">W trybie Steam. Przytrzymanie Wstecz otwiera też szybki dostęp.</string>
|
||||
<string name="input_restore_shortcut">Przywróć domyślne</string>
|
||||
<string name="input_second_mode_hint">Wybór panelu jest zapamiętywany. Pulpit otwiera drugą przestrzeń roboczą; nie przełącza sesji ani jej profilu wejścia.</string>
|
||||
<string name="input_virtual_controller">Wirtualny kontroler</string>
|
||||
<string name="input_virtual_controller_hint">Typ kontrolera widziany przez Steam lub grę.</string>
|
||||
<string name="input_touchscreen">Ekran dotykowy</string>
|
||||
|
||||
@@ -808,7 +808,6 @@
|
||||
<string name="drawer_pc_keyboard">Klawiatura PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Drugi ekran</string>
|
||||
<string name="drawer_second_screen_mode">Tryb</string>
|
||||
<string name="drawer_second_screen_shows">Pokazuje</string>
|
||||
<string name="drawer_android_apps">Aplikacje Android</string>
|
||||
<string name="drawer_launch_app">Uruchom aplikację</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Voltar · duas vezes no Steam, uma no ambiente de trabalho</string>
|
||||
<string name="input_shortcut_hold_hint">No modo Steam. Manter Voltar também abre o acesso rápido.</string>
|
||||
<string name="input_restore_shortcut">Repor predefinições</string>
|
||||
<string name="input_second_mode_hint">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.</string>
|
||||
<string name="input_virtual_controller">Comando virtual</string>
|
||||
<string name="input_virtual_controller_hint">O tipo de comando visto pelo Steam ou pelo jogo.</string>
|
||||
<string name="input_touchscreen">Ecrã tátil</string>
|
||||
|
||||
@@ -806,7 +806,6 @@
|
||||
<string name="drawer_pc_keyboard">Teclado de PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Segundo ecrã</string>
|
||||
<string name="drawer_second_screen_mode">Modo</string>
|
||||
<string name="drawer_second_screen_shows">Mostra</string>
|
||||
<string name="drawer_android_apps">Apps Android</string>
|
||||
<string name="drawer_launch_app">Iniciar uma app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Voltar · duas vezes no Steam, uma no desktop</string>
|
||||
<string name="input_shortcut_hold_hint">No modo Steam. Manter Voltar também abre o acesso rápido.</string>
|
||||
<string name="input_restore_shortcut">Restaurar o padrão</string>
|
||||
<string name="input_second_mode_hint">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.</string>
|
||||
<string name="input_virtual_controller">Controle virtual</string>
|
||||
<string name="input_virtual_controller_hint">O tipo de controle visto pelo Steam ou pelo jogo.</string>
|
||||
<string name="input_touchscreen">Tela sensível ao toque</string>
|
||||
|
||||
@@ -813,7 +813,6 @@
|
||||
<string name="drawer_pc_keyboard">Teclado de PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Segunda tela</string>
|
||||
<string name="drawer_second_screen_mode">Modo</string>
|
||||
<string name="drawer_second_screen_shows">Mostra</string>
|
||||
<string name="drawer_android_apps">Apps Android</string>
|
||||
<string name="drawer_launch_app">Abrir um app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Înapoi · de două ori în Steam, o dată pe desktop</string>
|
||||
<string name="input_shortcut_hold_hint">În modul Steam. Ținerea butonului Înapoi deschide și accesul rapid.</string>
|
||||
<string name="input_restore_shortcut">Restabilește implicit</string>
|
||||
<string name="input_second_mode_hint">Alegerea panoului este reținută. Desktopul deschide un al doilea spațiu de lucru; nu schimbă sesiunea sau profilul ei de intrare.</string>
|
||||
<string name="input_virtual_controller">Controller virtual</string>
|
||||
<string name="input_virtual_controller_hint">Tipul de controller văzut de Steam sau de joc.</string>
|
||||
<string name="input_touchscreen">Ecran tactil</string>
|
||||
|
||||
@@ -806,7 +806,6 @@
|
||||
<string name="drawer_pc_keyboard">Tastatură de PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Al doilea ecran</string>
|
||||
<string name="drawer_second_screen_mode">Mod</string>
|
||||
<string name="drawer_second_screen_shows">Arată</string>
|
||||
<string name="drawer_android_apps">Aplicații Android</string>
|
||||
<string name="drawer_launch_app">Lansează o aplicație</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Назад · дважды в Steam, один раз в рабочем столе</string>
|
||||
<string name="input_shortcut_hold_hint">В режиме Steam. Удержание «Назад» также открывает быстрый доступ.</string>
|
||||
<string name="input_restore_shortcut">Вернуть по умолчанию</string>
|
||||
<string name="input_second_mode_hint">Выбор панели запоминается. Рабочий стол открывает второе рабочее пространство; он не переключает сеанс или его профиль ввода.</string>
|
||||
<string name="input_virtual_controller">Виртуальный контроллер</string>
|
||||
<string name="input_virtual_controller_hint">Тип контроллера, который видят Steam или игра.</string>
|
||||
<string name="input_touchscreen">Сенсорный экран</string>
|
||||
|
||||
@@ -808,7 +808,6 @@
|
||||
<string name="drawer_pc_keyboard">Клавиатура ПК</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Второй экран</string>
|
||||
<string name="drawer_second_screen_mode">Режим</string>
|
||||
<string name="drawer_second_screen_shows">Показывать</string>
|
||||
<string name="drawer_android_apps">Приложения Android</string>
|
||||
<string name="drawer_launch_app">Запустить приложение</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Tillbaka · två gånger i Steam, en gång på skrivbordet</string>
|
||||
<string name="input_shortcut_hold_hint">I Steam-läge. Att hålla Tillbaka öppnar även snabbåtkomst.</string>
|
||||
<string name="input_restore_shortcut">Återställ till standard</string>
|
||||
<string name="input_second_mode_hint">Ditt panelval kommer ihåg. Skrivbord öppnar en andra arbetsyta; det byter inte sessionen eller dess inmatningsprofil.</string>
|
||||
<string name="input_virtual_controller">Virtuell handkontroll</string>
|
||||
<string name="input_virtual_controller_hint">Den handkontrolltyp som Steam eller spelet ser.</string>
|
||||
<string name="input_touchscreen">Pekskärm</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">PC-tangentbord</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Andra skärmen</string>
|
||||
<string name="drawer_second_screen_mode">Läge</string>
|
||||
<string name="drawer_second_screen_shows">Visar</string>
|
||||
<string name="drawer_android_apps">Android-appar</string>
|
||||
<string name="drawer_launch_app">Starta en app</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">ย้อนกลับ · สองครั้งใน Steam หนึ่งครั้งบนเดสก์ท็อป</string>
|
||||
<string name="input_shortcut_hold_hint">ในโหมด Steam การกดย้อนกลับค้างจะเปิดการเข้าถึงด่วนด้วย</string>
|
||||
<string name="input_restore_shortcut">คืนค่าเริ่มต้น</string>
|
||||
<string name="input_second_mode_hint">ตัวเลือกแผงของคุณจะถูกจำไว้ เดสก์ท็อปจะเปิดพื้นที่ทำงานที่สอง ไม่ได้สลับเซสชันหรือโปรไฟล์อินพุต</string>
|
||||
<string name="input_virtual_controller">คอนโทรลเลอร์เสมือน</string>
|
||||
<string name="input_virtual_controller_hint">ชนิดคอนโทรลเลอร์ที่ Steam หรือเกมมองเห็น</string>
|
||||
<string name="input_touchscreen">หน้าจอสัมผัส</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">แป้นพิมพ์พีซี</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">หน้าจอที่สอง</string>
|
||||
<string name="drawer_second_screen_mode">โหมด</string>
|
||||
<string name="drawer_second_screen_shows">แสดง</string>
|
||||
<string name="drawer_android_apps">แอป Android</string>
|
||||
<string name="drawer_launch_app">เปิดแอป</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Geri · Steam\'de iki kez, masaüstünde bir kez</string>
|
||||
<string name="input_shortcut_hold_hint">Steam modunda. Geri tuşunu basılı tutmak hızlı erişimi de açar.</string>
|
||||
<string name="input_restore_shortcut">Varsayılana sıfırla</string>
|
||||
<string name="input_second_mode_hint">Panel seçiminiz hatırlanır. Masaüstü ikinci bir çalışma alanı açar; oturumu veya giriş profilini değiştirmez.</string>
|
||||
<string name="input_virtual_controller">Sanal denetleyici</string>
|
||||
<string name="input_virtual_controller_hint">Steam veya oyunun gördüğü denetleyici türü.</string>
|
||||
<string name="input_touchscreen">Dokunmatik ekran</string>
|
||||
|
||||
@@ -804,7 +804,6 @@
|
||||
<string name="drawer_pc_keyboard">PC klavyesi</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">İkinci ekran</string>
|
||||
<string name="drawer_second_screen_mode">Mod</string>
|
||||
<string name="drawer_second_screen_shows">Gösterilen</string>
|
||||
<string name="drawer_android_apps">Android uygulamaları</string>
|
||||
<string name="drawer_launch_app">Uygulama başlat</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Назад · двічі в Steam, один раз у робочому столі</string>
|
||||
<string name="input_shortcut_hold_hint">У режимі Steam. Утримання «Назад» також відкриває швидкий доступ.</string>
|
||||
<string name="input_restore_shortcut">Відновити типове</string>
|
||||
<string name="input_second_mode_hint">Ваш вибір панелі запам\'ятовується. Робочий стіл відкриває другий робочий простір; він не перемикає сеанс або його профіль введення.</string>
|
||||
<string name="input_virtual_controller">Віртуальний контролер</string>
|
||||
<string name="input_virtual_controller_hint">Тип контролера, який бачать Steam або гра.</string>
|
||||
<string name="input_touchscreen">Сенсорний екран</string>
|
||||
|
||||
@@ -808,7 +808,6 @@
|
||||
<string name="drawer_pc_keyboard">Клавіатура ПК</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Другий екран</string>
|
||||
<string name="drawer_second_screen_mode">Режим</string>
|
||||
<string name="drawer_second_screen_shows">Показує</string>
|
||||
<string name="drawer_android_apps">Додатки Android</string>
|
||||
<string name="drawer_launch_app">Запустити додаток</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Quay lại · hai lần trong Steam, một lần trên máy tính</string>
|
||||
<string name="input_shortcut_hold_hint">Ở chế độ Steam. Giữ Quay lại cũng mở truy cập nhanh.</string>
|
||||
<string name="input_restore_shortcut">Khôi phục mặc định</string>
|
||||
<string name="input_second_mode_hint">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ó.</string>
|
||||
<string name="input_virtual_controller">Tay cầm ảo</string>
|
||||
<string name="input_virtual_controller_hint">Loại tay cầm mà Steam hoặc trò chơi thấy.</string>
|
||||
<string name="input_touchscreen">Màn hình cảm ứng</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">Bàn phím PC</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Màn hình thứ hai</string>
|
||||
<string name="drawer_second_screen_mode">Chế độ</string>
|
||||
<string name="drawer_second_screen_shows">Hiển thị</string>
|
||||
<string name="drawer_android_apps">Ứng dụng Android</string>
|
||||
<string name="drawer_launch_app">Khởi chạy một ứng dụng</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">返回 · Steam 里两下,桌面上一下</string>
|
||||
<string name="input_shortcut_hold_hint">Steam 模式下。按住返回也会打开快捷菜单。</string>
|
||||
<string name="input_restore_shortcut">恢复默认</string>
|
||||
<string name="input_second_mode_hint">面板选择会被记住。桌面会打开第二个工作区,不切换会话或它的输入配置。</string>
|
||||
<string name="input_virtual_controller">虚拟手柄</string>
|
||||
<string name="input_virtual_controller_hint">Steam 或游戏看到的手柄类型。</string>
|
||||
<string name="input_touchscreen">触摸屏</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">PC 键盘</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">副屏</string>
|
||||
<string name="drawer_second_screen_mode">模式</string>
|
||||
<string name="drawer_second_screen_shows">显示</string>
|
||||
<string name="drawer_android_apps">Android 应用</string>
|
||||
<string name="drawer_launch_app">启动应用</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">返回 · Steam 裡兩下,桌面上一下</string>
|
||||
<string name="input_shortcut_hold_hint">Steam 模式下。按住返回也會開啟快速選單。</string>
|
||||
<string name="input_restore_shortcut">恢復預設</string>
|
||||
<string name="input_second_mode_hint">面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。</string>
|
||||
<string name="input_virtual_controller">虛擬控制器</string>
|
||||
<string name="input_virtual_controller_hint">Steam 或遊戲看到的控制器類型。</string>
|
||||
<string name="input_touchscreen">觸控螢幕</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">電腦鍵盤</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">第二螢幕</string>
|
||||
<string name="drawer_second_screen_mode">模式</string>
|
||||
<string name="drawer_second_screen_shows">顯示</string>
|
||||
<string name="drawer_android_apps">Android 應用程式</string>
|
||||
<string name="drawer_launch_app">啟動應用程式</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">返回 · Steam 裡兩下,桌面上一下</string>
|
||||
<string name="input_shortcut_hold_hint">Steam 模式下。按住返回也會開啟快速選單。</string>
|
||||
<string name="input_restore_shortcut">恢復預設</string>
|
||||
<string name="input_second_mode_hint">面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。</string>
|
||||
<string name="input_virtual_controller">虛擬控制器</string>
|
||||
<string name="input_virtual_controller_hint">Steam 或遊戲看到的控制器類型。</string>
|
||||
<string name="input_touchscreen">觸控螢幕</string>
|
||||
|
||||
@@ -802,7 +802,6 @@
|
||||
<string name="drawer_pc_keyboard">電腦鍵盤</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">第二螢幕</string>
|
||||
<string name="drawer_second_screen_mode">模式</string>
|
||||
<string name="drawer_second_screen_shows">顯示</string>
|
||||
<string name="drawer_android_apps">Android 應用程式</string>
|
||||
<string name="drawer_launch_app">啟動應用程式</string>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<string name="input_shortcut_back_modes">Back · twice in Steam, once in Desktop</string>
|
||||
<string name="input_shortcut_hold_hint">In Steam mode. Holding Back also opens quick access.</string>
|
||||
<string name="input_restore_shortcut">Restore to default</string>
|
||||
<string name="input_second_mode_hint">Your panel choice is remembered. Desktop opens a second workspace; it does not switch the session or its input profile.</string>
|
||||
<string name="input_virtual_controller">Virtual controller</string>
|
||||
<string name="input_virtual_controller_hint">The controller type seen by Steam or the game.</string>
|
||||
<string name="input_touchscreen">Touchscreen</string>
|
||||
|
||||
@@ -865,7 +865,6 @@
|
||||
<string name="drawer_pc_keyboard">PC keyboard</string>
|
||||
<string name="drawer_android_keyboard">Android</string>
|
||||
<string name="drawer_second_screen">Second screen</string>
|
||||
<string name="drawer_second_screen_mode">Mode</string>
|
||||
<string name="drawer_second_screen_shows">Shows</string>
|
||||
<string name="drawer_android_apps">Android apps</string>
|
||||
<string name="drawer_launch_app">Launch an app</string>
|
||||
@@ -2260,6 +2259,8 @@
|
||||
<string name="second_mode_deck_controls">Deck grips + trackpads</string>
|
||||
<string name="second_mode_dashboard">Dashboard</string>
|
||||
<string name="second_mode_desktop">Desktop</string>
|
||||
<string name="screen_picker_description">Second screen: %1$s</string>
|
||||
<string name="screen_picker_last_used">Last used</string>
|
||||
<string name="bottom_desktop_start">Start the desktop</string>
|
||||
<string name="bottom_desktop_title">Desktop · %1$s</string>
|
||||
<string name="bottom_desktop_mode_trackpad">Trackpad</string>
|
||||
|
||||
@@ -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<SecondScreenMode>()
|
||||
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())
|
||||
}
|
||||
}
|
||||
@@ -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<MutableState<Boolean>>(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() }
|
||||
}
|
||||
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
@@ -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<SecondScreenMode>()
|
||||
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<Boolean>("drawerOpenState").value = true
|
||||
state<Boolean>("drawerControllerActive").value = true
|
||||
state<List<SecondScreenDisplay>>("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<SecondScreenDisplay>,
|
||||
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 = {},
|
||||
|
||||
Reference in new issue
Block a user