From 0fba656ee296123bc4844724b1bd366086c0a166 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:08:30 -0500 Subject: [PATCH 01/25] feat(input): draw on-screen controls per virtual controller with a corner button and a simpler controller page --- .../com/droiddeck/launcher/SessionActivity.kt | 307 +++++++++------ .../launcher/input/ControlsPresenter.kt | 40 ++ .../droiddeck/launcher/input/GameControls.kt | 24 ++ .../launcher/input/InputLibraries.kt | 54 +-- .../droiddeck/launcher/input/InputLibrary.kt | 2 +- .../droiddeck/launcher/input/InputProfile.kt | 9 +- .../com/droiddeck/launcher/input/KitLayout.kt | 115 ++++++ .../launcher/input/LegacyGamepadLayout.kt | 362 ------------------ .../launcher/input/OnScreenControls.kt | 153 ++++---- .../launcher/input/OnScreenLayout.kt | 62 +-- .../com/droiddeck/launcher/input/PadKit.kt | 39 ++ .../launcher/input/SteamTouchControls.kt | 125 +++--- .../launcher/session/SessionPrefs.kt | 15 +- .../launcher/ui/InputSettingsPage.kt | 2 +- .../launcher/ui/InputSurfaceDialog.kt | 278 ++++++++------ .../droiddeck/launcher/ui/InputSurfaceView.kt | 295 ++++---------- .../launcher/ui/ModeSettingsDialog.kt | 2 - .../java/com/droiddeck/launcher/ui/PadArt.kt | 354 +++++++++++++++++ .../droiddeck/launcher/ui/SessionOverlay.kt | 178 +++++---- app/src/main/res/values/strings.xml | 25 ++ 20 files changed, 1295 insertions(+), 1146 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/GameControls.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt delete mode 100644 app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/input/PadKit.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 52e9eecce..0f468ee87 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -170,8 +170,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var pipAutoEnter by mutableStateOf(false) private var unfoldedControls by mutableStateOf(false) private var unfoldedControlsWithController by mutableStateOf(false) - private var adaptiveSticks by mutableStateOf(null) - private var quickButtons by mutableStateOf>(emptyMap()) private var picturePosition by mutableStateOf("center") private var integerScaling by mutableStateOf(false) @@ -646,6 +644,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var steamDownloadsInBackground by mutableStateOf(false) private var oscMode by mutableStateOf(SessionPrefs.OSC_AUTO) private var onScreenButtonsVisible by mutableStateOf(false) + private var layoutOptions by mutableStateOf>>(emptyList()) + private var layoutChoice by mutableStateOf("") + private var layoutEditor by mutableStateOf?>(null) + private var controlsGame: Long? = null + private var controllerInUse = false + private var controlsHiddenByTap = false private var secondScreenMode by mutableStateOf(SessionState.secondScreenMode) private var secondScreenDisplays by mutableStateOf>(emptyList()) private var selectedSecondScreenDisplay by mutableStateOf(SessionState.secondScreenDisplay) @@ -876,8 +880,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionState.deckPadListener = deckPadListener openDeckRing("activity created") bridge.setOnPlayerInput(::onPadInput) + controllerInUse = PadBridge.anyControllerConnected() || SteamControllerBle.connected onScreenControls = OnScreenControls(this, bridge).also { controls -> controls.updateLayout(primaryInputLayout) + controls.onCornerTap = ::onControlsCornerTap + controls.onCornerHold = ::openControllerMenu controls.onTouchMiss = miss@{ event -> if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss event.offsetLocation(controls.left - surfaceView.left.toFloat(), controls.top - surfaceView.top.toFloat()) @@ -957,7 +964,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde hud = DroidDeckHudHost(this) hud.onConfigChanged = { hudConfig = DroidDeckHudConfig.load(this) } hud.passesTouchAt = ::controlTakesTouchAt - hud.attach(root, root.childCount) + hud.attach(root, onScreenControls?.let(root::indexOfChild)?.takeIf { it >= 0 } ?: root.childCount) memoryHud = com.droiddeck.launcher.session.MemoryHud(this) hud.onPresentingWindowChanged = { CompositorHost.rearmFrameGen { applyFrameGen(force = true) } @@ -1247,7 +1254,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture) - if (inputSettingsOpen) com.droiddeck.launcher.ui.InputSettingsDialog( + layoutEditor?.let { (profile, layout, bindings) -> + com.droiddeck.launcher.ui.InputSurfaceDialog(profile, onDismiss = { + layoutEditor = null; inputSettingsOpen = false + refreshInputProfile(); updateOnScreenControls() + }, onChanged = { refreshInputProfile() }, role = InputRole.PRIMARY, layoutId = layout, bindingsId = bindings, + scope = primaryInputLayout?.name?.let { name -> controlsGameName()?.let { getString(R.string.osc_scope_game, name, it) } ?: getString(R.string.osc_scope_default, name) }) + } + if (inputSettingsOpen && layoutEditor == null) com.droiddeck.launcher.ui.InputSettingsDialog( onBack = { inputSettingsOpen = false; secondScreenPresentation?.refreshControls() }, onChanged = { controllerSettings = ControllerPrefs.read(this@SessionActivity) @@ -1431,16 +1445,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde textureLodBias = if (drawerGameProfileId == null) textureLodBias else drawerTextureLodBias, frameGen = frameGen, frameGenTargetGameId = frameGenTargetGameId()?.toString(), - frameGenTargetGameName = when { - !drawerGameProfileFollowState.followsSteam -> - drawerGameProfileRefresh.data?.profiles - ?.firstOrNull { it.first == frameGenTargetGameId() }?.second - SessionState.mode == SessionService.MODE_STEAM -> frameGenActiveGameName - SessionState.mode == SessionService.MODE_RUN -> - com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) - else -> drawerGameProfileRefresh.data?.profiles - ?.firstOrNull { it.first == frameGenTargetGameId() }?.second - }, + frameGenTargetGameName = frameGenTargetGameName(), hasGameOverride = frameGenHasGameOverride, lossless = lossless, oscMode = oscMode, suspendPolicy = suspendPolicy, @@ -1708,15 +1713,23 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde }, onOsc = { v -> SessionPrefs.setOscMode(this@SessionActivity, v) + controlsHiddenByTap = false readPrefs() updateOnScreenControls() - if (v == SessionPrefs.OSC_STEAM_TOUCH && com.droiddeck.launcher.input.SteamTouchDevice.current == null) - Toast.makeText(this@SessionActivity, R.string.osc_style_next_session, Toast.LENGTH_LONG).show() }, - onEditSteamTouch = if (steamTouchAvailable && oscMode == SessionPrefs.OSC_STEAM_TOUCH && onScreenButtonsVisible) ({ - drawerOpen = false - steamTouchControls?.startEditing() - }) else null, + layoutGame = controlsGameName(), + layoutOptions = layoutOptions, + layoutChoice = layoutChoice, + layoutHint = getString(if (controlsGameId() != null) R.string.osc_layout_this_game else R.string.osc_layout_default), + onLayout = ::chooseLayout, + onEditLayout = when { + layoutChoice == com.droiddeck.launcher.input.GameControls.STEAM -> if (steamTouchAvailable && onScreenButtonsVisible) ({ + drawerOpen = false + steamTouchControls?.startEditing() + }) else null + primaryInputLayout?.editable == true -> ({ openLayoutEditor() }) + else -> null + }, onSuspendPolicy = { policy -> SessionPrefs.setSuspendPolicy(this@SessionActivity, SessionState.mode, policy) suspendPolicy = policy @@ -1779,21 +1792,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde }, unfoldedControls = unfoldedControls, onUnfoldedControls = ::chooseUnfoldedControls, - adaptiveSticks = adaptiveSticks.takeIf { - unfoldedPanel != null || oscMode != SessionPrefs.OSC_NEVER && oscMode != SessionPrefs.OSC_STEAM_QAM && !steamTouchInUse - }, - onAdaptiveSticks = { on -> - primaryInputLayout?.let { com.droiddeck.launcher.input.InputLibraries.setAdaptiveSticks(this@SessionActivity, it.id, on) } - refreshInputProfile() - }, - quickButtons = quickButtons.takeIf { - unfoldedPanel != null || oscMode != SessionPrefs.OSC_NEVER && !steamTouchInUse - }.orEmpty(), - onQuickButton = { button, on -> - primaryInputLayout?.let { com.droiddeck.launcher.input.InputLibraries.setQuickButton(this@SessionActivity, it.id, button, on) } - refreshInputProfile() - updateOnScreenControls() - }, unfoldedControlsWithController = unfoldedControlsWithController, onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController, onBackground = { drawerOpen = false; pip.background(); moveTaskToBack(true) }, @@ -2013,6 +2011,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde }, "drawer-components").start() } + private fun frameGenTargetGameName(): String? = when { + !drawerGameProfileFollowState.followsSteam -> + drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + SessionState.mode == SessionService.MODE_STEAM -> frameGenActiveGameName + SessionState.mode == SessionService.MODE_RUN -> + com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) + else -> drawerGameProfileRefresh.data?.profiles + ?.firstOrNull { it.first == frameGenTargetGameId() }?.second + } + private fun frameGenTargetGameId(): Long? { if (!drawerGameProfileFollowState.followsSteam) { return drawerGameProfileId @@ -2030,6 +2039,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun loadFrameGenFor(appId: Long?) { + if (appId != controlsGame) { controlsGame = appId; uiHandler.post { refreshInputProfile(); updateOnScreenControls() } } val profileId = appId?.toString() frameGen = FrameGen.mode(this, profileId) frameGenHasGameOverride = appId?.let { @@ -3620,6 +3630,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN) || PenStream.penIndex(event) >= 0)) { drawerControllerActive = false gestureTouchStreamGate.reset() + if (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) noteScreenTouch(event) } return super.dispatchTouchEvent(event) } @@ -3991,6 +4002,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun onPadInput() { + noteControllerUse() if (inputUsesPointer && !pointerLocked) return lastPadInputMs = android.os.SystemClock.uptimeMillis() uiHandler.removeCallbacks(cursorHide) @@ -4355,14 +4367,70 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (started && displayId !in inputWindowDisplays && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) } - private fun refreshInputProfile() { + private fun controlsGameId(): Long? = frameGenTargetGameId() + + private fun controlsGameName(): String? = controlsGameId()?.let { frameGenTargetGameName() } + + /** The input library with the current game's main-screen layout selected, without saving it. */ + private fun gameLibrary(): com.droiddeck.launcher.input.InputLibrary { val library = com.droiddeck.launcher.input.InputLibraries.read(this) val desktop = loadingMode() == SessionService.MODE_DESKTOP + val chosen = com.droiddeck.launcher.input.GameControls.bindings(this, controlsGameId()) + ?.takeIf { id -> library.bindings.any { it.id == id && !it.physical && it.layoutId?.let { l -> library.layouts.any { x -> x.id == l && x.supports(InputRole.PRIMARY) } } == true } } + return if (chosen == null) library else library.selectPart(desktop, InputRole.PRIMARY, chosen) + } + + private fun refreshLayoutOptions(library: com.droiddeck.launcher.input.InputLibrary) { + val steam = SessionState.mode == SessionService.MODE_STEAM + layoutOptions = listOf(com.droiddeck.launcher.input.InputLibraries.OVERLAY to getString(R.string.osc_layout_gamepad)) + + (if (steam) listOf(com.droiddeck.launcher.input.GameControls.STEAM to getString(R.string.osc_layout_steam)) else emptyList()) + + library.layouts.filter { it.editable && it.supports(InputRole.PRIMARY) && it.id != com.droiddeck.launcher.input.InputLibraries.OVERLAY }.map { it.id to it.name } + layoutChoice = if (steam && com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId())) com.droiddeck.launcher.input.GameControls.STEAM + else primaryInputLayout?.id ?: com.droiddeck.launcher.input.InputLibraries.OVERLAY + } + + private fun chooseLayout(id: String) { + val game = controlsGameId() + val desktop = loadingMode() == SessionService.MODE_DESKTOP + val steam = id == com.droiddeck.launcher.input.GameControls.STEAM + runCatching { + val bindings = if (steam) null else { + var library = com.droiddeck.launcher.input.InputLibraries.read(this) + val layout = library.layouts.first { it.id == id } + library.bindings.firstOrNull { !it.physical && it.compatible(layout) }?.id ?: com.droiddeck.launcher.input.newInputId().also { newId -> + library = com.droiddeck.launcher.input.InputLibraries.update(this) { + it.withPreset(com.droiddeck.launcher.input.SavedInputBindings(newId, layout.name, false, layout.id)) + } + } + } + if (game != null) com.droiddeck.launcher.input.GameControls.choose(this, game, bindings, steam) + else { + SessionPrefs.setSteamTouchLayout(this, steam) + if (bindings != null) com.droiddeck.launcher.input.InputLibraries.update(this) { it.selectPart(desktop, InputRole.PRIMARY, bindings) } + } + }.onFailure { Log.w(TAG, "could not choose layout $id", it) } + releasePads() + refreshInputProfile() + updateOnScreenControls() + } + + private fun openLayoutEditor() { + val library = gameLibrary() + val desktop = loadingMode() == SessionService.MODE_DESKTOP + val layout = primaryInputLayout ?: return + releasePads() + drawerOpen = false + layoutEditor = Triple(library.activeId(desktop), layout.id, library.activePart(desktop, InputRole.PRIMARY).bindings) + inputSettingsOpen = true + } + + private fun refreshInputProfile() { + val library = gameLibrary() + val desktop = loadingMode() == SessionService.MODE_DESKTOP inputProfile = library.compileActive(desktop, secondScreenMode.panel(this)) stockInputProfile = library.compileStock(desktop, secondScreenMode.panel(this)) primaryInputLayout = library.activeLayout(desktop, InputRole.PRIMARY) - adaptiveSticks = primaryInputLayout?.adaptiveSticks - quickButtons = primaryInputLayout?.takeIf { it.editable }?.let { l -> l.quickButtons.associateWith { it !in l.style.hidden } }.orEmpty() + refreshLayoutOptions(library) secondaryInputLayout = library.panelLayout(desktop, secondScreenMode.panel(this)) deckPanelLayouts = com.droiddeck.launcher.input.DeckPanel.entries.associateWith { library.panelLayout(desktop, it.bindings) } inputUsesLocalActions = InputControl.padControls.any { inputProfile.action(InputRole.PHYSICAL, it) !is InputAction.Native } @@ -5300,99 +5368,116 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde updateOnScreenPad() val c = onScreenControls glassesSlot = when { - c == null || c.visibility != View.VISIBLE || c.isPinnedOnly -> 0 - c.isButtonsOnly -> -1 - primaryInputLayout?.let { l -> l.elements.any { it.quickButton == InputCommand.KEYBOARD && !l.style.hides(it) } } - ?: (controllerSettings?.keyboardButton != false) -> 2 + c == null || c.visibility != View.VISIBLE || c.hidden != null -> 0 + c.inputSurface.shownElements.any { it.id == com.droiddeck.launcher.input.KitLayout.KEYBOARD_ID } -> 2 else -> 1 } } + private fun controlsPlan(): com.droiddeck.launcher.input.ControlsPresenter.Plan { + val steam = SessionState.mode == SessionService.MODE_STEAM + return com.droiddeck.launcher.input.ControlsPresenter.plan(com.droiddeck.launcher.input.ControlsPresenter.State( + mode = SessionPrefs.oscMode(this), + desktop = SessionState.mode == SessionService.MODE_DESKTOP, + virtualPad = !steam || SessionPrefs.builtinPad(this), + covered = pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen || keyboardCoversPad(), + controllerInUse = controllerInUse && (PadBridge.anyControllerConnected() || SteamControllerBle.connected), + hiddenByTap = controlsHiddenByTap, + steamLayout = steam && com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()), + bottomScreen = bottomGame?.surfaceView?.parent is android.view.ViewGroup, + )) + } + private fun updateOnScreenPad() { - fun hideBottomControls() { bottomInputControls?.takeIf { it.visibility == View.VISIBLE }?.let { it.releaseAll(); it.visibility = View.GONE } } - val forced = File(Environment.getExternalStorageDirectory(), "Download/droiddeck-osc") - .takeIf { it.isFile } - ?.let { FileUtils.readString(it)?.trim()?.lowercase() } - ?: SessionPrefs.oscMode(this) val controls = onScreenControls ?: return - fun showPinned() { - controls.setPinnedOnly(true) - val pinned = controls.hasPinned && !pipUi && !inputSettingsOpen - if (!pinned) controls.releaseAll() - controls.visibility = if (pinned) View.VISIBLE else View.GONE - } - if (pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen || - (SessionState.mode == SessionService.MODE_STEAM && !SessionPrefs.builtinPad(this))) { - onScreenButtonsVisible = false - hideBottomControls() - showPinned() + fun hideBottomControls() { bottomInputControls?.takeIf { it.visibility == View.VISIBLE }?.let { it.releaseAll(); it.visibility = View.GONE } } + fun hideSteam() { steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false - applyTouchRouting() - return } - val buttonsOnly = forced == SessionPrefs.OSC_STEAM_QAM - val wantsSteam = forced == SessionPrefs.OSC_STEAM_TOUCH && SessionState.mode == SessionService.MODE_STEAM + val plan = controlsPlan() + onScreenButtonsVisible = plan.shown + val wantsSteam = plan.place == com.droiddeck.launcher.input.ControlsPresenter.Place.STEAM val steam = if (wantsSteam) steamTouch() else null steamTouchInUse = steam != null if (wantsSteam && steam == null && !isFinishing && !isDestroyed) { uiHandler.removeCallbacks(steamTouchRetry) uiHandler.postDelayed(steamTouchRetry, 1000) } - if (steam == null) { - steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } - com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false - applyTouchRouting() - } - controls.setButtonsOnly(buttonsOnly) - val show = when (forced) { - SessionPrefs.OSC_ALWAYS -> true - SessionPrefs.OSC_STEAM_QAM -> true - SessionPrefs.OSC_NEVER -> false - SessionPrefs.OSC_STEAM_TOUCH -> SessionState.mode == SessionService.MODE_STEAM || - (!PadBridge.anyControllerConnected() && SessionState.mode != SessionService.MODE_DESKTOP) - else -> !PadBridge.anyControllerConnected() && !SteamControllerBle.connected && - SessionState.mode != SessionService.MODE_DESKTOP - } - onScreenButtonsVisible = show - val drawn = show && !keyboardCoversPad() if (steam != null) { hideBottomControls() - showPinned() - if (!drawn) { steam.cancelEditing(); steam.releaseAll() } - steam.visibility = if (drawn) View.VISIBLE else View.GONE - com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = show - applyTouchRouting() - Log.i(TAG, "on-screen controls: Steam's touch controller " + if (drawn) "shown" else "hidden") - return - } - val bottomRoot = bottomGame?.surfaceView?.parent as? android.view.ViewGroup - if (bottomRoot != null && (drawn || controls.hasPinned)) { controls.releaseAll(); controls.visibility = View.GONE - var bottom = bottomInputControls - if (bottom?.parent !== bottomRoot) { - (bottom?.parent as? android.view.ViewGroup)?.removeView(bottom) - bottom = OnScreenControls(bottomRoot.context, padBridge).also { view -> - view.onTouchMiss = { event -> onBottomGameTouch(event) } - bottomRoot.addView(view, android.view.ViewGroup.LayoutParams(-1, -1)) - } - bottomInputControls = bottom - } - bottom.updateLayout(primaryInputLayout) - bottom.setButtonsOnly(buttonsOnly) - bottom.setPinnedOnly(!drawn) - bottom.visibility = View.VISIBLE + if (!plan.shown) { steam.cancelEditing(); steam.releaseAll() } + steam.visibility = if (plan.shown) View.VISIBLE else View.GONE + com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = plan.shown + applyTouchRouting() return } - hideBottomControls() - val wasDrawn = controls.visibility == View.VISIBLE && !controls.isPinnedOnly - if (!drawn) showPinned() else { controls.setPinnedOnly(false); controls.visibility = View.VISIBLE } - if (drawn == wasDrawn) return - Log.i(TAG, "on-screen controls " + when { - !drawn -> "hidden" - buttonsOnly -> "Steam + QAM" - else -> "full pad" - }) + hideSteam() + applyTouchRouting() + when (plan.place) { + com.droiddeck.launcher.input.ControlsPresenter.Place.BOTTOM -> { + val bottomRoot = bottomGame?.surfaceView?.parent as android.view.ViewGroup + controls.releaseAll(); controls.visibility = View.GONE + var bottom = bottomInputControls + if (bottom?.parent !== bottomRoot) { + (bottom?.parent as? android.view.ViewGroup)?.removeView(bottom) + bottom = OnScreenControls(bottomRoot.context, padBridge).also { view -> + view.onTouchMiss = { event -> onBottomGameTouch(event) } + view.onCornerTap = ::onControlsCornerTap + view.onCornerHold = ::openControllerMenu + bottomRoot.addView(view, android.view.ViewGroup.LayoutParams(-1, -1)) + } + bottomInputControls = bottom + } + bottom.updateLayout(primaryInputLayout) + bottom.setHidden(plan.hidden) + bottom.visibility = View.VISIBLE + } + com.droiddeck.launcher.input.ControlsPresenter.Place.MAIN -> { + hideBottomControls() + controls.setHidden(plan.hidden) + controls.visibility = View.VISIBLE + } + else -> { + hideBottomControls() + controls.releaseAll() + controls.visibility = View.GONE + } + } + } + + private fun onControlsCornerTap(next: OnScreenControls.Hidden?) { + controlsHiddenByTap = next == OnScreenControls.Hidden.BY_TAP + if (next == null) controllerInUse = false + updateOnScreenControls() + } + + private fun openControllerMenu() { + drawerPage = SessionDrawerPage.CONTROLLER + drawerOpen = true + } + + private fun noteControllerUse() { + if (controllerInUse) return + controllerInUse = true + uiHandler.post { + val wasShown = onScreenButtonsVisible + updateOnScreenControls() + if (wasShown && controlsPlan().hidden == OnScreenControls.Hidden.BY_CONTROLLER) + Toast.makeText(this, R.string.osc_hidden_controller, Toast.LENGTH_SHORT).show() + } + } + + private fun noteScreenTouch(event: MotionEvent) { + if (!controllerInUse) return + val corner = onScreenControls?.takeIf { it.isShown }?.let { c -> + val at = IntArray(2).also(c::getLocationOnScreen) + c.cornerTakes(event.rawX - at[0], event.rawY - at[1]) + } == true + if (corner) return + controllerInUse = false + updateOnScreenControls() } private fun desktopTextInput() = diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt b/app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt new file mode 100644 index 000000000..fffc75e80 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt @@ -0,0 +1,40 @@ +package com.droiddeck.launcher.input + +import com.droiddeck.launcher.session.SessionPrefs + +/** Decides where the on-screen controls go and why they're hidden, from the session's state alone. */ +object ControlsPresenter { + enum class Place { NONE, MAIN, BOTTOM, STEAM } + + data class State( + val mode: String, + val desktop: Boolean, + val virtualPad: Boolean, + val covered: Boolean, + val controllerInUse: Boolean, + val hiddenByTap: Boolean, + val steamLayout: Boolean, + val bottomScreen: Boolean, + ) + + data class Plan(val place: Place, val hidden: OnScreenControls.Hidden? = null) { + val shown get() = place != Place.NONE && hidden == null + } + + fun plan(state: State): Plan = when { + state.covered || !state.virtualPad || state.mode == SessionPrefs.OSC_NEVER -> Plan(Place.NONE) + state.mode == SessionPrefs.OSC_AUTO && state.desktop -> Plan(Place.NONE) + else -> Plan( + when { + state.steamLayout -> Place.STEAM + state.bottomScreen -> Place.BOTTOM + else -> Place.MAIN + }, + when { + state.hiddenByTap -> OnScreenControls.Hidden.BY_TAP + state.mode == SessionPrefs.OSC_AUTO && state.controllerInUse -> OnScreenControls.Hidden.BY_CONTROLLER + else -> null + }, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/GameControls.kt b/app/src/main/java/com/droiddeck/launcher/input/GameControls.kt new file mode 100644 index 000000000..4d76af54e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/GameControls.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import com.droiddeck.launcher.session.SessionPrefs + +/** Which on-screen layout each game uses. Games without a choice use the default profile's main-screen layout. */ +object GameControls { + const val STEAM = "steam" + + private fun prefs(context: Context) = context.getSharedPreferences("game-controls", Context.MODE_PRIVATE) + + /** The main-screen bindings preset saved for [game], whose layout is the one drawn. */ + fun bindings(context: Context, game: Long?): String? = game?.let { prefs(context).getString("$it.bindings", null) } + + fun steamLayout(context: Context, game: Long?): Boolean { + val p = prefs(context) + return if (game != null && p.contains("$game.steam")) p.getBoolean("$game.steam", false) else SessionPrefs.steamTouchLayout(context) + } + + fun choose(context: Context, game: Long, bindings: String?, steam: Boolean) { + prefs(context).edit().apply { if (bindings == null) remove("$game.bindings") else putString("$game.bindings", bindings) } + .putBoolean("$game.steam", steam).apply() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index 5f0b082c8..76423ea13 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -10,7 +10,7 @@ import org.json.JSONObject import java.util.UUID object InputLibraries { - private const val VERSION = 14 + private const val VERSION = 15 private const val KEY = "library" private const val RECOVERY = "library-recovery." const val OVERLAY = "builtin.overlay" @@ -29,10 +29,10 @@ object InputLibraries { val version = raw?.let { JSONObject(it).getInt("version") } ?: 0 if (version < 5) library = scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, library))) if (version < 11) library = neutralStockLayouts(library) - if (version < 10) library = restyleGamepads(context, library) if (version < 12) library = barStockLayouts(library) if (version < 13) library = LegacyScreenKeyMigration.pin(library) if (version < 14) library = deckGamepadSurfaces(context, library) + if (version < 15) library = kitGamepads(library) if (version < 6 || !p.contains(LegacyScreenKeyMigration.BACKUP)) { val legacy = LegacyScreenKeyMigration.snapshot(context) if (legacy != null) { @@ -141,11 +141,11 @@ object InputLibraries { fun defaultPositions(context: Context, library: InputLibrary, layout: SavedInputLayout): Pair, Float>? { val origin = layout.origin ?: layout.id InputStockLayouts.layouts().firstOrNull { it.id == origin }?.let { return it.elements to it.aspect } - if (origin == OVERLAY || origin.startsWith("migrated.layout.")) { + if (origin == OVERLAY) { val (surfaceContext, metrics) = primaryDisplay(context) - val size = if (origin == OVERLAY) listOf(metrics.widthPixels, metrics.heightPixels) - else origin.removePrefix("migrated.layout.").split('x').mapNotNull { it.toIntOrNull() } - return size.takeIf { it.size == 2 && it.all { side -> side > 0 } }?.let { LegacyGamepadLayout(surfaceContext, it[0], it[1]).elements() to it[0].toFloat() / it[1] } + val w = maxOf(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) + val h = minOf(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) + return KitLayout.elements(surfaceContext, PadKit.current(context), w, h) to w.toFloat() / h } return library.layouts.firstOrNull { it.id == origin && it.id != layout.id }?.let { it.elements to it.aspect } } @@ -157,29 +157,13 @@ object InputLibraries { return surfaceContext to DisplayMetrics().also { if (display != null) display.getRealMetrics(it) else it.setTo(context.resources.displayMetrics) } } - private fun restyleGamepads(context: Context, library: InputLibrary): InputLibrary { - if (library.layouts.none { it.id == OVERLAY || it.id.startsWith("migrated.layout.") }) return library - val (surfaceContext, metrics) = primaryDisplay(context) - return library.copy(layouts = library.layouts.map { layout -> - val size = when { - layout.id == OVERLAY -> listOf(metrics.widthPixels, metrics.heightPixels) - layout.id.startsWith("migrated.layout.") -> layout.id.removePrefix("migrated.layout.").split('x').mapNotNull { it.toIntOrNull() } - else -> emptyList() - } - if (size.size != 2 || size.any { it <= 0 }) layout - else layout.copy(elements = LegacyGamepadLayout(surfaceContext, size[0], size[1]).restyle(layout.elements)) - }) - } - private fun upgradeOverlay(context: Context, library: InputLibrary): InputLibrary { if (library.layouts.none { it.template == InputLayoutTemplate.OVERLAY }) return library - val (surfaceContext, metrics) = primaryDisplay(context) val settings = ControllerPrefs.read(context) - val elements = LegacyGamepadLayout(surfaceContext, metrics.widthPixels.coerceAtLeast(1), metrics.heightPixels.coerceAtLeast(1)).elements() - val style = InputSurfaceStyle(settings.tint, settings.opacity) + val elements = emptyList() + val style = InputSurfaceStyle(opacity = settings.opacity) val replacements = library.layouts.filter { it.template == InputLayoutTemplate.OVERLAY }.associate { old -> - old.id to old.copy(name = "Gamepad", elements = elements, template = InputLayoutTemplate.CUSTOM, style = style, - aspect = (metrics.widthPixels.coerceAtLeast(1).toFloat() / metrics.heightPixels.coerceAtLeast(1)).coerceIn(.05f, 20f)) + old.id to old.copy(name = "Gamepad", elements = elements, template = InputLayoutTemplate.CUSTOM, style = style) } var result = library.copy(layouts = library.layouts.map { replacements[it.id] ?: it }) val migrated = mutableMapOf, String>() @@ -201,15 +185,6 @@ object InputLibraries { } val oldBindings = migrated.keys.map { it.first }.toSet() result = result.copy(bindings = result.bindings.filter { it.id !in oldBindings || result.usersOfBindings(it.id).isNotEmpty() }) - // Older editor layouts were resolution-specific. Keep each as a selectable saved layout. - for (key in ControllerPrefs.prefs(context).all.keys.filter { it.startsWith("layout.") }.sorted()) { - val size = key.removePrefix("layout.").split('x').mapNotNull { it.toIntOrNull() } - if (size.size != 2 || size.any { it <= 0 } || result.layouts.size >= 128) continue - if (size[0] == metrics.widthPixels && size[1] == metrics.heightPixels) continue - val id = "migrated.$key" - if (result.layouts.none { it.id == id }) result = result.withLayout(SavedInputLayout(id, "Gamepad ${size[0]} × ${size[1]}", - LegacyGamepadLayout(surfaceContext, size[0], size[1]).elements(), style = style, aspect = (size[0].toFloat() / size[1]).coerceIn(.05f, 20f))) - } return result.validate() } @@ -275,6 +250,17 @@ object InputLibraries { return library.withLayout(saved.copy(elements = InputStockLayouts.gamepad(leftPad, rightStick))).validate() } + /** Gamepads saved by the old editor follow the virtual controller's kit again; their positions don't map onto the new controls. */ + private fun kitGamepads(library: InputLibrary): InputLibrary { + var result = library + for (layout in library.layouts) { + val origin = layout.origin ?: layout.id + if (origin != OVERLAY && !origin.startsWith("migrated.layout.")) continue + result = result.withLayout(layout.copy(elements = emptyList(), origin = if (layout.id == OVERLAY) null else OVERLAY, aspect = 0f, scale = 1f)) + } + return result.validate() + } + private fun migrationBindingId(library: InputLibrary, binding: String, layout: String): String { val seed = JSONArray(listOf(binding, layout)).toString().toByteArray(Charsets.UTF_8) val base = "migrated.bindings." + UUID.nameUUIDFromBytes(seed) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index 0e5ed4261..d1a4c8335 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -49,7 +49,7 @@ data class SavedInputBindings( fun action(element: InputSurfaceElement) = elements[element.id] ?: if (element.id == "legacy:${element.control.id}") controls[element.control] ?: InputAction.Native() - else InputAction.Disabled + else defaultElementAction(element.id) fun clickAction(element: InputSurfaceElement) = clicks[element.id] ?: defaultElementClick(element, action(element)) { controls[it] ?: InputAction.Native() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt b/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt index a12276627..c02cb7811 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt @@ -48,7 +48,7 @@ data class InputProfile( copy(bindings = bindings + (role to (bindings[role].orEmpty() + (control to action)))) fun elementAction(role: InputRole, id: String, control: InputControl): InputAction = - elements[role]?.get(id) ?: if (id == "legacy:${control.id}") action(role, control) else InputAction.Disabled + elements[role]?.get(id) ?: if (id == "legacy:${control.id}") action(role, control) else defaultElementAction(id) fun elementClickAction(role: InputRole, element: InputSurfaceElement): InputAction = clicks[role]?.get(element.id) ?: defaultElementClick(element, elementAction(role, element.id, element.control)) { action(role, it) } @@ -115,3 +115,10 @@ internal fun InputAction.validFor(control: InputControl): Boolean = when (this) is InputAction.Scroll -> control.dimensions == 2 && speed.isFinite() && speed in 1f..60f else -> true } + +/** What an on-screen element with no saved action does: kit controls press their own button, everything else is unassigned. */ +internal fun defaultElementAction(id: String): InputAction = when (id) { + KitLayout.DPAD_ID -> InputAction.Native() + KitLayout.KEYBOARD_ID -> InputAction.Command(InputCommand.KEYBOARD) + else -> InputAction.Disabled +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt new file mode 100644 index 000000000..e0ca23bf7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -0,0 +1,115 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.graphics.Rect +import kotlin.math.max +import kotlin.math.min + +/** + * Places a virtual controller's default on-screen controls. Each kit is drawn on a 1600 × 900 reference screen; controls keep + * their distance from the nearest edge, so wider screens spread them apart instead of stretching them. + */ +object KitLayout { + const val DPAD_ID = "kit:dpad" + const val KEYBOARD_ID = "builtin:keyboard" + private const val REF_W = 1600f + private const val REF_H = 900f + private const val MAX_HEIGHT_MM = 80f + + private class Spec(val control: InputControl, val cx: Float, val cy: Float, val hw: Float, val hh: Float = hw, val id: String = "legacy:${control.id}", + val kind: InputElementKind = InputElementKind.from(control), val shape: InputButtonShape = InputButtonShape.CIRCLE, val icon: Int = 0, val name: String = control.label) + + private fun shoulders() = listOf( + Spec(InputControl.LT, 140f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.LB, 140f, 148f, 88f, 28f, shape = InputButtonShape.PILL), + Spec(InputControl.RT, 1460f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.RB, 1460f, 148f, 88f, 28f, shape = InputButtonShape.PILL)) + + private fun face(cx: Float, cy: Float, r: Float, off: Float) = listOf( + Spec(InputControl.Y, cx, cy - off, r), Spec(InputControl.X, cx - off, cy, r), Spec(InputControl.B, cx + off, cy, r), Spec(InputControl.A, cx, cy + off, r)) + + private fun dpad(cx: Float, cy: Float, half: Float) = + Spec(InputControl.LS, cx, cy, half, id = DPAD_ID, kind = InputElementKind.DPAD, shape = InputButtonShape.ROUNDED, name = "D-pad") + + private fun keyboard(cx: Float) = Spec(InputControl.A, cx, 848f, 46f, id = KEYBOARD_ID, icon = InputButtonIcons.KEYBOARD, name = "Keyboard") + + private fun specs(kit: PadKit): List = when { + kit.steam -> shoulders() + listOf( + Spec(InputControl.L4, 30f, 470f, 30f, 62f, shape = InputButtonShape.ROUNDED), Spec(InputControl.L5, 30f, 590f, 30f, 62f, shape = InputButtonShape.ROUNDED), + Spec(InputControl.R4, 1570f, 470f, 30f, 62f, shape = InputButtonShape.ROUNDED), Spec(InputControl.R5, 1570f, 590f, 30f, 62f, shape = InputButtonShape.ROUNDED), + dpad(215f, 330f, 100f)) + face(1385f, 330f, 50f, 82f) + listOf( + Spec(InputControl.LS, 290f, 610f, 96f), Spec(InputControl.RS, 1310f, 610f, 96f), + Spec(InputControl.LEFT_PAD, 480f, 345f, 95f, shape = InputButtonShape.ROUNDED), Spec(InputControl.RIGHT_PAD, 1120f, 345f, 95f, shape = InputButtonShape.ROUNDED), + Spec(InputControl.SELECT, 660f, 150f, 46f, 26f, shape = InputButtonShape.PILL), Spec(InputControl.START, 940f, 150f, 46f, 26f, shape = InputButtonShape.PILL), + Spec(InputControl.GUIDE, 370f, 852f, 66f, 30f, shape = InputButtonShape.PILL), Spec(InputControl.QAM, 1230f, 852f, 66f, 30f, shape = InputButtonShape.PILL), + keyboard(136f)) + kit.playStation -> shoulders() + listOf(dpad(250f, 395f, 125f)) + face(1350f, 395f, 56f, 92f) + listOf( + Spec(InputControl.LS, 565f, 690f, 100f), Spec(InputControl.RS, 1035f, 690f, 100f), + Spec(InputControl.L3, 420f, 790f, 42f), Spec(InputControl.R3, 1180f, 790f, 42f), + Spec(InputControl.SELECT, 640f, 150f, 50f, 30f, shape = InputButtonShape.PILL), Spec(InputControl.START, 960f, 150f, 50f, 30f, shape = InputButtonShape.PILL), + Spec(InputControl.GUIDE, 800f, 250f, 46f), Spec(InputControl.QAM, 220f, 848f, 46f), keyboard(136f)) + else -> shoulders() + listOf(Spec(InputControl.LS, 235f, 400f, 104f), dpad(470f, 690f, 118f)) + face(1375f, 400f, 58f, 94f) + listOf( + Spec(InputControl.RS, 1130f, 690f, 104f), Spec(InputControl.L3, 385f, 290f, 42f), Spec(InputControl.R3, 1290f, 790f, 42f), + Spec(InputControl.SELECT, 690f, 162f, 38f), Spec(InputControl.GUIDE, 800f, 162f, 54f), Spec(InputControl.START, 910f, 162f, 38f), + Spec(InputControl.QAM, 220f, 848f, 46f), keyboard(136f)) + } + + /** The default controls for [kit] on a [width] × [height] screen. */ + fun elements(context: Context, kit: PadKit, width: Int, height: Int, safe: Rect = Rect(), scale: Float = 1f): List { + if (width <= 0 || height <= 0) return emptyList() + val w = width.toFloat(); val h = height.toFloat() + val unit = min(w / REF_W, h / REF_H) * cap(context, min(width, height)) * scale + fun x(ref: Float) = when { + ref < REF_W / 3f -> safe.left + ref * unit + ref > REF_W * 2f / 3f -> w - safe.right - (REF_W - ref) * unit + else -> w / 2f + (ref - REF_W / 2f) * unit + } + fun y(ref: Float) = when { + ref < REF_H / 3f -> safe.top + ref * unit + ref > REF_H * 2f / 3f -> h - safe.bottom - (REF_H - ref) * unit + else -> h / 2f + (ref - REF_H / 2f) * unit + } + return specs(kit).map { s -> + val cx = x(s.cx); val cy = y(s.cy); val hw = s.hw * unit; val hh = s.hh * unit + InputSurfaceElement(s.control, (cx - hw) / w, (cy - hh) / h, 2 * hw / w, 2 * hh / h, s.id, s.kind, s.name, + floating = s.kind == InputElementKind.STICK, buttonShape = s.shape, icon = s.icon).bounded() + } + } + + /** Controls for the panel below the game, in [GamepadGeometry]'s slots. */ + fun dock(context: Context, kit: PadKit, width: Int, height: Int, portrait: Boolean, left: InputControl, right: InputControl): List { + val w = width.toFloat(); val h = height.toFloat() + val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait) + val placed = mutableListOf() + fun put(control: InputControl, box: GamepadGeometry.Box?, shape: InputButtonShape, id: String = "legacy:${control.id}", + kind: InputElementKind = InputElementKind.from(control), name: String = control.label) { + val b = box ?: return + placed += InputSurfaceElement(control, b.left / w, b.top / h, b.width / w, b.height / h, id, kind, name, floating = false, buttonShape = shape).bounded() + } + fun square(box: GamepadGeometry.Box?) = box?.let { val side = min(it.width, it.height); GamepadGeometry.Box(it.cx, it.cy, side, side) } + put(left, square(boxes[GamepadGeometry.Slot.LEFT_MAIN]), InputButtonShape.CIRCLE) + put(InputControl.LS, square(boxes[GamepadGeometry.Slot.LEFT_SECOND]), InputButtonShape.ROUNDED, DPAD_ID, InputElementKind.DPAD, "D-pad") + put(right, square(boxes[GamepadGeometry.Slot.RIGHT_MAIN]), InputButtonShape.CIRCLE) + square(boxes[GamepadGeometry.Slot.RIGHT_SECOND])?.let { b -> + val r = b.width * .17f; val off = b.width * .3f + listOf(InputControl.Y to (0f to -1f), InputControl.B to (1f to 0f), InputControl.A to (0f to 1f), InputControl.X to (-1f to 0f)).forEach { (c, d) -> + put(c, GamepadGeometry.Box(b.cx + d.first * off, b.cy + d.second * off, 2 * r, 2 * r), InputButtonShape.CIRCLE) + } + } + put(InputControl.LT, boxes[GamepadGeometry.Slot.LEFT_OUTER_SHOULDER], InputButtonShape.PILL) + put(InputControl.LB, boxes[GamepadGeometry.Slot.LEFT_INNER_SHOULDER], InputButtonShape.PILL) + put(InputControl.RB, boxes[GamepadGeometry.Slot.RIGHT_INNER_SHOULDER], InputButtonShape.PILL) + put(InputControl.RT, boxes[GamepadGeometry.Slot.RIGHT_OUTER_SHOULDER], InputButtonShape.PILL) + put(InputControl.SELECT, boxes[GamepadGeometry.Slot.VIEW], InputButtonShape.PILL) + put(InputControl.START, boxes[GamepadGeometry.Slot.MENU], InputButtonShape.PILL) + if (kit.steam) listOf(InputControl.L4 to GamepadGeometry.Slot.L4, InputControl.L5 to GamepadGeometry.Slot.L5, + InputControl.R5 to GamepadGeometry.Slot.R5, InputControl.R4 to GamepadGeometry.Slot.R4).forEach { (c, slot) -> put(c, boxes[slot], InputButtonShape.ROUNDED) } + return placed + } + + private fun cap(context: Context, shortSide: Int): Float { + val metrics = context.resources.displayMetrics + val nominal = metrics.densityDpi.toFloat() + val dpi = metrics.ydpi.takeIf { it > nominal * .6f && it < nominal * 1.6f } ?: nominal + val mm = shortSide / dpi * 25.4f + return min(1f, MAX_HEIGHT_MM / max(mm, 1f)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt deleted file mode 100644 index 2a36489e8..000000000 --- a/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt +++ /dev/null @@ -1,362 +0,0 @@ -package com.droiddeck.launcher.input - -import android.content.Context -import android.graphics.Rect -import kotlin.math.* - -internal class LegacyGamepadLayout(private val context: Context, private val width: Int, private val height: Int, private val safe: Rect = Rect(), - private val scale: Float = 1f) { - private val resources get() = context.resources - private val settings = ControllerPrefs.read(context) - private var fit = 1f - private class Control(val id: String, val group: String, val stick: Int, val radiusDp: Float, val offsetXDp: Float, val offsetYDp: Float) { - var radius = 0f - var cx = 0f - var cy = 0f - val halfW get() = if (id in shoulderIds) radius * SHOULDER_WIDTH else radius - val halfH get() = if (id in shoulderIds) radius * SHOULDER_HEIGHT else radius - } - private val controls = listOf( - Control("up", "dpad", -1, 30f, 0f, -50f), - Control("right", "dpad", -1, 30f, 50f, 0f), - Control("down", "dpad", -1, 30f, 0f, 50f), - Control("left", "dpad", -1, 30f, -50f, 0f), - Control("ls", "ls", 0, 48f, 0f, 0f), - Control("rs", "rs", 1, 48f, 0f, 0f), - Control("a", "face", -1, 30f, 0f, 50f), - Control("b", "face", -1, 30f, 50f, 0f), - Control("x", "face", -1, 30f, -50f, 0f), - Control("y", "face", -1, 30f, 0f, -50f), - Control("lb", "lb", -1, 24f, 0f, 0f), - Control("rb", "rb", -1, 24f, 0f, 0f), - Control("lt", "lt", -1, 24f, 0f, 0f), - Control("rt", "rt", -1, 24f, 0f, 0f), - Control("select", "select", -1, 20f, 0f, 0f), - Control("start", "start", -1, 20f, 0f, 0f), - Control("guide", "guide", -1, 22f, 0f, 0f), - Control("qam", "qam", -1, 22f, 0f, 0f), - ) - - private val groups = controls.map { it.group }.distinct() - - private fun dp(value: Float) = value * resources.displayMetrics.density - - private fun scaled(value: Float) = dp(value) * settings.size / 100f * scale * fit - - private fun fitScale(): Float { - val metrics = resources.displayMetrics - val heightMm = (height - safe.top - safe.bottom) / pxPerMm(metrics.ydpi) - val faceMm = dp(60f) / pxPerMm(metrics.xdpi) - val floor = (MIN_FACE_MM / faceMm).coerceAtMost(1f) - return (heightMm / FULL_SIZE_HEIGHT_MM).coerceIn(floor, 1f) - } - - private fun pxPerMm(dpi: Float): Float { - val nominal = resources.displayMetrics.densityDpi.toFloat() - return (if (dpi > nominal * 0.6f && dpi < nominal * 1.6f) dpi else nominal) / 25.4f - } - - private fun placeAuto(w: Float, h: Float) { - val metrics = resources.displayMetrics - val mmX = pxPerMm(metrics.xdpi) - val mmY = pxPerMm(metrics.ydpi) - val usableW = w - safe.left - safe.right - val usableH = h - safe.top - safe.bottom - val inboard = (0.17f * usableW / mmX).coerceIn(24f, 40f) * mmX - val lift = (0.285f * usableH / mmY).coerceIn(22f, 45f) * mmY - val gap = dp(12f) - val floor = BOTTOM_MARGIN_MM * mmY - val drop = max(drop("dpad", "ls", gap), drop("rs", "face", gap)) - val restY = min(h - safe.bottom - lift, h - safe.bottom - floor - drop) - put("ls", safe.left + inboard, restY) - put("face", w - safe.right - inboard, restY) - besideBelow("dpad", "ls", 1f, gap, floor) - besideBelow("rs", "face", -1f, gap, floor) - val phone = usableH / mmY < PHONE_MAX_HEIGHT_MM - val shoulderY = if (phone) safe.top + floor + halfH("lb") - else min(centre("ls").second - extent("ls"), centre("face").second - extent("face")) - gap - halfH("lb") - shoulders("ls", "lb", "lt", 1f, gap, shoulderY) - shoulders("face", "rb", "rt", -1f, gap, shoulderY) - val bottom = h - safe.bottom - floor - extent("guide") - val spread = extent("guide") + gap / 2f - put("guide", w / 2f - spread, bottom) - put("qam", w / 2f + spread, bottom) - val inner = max(centre("dpad").first + extent("dpad"), w - centre("rs").first + extent("rs")) + gap + extent("select") - put("select", inner, restY) - put("start", w - inner, restY) - if (phone) { - val top = max(centre("lb").first + extent("lb"), w - centre("rb").first + extent("rb")) + gap * 2.5f + extent("select") - put("select", top, shoulderY) - put("start", w - top, shoulderY) - } - if (crowded("select", gap) || crowded("start", gap)) { - above("select", "dpad", gap) - val (sx, sy) = centre("select") - put("start", w - sx, sy) - if (crowded("start", gap)) above("start", "rs", gap) - } - if (crowded("guide", gap, gap, "qam") || crowded("qam", gap, gap, "guide")) { - val row = centre("select").second - put("guide", w / 2f - spread, row) - put("qam", w / 2f + spread, row) - if (crowded("guide", gap, gap, "qam") || crowded("qam", gap, gap, "guide")) { - val top = safe.top + dp(8f) + extent("guide") - put("guide", w / 2f - spread, top) - put("qam", w / 2f + spread, top) - } - } - } - - private fun drop(group: String, anchor: String, gap: Float): Float = - (extent(anchor) + extent(group) + gap) * sin(Math.toRadians(DROP_DEGREES)).toFloat() + extent(group) - - private fun besideBelow(group: String, anchor: String, inward: Float, gap: Float, margin: Float) { - val (ax, ay) = centre(anchor) - val reach = extent(anchor) + extent(group) + gap - val floor = height - safe.bottom - margin - extent(group) - val dy = min(reach * sin(Math.toRadians(DROP_DEGREES)).toFloat(), floor - ay) - val dx = sqrt(max(0f, reach * reach - dy * dy)) - put(group, ax + inward * dx, ay + dy) - } - - private fun shoulders(anchor: String, bumper: String, trigger: String, inward: Float, gap: Float, y: Float) { - val (ax, _) = centre(anchor) - val spread = extent(bumper) + gap / 2f - put(bumper, ax + inward * spread, y) - put(trigger, ax - inward * spread, y) - } - - private fun above(group: String, anchor: String, gap: Float) { - val (ax, ay) = centre(anchor) - put(group, ax, ay - extent(anchor) - gap - extent(group)) - } - - private fun crowded(group: String, gap: Float, space: Float = gap / 2f, except: String? = null): Boolean { - val (x, y) = centre(group) - return groups.any { other -> - if (other == group || other == except) return@any false - val (ox, oy) = centre(other) - val dx = x - ox - val dy = y - oy - sqrt(dx * dx + dy * dy) < extent(group) + extent(other) + space - } - } - - private fun members(group: String) = controls.filter { it.group == group } - - private fun centre(group: String): Pair { - val first = members(group).first() - return (first.cx - scaled(first.offsetXDp)) to (first.cy - scaled(first.offsetYDp)) - } - - private fun extent(group: String): Float = members(group).maxOf { control -> - sqrt(scaled(control.offsetXDp).let { it * it } + scaled(control.offsetYDp).let { it * it }) + control.halfW - } - - private fun halfH(group: String): Float = members(group).maxOf { abs(scaled(it.offsetYDp)) + it.halfH } - - private fun put(group: String, x: Float, y: Float) { - for (control in members(group)) { - control.cx = x + scaled(control.offsetXDp) - control.cy = y + scaled(control.offsetYDp) - } - } - - private fun clamp(group: String) { - val list = members(group) - val margin = dp(4f) - val minX = list.minOf { it.cx - it.halfW } - safe.left - margin - val maxX = list.maxOf { it.cx + it.halfW } - (width - safe.right - margin) - val minY = list.minOf { it.cy - it.halfH } - safe.top - margin - val maxY = list.maxOf { it.cy + it.halfH } - (height - safe.bottom - margin) - val dx = if (minX < 0) -minX else if (maxX > 0) -maxX else 0f - val dy = if (minY < 0) -minY else if (maxY > 0) -maxY else 0f - if (dx == 0f && dy == 0f) return - for (control in list) { control.cx += dx; control.cy += dy } - } - - - fun elements(previousStickGeometry: Boolean = false): List { - fit = fitScale() - controls.forEach { it.radius = scaled(it.radiusDp) } - placeAuto(width.toFloat(), height.toFloat()) - for ((group, position) in ControllerPrefs.layout(context, width, height)) { - if (group in groups && position.first.isFinite() && position.second.isFinite()) put(group, position.first * width, position.second * height) - } - groups.forEach(::clamp) - val result = controls.filter { - settings.mapping[it.id] != ControllerPrefs.OFF && (it.id != "guide" || settings.steamButton) && (it.id != "qam" || settings.qamButton) - }.map { c -> - InputSurfaceElement(requireNotNull(InputControl.fromId(c.id)), (c.cx - c.halfW) / width, (c.cy - c.halfH) / height, - 2 * c.halfW / width, 2 * c.halfH / height, floating = settings.adaptiveSticks, hideWhenIdle = c.stick >= 0 && settings.adaptiveSticks, - buttonShape = if (c.id in shoulderIds) InputButtonShape.PILL else InputButtonShape.CIRCLE).let { if (previousStickGeometry) widenStickPreviously(it) else widenStick(it) }.bounded() - }.toMutableList() - if (settings.keyboardButton) result += keyboard() - return result - } - - fun regenerate(stored: List): List = withGeometry(stored, elements()) - - fun rescale(stored: List, from: LegacyGamepadLayout): List { - val before = from.elements().associateBy { it.id } - val after = elements().associateBy { it.id } - return stored.map { e -> - val b = before[e.id] ?: return@map e - val a = after[e.id] ?: return@map e - val w = (a.width * e.width / b.width).coerceIn(.03f, 1f) - val h = (a.height * e.height / b.height).coerceIn(.03f, 1f) - val cx = a.x + a.width / 2 + (e.x + e.width / 2 - b.x - b.width / 2) - val cy = a.y + a.height / 2 + (e.y + e.height / 2 - b.y - b.height / 2) - e.copy(x = (cx - w / 2).coerceIn(0f, 1f - w), y = (cy - h / 2).coerceIn(0f, 1f - h), width = w, height = h).bounded() - } - } - - fun buttonsOnly(stored: List): List { - val inset = dp(BUTTONS_ONLY_INSET_DP) - val bottom = height - safe.bottom - inset - val radius = dp(BUTTONS_ONLY_RADIUS_DP) - fun pick(control: InputControl, shown: Boolean) = stored.firstOrNull { it.id == "legacy:${control.id}" } - ?: stored.firstOrNull { it.control == control && it.kind == InputElementKind.BUTTON } - ?: InputSurfaceElement(control, 0f, 0f, 0f, 0f, buttonShape = InputButtonShape.CIRCLE).takeIf { shown } - return listOfNotNull( - pick(InputControl.GUIDE, settings.steamButton)?.let { circle(it, safe.left + inset, bottom, radius) }, - pick(InputControl.QAM, settings.qamButton)?.let { circle(it, width - safe.right - inset, bottom, radius) }, - stored.firstOrNull { it.id == KEYBOARD_ID }?.let { circle(it, width / 2f, bottom, dp(KEYBOARD_RADIUS_DP)) }, - ) - } - - fun dock(stored: List, portrait: Boolean, grips: Boolean, left: InputControl = InputControl.LS, - right: InputControl = InputControl.RS): List { - val boxes = GamepadGeometry.layout(width.toFloat(), height.toFloat(), resources.displayMetrics.density, portrait) - val placed = mutableListOf() - fun box(control: InputControl, slot: GamepadGeometry.Slot, shape: InputButtonShape) { - val b = boxes[slot] ?: return - placed += InputSurfaceElement(control, b.left / width, b.top / height, b.width / width, b.height / height, - floating = false, buttonShape = shape).bounded() - } - fun cross(controls: List, slot: GamepadGeometry.Slot) { - val b = boxes[slot] ?: return - val side = min(b.width, b.height) - val spread = side * CROSS_SPREAD - val radius = side * CROSS_RADIUS - controls.zip(listOf(0f to -1f, 1f to 0f, 0f to 1f, -1f to 0f)).forEach { (control, direction) -> - placed += circle(InputSurfaceElement(control, 0f, 0f, 0f, 0f, buttonShape = InputButtonShape.CIRCLE), - b.cx + direction.first * spread, b.cy + direction.second * spread, radius) - } - } - box(left, GamepadGeometry.Slot.LEFT_MAIN, InputButtonShape.CIRCLE) - cross(DPAD_ORDER, GamepadGeometry.Slot.LEFT_SECOND) - box(right, GamepadGeometry.Slot.RIGHT_MAIN, InputButtonShape.CIRCLE) - cross(FACE_ORDER, GamepadGeometry.Slot.RIGHT_SECOND) - box(InputControl.LT, GamepadGeometry.Slot.LEFT_OUTER_SHOULDER, InputButtonShape.PILL) - box(InputControl.LB, GamepadGeometry.Slot.LEFT_INNER_SHOULDER, InputButtonShape.PILL) - box(InputControl.RB, GamepadGeometry.Slot.RIGHT_INNER_SHOULDER, InputButtonShape.PILL) - box(InputControl.RT, GamepadGeometry.Slot.RIGHT_OUTER_SHOULDER, InputButtonShape.PILL) - box(InputControl.SELECT, GamepadGeometry.Slot.VIEW, InputButtonShape.PILL) - box(InputControl.START, GamepadGeometry.Slot.MENU, InputButtonShape.PILL) - if (grips) GRIPS.forEach { (control, slot) -> box(control, slot, InputButtonShape.ROUNDED) } - val surfaces = listOf(left, right).filter { it.isTrackpad } - return withGeometry(stored, placed) + placed.filter { p -> (GRIPS.any { it.first == p.control } || p.control in surfaces) && stored.none { it.id == p.id } } - } - - private fun circle(e: InputSurfaceElement, cx: Float, cy: Float, radius: Float) = - e.copy(x = (cx - radius) / width, y = (cy - radius) / height, width = 2 * radius / width, height = 2 * radius / height).bounded() - - private fun withGeometry(stored: List, placed: List): List { - val byId = placed.associateBy { it.id } - return stored.mapNotNull { e -> byId[e.id]?.let { e.copy(x = it.x, y = it.y, width = it.width, height = it.height) } } - } - - private fun keyboard(): InputSurfaceElement { - val radius = dp(KEYBOARD_RADIUS_DP) - val cx = safe.left + dp(KEYBOARD_X_DP) - val cy = height - safe.bottom - dp(KEYBOARD_Y_DP) - return InputSurfaceElement(InputControl.A, (cx - radius) / width, (cy - radius) / height, 2 * radius / width, 2 * radius / height, - KEYBOARD_ID, name = "Keyboard", icon = InputButtonIcons.KEYBOARD, buttonShape = InputButtonShape.CIRCLE).bounded() - } - - fun restyle(elements: List): List { - val dpad = elements.filter { it.id == "legacy:${it.control.id}" && it.control in DPAD && it.buttonShape == InputButtonShape.ROUNDED } - val centreX = dpad.map { (it.x + it.width / 2f) * width }.average().toFloat() - val centreY = dpad.map { (it.y + it.height / 2f) * height }.average().toFloat() - val resize = untouchedDpad(dpad, centreX, centreY) - return elements.map { e -> - when { - e.id == KEYBOARD_ID && e.icon == 0 && e.name == "Keyboard" && e.buttonShape == InputButtonShape.ROUNDED && - e.x == .02f && e.y == .9f && e.width == .12f && e.height == .08f -> keyboard() - e.id == "legacy:${e.control.id}" && e.buttonShape == InputButtonShape.ROUNDED -> { - val round = e.copy(buttonShape = if (e.control.id in shoulderIds) InputButtonShape.PILL else InputButtonShape.CIRCLE) - (if (resize && e.control in DPAD) resizeDpad(round, centreX, centreY) else widenStick(round)).bounded() - } - else -> e - } - } - } - - private fun untouchedDpad(dpad: List, centreX: Float, centreY: Float): Boolean { - if (dpad.size != DPAD.size) return false - val radius = dpad[0].width * width / 2f - val tolerance = 1.5f - val offset = radius * LEGACY_DPAD_OFFSET_DP / LEGACY_DPAD_RADIUS_DP - return dpad.all { e -> - val old = controls.first { it.id == e.control.id } - val dx = (e.x + e.width / 2f) * width - centreX - val dy = (e.y + e.height / 2f) * height - centreY - abs(e.width * width / 2f - radius) <= tolerance && abs(e.height * height / 2f - radius) <= tolerance && - abs(dx - offset * sign(old.offsetXDp)) <= tolerance && abs(dy - offset * sign(old.offsetYDp)) <= tolerance - } - } - - private fun resizeDpad(e: InputSurfaceElement, centreX: Float, centreY: Float): InputSurfaceElement { - val old = controls.first { it.id == e.control.id } - val radius = e.width * width / 2f * old.radiusDp / LEGACY_DPAD_RADIUS_DP - val cx = centreX + ((e.x + e.width / 2f) * width - centreX) * abs(old.offsetXDp + old.offsetYDp) / LEGACY_DPAD_OFFSET_DP - val cy = centreY + ((e.y + e.height / 2f) * height - centreY) * abs(old.offsetXDp + old.offsetYDp) / LEGACY_DPAD_OFFSET_DP - return e.copy(x = (cx - radius) / width, y = (cy - radius) / height, width = 2 * radius / width, height = 2 * radius / height) - } - - private fun widenStickPreviously(e: InputSurfaceElement): InputSurfaceElement { - val extra = e.width * (STICK_REACH - 1f) - return when (e.control) { - InputControl.LS -> (e.x - extra).coerceAtLeast(0f).let { x -> e.copy(x = x, width = e.x + e.width - x) } - InputControl.RS -> e.copy(width = (e.width + extra).coerceAtMost(1f - e.x)) - else -> e - } - } - - private fun widenStick(e: InputSurfaceElement): InputSurfaceElement { - val extra = e.width * (STICK_REACH - 1f) - val width = e.width + extra - return when (e.control) { - InputControl.LS -> e.copy(x = (e.x - extra).coerceIn(0f, (1f - width).coerceAtLeast(0f)), width = width) - InputControl.RS -> e.copy(x = e.x.coerceIn(0f, (1f - width).coerceAtLeast(0f)), width = width) - else -> e - } - } - private companion object { - const val MIN_FACE_MM = 9.5f - const val FULL_SIZE_HEIGHT_MM = 85f - const val BOTTOM_MARGIN_MM = 5f - const val DROP_DEGREES = 35.0 - const val PHONE_MAX_HEIGHT_MM = 90f - const val SHOULDER_WIDTH = 1.45f - const val SHOULDER_HEIGHT = 0.8f - val shoulderIds = setOf("lb", "rb", "lt", "rt") - const val STICK_REACH = 1.25f - const val LEGACY_DPAD_RADIUS_DP = 26f - const val LEGACY_DPAD_OFFSET_DP = 52f - val DPAD = setOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT) - const val KEYBOARD_ID = "builtin:keyboard" - const val KEYBOARD_RADIUS_DP = 18f - const val KEYBOARD_X_DP = 90f - const val KEYBOARD_Y_DP = 34f - const val BUTTONS_ONLY_RADIUS_DP = 30f - const val BUTTONS_ONLY_INSET_DP = 44f - const val CROSS_SPREAD = .30f - const val CROSS_RADIUS = .16f - val DPAD_ORDER = listOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT) - val FACE_ORDER = listOf(InputControl.Y, InputControl.B, InputControl.A, InputControl.X) - val GRIPS = listOf(InputControl.L4 to GamepadGeometry.Slot.L4, InputControl.L5 to GamepadGeometry.Slot.L5, - InputControl.R5 to GamepadGeometry.Slot.R5, InputControl.R4 to GamepadGeometry.Slot.R4) - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index ee3a6560a..4f81f2e9e 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -3,103 +3,77 @@ package com.droiddeck.launcher.input import android.annotation.SuppressLint import android.content.Context import android.graphics.Canvas +import android.graphics.Color import android.graphics.Paint import android.graphics.Rect -import android.graphics.Typeface +import android.graphics.RectF import android.os.Build import android.view.Gravity import android.view.HapticFeedbackConstants import android.view.MotionEvent import android.view.View +import android.view.ViewConfiguration import android.view.WindowInsets import android.widget.FrameLayout import com.droiddeck.launcher.ui.InputSurfaceView +import com.droiddeck.launcher.ui.PadArt class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayout.Dock? = null) : FrameLayout(context) { + /** Why the controls are hidden while the corner button stays. */ + enum class Hidden { BY_TAP, BY_CONTROLLER } + private val surface = InputSurfaceView(context, pad, inputRole = InputRole.PRIMARY, haptics = dock != null) private var layout: SavedInputLayout? = null private val safe = Rect() private var viewWidth = 0 private var viewHeight = 0 - private val placements = object : LinkedHashMap>(4, .75f, true) { - override fun removeEldestEntry(eldest: MutableMap.MutableEntry>) = size > PLACEMENT_CACHE - } - private val quickToggle = QuickToggle(context) - var isButtonsOnly = false + private val corner = CornerButton(context) + var hidden: Hidden? = null private set - var isQuickHidden = false - private set - var isPinnedOnly = false - private set - val hasPinned get() = layout?.elements?.any { it.alwaysShown } == true - val inputSurface: com.droiddeck.launcher.ui.InputSurfaceView get() = surface + /** Holding the corner button opens DroidDeck's controller menu. */ + var onCornerHold: (() -> Unit)? = null + /** The player tapped the corner button. */ + var onCornerTap: ((Hidden?) -> Unit)? = null + val inputSurface: InputSurfaceView get() = surface var onTouchMiss: ((MotionEvent) -> Unit)? get() = surface.onTouchMiss set(value) { surface.onTouchMiss = value } init { addView(surface, LayoutParams(-1, -1)) - val size = (QUICK_HIT_DP * 2 * resources.displayMetrics.density).toInt() - addView(quickToggle, LayoutParams(size, size, Gravity.START or Gravity.BOTTOM)) + val size = (CORNER_HIT_DP * resources.displayMetrics.density).toInt() + addView(corner, LayoutParams(size, size, Gravity.START or Gravity.BOTTOM)) } fun updateLayout(value: SavedInputLayout?) { - if (layout == value) return + val kit = PadKit.current(context) + if (layout == value && surface.kit == kit) return releaseAll() layout = value + surface.kit = kit render() } - fun setButtonsOnly(enabled: Boolean) { - if (isButtonsOnly == enabled) return + fun setHidden(value: Hidden?) { + if (hidden == value) return releaseAll() - isButtonsOnly = enabled - isQuickHidden = false + hidden = value render() } - fun setQuickHidden(hidden: Boolean) { - if (isButtonsOnly || isQuickHidden == hidden) return - releaseAll() - isQuickHidden = hidden - render() - } - - fun setPinnedOnly(enabled: Boolean) { - if (isPinnedOnly == enabled) return - releaseAll() - isPinnedOnly = enabled - render() - } - - private data class Placement(val layout: SavedInputLayout?, val width: Int, val height: Int, val safe: Rect, val buttonsOnly: Boolean) - - private fun placed(): List { - val key = Placement(layout, viewWidth, viewHeight, Rect(safe), isButtonsOnly) - return placements.getOrPut(key) { - OnScreenLayout.elements(context, layout, viewWidth, viewHeight, safe, isButtonsOnly, dock) - } - } - private fun render() { - val elements = placed() - surface.updateCustomLayout(when { - isPinnedOnly -> elements.filter { it.alwaysShown } - isQuickHidden -> elements.filter { it.id == "builtin:keyboard" || it.alwaysShown } - else -> elements - }) - val style = layout?.style ?: InputSurfaceStyle() - surface.updateStyle(style) - quickToggle.tint = style.tint - quickToggle.alpha = style.opacity / 100f - quickToggle.visibility = if (isButtonsOnly || isPinnedOnly || layout == null || dock != null) GONE else VISIBLE - quickToggle.invalidate() + surface.updateCustomLayout(if (hidden != null) emptyList() else OnScreenLayout.elements(context, layout, viewWidth, viewHeight, safe, dock)) + surface.updateStyle(layout?.style ?: InputSurfaceStyle()) + corner.visibility = if (layout == null || dock != null) GONE else VISIBLE + corner.alpha = (layout?.style?.opacity ?: 100) / 100f + corner.invalidate() } fun takesTouchAt(x: Float, y: Float) = surface.takesTouchAt(x, y) || - quickToggle.visibility == VISIBLE && x >= quickToggle.left && x < quickToggle.right && y >= quickToggle.top && y < quickToggle.bottom + corner.visibility == VISIBLE && x >= corner.left && x < corner.right && y >= corner.top && y < corner.bottom + fun cornerTakes(x: Float, y: Float) = corner.visibility == VISIBLE && x >= corner.left && x < corner.right && y >= corner.top && y < corner.bottom fun releaseAll() = surface.releaseInputs() - fun reload() { releaseAll(); placements.clear(); render() } + fun reload() { releaseAll(); surface.kit = PadKit.current(context); render() } override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { val w = MeasureSpec.getSize(widthMeasureSpec) @@ -116,14 +90,14 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { val cutout = if (Build.VERSION.SDK_INT >= 28) insets.displayCutout else null - val offset = ((QUICK_CENTER_DP - QUICK_HIT_DP) * resources.displayMetrics.density).toInt() - val params = quickToggle.layoutParams as LayoutParams - val left = (cutout?.safeInsetLeft ?: 0) + offset - val bottom = (cutout?.safeInsetBottom ?: 0) + offset + val margin = (CORNER_MARGIN_DP * resources.displayMetrics.density).toInt() + val params = corner.layoutParams as LayoutParams + val left = (cutout?.safeInsetLeft ?: 0) + margin + val bottom = (cutout?.safeInsetBottom ?: 0) + margin if (params.leftMargin != left || params.bottomMargin != bottom) { params.leftMargin = left params.bottomMargin = bottom - quickToggle.layoutParams = params + corner.layoutParams = params } val fresh = Rect(cutout?.safeInsetLeft ?: 0, if (dock == null) cutout?.safeInsetTop ?: 0 else 0, cutout?.safeInsetRight ?: 0, cutout?.safeInsetBottom ?: 0) if (fresh != safe) { @@ -133,42 +107,45 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo return super.onApplyWindowInsets(insets) } - private inner class QuickToggle(context: Context) : View(context) { - var tint: Int? = ControllerPrefs.STEAM_BLUE - private val density = resources.displayMetrics.density + private inner class CornerButton(context: Context) : View(context) { + private val art = PadArt(context) + private val badge = Paint(Paint.ANTI_ALIAS_FLAG) private var armed = false - private val fill = Paint(Paint.ANTI_ALIAS_FLAG) - private val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeWidth = 1.5f * density } - private val text = Paint(Paint.ANTI_ALIAS_FLAG).apply { - textAlign = Paint.Align.CENTER - typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) - textSize = 22 * density - } + private var held = false + private val hold = Runnable { if (armed) { held = true; performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) } } override fun onDraw(canvas: Canvas) { - val x = width / 2f - val y = height / 2f - val radius = QUICK_RADIUS_DP * density - val color = tint - fill.color = if (color != null) InputSurfaceView.shade(color, 190, 0.12f) else (InputSurfaceView.SURFACE and 0x00ffffff) or (190 shl 24) - canvas.drawCircle(x, y, radius, fill) - stroke.color = if (color != null) InputSurfaceView.light(color, 150, 0.25f) else InputSurfaceView.LINE - canvas.drawCircle(x, y, radius, stroke) - text.color = if (color != null) InputSurfaceView.light(color, 210, 0.75f) else InputSurfaceView.TEXT - canvas.drawText(if (isQuickHidden) "+" else "−", x, y + text.textSize * 0.35f, text) + val w = width.toFloat(); val h = height.toFloat() + val dimmed = hidden != null && !armed + if (dimmed) canvas.saveLayerAlpha(0f, 0f, w, h, 170) + art.system(canvas, w, h, PadArt.Shape.ROUND, PadArt.Icon.MARK, armed) + if (dimmed) canvas.restore() + if (hidden == Hidden.BY_CONTROLLER) { + val d = art.density + val r = RectF(w - 15 * d, 3 * d, w - 2 * d, 12 * d) + badge.style = Paint.Style.FILL; badge.color = Color.rgb(0x16, 0x19, 0x1E) + canvas.drawRoundRect(r, 2.5f * d, 2.5f * d, badge) + badge.style = Paint.Style.STROKE; badge.strokeWidth = 1.3f * d; badge.color = Color.rgb(0xFF, 0xB3, 0x47) + canvas.drawRoundRect(r, 2.5f * d, 2.5f * d, badge) + } } @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent): Boolean { when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> armed = true - MotionEvent.ACTION_CANCEL -> armed = false + MotionEvent.ACTION_DOWN -> { armed = true; held = false; postDelayed(hold, ViewConfiguration.getLongPressTimeout().toLong()); invalidate() } + MotionEvent.ACTION_CANCEL -> { armed = false; removeCallbacks(hold); invalidate() } MotionEvent.ACTION_UP -> { - if (armed && event.x in 0f..width.toFloat() && event.y in 0f..height.toFloat()) { + removeCallbacks(hold) + if (armed && held) post { onCornerHold?.invoke() } + else if (armed && event.x in 0f..width.toFloat() && event.y in 0f..height.toFloat()) { performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY) - setQuickHidden(!isQuickHidden) + val next = if (hidden == null) Hidden.BY_TAP else null + setHidden(next) + onCornerTap?.invoke(next) } armed = false + invalidate() } } return true @@ -176,9 +153,7 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo } private companion object { - const val QUICK_CENTER_DP = 34f - const val QUICK_HIT_DP = 26f - const val QUICK_RADIUS_DP = 18f - const val PLACEMENT_CACHE = 4 + const val CORNER_HIT_DP = 48f + const val CORNER_MARGIN_DP = 4f } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt index 9fbb01c7a..32b3b73c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt @@ -2,10 +2,8 @@ package com.droiddeck.launcher.input import android.content.Context import android.graphics.Rect -import kotlin.math.abs import kotlin.math.max import kotlin.math.min -import kotlin.math.roundToInt object OnScreenLayout { data class Dock(val portrait: Boolean, val grips: Boolean, val left: InputControl = InputControl.LS, val right: InputControl = InputControl.RS) { @@ -21,25 +19,18 @@ object OnScreenLayout { } } - private const val TOLERANCE = .01f - private const val KEYBOARD_ID = "builtin:keyboard" + /** The built-in gamepad keeps no positions until it is edited; until then it follows the virtual controller's kit. */ + fun generated(layout: SavedInputLayout) = layout.elements.isEmpty() && (layout.id == InputLibraries.OVERLAY || layout.origin == InputLibraries.OVERLAY) - fun elements(context: Context, layout: SavedInputLayout?, width: Int, height: Int, safe: Rect, - buttonsOnly: Boolean = false, dock: Dock? = null): List { - val stored = layout?.elements ?: return emptyList() - if (width <= 0 || height <= 0) return stored - val generator = LegacyGamepadLayout(context, width, height, safe, layout.scale) - val (reference, generated) = reference(context, layout, width, height) - if (buttonsOnly && dock == null) return generator.buttonsOnly(stored) + fit(stored.filter { it.alwaysShown }, reference.first, reference.second, width, height, safe) - val gamepad = if (generated) stored.filter(::isGamepad) else emptyList() - val others = fit(stored.filterNot { generated && isGamepad(it) || dock != null && it.alwaysShown }, reference.first, reference.second, width, height, safe) - val placed = when { - gamepad.isEmpty() -> emptyList() - dock != null -> generator.dock(gamepad, dock.portrait, dock.grips, dock.left, dock.right) - else -> generator.regenerate(gamepad) + fun elements(context: Context, layout: SavedInputLayout?, width: Int, height: Int, safe: Rect, dock: Dock? = null): List { + layout ?: return emptyList() + if (width <= 0 || height <= 0) return layout.elements + if (generated(layout)) { + val kit = PadKit.current(context) + return if (dock != null) KitLayout.dock(context, kit, width, height, dock.portrait, dock.left, dock.right) + else KitLayout.elements(context, kit, width, height, safe, layout.scale) } - val byId = (placed + others).associateBy { it.id } - return stored.mapNotNull { byId[it.id] } + placed.filter { p -> stored.none { it.id == p.id } } + return fit(layout.elements, aspect(context, layout), 1f, width, height, safe) } fun editorElements(context: Context, layout: SavedInputLayout, width: Int, height: Int, edited: Boolean = false): List = @@ -73,35 +64,8 @@ object OnScreenLayout { } } - private fun isGamepad(e: InputSurfaceElement) = e.id.startsWith("legacy:") || e.id == KEYBOARD_ID - - fun generatedSize(context: Context, layout: SavedInputLayout, width: Int, height: Int): Pair? = - reference(context, layout, width, height).takeIf { it.second }?.first?.let { it.first.toInt() to it.second.toInt() } - - private fun reference(context: Context, layout: SavedInputLayout, width: Int, height: Int): Pair, Boolean> { - val (display, metrics) = InputLibraries.primaryDisplay(context) - val long = max(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) - val short = min(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) - val gamepad = layout.elements.filter(::isGamepad) - if (gamepad.any { it.id.startsWith("legacy:") }) { - val named = layout.id.removePrefix("migrated.layout.").takeIf { it != layout.id }?.split('x')?.mapNotNull { it.toIntOrNull() } - ?.takeIf { it.size == 2 && it.all { size -> size > 0 } }?.let { it[0] to it[1] } - val aspectSize = layout.aspect.takeIf { layout.id == InputLibraries.OVERLAY && it > 0f } - ?.let { (it * height).roundToInt().coerceAtLeast(1) to height } - for ((w, h) in listOfNotNull(named, width to height, aspectSize, long to short, short to long).distinct()) { - val generator = LegacyGamepadLayout(display, w, h, scale = layout.scale) - if (matches(gamepad, generator.elements()) || matches(gamepad, generator.elements(previousStickGeometry = true))) return (w.toFloat() to h.toFloat()) to true - } - } - val aspect = layout.aspect.takeIf { it > 0f } ?: (long.toFloat() / short) - return (aspect to 1f) to false - } - - private fun matches(stored: List, generated: List): Boolean { - val byId = generated.associateBy { it.id } - return stored.all { e -> - val g = byId[e.id] ?: return@all false - abs(e.x - g.x) <= TOLERANCE && abs(e.y - g.y) <= TOLERANCE && abs(e.width - g.width) <= TOLERANCE && abs(e.height - g.height) <= TOLERANCE - } + private fun aspect(context: Context, layout: SavedInputLayout): Float = layout.aspect.takeIf { it > 0f } ?: run { + val metrics = InputLibraries.primaryDisplay(context).second + max(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1).toFloat() / min(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadKit.kt b/app/src/main/java/com/droiddeck/launcher/input/PadKit.kt new file mode 100644 index 000000000..a81c3a4f1 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/PadKit.kt @@ -0,0 +1,39 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import com.droiddeck.launcher.session.SessionPrefs + +enum class FaceGlyphs { MONO_LETTERS, COLOR_LETTERS, COLOR_SYMBOLS, MONO_SYMBOLS } +enum class DpadStyle { CROSS, DISC, ARROWS } +enum class StickCap { RINGED, DISHED, KNURLED } + +enum class PadKit(val face: FaceGlyphs, val dpad: DpadStyle, val stick: StickCap, private val xbox: Boolean = false) { + STEAM_DECK(FaceGlyphs.MONO_LETTERS, DpadStyle.CROSS, StickCap.RINGED), + STEAM_CONTROLLER(FaceGlyphs.MONO_LETTERS, DpadStyle.CROSS, StickCap.RINGED), + XBOX(FaceGlyphs.COLOR_LETTERS, DpadStyle.DISC, StickCap.DISHED, xbox = true), + DUALSHOCK(FaceGlyphs.COLOR_SYMBOLS, DpadStyle.ARROWS, StickCap.KNURLED), + DUALSENSE(FaceGlyphs.MONO_SYMBOLS, DpadStyle.ARROWS, StickCap.KNURLED); + + val steam get() = this == STEAM_DECK || this == STEAM_CONTROLLER + val playStation get() = this == DUALSHOCK || this == DUALSENSE + + fun label(control: InputControl): String = when (control) { + InputControl.LB -> if (xbox) "LB" else "L1" + InputControl.RB -> if (xbox) "RB" else "R1" + InputControl.LT -> if (xbox) "LT" else "L2" + InputControl.RT -> if (xbox) "RT" else "R2" + else -> control.label + } + + companion object { + fun of(type: String) = when (type) { + SessionPrefs.CONTROLLER_STEAM -> STEAM_CONTROLLER + SessionPrefs.CONTROLLER_XBOX360 -> XBOX + SessionPrefs.CONTROLLER_DS4 -> DUALSHOCK + SessionPrefs.CONTROLLER_DUALSENSE -> DUALSENSE + else -> STEAM_DECK + } + + fun current(context: Context) = of(SessionPrefs.steamController(context)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 3e6e7944a..8838df53e 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -119,6 +119,7 @@ class SteamTouchControls( private var selectedArm = 0 private val fill = Paint(Paint.ANTI_ALIAS_FLAG) + private val art = com.droiddeck.launcher.ui.PadArt(context) private val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } private val text = Paint(Paint.ANTI_ALIAS_FLAG).apply { textAlign = Paint.Align.CENTER; isFakeBoldText = true } @@ -281,56 +282,54 @@ class SteamTouchControls( val r = radius(e) val pressed = !editing && e.type in pressedTypes() val alpha = (255 * alphaScale * if (faded) FADED else 1f).toInt().coerceIn(30, 255) - val ink = Color.argb(alpha, Color.red(tint), Color.green(tint), Color.blue(tint)) - stroke.color = if (isSelected) Color.rgb(26, 159, 255) else ink - stroke.strokeWidth = if (isSelected) lineWidth() * 2f else lineWidth() - fill.color = Color.argb((alpha * 0.85f).toInt(), 230, 233, 236) - text.color = ink - text.typeface = android.graphics.Typeface.DEFAULT_BOLD + if (alpha < 255) canvas.saveLayerAlpha(x - r * 1.5f, y - r * 1.5f, x + r * 1.5f, y + r * 1.5f, alpha) when (e.type) { - SteamTouchConfig.DPAD -> drawDpad(canvas, e, x, y, r) + SteamTouchConfig.DPAD -> if (visuals[SteamTouchConfig.DPAD].orEmpty().any { it.binding?.hasIcon == true }) drawDpad(canvas, e, x, y, r) else { + val bits = if (editing) 0L else dpadBits(e) + val held = (if (bits and DPAD_UP != 0L) 1 else 0) or (if (bits and DPAD_RIGHT != 0L) 2 else 0) or + (if (bits and DPAD_DOWN != 0L) 4 else 0) or (if (bits and DPAD_LEFT != 0L) 8 else 0) + canvas.save(); canvas.translate(x - r, y - r) + art.dpad(canvas, 2 * r, 2 * r, PadKit.STEAM_DECK, held) + canvas.restore() + } SteamTouchConfig.JOYSTICK_LEFT, SteamTouchConfig.JOYSTICK_RIGHT -> { - canvas.drawCircle(x, y, r, stroke) - val f = fingers.values.firstOrNull { it.element?.type == e.type } - if (f != null && !editing) { + val f = fingers.values.firstOrNull { it.element?.type == e.type }.takeIf { !editing } + var kx = 0f; var ky = 0f + if (f != null) { val d = hypot(f.x - x, f.y - y) val k = if (d > r) r / d else 1f - val kx = x + (f.x - x) * k - val ky = y + (f.y - y) * k - canvas.drawCircle(kx, ky, r * 0.42f, fill) + kx = (f.x - x) * k * .54f; ky = (f.y - y) * k * .54f } + art.stick(canvas, x, y, r, PadKit.STEAM_DECK, kx, ky, f != null) } SteamTouchConfig.TRACKPAD_LEFT, SteamTouchConfig.TRACKPAD_RIGHT, SteamTouchConfig.TRACKPAD_CENTER -> { - val rect = RectF(x - r * 1.3f, y - r * 0.85f, x + r * 1.3f, y + r * 0.85f) - if (pressed) canvas.drawRoundRect(rect, r * 0.18f, r * 0.18f, fill) - canvas.drawRoundRect(rect, r * 0.18f, r * 0.18f, stroke) - if (editing) { - text.textSize = r * 0.3f - text.color = Color.argb(alpha / 2, 255, 255, 255) - canvas.drawText(context.getString(R.string.deck_surface_trackpad), x, y - (text.descent() + text.ascent()) / 2, text) - } - } - SteamTouchConfig.STEAM -> { - if (isSelected) canvas.drawCircle(x, y, r, stroke) - drawMark(canvas, x, y, r * 0.5f, if (pressed) accent else ink, alpha) + val f = fingers.values.firstOrNull { it.element?.type == e.type }.takeIf { !editing } + canvas.save(); canvas.translate(x - r * 1.3f, y - r * .85f) + art.trackpad(canvas, r * 2.6f, r * 1.7f, f != null, (f?.x ?: x) - x + r * 1.3f, (f?.y ?: y) - y + r * .85f) + canvas.restore() + if (editing) art.text(canvas, context.getString(R.string.deck_surface_trackpad), x, y, r * .3f, Color.argb(128, 255, 255, 255)) } + SteamTouchConfig.STEAM -> systemButton(canvas, x, y, r, com.droiddeck.launcher.ui.PadArt.Shape.PILL, com.droiddeck.launcher.ui.PadArt.Icon.STEAM, pressed) SteamTouchConfig.SELECT, SteamTouchConfig.START -> { val binding = visuals[e.type]?.firstOrNull()?.binding - if (binding?.hasIcon == true) { - drawFace(canvas, e.type, binding, x, y, r, alpha, pressed); return - } - val rect = RectF(x - r * 1.08f, y - r * 0.55f, x + r * 1.08f, y + r * 0.55f) - if (pressed) canvas.drawRoundRect(rect, r * 0.5f, r * 0.5f, fill) - canvas.drawRoundRect(rect, r * 0.5f, r * 0.5f, stroke) - val t = r * 0.26f - val dir = if (e.type == SteamTouchConfig.START) 1f else -1f - val tri = Path().apply { - moveTo(x + dir * t, y); lineTo(x - dir * t * 0.75f, y - t); lineTo(x - dir * t * 0.75f, y + t); close() - } - canvas.drawPath(tri, Paint(Paint.ANTI_ALIAS_FLAG).apply { color = if (pressed) Color.argb(alpha, 23, 26, 33) else ink }) + if (binding?.hasIcon == true) drawFace(canvas, e.type, binding, x, y, r, pressed) + else systemButton(canvas, x, y, r, com.droiddeck.launcher.ui.PadArt.Shape.CHIP, + if (e.type == SteamTouchConfig.START) com.droiddeck.launcher.ui.PadArt.Icon.MENU else com.droiddeck.launcher.ui.PadArt.Icon.VIEW, pressed) } - else -> drawFace(canvas, e.type, visuals[e.type]?.firstOrNull()?.binding, x, y, r, alpha, pressed) + else -> drawFace(canvas, e.type, visuals[e.type]?.firstOrNull()?.binding, x, y, r, pressed) } + if (alpha < 255) canvas.restore() + if (isSelected) { + stroke.color = accent; stroke.strokeWidth = lineWidth() * 2f + if (isSquare(e.type)) canvas.drawRoundRect(RectF(x - r, y - r, x + r, y + r), r * .3f, r * .3f, stroke) else canvas.drawCircle(x, y, r, stroke) + } + } + + private fun systemButton(canvas: Canvas, x: Float, y: Float, r: Float, shape: com.droiddeck.launcher.ui.PadArt.Shape, + icon: com.droiddeck.launcher.ui.PadArt.Icon, pressed: Boolean) { + canvas.save(); canvas.translate(x - r * 1.4f, y - r * 1.4f) + art.system(canvas, r * 2.8f, r * 2.8f, shape, icon, pressed) + canvas.restore() } private fun isSquare(type: Int) = type in setOf(SteamTouchConfig.BUMPER_LEFT, SteamTouchConfig.BUMPER_RIGHT, @@ -350,53 +349,29 @@ class SteamTouchControls( canvas.restore() } - private fun drawFace(canvas: Canvas, type: Int, binding: SteamTouchBindings.Binding?, x: Float, y: Float, r: Float, - alpha: Int, pressed: Boolean) { - val square = isSquare(type) - val rect = RectF(x - r, y - r, x + r, y + r) - val corner = r * 0.3f - fun shape(paint: Paint) = if (square) canvas.drawRoundRect(rect, corner, corner, paint) else canvas.drawCircle(x, y, r, paint) + private fun drawFace(canvas: Canvas, type: Int, binding: SteamTouchBindings.Binding?, x: Float, y: Float, r: Float, pressed: Boolean) { + val shape = if (isSquare(type)) art.roundRect(x - r, y - r, x + r, y + r, r * .3f) else art.circle(x, y, r) val icon = binding?.icon?.takeIf { it.isNotEmpty() }?.let(::iconOrLoad) + val custom = binding != null && binding.background.isNotEmpty() && !binding.background.equals(SteamTouchBindings.DEFAULT_BACKGROUND, true) + art.glass(canvas, shape, pressed && !custom, if (custom) parseColor(binding!!.background, SteamTouchBindings.DEFAULT_BACKGROUND) else 0x850E1014.toInt()) + val ink = if (pressed && !custom) com.droiddeck.launcher.ui.PadArt.ON_ACCENT else com.droiddeck.launcher.ui.PadArt.INK if (icon != null) { val s = r * 0.62f - val custom = binding.background.isNotEmpty() && !binding.background.equals(SteamTouchBindings.DEFAULT_BACKGROUND, true) - if (custom) { - shape(Paint(Paint.ANTI_ALIAS_FLAG).apply { - color = parseColor(binding.background, SteamTouchBindings.DEFAULT_BACKGROUND) - this.alpha = if (pressed) alpha else (alpha * 0.85f).toInt() - }) - canvas.drawBitmap(tinted(binding.icon, icon, binding.foreground), null, RectF(x - s, y - s, x + s, y + s), - Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG).apply { this.alpha = alpha }) - } else { - if (pressed) shape(fill) - val ink = if (pressed) Color.argb(alpha, 23, 26, 33) else stroke.color - canvas.drawBitmap(inked(binding.icon, icon), null, RectF(x - s, y - s, x + s, y + s), - Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG).apply { - colorFilter = android.graphics.PorterDuffColorFilter(ink, android.graphics.PorterDuff.Mode.SRC_IN) - }) - } - shape(stroke) + if (custom) canvas.drawBitmap(tinted(binding!!.icon, icon, binding.foreground), null, RectF(x - s, y - s, x + s, y + s), Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG)) + else canvas.drawBitmap(inked(binding!!.icon, icon), null, RectF(x - s, y - s, x + s, y + s), + Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG).apply { colorFilter = android.graphics.PorterDuffColorFilter(ink, android.graphics.PorterDuff.Mode.SRC_IN) }) return } - if (pressed) shape(fill) - shape(stroke) - if (type == SteamTouchConfig.THUMB) { drawDots(canvas, x, y, r, if (pressed) Color.argb(alpha, 23, 26, 33) else text.color); return } - if (type == SteamTouchConfig.KEYBOARD) { drawKeyboardGlyph(canvas, x, y, r, if (pressed) Color.argb(alpha, 23, 26, 33) else text.color); return } - val own = label(type) - val shown = own - text.textSize = when { + if (type == SteamTouchConfig.THUMB) { art.icon(canvas, x, y, r * 1.1f, com.droiddeck.launcher.ui.PadArt.Icon.QAM, ink); return } + if (type == SteamTouchConfig.KEYBOARD) { art.icon(canvas, x, y, r * 1.1f, com.droiddeck.launcher.ui.PadArt.Icon.KEYBOARD, ink); return } + val shown = label(type) + val size = when { shown.length <= 1 -> r * 0.9f shown.length <= 2 -> r * 0.66f shown.length <= 5 -> r * 0.4f else -> r * 0.3f } - text.color = when { - pressed -> Color.argb(alpha, 23, 26, 33) - shown == own -> LABEL_COLORS[type]?.let { Color.argb(alpha, Color.red(it), Color.green(it), Color.blue(it)) } ?: text.color - else -> text.color - } - val line = if (shown.length > 10) shown.take(9) + "…" else shown - canvas.drawText(line, x, y - (text.descent() + text.ascent()) / 2, text) + art.text(canvas, if (shown.length > 10) shown.take(9) + "…" else shown, x, y, size, ink, r * 1.8f) } private fun drawDots(canvas: Canvas, x: Float, y: Float, r: Float, color: Int) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index d0da893c7..15d6cdb35 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -639,12 +639,25 @@ object SessionPrefs { prefs(context).getString("shape", null) ?: if (context.packageManager.hasSystemFeature("android.hardware.sensor.hinge_angle")) SHAPE_WIDE else SHAPE_AUTO - fun oscMode(context: Context): String = prefs(context).getString("osc", OSC_AUTO) ?: OSC_AUTO + /** Auto, Always or Never. Older builds also stored the Steam layout and a buttons-only mode here. */ + fun oscMode(context: Context): String = when (val mode = prefs(context).getString("osc", OSC_AUTO)) { + OSC_ALWAYS, OSC_NEVER -> mode + OSC_STEAM_QAM -> OSC_ALWAYS + else -> OSC_AUTO + } fun setOscMode(context: Context, mode: String) { prefs(context).edit().putString("osc", mode).apply() } + /** Draw Steam's touch layout for the game instead of DroidDeck's own. */ + fun steamTouchLayout(context: Context): Boolean = + prefs(context).getBoolean("steamTouchLayout", prefs(context).getString("osc", null) == OSC_STEAM_TOUCH) + + fun setSteamTouchLayout(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("steamTouchLayout", on).apply() + } + fun linuxDriver(context: Context): String = prefs(context).getString("linuxDriver", null) ?: prefs(context).getString("linuxDriver.steam", null) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt index 812557f36..9e55ae2a8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt @@ -270,7 +270,7 @@ private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embe if (role == InputRole.PRIMARY) SettingsGroup(stringResource(R.string.input_screen_visibility)) { ChoiceRow(host, "controller-osc", stringResource(R.string.mode_osc), stringResource(R.string.input_visibility_shared), listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), - SessionPrefs.OSC_STEAM_TOUCH to stringResource(R.string.osc_steam_touch), SessionPrefs.OSC_STEAM_QAM to stringResource(R.string.mode_osc_qam), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), + SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), oscMode) { SessionPrefs.setOscMode(context, it); oscMode = it; onChanged() } } if (layout != null) SettingsGroup(stringResource(R.string.ctrl_layout)) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 5b9422511..55f45de33 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -63,40 +63,24 @@ import com.droiddeck.launcher.session.SessionState private data class SurfaceSnapshot(val elements: List, val actions: Map, val clicks: Map, val scale: Float, val aspect: Float) -private class GamepadScaler(private val context: android.content.Context, private val width: Int, private val height: Int) { - private fun generator(scale: Float) = LegacyGamepadLayout(context, width, height, scale = scale) - val ids = generator(1f).elements().map { it.id }.toSet() - fun rescale(stored: List, from: Float, to: Float) = generator(to).rescale(stored, generator(from)) - fun reset(stored: List) = generator(1f).regenerate(stored).associateBy { it.id }.let { placed -> stored.map { placed[it.id] ?: it } } -} - private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputBindings, val defaults: List? = null, - private val defaultsFrame: Float = 0f, private var gamepad: GamepadScaler? = null, snap: Boolean = true) { - val hasGamepad get() = gamepad != null + private val defaultsFrame: Float = 0f, snap: Boolean = true) { var elements by mutableStateOf(layout.elements) var actions by mutableStateOf(preset.elements) var clicks by mutableStateOf(preset.clicks) var selected by mutableStateOf(null) - var toolsExpanded by mutableStateOf(false) - var toolsX by mutableFloatStateOf(.02f) - var toolsY by mutableFloatStateOf(.02f) var snap by mutableStateOf(snap) - var adding by mutableStateOf(false) + var popover by mutableStateOf(null) + var confirmDiscard by mutableStateOf(false) var properties by mutableStateOf(false) var clickProperties by mutableStateOf(false) var history by mutableStateOf>(emptyList()) var layoutScale by mutableFloatStateOf(layout.scale) var aspect by mutableFloatStateOf(layout.aspect) - private var scaleBase by mutableStateOf, List, Float>?>(null) + private var scaleBase by mutableStateOf, List>?>(null) private var scaleValue by mutableIntStateOf(100) - private val rescales get() = gamepad?.let { pad -> elements.any { it.id in pad.ids } } == true - val scale get() = when { - scaleBase?.second == elements -> scaleValue - rescales -> (layoutScale * 100).roundToInt() - else -> 100 - } - val positioned get() = (if (rescales) gamepad!!.reset(elements) else defaults?.let { elements.withPositionsOf(refit(it, defaultsFrame)) }) - ?.takeIf { it != elements || rescales && layoutScale != 1f } + val scale get() = if (scaleBase?.second == elements) scaleValue else 100 + val positioned get() = defaults?.let { elements.withPositionsOf(refit(it, defaultsFrame)) }?.takeIf { it != elements } private fun refit(placed: List, from: Float): List { if (from <= 0f || aspect <= 0f || abs(from / aspect - 1f) < .01f) return placed @@ -106,31 +90,34 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB val dirty get() = elements != layout.elements || actions != preset.elements || clicks != preset.clicks || layoutScale != layout.scale || aspect != layout.aspect fun checkpoint() { history = (history + SurfaceSnapshot(elements, actions, clicks, layoutScale, aspect)).takeLast(40) } fun undo() { history.lastOrNull()?.let { elements = it.elements; actions = it.actions; clicks = it.clicks; layoutScale = it.scale; aspect = it.aspect; history = history.dropLast(1) } } - fun beginEdit(displayed: List, aspect: Float, scaler: GamepadScaler? = gamepad) { + fun beginEdit(displayed: List, aspect: Float) { checkpoint() elements = OnScreenLayout.editorFrame(layout.copy(elements = elements), displayed) this.aspect = aspect - scaler?.let { gamepad = it } } fun scaleAll(percent: Int) { - val base = scaleBase?.takeIf { it.second == elements } ?: Triple(elements, elements, if (rescales) layoutScale else 0f).also { checkpoint() } - val factor = percent / 100f - val pad = gamepad - elements = if (base.third > 0f && pad != null) { - layoutScale = factor - val others = base.first.filterNot { it.id in pad.ids }.scaled(factor / base.third).associateBy { it.id } - pad.rescale(base.first, base.third, factor).map { others[it.id] ?: it } - } else base.first.scaled(factor) - scaleValue = percent; scaleBase = Triple(base.first, elements, base.third) + val base = scaleBase?.takeIf { it.second == elements } ?: (elements to elements).also { checkpoint() } + elements = base.first.scaled(percent / 100f) + scaleValue = percent; scaleBase = base.first to elements + } + fun resetPositions() { positioned?.let { checkpoint(); elements = it } } + fun hiddenDefaults(): List = defaults?.let { refit(it, defaultsFrame) }?.filter { d -> elements.none { it.id == d.id } }.orEmpty() + fun add(element: InputSurfaceElement) { checkpoint(); elements = elements + element; selected = element.id; popover = null } + fun remove(id: String) { checkpoint(); elements = elements.filterNot { it.id == id }; actions = actions - id; clicks = clicks - id; selected = null } + fun resizeSelected(factor: Float) { + val e = element ?: return + checkpoint() + val w = (e.width * factor).coerceIn(.03f, 1f); val h = (e.height * factor).coerceIn(.03f, 1f) + val cx = e.x + e.width / 2; val cy = e.y + e.height / 2 + elements = elements.map { if (it.id == e.id) e.copy(x = (cx - w / 2).coerceIn(0f, 1f - w), y = (cy - h / 2).coerceIn(0f, 1f - h), width = w, height = h).bounded() else it } } - fun resetPositions() { positioned?.let { checkpoint(); elements = it; if (rescales) layoutScale = 1f } } fun action(e: InputSurfaceElement) = preset.copy(elements = actions).action(e) fun clickAction(e: InputSurfaceElement) = preset.copy(elements = actions, clicks = clicks).clickAction(e) } @Composable fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> Unit, - role: InputRole = InputRole.SECONDARY, layoutId: String? = null, bindingsId: String? = null) { + role: InputRole = InputRole.SECONDARY, layoutId: String? = null, bindingsId: String? = null, scope: String? = null) { val context = LocalContext.current val host = LocalInputActivity.current ?: context.findActivity() as? ComponentActivity val library = remember { InputLibraries.read(context) } @@ -139,17 +126,12 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> val layoutUsers = library.usersOfLayout(savedLayout.id).size val bindingUsers = library.usersOfBindings(savedBindings.id).size val draft = remember { - val (display, metrics) = InputLibraries.primaryDisplay(context) - val gamepad = savedLayout.elements.takeIf { e -> e.any { it.id.startsWith("legacy:") } }?.let { - val (w, h) = OnScreenLayout.generatedSize(context, savedLayout, metrics.widthPixels, metrics.heightPixels) ?: (metrics.widthPixels to metrics.heightPixels) - GamepadScaler(display, w, h) - } val defaults = InputLibraries.defaultPositions(context, library, savedLayout) - SurfaceDraft(savedLayout, savedBindings, defaults?.first, defaults?.second ?: 0f, gamepad, ControllerPrefs.snap(context)) + val start = if (OnScreenLayout.generated(savedLayout) && defaults != null) savedLayout.copy(elements = defaults.first, aspect = defaults.second) else savedLayout + SurfaceDraft(start, savedBindings, defaults?.first, defaults?.second ?: 0f, ControllerPrefs.snap(context)) } val manager = remember { context.getSystemService(DisplayManager::class.java) } var revision by remember { mutableIntStateOf(0) } - var discard by remember { mutableStateOf(false) } var failure by remember { mutableStateOf(null) } val target = remember(revision, role) { if (host is SessionActivity) host.inputEditorDisplay(role) @@ -160,7 +142,7 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> } } val remote = target != null && target.displayId != host?.window?.decorView?.display?.displayId - fun leave() { if (draft.dirty) discard = true else onDismiss() } + fun leave() { if (draft.dirty) draft.confirmDiscard = true else onDismiss() } fun save() { runCatching { InputLibraries.update(context) { latest -> @@ -209,8 +191,23 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> androidx.compose.ui.graphics.Color.Transparent else MaterialTheme.colorScheme.surface) { val element = draft.element BackHandler { if (draft.properties) draft.properties = false else leave() } + val editorScope = scope ?: if (layoutUsers > 1) stringResource(R.string.input_editor_shared, layoutUsers) else savedLayout.name when { - draft.properties && element != null -> { + target == null -> SettingsPage(rememberMenuHost(), savedLayout.name, ::leave) { + Text(stringResource(R.string.input_display_unavailable)) + PrimaryButton(stringResource(R.string.input_editor_done)) { save() } + } + remote -> SettingsPage(rememberMenuHost(), stringResource(R.string.input_editor_remote), ::leave, + lede = if (layoutUsers > 1) stringResource(R.string.input_editor_shared, layoutUsers) else savedLayout.name) { + SurfaceToolbar(draft, ::save, ::leave, onDismiss) + SurfaceSelection(draft) + when (draft.popover) { EditorPopover.ADD -> AddRows(draft); EditorPopover.HIDDEN -> HiddenRows(draft); null -> Unit } + } + else -> Box(Modifier.fillMaxSize()) { + SurfaceCanvas(draft, transparent = host is SessionActivity && role == InputRole.PRIMARY) + EditorChrome(draft, editorScope, failure, ::save, ::leave, onDismiss) + if (draft.properties && element != null) Surface(Modifier.align(Alignment.CenterEnd).fillMaxHeight().fillMaxWidth(.44f), + color = MaterialTheme.colorScheme.surface, shadowElevation = 12.dp) { var properties by remember(element.id) { mutableStateOf(element) } InputActionEditor(if (draft.clickProperties) InputControl.A else element.control, if (draft.clickProperties) draft.clickAction(element) else draft.action(element), @@ -228,37 +225,11 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> draft.elements = draft.elements.map { if (it.id == element.id) properties.copy(name = properties.name.trim().ifBlank { element.name }) else it } draft.properties = false }) - } - target == null -> SettingsPage(rememberMenuHost(), savedLayout.name, ::leave) { - Text(stringResource(R.string.input_display_unavailable)) - PrimaryButton(stringResource(R.string.input_editor_done)) { save() } - } - remote -> SettingsPage(rememberMenuHost(), stringResource(R.string.input_editor_remote), ::leave, - lede = if (layoutUsers > 1) stringResource(R.string.input_editor_shared, layoutUsers) else savedLayout.name) { - SurfaceToolbar(draft, ::save, ::leave) - SurfaceSelection(draft) - } - else -> Box(Modifier.fillMaxSize()) { - SurfaceCanvas(draft, transparent = host is SessionActivity && role == InputRole.PRIMARY) - FloatingSurfaceTools(draft, ::save, ::leave) + } } } } } - if (draft.adding) AlertDialog(onDismissRequest = { draft.adding = false }, title = { Text(stringResource(R.string.input_add_element)) }, confirmButton = {}, text = { Column { - for (kind in InputElementKind.entries) PadTextButton(onClick = { draft.checkpoint() - val w = if (kind.control.dimensions == 2) .4f else .2f - val h = .3f - val name = context.getString(kind.label()) + " " + (draft.elements.count { it.kind == kind } + 1) - val element = InputSurfaceElement(kind.control, (1f - w) / 2, (1f - h) / 2, w, h, newInputId(), kind, name) - draft.elements = draft.elements + element; draft.selected = element.id - draft.adding = false; draft.toolsExpanded = false }) { Text(stringResource(kind.label())) } - } }) - if (discard) AlertDialog(onDismissRequest = { discard = false }, title = { Text(stringResource(R.string.input_editor_discard)) }, - confirmButton = { PadTextButton(onClick = onDismiss) { Text(stringResource(R.string.common_ok)) } }, - dismissButton = { PadTextButton(onClick = { discard = false }) { Text(stringResource(R.string.common_cancel)) } }) - failure?.let { AlertDialog(onDismissRequest = { failure = null }, title = { Text(stringResource(R.string.input_save_failed)) }, text = { Text(it) }, - confirmButton = { PadTextButton(onClick = { failure = null }) { Text(stringResource(R.string.common_ok)) } }) } } @Composable @@ -267,70 +238,145 @@ private fun SurfaceCanvas(draft: SurfaceDraft, transparent: Boolean = false) { update = { view -> view.setBackgroundColor(if (transparent) android.graphics.Color.TRANSPARENT else android.graphics.Color.rgb(10, 11, 13)) view.style = draft.layout.style.copy(hidden = emptySet()); view.sourceLayout = draft.layout; view.aspect = draft.aspect; view.elements = draft.elements; view.selected = draft.selected; view.snap = draft.snap - view.isEnabled = !draft.properties && !draft.adding + view.isEnabled = !draft.properties && draft.popover == null && !draft.confirmDiscard view.onSelect = { if (!draft.properties) draft.selected = it } - view.onBeginEdit = { e, w, h -> draft.beginEdit(e, w.toFloat() / h, if (draft.hasGamepad) GamepadScaler(view.context, w, h) else null) } + view.onBeginEdit = { e, w, h -> draft.beginEdit(e, w.toFloat() / h) } view.onChange = { e -> if (!draft.properties) draft.elements = draft.elements.map { if (it.id == e.id) e else it } } }) } +private enum class EditorPopover { ADD, HIDDEN } + @Composable -private fun FloatingSurfaceTools(draft: SurfaceDraft, onSave: () -> Unit, onLeave: () -> Unit) { +private fun EditorBar(modifier: Modifier = Modifier, content: @Composable RowScope.() -> Unit) { + Surface(modifier, shape = RoundedCornerShape(16.dp), color = MaterialTheme.colorScheme.surface.copy(alpha = .96f), + contentColor = MaterialTheme.colorScheme.onSurface, shadowElevation = 8.dp) { + Row(Modifier.horizontalScroll(rememberScrollState()).padding(6.dp), horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalAlignment = Alignment.CenterVertically, content = content) + } +} + +/** The editor's tools over the canvas: one toolbar, a bar on the selected control, and the Add and Hidden lists. */ +@Composable +private fun EditorChrome(draft: SurfaceDraft, scope: String, failure: String?, onSave: () -> Unit, onLeave: () -> Unit, onDiscard: () -> Unit) { + val context = LocalContext.current BoxWithConstraints(Modifier.fillMaxSize()) { - val density = LocalDensity.current - val screenWidth = with(density) { maxWidth.toPx() } - val screenHeight = with(density) { maxHeight.toPx() } - val margin = with(density) { 8.dp.toPx() } - var panelSize by remember { mutableStateOf(IntSize.Zero) } - val x = (draft.toolsX * screenWidth).coerceIn(margin, (screenWidth - panelSize.width - margin).coerceAtLeast(margin)) - val y = (draft.toolsY * screenHeight).coerceIn(margin, (screenHeight - panelSize.height - margin).coerceAtLeast(margin)) - val position by rememberUpdatedState(Offset(x, y)) - val expandedWidth = minOf(420.dp, maxWidth - 16.dp) - val panelWidth by animateDpAsState(if (draft.toolsExpanded) expandedWidth else 152.dp, label = "input-tools-width") - Surface(Modifier.offset { IntOffset(x.roundToInt(), y.roundToInt()) } - .width(panelWidth).clipToBounds() - .heightIn(max = maxHeight - 16.dp).onSizeChanged { panelSize = it }, - shape = RoundedCornerShape(18.dp), color = MaterialTheme.colorScheme.surface, - tonalElevation = 6.dp, shadowElevation = 10.dp) { - Column { - Row(Modifier.fillMaxWidth().heightIn(min = 52.dp).testTag("input-editor-tools") - .pointerInput(screenWidth, screenHeight, panelSize) { - var dragPosition = Offset.Zero - detectDragGestures(onDragStart = { dragPosition = position }) { change, delta -> - change.consume() - dragPosition = Offset((dragPosition.x + delta.x).coerceIn(margin, (screenWidth - panelSize.width - margin).coerceAtLeast(margin)), - (dragPosition.y + delta.y).coerceIn(margin, (screenHeight - panelSize.height - margin).coerceAtLeast(margin))) - draft.toolsX = dragPosition.x / screenWidth - draft.toolsY = dragPosition.y / screenHeight - } + Column(Modifier.align(Alignment.TopCenter).padding(top = 10.dp).widthIn(max = maxWidth - 16.dp), + horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(6.dp)) { + EditorBar(Modifier.testTag("input-editor-tools")) { + if (draft.confirmDiscard) { + Text(stringResource(R.string.input_editor_discard), Modifier.padding(horizontal = 8.dp), style = MaterialTheme.typography.titleSmall) + SecondaryButton(stringResource(R.string.input_keep_editing), compact = true) { draft.confirmDiscard = false } + PrimaryButton(stringResource(R.string.input_discard), compact = true, onClick = onDiscard) + } else { + SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = onLeave) + SecondaryButton(stringResource(R.string.input_editor_undo), enabled = draft.history.isNotEmpty(), compact = true) { draft.undo() } + SecondaryButton(stringResource(R.string.input_editor_add), enabled = draft.elements.size < 64, compact = true) { + draft.popover = if (draft.popover == EditorPopover.ADD) null else EditorPopover.ADD } - .clickable { draft.toolsExpanded = !draft.toolsExpanded }.padding(horizontal = 16.dp), - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - Text("⠿", color = MaterialTheme.colorScheme.primary) - Text(stringResource(if (draft.toolsExpanded) R.string.input_hide_tools else R.string.input_tools), style = MaterialTheme.typography.titleSmall, maxLines = 1) - } - AnimatedVisibility(draft.toolsExpanded, enter = expandVertically(expandFrom = Alignment.Top) + fadeIn(), - exit = shrinkVertically(shrinkTowards = Alignment.Top) + fadeOut()) { - Column(Modifier.requiredWidth(expandedWidth).verticalScroll(rememberScrollState())) { - HorizontalDivider() - SurfaceToolbar(draft, onSave, onLeave) - HorizontalDivider() - SurfaceSelection(draft) + if (draft.defaults != null) SecondaryButton(stringResource(R.string.input_hidden_count, draft.hiddenDefaults().size), compact = true) { + draft.popover = if (draft.popover == EditorPopover.HIDDEN) null else EditorPopover.HIDDEN } + if (draft.defaults != null) SecondaryButton(stringResource(R.string.input_reset_positions), enabled = draft.positioned != null, compact = true) { draft.resetPositions() } + Row(verticalAlignment = Alignment.CenterVertically) { + Checkbox(draft.snap, { draft.snap = it; ControllerPrefs.setSnap(context, it) }) + Text(stringResource(R.string.ctrl_editor_snap)) + } + if (draft.elements.isNotEmpty()) { + SecondaryButton("−", enabled = draft.scale > 80, compact = true) { draft.scaleAll((draft.scale - 5).coerceAtLeast(80)) } + Text("${draft.scale}%", Modifier.widthIn(min = 44.dp).testTag("input-editor-scale"), style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant) + SecondaryButton("+", enabled = draft.scale < 150, compact = true) { draft.scaleAll((draft.scale + 5).coerceAtMost(150)) } + } + PrimaryButton(stringResource(R.string.input_editor_done), compact = true, onClick = onSave) } } + Text(scope, Modifier.background(MaterialTheme.colorScheme.background.copy(alpha = .7f), RoundedCornerShape(50)).padding(horizontal = 12.dp, vertical = 4.dp), + style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + failure?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error) } + when (draft.popover) { + EditorPopover.ADD -> EditorList { AddRows(draft) } + EditorPopover.HIDDEN -> EditorList { HiddenRows(draft) } + null -> Unit + } + } + val e = draft.element + if (e != null && !draft.properties && draft.popover == null && !draft.confirmDiscard) { + val density = LocalDensity.current + var size by remember { mutableStateOf(IntSize.Zero) } + val w = with(density) { maxWidth.toPx() } + val h = with(density) { maxHeight.toPx() } + val gap = with(density) { 12.dp.toPx() } + val margin = with(density) { 8.dp.toPx() } + val top = h * e.y - gap - size.height + val above = top > with(density) { 110.dp.toPx() } + val x = (w * (e.x + e.width / 2) - size.width / 2).coerceIn(margin, (w - size.width - margin).coerceAtLeast(margin)) + val y = if (above) top else (h * (e.y + e.height) + gap).coerceAtMost(h - size.height - margin) + EditorBar(Modifier.offset { IntOffset(x.roundToInt(), y.roundToInt()) }.onSizeChanged { size = it }.testTag("input-editor-selection")) { + SecondaryButton("−", compact = true) { draft.resizeSelected(1f / 1.1f) } + SecondaryButton("+", compact = true) { draft.resizeSelected(1.1f) } + PrimaryButton(stringResource(R.string.input_options), compact = true) { draft.clickProperties = false; draft.properties = true } + if (e.hasClick) SecondaryButton(stringResource(R.string.input_click_short), compact = true) { draft.clickProperties = true; draft.properties = true } + SecondaryButton(stringResource(R.string.input_remove_element), compact = true) { draft.remove(e.id) } + } } } } +@Composable +private fun EditorList(content: @Composable ColumnScope.() -> Unit) { + Surface(Modifier.widthIn(min = 260.dp, max = 360.dp), shape = RoundedCornerShape(16.dp), color = MaterialTheme.colorScheme.surface.copy(alpha = .97f), + contentColor = MaterialTheme.colorScheme.onSurface, shadowElevation = 8.dp) { + Column(Modifier.padding(6.dp).heightIn(max = 320.dp).verticalScroll(rememberScrollState()), content = content) + } +} + +@Composable +private fun EditorRow(title: String, action: String, onClick: () -> Unit) { + Row(Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 4.dp), verticalAlignment = Alignment.CenterVertically) { + Text(title, Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium) + SecondaryButton(action, compact = true, onClick = onClick) + } +} + +@Composable +private fun AddRows(draft: SurfaceDraft) { + val context = LocalContext.current + for (control in listOf(InputControl.L3, InputControl.R3).filter { c -> draft.elements.none { it.id == "legacy:${c.id}" } }) + EditorRow(control.label, stringResource(R.string.input_editor_add)) { draft.add(InputSurfaceElement(control, .47f, .45f, .06f, .1f, buttonShape = InputButtonShape.CIRCLE)) } + for (kind in InputElementKind.entries) EditorRow(stringResource(kind.label()), stringResource(R.string.input_editor_add)) { + val w = if (kind.control.dimensions == 2) .2f else .1f + val h = if (kind.control.dimensions == 2) .35f else .16f + val name = context.getString(kind.label()) + " " + (draft.elements.count { it.kind == kind } + 1) + draft.add(InputSurfaceElement(kind.control, (1f - w) / 2, (1f - h) / 2, w, h, newInputId(), kind, name)) + } +} + +@Composable +private fun HiddenRows(draft: SurfaceDraft) { + val hidden = draft.hiddenDefaults() + if (hidden.isEmpty()) Text(stringResource(R.string.input_nothing_hidden), Modifier.padding(12.dp), style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant) + for (e in hidden) EditorRow(e.name, stringResource(R.string.input_restore)) { draft.add(e) } +} + @OptIn(ExperimentalLayoutApi::class) @Composable -private fun SurfaceToolbar(draft: SurfaceDraft, onSave: () -> Unit, onLeave: () -> Unit) { +private fun SurfaceToolbar(draft: SurfaceDraft, onSave: () -> Unit, onLeave: () -> Unit, onDiscard: () -> Unit) { val context = LocalContext.current + if (draft.confirmDiscard) { + FlowRow(Modifier.fillMaxWidth().padding(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(stringResource(R.string.input_editor_discard), style = MaterialTheme.typography.titleSmall) + SecondaryButton(stringResource(R.string.input_keep_editing), compact = true) { draft.confirmDiscard = false } + PrimaryButton(stringResource(R.string.input_discard), compact = true, onClick = onDiscard) + } + return + } FlowRow(Modifier.fillMaxWidth().padding(8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = onLeave) - SecondaryButton(stringResource(R.string.input_editor_add), enabled = draft.elements.size < 64, compact = true) { draft.adding = true } + SecondaryButton(stringResource(R.string.input_editor_add), enabled = draft.elements.size < 64, compact = true) { draft.popover = EditorPopover.ADD } + if (draft.defaults != null) SecondaryButton(stringResource(R.string.input_hidden_count, draft.hiddenDefaults().size), compact = true) { draft.popover = EditorPopover.HIDDEN } SecondaryButton(stringResource(R.string.input_editor_undo), enabled = draft.history.isNotEmpty(), compact = true) { draft.undo() } if (draft.defaults != null) SecondaryButton(stringResource(R.string.input_reset_positions), enabled = draft.positioned != null, compact = true) { draft.resetPositions() } Row(verticalAlignment = Alignment.CenterVertically) { @@ -352,9 +398,7 @@ private fun SurfaceSelection(draft: SurfaceDraft) { FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { PrimaryButton(stringResource(R.string.input_properties), compact = true) { draft.clickProperties = false; draft.properties = true } if (e.hasClick) SecondaryButton(stringResource(R.string.input_click_properties), compact = true) { draft.clickProperties = true; draft.properties = true } - SecondaryButton(stringResource(R.string.input_remove_element), compact = true) { - draft.checkpoint(); draft.elements = draft.elements.filterNot { it.id == e.id }; draft.actions = draft.actions - e.id; draft.clicks = draft.clicks - e.id; draft.selected = null - } + SecondaryButton(stringResource(R.string.input_remove_element), compact = true) { draft.remove(e.id) } } } ?: Text(stringResource(R.string.input_editor_hint)) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt index 0058224c0..313334ca5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt @@ -1,17 +1,12 @@ package com.droiddeck.launcher.ui -import com.droiddeck.launcher.R - import android.annotation.SuppressLint import android.content.Context import android.graphics.BitmapFactory import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint -import android.graphics.Path -import android.graphics.RadialGradient import android.graphics.RectF -import android.graphics.Shader import android.graphics.Typeface import android.graphics.drawable.GradientDrawable import android.view.Gravity @@ -36,7 +31,9 @@ import com.droiddeck.launcher.input.InputAction import com.droiddeck.launcher.input.InputButtonIcons import com.droiddeck.launcher.input.InputButtonShape import com.droiddeck.launcher.input.InputButtonImages +import com.droiddeck.launcher.input.KitLayout import com.droiddeck.launcher.input.PadBridge +import com.droiddeck.launcher.input.PadKit import com.droiddeck.launcher.input.pcKeyLabel import com.droiddeck.launcher.session.SessionPrefs import kotlin.math.atan2 @@ -51,7 +48,11 @@ class InputSurfaceView( val inputRole: InputRole = InputRole.SECONDARY, private var surfaceStyle: InputSurfaceStyle = InputSurfaceStyle(), private val haptics: Boolean = inputRole != InputRole.PRIMARY, + kit: PadKit = PadKit.current(context), ) : FrameLayout(context) { + var kit: PadKit = kit + set(value) { if (field != value) { field = value; customCanvas?.let { c -> for (i in 0 until c.childCount) c.getChildAt(i).invalidate() } } } + private val art = PadArt(context) private val content = FrameLayout(context) private val elementSources = ArrayList() private var customCanvas: ViewGroup? = null @@ -144,7 +145,6 @@ class InputSurfaceView( private fun styleElement(view: View) { view.alpha = surfaceStyle.opacity / 100f * ((view.tag as? InputSurfaceElement)?.opacity ?: 1f) - (view as? Surface)?.tint = surfaceStyle.tint view.invalidate() } @@ -192,12 +192,12 @@ class InputSurfaceView( } } } - canvas.clipChildren = customLayout.none { it.kind == InputElementKind.STICK && (classic(it) || adaptive(it)) } + canvas.clipChildren = customLayout.none(::adaptive) for (element in customLayout) { val source = pad?.let { InputSurfaceSource(it, inputRole, element).also { s -> elementSources += s } } canvas.addView(when (element.kind) { InputElementKind.STICK -> StickView(context, element, source, element.floating, element.hideWhenIdle && pad != null) - InputElementKind.TRACKPAD -> TrackpadView(context, element.control == InputControl.RIGHT_PAD, source = source) + InputElementKind.TRACKPAD -> TrackpadView(context, source) InputElementKind.DPAD -> DirectionPad(context, element, source) else -> HoldButton(context, element, source) }.apply { tag = element; contentDescription = element.name; styleElement(this); source?.onStateChanged = { postInvalidate() } }) @@ -267,64 +267,12 @@ class InputSurfaceView( private fun feedback(view: View, type: Int) { if (haptics) view.performHapticFeedback(type) } private abstract class Surface(context: Context) : View(context) { - var tint: Int? = null protected val density = resources.displayMetrics.density - protected val rect = RectF() - private val fill = Paint(Paint.ANTI_ALIAS_FLAG) - private val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } protected val labelPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { textAlign = Paint.Align.CENTER typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) + color = TEXT } - protected val captionPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - textAlign = Paint.Align.CENTER - color = TEXT_DIM - } - - protected fun drawSurface(canvas: Canvas, lit: Boolean, shape: InputButtonShape = InputButtonShape.ROUNDED, classic: Boolean = false) { - val inset = if (classic && tint != null) 0.75f * density else density - rect.set(inset, inset, width - inset, height - inset) - val radius = when (shape) { InputButtonShape.CIRCLE, InputButtonShape.PILL -> min(width, height) / 2f; InputButtonShape.RECTANGLE -> 2 * density; else -> CORNER * density } - val color = tint - if (classic && color != null) { - val corner = if (shape == InputButtonShape.PILL) radius * 0.55f else radius - fill.color = if (lit) shade(color, 160, 1f) else shade(color, 80, 0.12f) - canvas.drawRoundRect(rect, corner, corner, fill) - stroke.color = if (lit) light(color, 230, 0.7f) else light(color, 150, 0.25f) - stroke.strokeWidth = 1.5f * density - canvas.drawRoundRect(rect, corner, corner, stroke) - return - } - fill.color = tint?.let { color -> (color and 0x00ffffff) or ((if (lit) 140 else 48) shl 24) } ?: if (lit) ACCENT_WASH else SURFACE - canvas.drawRoundRect(rect, radius, radius, fill) - stroke.color = tint?.let { color -> (color and 0x00ffffff) or ((if (lit) 255 else 160) shl 24) } ?: if (lit) ACCENT else LINE - stroke.strokeWidth = (if (lit) 2f else 1f) * density - canvas.drawRoundRect(rect, radius, radius, stroke) - } - - protected fun drawCircle(canvas: Canvas, x: Float, y: Float, radius: Float, fillColor: Int, strokeColor: Int) { - fill.color = fillColor - canvas.drawCircle(x, y, radius, fill) - stroke.color = strokeColor - stroke.strokeWidth = 1.5f * density - canvas.drawCircle(x, y, radius, stroke) - } - - protected fun drawKeyboard(canvas: Canvas, x: Float, y: Float, lit: Boolean) { - val color = tint ?: return - stroke.color = if (lit) light(color, 230, 0.7f) else light(color, 150, 0.25f) - stroke.strokeWidth = 1.5f * density - rect.set(x - 10 * density, y - 7 * density, x + 10 * density, y + 7 * density) - canvas.drawRoundRect(rect, 2 * density, 2 * density, stroke) - for (row in 0..1) for (col in 0..2) { - val kx = x + (-6f + col * 5f) * density - val ky = y + (-3f + row * 4f) * density - canvas.drawLine(kx, ky, kx + 2 * density, ky, stroke) - } - canvas.drawLine(x - 5 * density, y + 4 * density, x + 5 * density, y + 4 * density, stroke) - } - - protected fun textColor(lit: Boolean) = if (lit) Color.WHITE else tint?.let { light(it, 210, 0.75f) } ?: TEXT } private inner class HoldButton(context: Context, private val element: InputSurfaceElement, private val source: InputSurfaceSource?) : Surface(context) { @@ -346,38 +294,58 @@ class InputSurfaceView( override fun onDraw(canvas: Canvas) { val lit = if (element.toggle) source?.latched == true else down - val classic = classic(element) - drawSurface(canvas, lit, element.buttonShape, classic) - val cx = width / 2f - labelPaint.color = if (classic && tint != null) textColor(lit) else if (lit) ACCENT else TEXT + val w = width.toFloat(); val h = height.toFloat() + val c = element.control + val native = element.id == "legacy:${c.id}" && element.showLabel && element.icon == 0 && bitmap == null + when { + element.id == KitLayout.KEYBOARD_ID && element.icon == InputButtonIcons.KEYBOARD -> art.system(canvas, w, h, PadArt.Shape.ROUND, PadArt.Icon.KEYBOARD, lit) + native && c in FACE -> art.face(canvas, w / 2f, h / 2f, min(w, h) / 2f - art.dp(2f), c, kit, lit) + native && c in SHOULDERS -> art.shoulder(canvas, w, h, c, kit, lit) + native && c in GRIPS -> art.grip(canvas, w, h, c.label, lit) + native && (c == InputControl.L3 || c == InputControl.R3) -> art.small(canvas, w, h, c.label, lit) + native && c in SYSTEM -> systemLook(c).let { (shape, icon) -> art.system(canvas, w, h, shape, icon, lit) } + else -> custom(canvas, w, h, lit) + } + } + + private fun systemLook(c: InputControl): Pair = when { + kit.steam -> when (c) { + InputControl.SELECT -> PadArt.Shape.CHIP to PadArt.Icon.VIEW + InputControl.START -> PadArt.Shape.CHIP to PadArt.Icon.MENU + InputControl.GUIDE -> PadArt.Shape.PILL to PadArt.Icon.STEAM + else -> PadArt.Shape.PILL to PadArt.Icon.QAM + } + kit.playStation -> when (c) { + InputControl.SELECT -> PadArt.Shape.PILL to if (kit == PadKit.DUALSHOCK) PadArt.Icon.SHARE else PadArt.Icon.CREATE + InputControl.START -> PadArt.Shape.PILL to if (kit == PadKit.DUALSHOCK) PadArt.Icon.OPTIONS else PadArt.Icon.MENU + InputControl.GUIDE -> PadArt.Shape.ROUND to PadArt.Icon.HOME + else -> PadArt.Shape.ROUND to PadArt.Icon.QAM + } + else -> PadArt.Shape.ROUND to when (c) { + InputControl.SELECT -> PadArt.Icon.BACK + InputControl.START -> PadArt.Icon.START + InputControl.GUIDE -> PadArt.Icon.HOME + else -> PadArt.Icon.QAM + } + } + + private fun custom(canvas: Canvas, w: Float, h: Float, lit: Boolean) { + val inset = art.dp(2f) + art.glass(canvas, when (element.buttonShape) { + InputButtonShape.CIRCLE -> art.circle(w / 2f, h / 2f, min(w, h) / 2f - inset) + InputButtonShape.PILL -> art.roundRect(inset, inset, w - inset, h - inset, min(w, h) / 2f) + InputButtonShape.RECTANGLE -> art.roundRect(inset, inset, w - inset, h - inset, art.dp(4f)) + InputButtonShape.ROUNDED -> art.roundRect(inset, inset, w - inset, h - inset, min(w, h) * .22f) + }, lit) + labelPaint.color = if (lit) PadArt.ON_ACCENT else PadArt.INK bitmap?.let { - val scale = min(width * .84f / it.width, height * .84f / it.height) - imageRect.set(cx - it.width * scale / 2, (height - it.height * scale) / 2, - cx + it.width * scale / 2, (height + it.height * scale) / 2) + val scale = min(w * .84f / it.width, h * .84f / it.height) + imageRect.set(w / 2f - it.width * scale / 2, (h - it.height * scale) / 2, w / 2f + it.width * scale / 2, (h + it.height * scale) / 2) canvas.drawBitmap(it, null, imageRect, labelPaint) return } - if (classic && element.id == "builtin:keyboard" && element.icon == InputButtonIcons.KEYBOARD) { drawKeyboard(canvas, cx, height / 2f, lit); return } - if (element.icon != 0 && InputButtonIcons.draw(canvas, element.icon, cx, height / 2f, min(width, height) * .68f, labelPaint, symbol)) return - if (!element.showLabel) return - labelPaint.style = Paint.Style.FILL - if (classic && element.name == element.control.label) { - val radius = min(width, height) / 2f - val direction = DIRECTIONS.indexOf(element.control) - if (direction >= 0) { drawArrow(canvas, cx, height / 2f, radius * 0.34f, direction, labelPaint); return } - val glyph = glyph(element.control) - labelPaint.textSize = when { - element.buttonShape == InputButtonShape.PILL -> height / 2f * 0.8f - glyph.length > 2 -> 11 * density - else -> radius * if (glyph.length == 2) 0.62f else 0.85f - } - canvas.drawText(glyph, cx, height / 2f + labelPaint.textSize * .35f, labelPaint) - return - } - labelPaint.textSize = min(height * .3f, 30 * density) - val labelWidth = labelPaint.measureText(element.name) - if (labelWidth > width * .84f) labelPaint.textSize *= width * .84f / labelWidth - canvas.drawText(element.name, cx, height / 2f + labelPaint.textSize * .35f, labelPaint) + if (element.icon != 0 && InputButtonIcons.draw(canvas, element.icon, w / 2f, h / 2f, min(w, h) * .6f, labelPaint, symbol)) return + if (element.showLabel) art.text(canvas, element.name, w / 2f, h / 2f, min(h * .34f, 26 * density), labelPaint.color, w * .82f) } fun press(pointer: Int, pressed: Boolean, cancelled: Boolean = false) { @@ -398,8 +366,7 @@ class InputSurfaceView( } } - private inner class TrackpadView(context: Context, private val right: Boolean, private val captioned: Boolean = true, - private val source: InputSurfaceSource? = null) : Surface(context) { + private inner class TrackpadView(context: Context, private val source: InputSurfaceSource? = null) : Surface(context) { private var gestureX = 0f private var gestureY = 0f private val mouse = TouchpadGestures(ViewConfiguration.get(context).scaledTouchSlop.toFloat(), object : PointerGestures.Listener { @@ -416,29 +383,9 @@ class InputSurfaceView( private var clicked = false private var fingerX = 0f private var fingerY = 0f - private val guide = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; color = GUIDE } - private val dot = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = ACCENT } - private val glow = Paint(Paint.ANTI_ALIAS_FLAG) override fun onDraw(canvas: Canvas) { - drawSurface(canvas, clicked) - val cx = width / 2f - val cy = height / 2f - guide.strokeWidth = density - val reach = min(width, height) / 2f - 24 * density - canvas.drawCircle(cx, cy, reach, guide) - canvas.drawCircle(cx, cy, reach / 2f, guide) - canvas.drawLine(cx - reach, cy, cx + reach, cy, guide) - canvas.drawLine(cx, cy - reach, cx, cy + reach, guide) - captionPaint.textSize = 12 * density - captionPaint.color = if (touching) ACCENT else TEXT_DIM - if (captioned) canvas.drawText((contentDescription?.toString() ?: if (right) context.getString(R.string.deck_right_trackpad) else context.getString(R.string.deck_left_trackpad)).uppercase(), cx, 28 * density, captionPaint) - if (touching) { - val radius = 56 * density - glow.shader = RadialGradient(fingerX, fingerY, radius, ACCENT_GLOW, Color.TRANSPARENT, Shader.TileMode.CLAMP) - canvas.drawCircle(fingerX, fingerY, radius, glow) - canvas.drawCircle(fingerX, fingerY, (if (clicked) 16 else 12) * density, dot) - } + art.trackpad(canvas, width.toFloat(), height.toFloat(), touching || clicked, fingerX, fingerY) } @SuppressLint("ClickableViewAccessibility") @@ -510,55 +457,31 @@ class InputSurfaceView( private var originY = 0f private var knobX = 0f private var knobY = 0f - private val ring = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } - private val knob = Paint(Paint.ANTI_ALIAS_FLAG) - val adaptive get() = adaptive(element) - fun reach() = min(width, height) * if (classic(element)) CLASSIC_REACH else PANEL_REACH + private fun radius() = min(width, height) / 2f - 3 * density + + fun reach() = radius() * STICK_REACH fun captures(x: Float, y: Float): Boolean { val cx = centreX() - val dx = if (element.control == InputControl.LS) maxOf(0f, x - cx) else x - cx - val limit = reach() * ADAPTIVE_REACH + val dx = when (element.control) { InputControl.LS -> maxOf(0f, x - cx); InputControl.RS -> minOf(0f, x - cx); else -> x - cx } + val limit = radius() * ADAPTIVE_REACH return dx * dx + (y - height / 2f) * (y - height / 2f) <= limit * limit } - fun centreX() = when { - !classic(element) || width <= height -> width / 2f - element.control == InputControl.LS -> width - height / 2f - else -> height / 2f - } + fun centreX() = width / 2f override fun onDraw(canvas: Canvas) { if (hideWhenIdle && !touching) return val cx = if (touching) originX else centreX() val cy = if (touching) originY else height / 2f - val color = tint - if (classic(element) && color != null) { - val radius = min(width, height) / 2f - 0.75f * density - drawCircle(canvas, cx, cy, radius, - if (touching) shade(color, 160, 1f) else shade(color, 60, 0.12f), if (touching) light(color, 230, 0.7f) else light(color, 150, 0.25f)) - val knobRadius = radius * 0.46f - drawCircle(canvas, cx + knobX, cy + knobY, knobRadius, - if (touching || clicking) shade(color, 160, 1f) else shade(color, 120, 0.35f), if (touching) light(color, 230, 0.7f) else light(color, 150, 0.25f)) - if (!element.showLabel) return - labelPaint.color = textColor(touching) - if (drawDirectionLabels(canvas, source, false, cx, cy, radius * 0.66f, radius * 0.34f, labelPaint)) return - labelPaint.textSize = knobRadius * 0.8f - val label = if (element.name == element.control.label) glyph(element.control) else element.name - canvas.drawText(label, cx + knobX, cy + knobY + labelPaint.textSize * 0.35f, labelPaint) - return - } - drawSurface(canvas, clicking) - ring.strokeWidth = 2 * density - ring.color = if (touching) ACCENT else LINE - canvas.drawCircle(cx, cy, reach(), ring) - knob.color = if (touching) ACCENT else KNOB - canvas.drawCircle(cx + knobX, cy + knobY, reach() * 0.45f, knob) + val r = radius() + val travel = r * KNOB_TRAVEL / reach().coerceAtLeast(1f) + art.stick(canvas, cx, cy, r, kit, knobX * travel, knobY * travel, touching || clicking) if (!element.showLabel) return - labelPaint.color = if (touching) ACCENT else TEXT - drawDirectionLabels(canvas, source, false, cx, cy, reach() * 1.32f, reach() * 0.68f, labelPaint) + labelPaint.color = PadArt.INK + drawDirectionLabels(canvas, source, false, cx, cy, r * .66f, r * .34f, labelPaint) } @SuppressLint("ClickableViewAccessibility") @@ -621,30 +544,15 @@ class InputSurfaceView( } private inner class DirectionPad(context: Context, private val element: InputSurfaceElement, private val source: InputSurfaceSource? = null) : View(context) { - private val density = resources.displayMetrics.density private var held = 0 - private val arm = Paint(Paint.ANTI_ALIAS_FLAG) private val label = Paint(Paint.ANTI_ALIAS_FLAG).apply { textAlign = Paint.Align.CENTER; typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD); color = TEXT } - private val rect = RectF() override fun onDraw(canvas: Canvas) { - val size = min(width, height) * 0.86f - val cx = width / 2f - val cy = height / 2f - val half = size / 2f - val thick = size / 3f / 2f - fun armRect(bit: Int, l: Float, t: Float, r: Float, b: Float) { - arm.color = if (held and bit != 0) ACCENT else KNOB - rect.set(l, t, r, b) - canvas.drawRoundRect(rect, 8 * density, 8 * density, arm) - } - armRect(1, cx - thick, cy - half, cx + thick, cy - thick) - armRect(4, cx - thick, cy + thick, cx + thick, cy + half) - armRect(8, cx - half, cy - thick, cx - thick, cy + thick) - armRect(2, cx + thick, cy - thick, cx + half, cy + thick) - arm.color = KNOB - canvas.drawRect(cx - thick, cy - thick, cx + thick, cy + thick, arm) - if (element.showLabel) drawDirectionLabels(canvas, source, true, cx, cy, (half + thick) / 2f, thick * 1.7f, label) + val labels = element.showLabel && directionLabels(context, source?.directions, true).isNotEmpty() + art.dpad(canvas, width.toFloat(), height.toFloat(), kit, held, chevrons = !labels) + if (!labels) return + val half = min(width, height) / 2f + drawDirectionLabels(canvas, source, true, width / 2f, height / 2f, half * .68f, half * .32f, label) } @SuppressLint("ClickableViewAccessibility") @@ -683,48 +591,21 @@ class InputSurfaceView( companion object { private const val CLICK_MS = 300L private const val STICK_TAP_MS = 200L - private const val CLASSIC_REACH = 0.5f - private const val PANEL_REACH = 0.30f + private const val STICK_REACH = .62f + private const val KNOB_TRAVEL = .54f private const val HIT_SLACK = 0.25f private const val ADAPTIVE_CLEARANCE_PX = 5f - private val ADAPTIVE_REACH = 1.4f * kotlin.math.sqrt(1.5f) - - - private const val CORNER = 20f + private const val ADAPTIVE_REACH = 1.71f private const val CORNER_PILL = 22f - private val ACCENT = Color.rgb(0x1A, 0x9F, 0xFF) - private val ACCENT_WASH = Color.argb(0x2E, 0x1A, 0x9F, 0xFF) - private val ACCENT_GLOW = Color.argb(0x66, 0x1A, 0x9F, 0xFF) - private val ON_ACCENT = Color.rgb(0x03, 0x11, 0x1F) internal val SURFACE = Color.rgb(0x0A, 0x0B, 0x0D) internal val LINE = Color.rgb(0x26, 0x29, 0x2E) - private val GUIDE = Color.rgb(0x16, 0x18, 0x1B) internal val TEXT = Color.rgb(0xF2, 0xF4, 0xF7) - private val TEXT_DIM = Color.rgb(0x7A, 0x80, 0x8A) - private val KNOB = Color.rgb(0x2A, 0x2D, 0x33) + private val FACE = setOf(InputControl.A, InputControl.B, InputControl.X, InputControl.Y) + private val SHOULDERS = setOf(InputControl.LB, InputControl.RB, InputControl.LT, InputControl.RT) + private val GRIPS = setOf(InputControl.L4, InputControl.L5, InputControl.R4, InputControl.R5) + private val SYSTEM = setOf(InputControl.SELECT, InputControl.START, InputControl.GUIDE, InputControl.QAM) - private fun adaptive(element: InputSurfaceElement) = element.kind == InputElementKind.STICK && element.floating && element.hideWhenIdle - - private fun classic(element: InputSurfaceElement) = (element.id == "legacy:${element.control.id}" || element.id == "builtin:keyboard") && - (element.buttonShape == InputButtonShape.CIRCLE || element.buttonShape == InputButtonShape.PILL) - - private val DIRECTIONS = listOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT) - - internal fun shade(tint: Int, alpha: Int, f: Float) = - Color.argb(alpha, (Color.red(tint) * f).toInt(), (Color.green(tint) * f).toInt(), (Color.blue(tint) * f).toInt()) - - internal fun light(tint: Int, alpha: Int, f: Float) = Color.argb(alpha, (Color.red(tint) + (255 - Color.red(tint)) * f).toInt(), - (Color.green(tint) + (255 - Color.green(tint)) * f).toInt(), (Color.blue(tint) + (255 - Color.blue(tint)) * f).toInt()) - - private fun glyph(control: InputControl) = when (control) { - InputControl.LS -> "L" - InputControl.RS -> "R" - InputControl.SELECT -> "⧉" - InputControl.START -> "☰" - InputControl.GUIDE -> "◉" - InputControl.QAM -> "⋯" - else -> control.id.uppercase() - } + private fun adaptive(element: InputSurfaceElement) = element.kind == InputElementKind.STICK && element.floating private val CARDINAL = listOf(0f to -1f, 1f to 0f, 0f to 1f, -1f to 0f) private val DIAGONAL = listOf(.7071f to -.7071f, .7071f to .7071f, -.7071f to .7071f, -.7071f to -.7071f) @@ -749,16 +630,6 @@ class InputSurfaceView( return labels.isNotEmpty() } - private fun drawArrow(canvas: Canvas, x: Float, y: Float, size: Float, direction: Int, paint: Paint) { - val (fx, fy) = when (direction) { 0 -> 0f to -1f; 1 -> 1f to 0f; 2 -> 0f to 1f; else -> -1f to 0f } - val path = Path() - path.moveTo(x + fx * size, y + fy * size) - path.lineTo(x - fx * size * 0.7f - fy * size, y - fy * size * 0.7f + fx * size) - path.lineTo(x - fx * size * 0.7f + fy * size, y - fy * size * 0.7f - fx * size) - path.close() - canvas.drawPath(path, paint) - } - internal fun dp(context: Context, value: Int): Int = (value * context.resources.displayMetrics.density + 0.5f).toInt() internal fun outline(context: Context, radius: Float, fill: Int) = GradientDrawable().apply { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 1cc039338..91f87cd94 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -299,8 +299,6 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: listOf( SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), - SessionPrefs.OSC_STEAM_TOUCH to stringResource(R.string.osc_steam_touch), - SessionPrefs.OSC_STEAM_QAM to stringResource(R.string.mode_osc_qam), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never), ), s.oscMode, note = stringResource(R.string.mode_osc_note), onPick = a.onOsc, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt b/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt new file mode 100644 index 000000000..23afe6055 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt @@ -0,0 +1,354 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.DashPathEffect +import android.graphics.LinearGradient +import android.graphics.Paint +import android.graphics.Path +import android.graphics.RadialGradient +import android.graphics.RectF +import android.graphics.Shader +import android.graphics.Typeface +import androidx.core.graphics.PathParser +import com.droiddeck.launcher.input.DpadStyle +import com.droiddeck.launcher.input.FaceGlyphs +import com.droiddeck.launcher.input.InputControl +import com.droiddeck.launcher.input.PadKit +import com.droiddeck.launcher.input.StickCap +import kotlin.math.atan2 +import kotlin.math.cos +import kotlin.math.min +import kotlin.math.sin + +/** The on-screen controls' shared drawing: one glass material, shaped per virtual controller. */ +internal class PadArt(context: Context) { + val density = context.resources.displayMetrics.density + private val body = Paint(Paint.ANTI_ALIAS_FLAG) + private val shine = Paint(Paint.ANTI_ALIAS_FLAG) + private val edge = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val ink = Paint(Paint.ANTI_ALIAS_FLAG).apply { textAlign = Paint.Align.CENTER; typeface = Typeface.create("sans-serif-medium", Typeface.BOLD) } + private val line = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeCap = Paint.Cap.ROUND; strokeJoin = Paint.Join.ROUND } + private val fill = Paint(Paint.ANTI_ALIAS_FLAG) + private val path = Path() + private val arm = Path() + private val bar = Path() + private val rect = RectF() + private var shineTop = Float.NaN + private var shineHeight = Float.NaN + + fun dp(value: Float) = value * density + + fun glass(canvas: Canvas, shape: Path, pressed: Boolean, tint: Int = BODY) { + shape.computeBounds(rect, false) + body.color = if (pressed) PRESSED else tint + body.setShadowLayer(dp(2.5f), 0f, dp(1.5f), SHADOW) + canvas.drawPath(shape, body) + body.clearShadowLayer() + if (!pressed) { + if (rect.top != shineTop || rect.height() != shineHeight) { + shineTop = rect.top; shineHeight = rect.height() + shine.shader = LinearGradient(0f, rect.top, 0f, rect.top + rect.height() * .55f, SHINE, Color.TRANSPARENT, Shader.TileMode.CLAMP) + } + canvas.drawPath(shape, shine) + } + edge.color = if (pressed) EDGE_PRESSED else EDGE + edge.strokeWidth = dp(1.25f) + canvas.drawPath(shape, edge) + } + + fun circle(cx: Float, cy: Float, r: Float): Path = path.apply { reset(); addCircle(cx, cy, r, Path.Direction.CW) } + + fun roundRect(l: Float, t: Float, r: Float, b: Float, radius: Float): Path = path.apply { + reset(); addRoundRect(RectF(l, t, r, b), radius, radius, Path.Direction.CW) + } + + private fun corners(l: Float, t: Float, r: Float, b: Float, tl: Float, tr: Float, br: Float, bl: Float): Path = path.apply { + reset(); addRoundRect(RectF(l, t, r, b), floatArrayOf(tl, tl, tr, tr, br, br, bl, bl), Path.Direction.CW) + } + + fun text(canvas: Canvas, value: String, cx: Float, cy: Float, size: Float, color: Int, maxWidth: Float = Float.MAX_VALUE) { + ink.textSize = size + val measured = ink.measureText(value) + if (measured > maxWidth) ink.textSize = size * maxWidth / measured + ink.color = color + canvas.drawText(value, cx, cy - (ink.ascent() + ink.descent()) / 2f, ink) + } + + fun face(canvas: Canvas, cx: Float, cy: Float, r: Float, control: InputControl, kit: PadKit, pressed: Boolean) { + glass(canvas, circle(cx, cy, r), pressed) + when (kit.face) { + FaceGlyphs.COLOR_SYMBOLS -> symbol(canvas, cx, cy, r, control, if (pressed) ON_ACCENT else SYMBOL_COLORS[control] ?: INK) + FaceGlyphs.MONO_SYMBOLS -> symbol(canvas, cx, cy, r, control, if (pressed) ON_ACCENT else INK_SOFT) + FaceGlyphs.COLOR_LETTERS -> text(canvas, control.label, cx, cy, r * .95f, if (pressed) ON_ACCENT else LETTER_COLORS[control] ?: INK) + FaceGlyphs.MONO_LETTERS -> text(canvas, control.label, cx, cy, r * .95f, if (pressed) ON_ACCENT else INK) + } + } + + private fun symbol(canvas: Canvas, cx: Float, cy: Float, r: Float, control: InputControl, color: Int) { + val s = r * .4f + line.color = color; line.strokeWidth = r * .12f + when (control) { + InputControl.A -> { canvas.drawLine(cx - s, cy - s, cx + s, cy + s, line); canvas.drawLine(cx + s, cy - s, cx - s, cy + s, line) } + InputControl.B -> canvas.drawCircle(cx, cy, s * 1.05f, line) + InputControl.X -> canvas.drawRoundRect(RectF(cx - s * .95f, cy - s * .95f, cx + s * .95f, cy + s * .95f), s * .18f, s * .18f, line) + else -> canvas.drawPath(path.apply { reset(); moveTo(cx, cy - s * 1.1f); lineTo(cx + s * 1.1f, cy + s * .85f); lineTo(cx - s * 1.1f, cy + s * .85f); close() }, line) + } + } + + fun shoulder(canvas: Canvas, w: Float, h: Float, control: InputControl, kit: PadKit, pressed: Boolean) { + val inset = dp(2f) + val l = inset; val t = inset; val r = w - inset; val b = h - inset + val trigger = control == InputControl.LT || control == InputControl.RT + val big = (b - t) * if (trigger) .9f else .62f + val small = dp(5f) + val left = control == InputControl.LT || control == InputControl.LB + glass(canvas, if (left) corners(l, t, r, b, big, small, small, small) else corners(l, t, r, b, small, big, small, small), pressed) + text(canvas, kit.label(control), w / 2f, h / 2f, (b - t) * .46f, if (pressed) ON_ACCENT else INK, (r - l) * .8f) + } + + fun grip(canvas: Canvas, w: Float, h: Float, label: String, pressed: Boolean) { + val vw = min(w * .8f, h * .4f); val vh = vw * 2.5f + val cx = w / 2f; val cy = h / 2f + glass(canvas, roundRect(cx - vw / 2, cy - vh / 2, cx + vw / 2, cy + vh / 2, vw / 2), pressed) + text(canvas, label, cx, cy, vw * .4f, if (pressed) ON_ACCENT else INK_SOFT) + } + + fun small(canvas: Canvas, w: Float, h: Float, label: String, pressed: Boolean) { + val r = min(w, h) / 2f * VISUAL + glass(canvas, circle(w / 2f, h / 2f, r), pressed) + text(canvas, label, w / 2f, h / 2f, r * .62f, if (pressed) ON_ACCENT else INK) + } + + enum class Shape { ROUND, PILL, CHIP } + enum class Icon { VIEW, MENU, QAM, KEYBOARD, BACK, START, CREATE, HOME, STEAM, SHARE, OPTIONS, MARK } + + fun system(canvas: Canvas, w: Float, h: Float, shape: Shape, icon: Icon, pressed: Boolean) { + val cx = w / 2f; val cy = h / 2f + val size = when (shape) { + Shape.ROUND -> { val r = min(w, h) / 2f * VISUAL; glass(canvas, circle(cx, cy, r), pressed); r * 1.2f } + Shape.PILL -> { val vh = min(h * VISUAL, w * VISUAL / 2.3f); val vw = vh * 2.3f + glass(canvas, roundRect(cx - vw / 2, cy - vh / 2, cx + vw / 2, cy + vh / 2, vh / 2), pressed); vh * 1.1f } + Shape.CHIP -> { val vh = min(h * VISUAL, w * VISUAL / 1.9f); val vw = vh * 1.9f + glass(canvas, roundRect(cx - vw / 2, cy - vh / 2, cx + vw / 2, cy + vh / 2, vh * .32f), pressed); vh * 1.05f } + } + icon(canvas, cx, cy, size, icon, if (pressed) ON_ACCENT else INK) + } + + fun icon(canvas: Canvas, cx: Float, cy: Float, size: Float, icon: Icon, color: Int) { + val u = size / 28f + line.color = color; line.strokeWidth = 3.2f * u + fill.color = color; fill.shader = null + when (icon) { + Icon.VIEW -> { + canvas.drawRoundRect(RectF(cx - 12 * u, cy - 9 * u, cx + 3 * u, cy + 3 * u), 3 * u, 3 * u, line) + fill.color = Color.argb(230, 14, 16, 20) + canvas.drawRoundRect(RectF(cx - 4 * u, cy - 3 * u, cx + 11 * u, cy + 9 * u), 3 * u, 3 * u, fill) + canvas.drawRoundRect(RectF(cx - 4 * u, cy - 3 * u, cx + 11 * u, cy + 9 * u), 3 * u, 3 * u, line) + } + Icon.MENU -> for (dy in intArrayOf(-7, 0, 7)) canvas.drawLine(cx - 11 * u, cy + dy * u, cx + 11 * u, cy + dy * u, line) + Icon.QAM -> for (dx in intArrayOf(-10, 0, 10)) canvas.drawCircle(cx + dx * u, cy, 3.4f * u, fill) + Icon.KEYBOARD -> { + canvas.drawRoundRect(RectF(cx - 16 * u, cy - 11 * u, cx + 16 * u, cy + 11 * u), 4.5f * u, 4.5f * u, line) + for (row in 0..1) for (col in 0..3) canvas.drawCircle(cx + (-9 + col * 6) * u, cy + (-4 + row * 5) * u, 1.7f * u, fill) + line.strokeWidth = 2.6f * u; canvas.drawLine(cx - 6 * u, cy + 6 * u, cx + 6 * u, cy + 6 * u, line) + } + Icon.BACK, Icon.START -> { + val f = if (icon == Icon.START) 1f else -1f + line.strokeWidth = 2.6f * u + canvas.drawPath(path.apply { reset(); moveTo(cx - 6 * f * u, cy - 8 * u); lineTo(cx + 7 * f * u, cy); lineTo(cx - 6 * f * u, cy + 8 * u); close() }, line) + } + Icon.CREATE -> { + line.strokeWidth = 2.8f * u + canvas.drawLine(cx - 8 * u, cy + 8 * u, cx - 2 * u, cy - 8 * u, line) + canvas.drawLine(cx + u, cy + 8 * u, cx + 4 * u, cy - 2 * u, line) + canvas.drawLine(cx + 8 * u, cy + 8 * u, cx + 9 * u, cy + 3 * u, line) + } + Icon.HOME -> canvas.drawPath(path.apply { + reset(); moveTo(cx - 13 * u, cy - u); lineTo(cx, cy - 13 * u); lineTo(cx + 13 * u, cy - u) + moveTo(cx - 9 * u, cy - 4 * u); lineTo(cx - 9 * u, cy + 11 * u); lineTo(cx + 9 * u, cy + 11 * u); lineTo(cx + 9 * u, cy - 4 * u) + }, line) + Icon.STEAM, Icon.SHARE, Icon.OPTIONS -> { + ink.letterSpacing = .12f + text(canvas, when (icon) { Icon.STEAM -> "STEAM"; Icon.SHARE -> "SHARE"; else -> "OPTIONS" }, cx, cy, 14 * u, color, size * 1.9f) + ink.letterSpacing = 0f + } + Icon.MARK -> mark(canvas, cx, cy, size * .5f, color, if (color == ON_ACCENT) ON_ACCENT else ACCENT) + } + } + + fun mark(canvas: Canvas, cx: Float, cy: Float, radius: Float, ink: Int, orb: Int) { + val k = radius / 111.86f + canvas.save() + canvas.translate(cx - 71.98f * k, cy - 111.86f * k) + canvas.scale(k, k) + fill.shader = null; fill.color = ink + canvas.drawPath(MARK, fill) + fill.color = orb + canvas.drawCircle(63.98f, 111.86f, 55.98f, fill) + canvas.restore() + } + + private fun chevron(canvas: Canvas, ax: Float, ay: Float, dx: Float, dy: Float, k: Float, color: Int, width: Float) { + val px = -dy; val py = dx + line.color = color; line.strokeWidth = width + canvas.drawPath(path.apply { + reset(); moveTo(ax - dx * k * .5f + px * k, ay - dy * k * .5f + py * k); lineTo(ax + dx * k * .6f, ay + dy * k * .6f) + lineTo(ax - dx * k * .5f - px * k, ay - dy * k * .5f - py * k) + }, line) + } + + private fun cross(target: Path, cx: Float, cy: Float, s: Float, h: Float, rc: Float) = target.apply { + reset() + addRoundRect(RectF(cx - h, cy - s, cx + h, cy + s), rc, rc, Path.Direction.CW) + bar.reset() + bar.addRoundRect(RectF(cx - s, cy - h, cx + s, cy + h), rc, rc, Path.Direction.CW) + op(bar, Path.Op.UNION) + } + + /** [held] bits: up 1, right 2, down 4, left 8. */ + fun dpad(canvas: Canvas, w: Float, h: Float, kit: PadKit, held: Int, chevrons: Boolean = true) { + val cx = w / 2f; val cy = h / 2f + val s = min(w, h) / 2f - dp(3f) + val dirs = arrayOf(floatArrayOf(0f, -1f), floatArrayOf(1f, 0f), floatArrayOf(0f, 1f), floatArrayOf(-1f, 0f)) + when (kit.dpad) { + DpadStyle.CROSS, DpadStyle.DISC -> { + val disc = kit.dpad == DpadStyle.DISC + val arms = if (disc) s * .78f else s + val half = if (disc) s * .25f else s * .37f + if (disc) { + glass(canvas, circle(cx, cy, s), false) + fill.shader = null; fill.color = Color.argb(18, 255, 255, 255) + canvas.drawPath(cross(arm, cx, cy, arms, half, half * .5f), fill) + edge.color = Color.argb(56, 255, 255, 255); edge.strokeWidth = dp(1f) + canvas.drawPath(arm, edge) + } else glass(canvas, cross(arm, cx, cy, arms, half, half * .43f), false) + for (i in 0..3) { + val dx = dirs[i][0]; val dy = dirs[i][1] + val on = held and (1 shl i) != 0 + if (on) { + fill.shader = null; fill.color = PRESSED + val near = half + dp(1f); val far = arms - dp(2f); val side = half - dp(2f) + rect.set(if (dx == 0f) cx - side else if (dx > 0) cx + near else cx - far, if (dy == 0f) cy - side else if (dy > 0) cy + near else cy - far, + if (dx == 0f) cx + side else if (dx > 0) cx + far else cx - near, if (dy == 0f) cy + side else if (dy > 0) cy + far else cy - near) + canvas.drawRoundRect(rect, half * .4f, half * .4f, fill) + } + val m = (arms + half) / 2f + if (chevrons) chevron(canvas, cx + dx * m, cy + dy * m, dx, dy, half * .32f, if (on) ON_ACCENT else INK, half * .17f) + } + if (!disc) { fill.shader = null; fill.color = Color.argb(18, 255, 255, 255); canvas.drawCircle(cx, cy, half * .36f, fill) } + } + DpadStyle.ARROWS -> { + fill.shader = null; fill.color = Color.argb(56, 0, 0, 0) + canvas.drawCircle(cx, cy, s, fill) + edge.color = Color.argb(36, 255, 255, 255); edge.strokeWidth = dp(1f) + canvas.drawCircle(cx, cy, s, edge) + val bw = s * .5f; val tip = s * .14f; val base = s * .38f; val top = s * .9f; val rc = s * .11f + for (i in 0..3) { + canvas.save() + canvas.rotate(i * 90f, cx, cy) + arm.reset() + arm.moveTo(cx, cy - tip); arm.lineTo(cx - bw / 2, cy - base); arm.lineTo(cx - bw / 2, cy - top + rc) + arm.quadTo(cx - bw / 2, cy - top, cx - bw / 2 + rc, cy - top); arm.lineTo(cx + bw / 2 - rc, cy - top) + arm.quadTo(cx + bw / 2, cy - top, cx + bw / 2, cy - top + rc); arm.lineTo(cx + bw / 2, cy - base); arm.close() + val on = held and (1 shl i) != 0 + glass(canvas, arm, on) + val ty = cy - (base + top) / 2f; val ts = s * .07f + fill.shader = null; fill.color = if (on) ON_ACCENT else INK_SOFT + if (chevrons) canvas.drawPath(path.apply { reset(); moveTo(cx, ty - ts); lineTo(cx + ts, ty + ts * .7f); lineTo(cx - ts, ty + ts * .7f); close() }, fill) + canvas.restore() + } + } + } + } + + fun stick(canvas: Canvas, cx: Float, cy: Float, radius: Float, kit: PadKit, kx: Float, ky: Float, active: Boolean) { + fill.shader = RadialGradient(cx, cy, radius, WELL_IN, WELL_OUT, Shader.TileMode.CLAMP) + fill.setShadowLayer(dp(2.5f), 0f, dp(1.5f), SHADOW) + canvas.drawCircle(cx, cy, radius, fill) + fill.clearShadowLayer(); fill.shader = null + edge.color = Color.argb(61, 255, 255, 255); edge.strokeWidth = dp(1.25f) + canvas.drawCircle(cx, cy, radius, edge) + line.color = Color.argb(71, 255, 255, 255); line.strokeWidth = dp(1.4f) + for (i in 0 until 8) { + val a = i * Math.PI / 4 + val c = cos(a).toFloat(); val n = sin(a).toFloat() + canvas.drawLine(cx + c * (radius - dp(7f)), cy + n * (radius - dp(7f)), cx + c * (radius - dp(3.5f)), cy + n * (radius - dp(3.5f)), line) + } + if (active && (kx != 0f || ky != 0f)) { + val angle = Math.toDegrees(atan2(ky, kx).toDouble()).toFloat() + line.color = ACCENT; line.strokeWidth = dp(3f) + val r = radius - dp(2f) + canvas.drawArc(RectF(cx - r, cy - r, cx + r, cy + r), angle - 35f, 70f, false, line) + } + val k = radius * .46f + val x = cx + kx; val y = cy + ky + if (kit.stick == StickCap.RINGED) { + line.color = if (active) ACCENT else Color.argb(140, 226, 232, 240); line.strokeWidth = dp(2.8f) + canvas.drawCircle(x, y, k * 1.14f, line) + } + glass(canvas, circle(x, y, k), false) + when (kit.stick) { + StickCap.DISHED -> { + fill.shader = RadialGradient(x, y - k * .1f, k * .74f, Color.argb(107, 0, 0, 0), Color.TRANSPARENT, Shader.TileMode.CLAMP) + canvas.drawCircle(x, y, k * .74f, fill); fill.shader = null + edge.color = if (active) ACCENT else Color.argb(51, 255, 255, 255); edge.strokeWidth = dp(1f) + canvas.drawCircle(x, y, k * .74f, edge) + } + StickCap.KNURLED -> { + line.color = if (active) ACCENT else Color.argb(66, 255, 255, 255); line.strokeWidth = dp(2.3f) + line.pathEffect = DashPathEffect(floatArrayOf(dp(1.2f), dp(1.9f)), 0f) + canvas.drawCircle(x, y, k * .9f, line); line.pathEffect = null + fill.color = Color.argb(56, 0, 0, 0); canvas.drawCircle(x, y, k * .6f, fill) + } + StickCap.RINGED -> { edge.color = Color.argb(36, 255, 255, 255); edge.strokeWidth = dp(1f); canvas.drawCircle(x, y, k * .66f, edge) } + } + } + + fun trackpad(canvas: Canvas, w: Float, h: Float, touching: Boolean, fx: Float, fy: Float) { + val inset = dp(1.5f) + val radius = min(w, h) * .14f + fill.shader = null; fill.color = Color.argb(51, 14, 16, 20) + rect.set(inset, inset, w - inset, h - inset) + canvas.drawRoundRect(rect, radius, radius, fill) + edge.color = if (touching) Color.argb(191, 0x1A, 0x9F, 0xFF) else Color.argb(51, 255, 255, 255) + edge.strokeWidth = dp(if (touching) 1.5f else 1f) + canvas.drawRoundRect(rect, radius, radius, edge) + if (!touching) return + val glow = min(w, h) * .3f + fill.shader = RadialGradient(fx, fy, glow, GLOW, Color.TRANSPARENT, Shader.TileMode.CLAMP) + canvas.drawCircle(fx, fy, glow, fill); fill.shader = null + fill.color = ACCENT; canvas.drawCircle(fx, fy, dp(5f), fill) + } + + fun label(canvas: Canvas, w: Float, h: Float, round: Boolean, value: String, pressed: Boolean) { + val inset = dp(2f) + glass(canvas, if (round) circle(w / 2f, h / 2f, min(w, h) / 2f - inset) else roundRect(inset, inset, w - inset, h - inset, min(w, h) * .25f), pressed) + text(canvas, value, w / 2f, h / 2f, min(h * .38f, dp(18f)), if (pressed) ON_ACCENT else INK, w * .82f) + } + + companion object { + const val VISUAL = .72f + val ACCENT = Color.rgb(0x1A, 0x9F, 0xFF) + val ON_ACCENT = Color.rgb(0x03, 0x11, 0x1F) + val INK = Color.rgb(0xF4, 0xF7, 0xFB) + val INK_SOFT = Color.argb(209, 0xF4, 0xF7, 0xFB) + private val BODY = Color.argb(133, 14, 16, 20) + private val PRESSED = Color.argb(235, 0x1A, 0x9F, 0xFF) + private val SHINE = Color.argb(43, 255, 255, 255) + private val EDGE = Color.argb(77, 255, 255, 255) + private val EDGE_PRESSED = Color.argb(140, 255, 255, 255) + private val SHADOW = Color.argb(97, 0, 0, 0) + private val WELL_IN = Color.argb(140, 5, 7, 10) + private val WELL_OUT = Color.argb(71, 14, 16, 20) + private val GLOW = Color.argb(140, 0x1A, 0x9F, 0xFF) + private val LETTER_COLORS = mapOf(InputControl.A to Color.rgb(0x5C, 0xCB, 0x5F), InputControl.B to Color.rgb(0xF0, 0x50, 0x4A), + InputControl.X to Color.rgb(0x4C, 0x9B, 0xF0), InputControl.Y to Color.rgb(0xF5, 0xC0, 0x2E)) + private val SYMBOL_COLORS = mapOf(InputControl.A to Color.rgb(0x8D, 0xB4, 0xF2), InputControl.B to Color.rgb(0xF2, 0x61, 0x6B), + InputControl.X to Color.rgb(0xEE, 0x93, 0xD6), InputControl.Y to Color.rgb(0x45, 0xCB, 0xAA)) + private const val MARK_DATA = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" + + "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" + val MARK: Path by lazy { PathParser.createPathFromPathData(MARK_DATA) } + } +} 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 cd1c3cd9c..d25181ad4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -293,7 +293,12 @@ class DrawerActions( val onAchievements: (() -> Unit)? = null, val achievementsProgress: Pair? = null, val onOsc: (String) -> Unit, - val onEditSteamTouch: (() -> Unit)? = null, + val layoutGame: String? = null, + val layoutOptions: List> = emptyList(), + val layoutChoice: String = "", + val layoutHint: String? = null, + val onLayout: (String) -> Unit = {}, + val onEditLayout: (() -> Unit)? = null, val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null, val onRumble: (Boolean) -> Unit = {}, val onSuspendPolicy: (String) -> Unit, @@ -339,10 +344,6 @@ class DrawerActions( val onPause: () -> Unit = {}, val onPipAutoEnter: (Boolean) -> Unit = {}, val unfoldedControls: Boolean? = null, - val adaptiveSticks: Boolean? = null, - val onAdaptiveSticks: (Boolean) -> Unit = {}, - val quickButtons: Map = emptyMap(), - val onQuickButton: (com.droiddeck.launcher.input.InputCommand, Boolean) -> Unit = { _, _ -> }, val onUnfoldedControls: (Boolean) -> Unit = {}, val unfoldedControlsWithController: Boolean = false, val onUnfoldedControlsWithController: (Boolean) -> Unit = {}, @@ -658,28 +659,22 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont if (!a.glassesOutput) CardboardGroup(host, a) { key -> focus.track(page, key) } } SessionDrawerPage.CONTROLLER -> { - SettingsGroup(stringResource(R.string.drawer_page_controller)) { - InputQuickSettings(host, desktop = a.desktop, onChanged = a.onInputSelection, onEdit = a.onInputSettings) { key -> focus.track(page, key) } - } - SettingsGroup(stringResource(R.string.input_device_settings)) { - a.padType?.let { type -> - ChoiceRow(host, "pad-type", stringResource(R.string.input_virtual_controller), stringResource(R.string.input_virtual_controller_hint), - listOf(SessionPrefs.CONTROLLER_DECK to stringResource(R.string.mode_controller_deck), - SessionPrefs.CONTROLLER_STEAM to stringResource(R.string.mode_controller_steam), - SessionPrefs.CONTROLLER_DS4 to stringResource(R.string.mode_controller_ds4), - SessionPrefs.CONTROLLER_DUALSENSE to stringResource(R.string.mode_controller_dualsense), - SessionPrefs.CONTROLLER_XBOX360 to stringResource(R.string.mode_controller_x360)), - type, chipModifier = focus.track(page, "pad-type"), onPick = a.onPadType) + SettingsGroup(a.layoutGame?.let { stringResource(R.string.osc_group_for, it) } ?: stringResource(R.string.mode_osc)) { + if (a.layoutOptions.isNotEmpty()) ChoiceRow(host, "osc-layout", stringResource(R.string.osc_layout), a.layoutHint, + a.layoutOptions, a.layoutChoice, chipModifier = focus.track(page, "osc-layout"), onPick = a.onLayout) + a.onEditLayout?.let { edit -> + ActionRow(stringResource(R.string.osc_edit_layout), null, stringResource(R.string.ctrl_edit), { host.open = null; edit() }, + modifier = focus.track(page, "osc-edit")) } - a.controller?.let { c -> - ToggleRow(host, "rumble", stringResource(R.string.ctrl_rumble), null, c.rumble, - chipModifier = focus.track(page, "rumble"), onChange = a.onRumble) - + SettingsRow(stringResource(R.string.osc_show), stringResource(R.string.osc_show_hint), stacked = true) { + SegmentedTabs(listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), + SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), a.oscMode, + tabModifier = { focus.track(page, "osc-$it") }, onPick = a.onOsc) } - } - SettingsGroup(stringResource(R.string.input_touchscreen)) { - ChoiceRow(host, "touch", stringResource(R.string.input_touchscreen), stringResource(R.string.input_touchscreen_hint), - listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), + ChoiceRow(host, "touch", stringResource(R.string.input_touches), stringResource(R.string.input_touches_hint), + listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_mouse), + SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), + SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) if (a.touchActive == SessionPrefs.TOUCH_PAD) RelativeMouseRow(host, a, focus.track(page, "relative-mouse")) @@ -698,26 +693,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont a.directHoldBehavior, chipModifier = focus.track(page, "long-press"), onPick = a.onDirectHoldBehavior) } - } - a.pen?.let { PenSettingsGroup(host, it, track = { key -> focus.track(page, key) }, onPick = a.onPen) } - SettingsGroup(stringResource(R.string.input_screen_visibility)) { - ChoiceRow(host, "osc", stringResource(R.string.mode_osc), null, - if (a.steam) listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_STEAM_TOUCH to stringResource(R.string.osc_steam_touch), SessionPrefs.OSC_STEAM_QAM to stringResource(R.string.mode_osc_qam), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)) - else listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), - if (!a.steam && a.oscMode == SessionPrefs.OSC_STEAM_TOUCH) SessionPrefs.OSC_AUTO else a.oscMode, - chipModifier = focus.track(page, "osc"), onPick = a.onOsc) - a.adaptiveSticks?.let { on -> - ToggleRow(host, "adaptive-sticks", stringResource(R.string.ctrl_adaptive), null, on, - chipModifier = focus.track(page, "adaptive-sticks"), onChange = a.onAdaptiveSticks) - } - for ((button, shown) in a.quickButtons) { - val key = "quick-${button.name.lowercase()}" - ToggleRow(host, key, stringResource(quickButtonLabel(button)), null, shown, - chipModifier = focus.track(page, key)) { a.onQuickButton(button, it) } - } - a.onEditSteamTouch?.let { edit -> - ActionRow(stringResource(R.string.osc_steam_layout), stringResource(R.string.osc_steam_layout_hint), stringResource(R.string.ctrl_edit), edit) - } if (a.steam && a.unfoldedControls != null) ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), stringResource(R.string.unfolded_controls_hint), a.unfoldedControls, chipModifier = focus.track(page, "unfolded-controls"), onChange = a.onUnfoldedControls) @@ -727,30 +702,22 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont chipModifier = focus.track(page, "unfolded-controls-with-controller"), onChange = a.onUnfoldedControlsWithController) } - SettingsGroup(stringResource(R.string.shortcuts_title)) { - if (a.steam) ToggleRow(host, "back-hold", stringResource(R.string.back_hold), - stringResource(R.string.back_hold_hint), a.backHold, - chipModifier = focus.track(page, "back-hold"), onChange = a.onBackHold) - if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.input_back_taps), stringResource(R.string.input_back_taps_hint), - listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), - a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) - if (a.steam) ChoiceRow(host, "back-double-tap", stringResource(R.string.back_double_tap_window), null, - SessionPrefs.BACK_DOUBLE_TAP_MS_OPTIONS.map { it to stringResource(R.string.back_tap_ms, it) }, - a.backDoubleTapMs, chipModifier = focus.track(page, "back-double-tap"), onPick = a.onBackDoubleTapMs) - PhysicalShortcutRows(modifierFor = { focus.track(page, "physical-shortcut-${it.name}") }) - ToggleRow(host, "corner-tap", stringResource(R.string.drawer_corner_tap), - stringResource(R.string.drawer_corner_tap_hint), a.cornerTap, - chipModifier = focus.track(page, "corner-tap"), onChange = a.onCornerTap) - } - SettingsGroup(stringResource(R.string.drawer_latency)) { - ToggleRow(host, "low-latency", stringResource(R.string.drawer_low_latency), - stringResource(R.string.drawer_low_latency_hint), a.lowLatency, - chipModifier = focus.track(page, "low-latency"), onChange = a.onLowLatency) - ToggleRow(host, "evdev-mouse", stringResource(R.string.drawer_evdev_mouse), - null, a.evdevMouse, - chipModifier = focus.track(page, "evdev-mouse"), onChange = a.onEvdevMouse) - if (a.touchActive != SessionPrefs.TOUCH_PAD) - RelativeMouseRow(host, a, focus.track(page, "relative-mouse")) + SettingsGroup(stringResource(R.string.drawer_page_controller)) { + a.padType?.let { type -> + ChoiceRow(host, "pad-type", stringResource(R.string.input_virtual_controller), stringResource(R.string.input_virtual_controller_hint), + listOf(SessionPrefs.CONTROLLER_DECK to stringResource(R.string.mode_controller_deck), + SessionPrefs.CONTROLLER_STEAM to stringResource(R.string.mode_controller_steam), + SessionPrefs.CONTROLLER_DS4 to stringResource(R.string.mode_controller_ds4), + SessionPrefs.CONTROLLER_DUALSENSE to stringResource(R.string.mode_controller_dualsense), + SessionPrefs.CONTROLLER_XBOX360 to stringResource(R.string.mode_controller_x360)), + type, chipModifier = focus.track(page, "pad-type"), onPick = a.onPadType) + } + a.controller?.let { c -> + ToggleRow(host, "rumble", stringResource(R.string.ctrl_rumble), null, c.rumble, + chipModifier = focus.track(page, "rumble"), onChange = a.onRumble) + } + ActionRow(stringResource(R.string.input_remap_buttons), stringResource(R.string.input_physical_hint), stringResource(R.string.ctrl_edit), + a.onInputSettings, modifier = focus.track(page, "remap")) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { @@ -770,28 +737,57 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ), a.wowChat, chipModifier = focus.track(page, "wow-chat"), onPick = a.onWowChat, ) - val keyboardContext = LocalContext.current - remember { PcKeyboardPrefs.load(keyboardContext) } - SliderRow( - stringResource(R.string.pckb_size), stringResource(R.string.pckb_size_hint), - PcKeyboardPrefs.size, SessionPrefs.PC_KEYBOARD_SIZE_RANGE, step = 1, - format = { "$it%" }, modifier = focus.track(page, "pckb-size"), - onChange = { PcKeyboardPrefs.setSize(keyboardContext, it) }) - SliderRow( - stringResource(R.string.pckb_opacity), stringResource(R.string.pckb_opacity_hint), - PcKeyboardPrefs.opacity, SessionPrefs.PC_KEYBOARD_OPACITY_RANGE, step = 5, - format = { "$it%" }, modifier = focus.track(page, "pckb-opacity"), - onChange = { PcKeyboardPrefs.setOpacity(keyboardContext, it) }) - MultiRow( - host, "pckb-hidden", stringResource(R.string.pckb_hidden_keys), - stringResource(R.string.pckb_hidden_keys_hint), - listOf( - 0 to stringResource(R.string.pckb_group_function), - 1 to stringResource(R.string.pckb_group_nav), - 2 to stringResource(R.string.pckb_group_arrows), - ), - PC_KEY_GROUP_IDS.filterValues { it in PcKeyboardPrefs.hiddenKeys }.keys, - onToggle = { id, on -> PcKeyboardPrefs.toggleHiddenKey(keyboardContext, PC_KEY_GROUP_IDS.getValue(id), on) }) + } + a.pen?.let { PenSettingsGroup(host, it, track = { key -> focus.track(page, key) }, onPick = a.onPen) } + var moreControls by rememberSaveable { mutableStateOf(false) } + SettingsGroup(stringResource(R.string.osc_more)) { + ActionRow(stringResource(R.string.osc_more_detail), null, stringResource(if (moreControls) R.string.common_hide else R.string.common_show), + { moreControls = !moreControls }, modifier = focus.track(page, "more-controls")) + if (moreControls) { + if (a.steam) ToggleRow(host, "back-hold", stringResource(R.string.back_hold), + stringResource(R.string.back_hold_hint), a.backHold, + chipModifier = focus.track(page, "back-hold"), onChange = a.onBackHold) + if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.input_back_taps), stringResource(R.string.input_back_taps_hint), + listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), + a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) + if (a.steam) ChoiceRow(host, "back-double-tap", stringResource(R.string.back_double_tap_window), null, + SessionPrefs.BACK_DOUBLE_TAP_MS_OPTIONS.map { it to stringResource(R.string.back_tap_ms, it) }, + a.backDoubleTapMs, chipModifier = focus.track(page, "back-double-tap"), onPick = a.onBackDoubleTapMs) + PhysicalShortcutRows(modifierFor = { focus.track(page, "physical-shortcut-${it.name}") }) + ToggleRow(host, "corner-tap", stringResource(R.string.drawer_corner_tap), + stringResource(R.string.drawer_corner_tap_hint), a.cornerTap, + chipModifier = focus.track(page, "corner-tap"), onChange = a.onCornerTap) + ToggleRow(host, "low-latency", stringResource(R.string.drawer_low_latency), + stringResource(R.string.drawer_low_latency_hint), a.lowLatency, + chipModifier = focus.track(page, "low-latency"), onChange = a.onLowLatency) + ToggleRow(host, "evdev-mouse", stringResource(R.string.drawer_evdev_mouse), + null, a.evdevMouse, + chipModifier = focus.track(page, "evdev-mouse"), onChange = a.onEvdevMouse) + if (a.touchActive != SessionPrefs.TOUCH_PAD) + RelativeMouseRow(host, a, focus.track(page, "relative-mouse")) + val keyboardContext = LocalContext.current + remember { PcKeyboardPrefs.load(keyboardContext) } + SliderRow( + stringResource(R.string.pckb_size), stringResource(R.string.pckb_size_hint), + PcKeyboardPrefs.size, SessionPrefs.PC_KEYBOARD_SIZE_RANGE, step = 1, + format = { "$it%" }, modifier = focus.track(page, "pckb-size"), + onChange = { PcKeyboardPrefs.setSize(keyboardContext, it) }) + SliderRow( + stringResource(R.string.pckb_opacity), stringResource(R.string.pckb_opacity_hint), + PcKeyboardPrefs.opacity, SessionPrefs.PC_KEYBOARD_OPACITY_RANGE, step = 5, + format = { "$it%" }, modifier = focus.track(page, "pckb-opacity"), + onChange = { PcKeyboardPrefs.setOpacity(keyboardContext, it) }) + MultiRow( + host, "pckb-hidden", stringResource(R.string.pckb_hidden_keys), + stringResource(R.string.pckb_hidden_keys_hint), + listOf( + 0 to stringResource(R.string.pckb_group_function), + 1 to stringResource(R.string.pckb_group_nav), + 2 to stringResource(R.string.pckb_group_arrows), + ), + PC_KEY_GROUP_IDS.filterValues { it in PcKeyboardPrefs.hiddenKeys }.keys, + onToggle = { id, on -> PcKeyboardPrefs.toggleHiddenKey(keyboardContext, PC_KEY_GROUP_IDS.getValue(id), on) }) + } } } SessionDrawerPage.SECOND_SCREEN -> { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 44e51c682..62bfb65a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -327,6 +327,31 @@ Steam + QAM Auto shows the controls when no controller is connected. Steam touch (beta) + On-screen controls · %1$s + Layout + Gamepad + Steam layout + Saved for this game + Default for games without their own + Edit layout + Show + Auto hides them while you use a controller. + More controller settings + Shortcuts, latency and the PC keyboard + Touches elsewhere + What touches outside the controls do. + Remap buttons + Mouse + Keep editing + Discard + Hidden %1$d + Restore + Nothing hidden. Removed controls wait here. + Options + Click + %1$s · saved for %2$s + %1$s · default for games without their own + Controller in use. Touch the screen to show the controls. Steam\'s touch controls start with the next Steam session Steam touch layout Image From 40665bbb1a0302903402a7a60c62c120b1e2046b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 19:06:54 -0500 Subject: [PATCH 02/25] feat(input): portrait pad under the game, kit-aware editor reset and leaner controller settings --- .../com/droiddeck/launcher/SessionActivity.kt | 20 +- .../launcher/input/ControllerPrefs.kt | 89 +------ .../launcher/input/InputLibraries.kt | 24 +- .../launcher/input/InputSurfaceLayout.kt | 37 ++- .../com/droiddeck/launcher/input/KitLayout.kt | 47 +++- .../launcher/input/OnScreenControls.kt | 3 +- .../launcher/input/OnScreenLayout.kt | 13 +- .../com/droiddeck/launcher/input/PadKit.kt | 9 + .../launcher/input/SteamTouchControls.kt | 15 -- .../launcher/session/SessionDisplay.kt | 14 +- .../launcher/session/SessionPrefs.kt | 2 +- .../launcher/ui/InputElementProperties.kt | 4 +- .../launcher/ui/InputLayoutWidgets.kt | 29 +-- .../launcher/ui/InputQuickSettings.kt | 81 ------ .../launcher/ui/InputSettingsPage.kt | 13 +- .../launcher/ui/InputSurfaceDialog.kt | 66 +++-- .../droiddeck/launcher/ui/InputSurfaceView.kt | 17 ++ .../launcher/ui/ModeSettingsDialog.kt | 4 +- .../launcher/ui/SecondScreenPresentation.kt | 6 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 49 ++-- app/src/main/res/values-ar/input_library.xml | 12 - app/src/main/res/values-ar/input_strings.xml | 2 - app/src/main/res/values-ar/strings.xml | 28 -- .../res/values-b+es+419/input_library.xml | 12 - .../res/values-b+es+419/input_strings.xml | 2 - app/src/main/res/values-b+es+419/strings.xml | 28 -- app/src/main/res/values-bg/input_library.xml | 12 - app/src/main/res/values-bg/input_strings.xml | 2 - app/src/main/res/values-bg/strings.xml | 28 -- app/src/main/res/values-cs/input_library.xml | 12 - app/src/main/res/values-cs/input_strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 28 -- app/src/main/res/values-da/input_library.xml | 12 - app/src/main/res/values-da/input_strings.xml | 2 - app/src/main/res/values-da/strings.xml | 28 -- app/src/main/res/values-de/input_library.xml | 12 - app/src/main/res/values-de/input_strings.xml | 2 - app/src/main/res/values-de/strings.xml | 28 -- app/src/main/res/values-el/input_library.xml | 12 - app/src/main/res/values-el/input_strings.xml | 2 - app/src/main/res/values-el/strings.xml | 28 -- app/src/main/res/values-es/input_library.xml | 12 - app/src/main/res/values-es/input_strings.xml | 2 - app/src/main/res/values-es/strings.xml | 28 -- app/src/main/res/values-fi/input_library.xml | 12 - app/src/main/res/values-fi/input_strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 28 -- app/src/main/res/values-fr/input_library.xml | 12 - app/src/main/res/values-fr/input_strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 28 -- app/src/main/res/values-hi/input_library.xml | 12 - app/src/main/res/values-hi/input_strings.xml | 2 - app/src/main/res/values-hi/strings.xml | 28 -- app/src/main/res/values-hu/input_library.xml | 12 - app/src/main/res/values-hu/input_strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 28 -- app/src/main/res/values-in/input_library.xml | 12 - app/src/main/res/values-in/input_strings.xml | 2 - app/src/main/res/values-in/strings.xml | 28 -- app/src/main/res/values-it/input_library.xml | 12 - app/src/main/res/values-it/input_strings.xml | 2 - app/src/main/res/values-it/strings.xml | 28 -- app/src/main/res/values-ja/input_library.xml | 12 - app/src/main/res/values-ja/input_strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 28 -- app/src/main/res/values-ko/input_library.xml | 12 - app/src/main/res/values-ko/input_strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 28 -- app/src/main/res/values-ms/input_library.xml | 12 - app/src/main/res/values-ms/input_strings.xml | 2 - app/src/main/res/values-ms/strings.xml | 28 -- app/src/main/res/values-nb/input_library.xml | 12 - app/src/main/res/values-nb/input_strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 28 -- app/src/main/res/values-nl/input_library.xml | 12 - app/src/main/res/values-nl/input_strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 28 -- app/src/main/res/values-pl/input_library.xml | 12 - app/src/main/res/values-pl/input_strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 28 -- .../main/res/values-pt-rPT/input_library.xml | 12 - .../main/res/values-pt-rPT/input_strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 28 -- app/src/main/res/values-pt/input_library.xml | 12 - app/src/main/res/values-pt/input_strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 31 --- app/src/main/res/values-ro/input_library.xml | 12 - app/src/main/res/values-ro/input_strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 28 -- app/src/main/res/values-ru/input_library.xml | 12 - app/src/main/res/values-ru/input_strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 28 -- app/src/main/res/values-sv/input_library.xml | 12 - app/src/main/res/values-sv/input_strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 28 -- app/src/main/res/values-th/input_library.xml | 12 - app/src/main/res/values-th/input_strings.xml | 2 - app/src/main/res/values-th/strings.xml | 28 -- app/src/main/res/values-tr/input_library.xml | 12 - app/src/main/res/values-tr/input_strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 28 -- app/src/main/res/values-uk/input_library.xml | 12 - app/src/main/res/values-uk/input_strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 28 -- app/src/main/res/values-vi/input_library.xml | 12 - app/src/main/res/values-vi/input_strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 28 -- .../main/res/values-zh-rCN/input_library.xml | 12 - .../main/res/values-zh-rCN/input_strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 28 -- .../main/res/values-zh-rHK/input_library.xml | 12 - .../main/res/values-zh-rHK/input_strings.xml | 2 - app/src/main/res/values-zh-rHK/strings.xml | 28 -- .../main/res/values-zh-rTW/input_library.xml | 12 - .../main/res/values-zh-rTW/input_strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 28 -- app/src/main/res/values/input_library.xml | 12 - app/src/main/res/values/input_strings.xml | 2 - app/src/main/res/values/strings.xml | 36 --- .../launcher/input/ControlsPresenterTest.kt | 66 +++++ .../launcher/input/InputLayoutToolsTest.kt | 136 +--------- .../launcher/input/InputLibraryTest.kt | 136 +--------- .../launcher/input/InputProfilesTest.kt | 13 +- .../droiddeck/launcher/input/KitLayoutTest.kt | 241 ++++++++++++++++++ .../launcher/input/LegacyControllerPrefs.kt | 14 + .../input/OnScreenControlPrefsTest.kt | 129 ++++++++++ .../launcher/input/OnScreenControlsTest.kt | 144 +++++++---- .../launcher/input/OnScreenLayoutTest.kt | 121 +++------ .../droiddeck/launcher/input/PadKitTest.kt | 73 ++++++ .../launcher/input/PhysicalShortcutsTest.kt | 6 +- .../input/SelectProfileRoutingTest.kt | 2 +- .../launcher/input/SessionKeyboardPadTest.kt | 3 +- .../launcher/input/ShowLayoutTest.kt | 45 ++++ .../launcher/input/StickDeadZoneTest.kt | 21 +- .../launcher/session/SessionDisplayTest.kt | 14 + .../launcher/session/SettingsResetTest.kt | 5 +- .../launcher/ui/InputSettingsTest.kt | 188 ++++++-------- .../launcher/ui/InputSurfaceTouchTest.kt | 41 +-- .../ui/PhysicalShortcutsDialogTest.kt | 3 +- .../launcher/ui/SessionSecondScreenTest.kt | 40 --- 140 files changed, 1059 insertions(+), 2321 deletions(-) delete mode 100644 app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/LegacyControllerPrefs.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/PadKitTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/ShowLayoutTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 0f468ee87..f202e3025 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1453,7 +1453,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde micAvailable = SessionState.micAvailable && !SessionState.suspended, micEnabled = SessionState.micEnabled, onMicEnabled = { SessionService.setMicEnabled(this@SessionActivity, it) }, - touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), + touchAuto = getString(if (usingTouchpad()) R.string.mode_touch_touchpad else R.string.mode_touch_mouse), pen = penSettings.takeIf { penSeen }, onPen = { key, value -> SessionPrefs.setPenSetting(this@SessionActivity, key, value); readPrefs() }, fexPreset = fexPreset, @@ -1720,7 +1720,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde layoutGame = controlsGameName(), layoutOptions = layoutOptions, layoutChoice = layoutChoice, - layoutHint = getString(if (controlsGameId() != null) R.string.osc_layout_this_game else R.string.osc_layout_default), onLayout = ::chooseLayout, onEditLayout = when { layoutChoice == com.droiddeck.launcher.input.GameControls.STEAM -> if (steamTouchAvailable && onScreenButtonsVisible) ({ @@ -4494,7 +4493,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val tabRow = unfoldedColumn?.getChildAt(0)?.height?.let { it - (com.droiddeck.launcher.ui.BAR_HEIGHT.value * resources.displayMetrics.density + 0.5f).toInt() } ?: 0 - val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height, tabRow) + val aspect = if (SessionState.followScreen) 16f / 9f else outputSize().let { (w, h) -> w.toFloat() / h.coerceAtLeast(1) } + val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height, tabRow, aspect) else FrameLayout.LayoutParams.MATCH_PARENT val params = surfaceView.layoutParams as FrameLayout.LayoutParams if (params.height != gameHeight) { @@ -4557,7 +4557,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (layout == null) { panel.visibility = View.VISIBLE; return } panel.releaseAll() panel.visibility = View.GONE - unfoldedDeckSurface = com.droiddeck.launcher.ui.InputSurfaceView(this, padBridge, layout.elements, InputRole.PRIMARY, layout.style, haptics = true).also { + unfoldedDeckSurface = com.droiddeck.launcher.ui.InputSurfaceView(this, padBridge, inputRole = InputRole.PRIMARY, haptics = true).also { + it.showLayout(layout) it.tag = layout column.addView(it, android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f)) } @@ -5380,7 +5381,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde mode = SessionPrefs.oscMode(this), desktop = SessionState.mode == SessionService.MODE_DESKTOP, virtualPad = !steam || SessionPrefs.builtinPad(this), - covered = pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen || keyboardCoversPad(), + covered = controlsCovered(), controllerInUse = controllerInUse && (PadBridge.anyControllerConnected() || SteamControllerBle.connected), hiddenByTap = controlsHiddenByTap, steamLayout = steam && com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()), @@ -5388,12 +5389,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde )) } + private fun controlsCovered() = pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen || keyboardCoversPad() + private fun updateOnScreenPad() { val controls = onScreenControls ?: return fun hideBottomControls() { bottomInputControls?.takeIf { it.visibility == View.VISIBLE }?.let { it.releaseAll(); it.visibility = View.GONE } } fun hideSteam() { steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } - com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false + val keyboardOver = SessionState.mode == SessionService.MODE_STEAM && controlsCovered() && + com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()) + if (!keyboardOver) com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false } val plan = controlsPlan() onScreenButtonsVisible = plan.shown @@ -6338,8 +6343,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } androidx.compose.runtime.key(profileLayout) { androidx.compose.ui.viewinterop.AndroidView( - factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge, profileLayout?.elements.orEmpty(), - surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()).also { swappedInputSurface = it } }, + factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge).also { it.showLayout(profileLayout); swappedInputSurface = it } }, modifier = Modifier.fillMaxWidth().weight(1f), onRelease = { if (swappedInputSurface === it) swappedInputSurface = null }, ) diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt index 5231a753a..a94147e71 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt @@ -7,21 +7,6 @@ object ControllerPrefs { const val STEAM_BLUE = 0xFF1A9FFF.toInt() const val OFF = "off" - val tints = listOf( - STEAM_BLUE to R.string.ctrl_tint_steam_blue, - 0xFF66C0F4.toInt() to R.string.ctrl_tint_sky, - 0xFFE8EEF4.toInt() to R.string.ctrl_tint_white, - 0xFFC77DFF.toInt() to R.string.ctrl_tint_violet, - 0xFF3DDC84.toInt() to R.string.ctrl_tint_green, - 0xFFFFA726.toInt() to R.string.ctrl_tint_amber, - 0xFFFF5252.toInt() to R.string.ctrl_tint_red, - 0xFFFF6FB5.toInt() to R.string.ctrl_tint_pink, - ) - - val opacities = listOf(40, 60, 80, 100) - - val sizes = listOf(80, 90, 100, 110, 125) - val deadZones = listOf(0, 5, 8, 12, 15, 20, 25) const val DEFAULT_DEAD_ZONE_PERCENT = 12 @@ -39,20 +24,15 @@ object ControllerPrefs { OFF to R.string.ctrl_target_hidden, ) + /** Settings still read: the rest only seed the one-time library and layout migrations. */ class Settings( val tint: Int, val opacity: Int, - val size: Int, val stickClick: Boolean, - val adaptiveSticks: Boolean, val rumble: Boolean, - val steamButton: Boolean, - val qamButton: Boolean, - val keyboardButton: Boolean, val selectSteam: Boolean, val joyConVr: Boolean, val snap: Boolean, - val customLayout: Boolean, val mapping: Map, val deadZone: Int, ) @@ -63,50 +43,17 @@ object ControllerPrefs { val p = prefs(context) return Settings( tint = p.getInt("tint", STEAM_BLUE), - opacity = p.getInt("opacity", 100).takeIf { it in opacities } ?: 100, - size = p.getInt("size", 100).takeIf { it in sizes } ?: 100, + opacity = p.getInt("opacity", 100).coerceIn(1, 100), stickClick = p.getBoolean("stickClick", true), - adaptiveSticks = p.getBoolean("adaptiveSticks", true), rumble = rumbleEnabled(context), - steamButton = p.getBoolean("steamButton", true), - qamButton = p.getBoolean("qamButton", true), - keyboardButton = p.getBoolean("keyboardButton", true), selectSteam = p.getBoolean("selectSteam", false), joyConVr = joyConVr(context), snap = snap(context), - customLayout = p.all.keys.any { it.startsWith("layout.") }, - mapping = mappable.associate { (id, _) -> id to target(context, id) }, + mapping = mappable.associate { (id, _) -> id to (p.getString("map.$id", id)?.takeIf { t -> targets.any { it.first == t } } ?: id) }, deadZone = deadZone(context), ) } - fun target(context: Context, id: String): String = - prefs(context).getString("map.$id", id)?.takeIf { t -> targets.any { it.first == t } } ?: id - - fun setTarget(context: Context, id: String, target: String) { - prefs(context).edit().putString("map.$id", target).apply() - } - - fun setTint(context: Context, tint: Int) { - prefs(context).edit().putInt("tint", tint).apply() - } - - fun setOpacity(context: Context, percent: Int) { - prefs(context).edit().putInt("opacity", percent).apply() - } - - fun setSize(context: Context, percent: Int) { - prefs(context).edit().putInt("size", percent).apply() - } - - fun setStickClick(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("stickClick", on).apply() - } - - fun setAdaptiveSticks(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("adaptiveSticks", on).apply() - } - fun rumbleEnabled(context: Context): Boolean = prefs(context).getBoolean("rumble", true) fun deadZone(context: Context): Int = @@ -120,18 +67,6 @@ object ControllerPrefs { prefs(context).edit().putBoolean("rumble", on).apply() } - fun setSteamButton(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("steamButton", on).apply() - } - - fun setKeyboardButton(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("keyboardButton", on).apply() - } - - fun setSelectSteam(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("selectSteam", on).apply() - } - fun joyConVr(context: Context): Boolean = prefs(context).getBoolean("joyConVr", true) fun setJoyConVr(context: Context, on: Boolean) { @@ -144,24 +79,6 @@ object ControllerPrefs { prefs(context).edit().putBoolean("snap", on).apply() } - fun layout(context: Context, width: Int, height: Int): Map> { - val raw = prefs(context).getString("layout.${width}x$height", null) ?: return emptyMap() - return raw.split(';').mapNotNull { entry -> - val (group, pos) = entry.split(':').takeIf { it.size == 2 } ?: return@mapNotNull null - val (x, y) = pos.split(',').mapNotNull { it.toFloatOrNull() }.takeIf { it.size == 2 } ?: return@mapNotNull null - group to (x to y) - }.toMap() - } - - fun setLayout(context: Context, width: Int, height: Int, positions: Map>) { - val raw = positions.entries.joinToString(";") { (group, pos) -> "$group:${pos.first},${pos.second}" } - prefs(context).edit().putString("layout.${width}x$height", raw).apply() - } - - fun resetLayout(context: Context, width: Int, height: Int) { - prefs(context).edit().remove("layout.${width}x$height").apply() - } - fun resetAll(context: Context) { prefs(context).edit().clear().putBoolean("rumble", true).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index 76423ea13..e9817887d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -125,19 +125,6 @@ object InputLibraries { return InputLibrary(profiles, layouts, bindings, selected).validate() } - fun setAdaptiveSticks(context: Context, layoutId: String, on: Boolean): Boolean = runCatching { - update(context) { library -> - library.copy(layouts = library.layouts.map { layout -> - if (layout.id != layoutId || !layout.editable) layout - else layout.copy(elements = layout.elements.map { if (it.kind == InputElementKind.STICK) it.copy(floating = on, hideWhenIdle = on) else it }) - }) - } - }.onSuccess { ControllerPrefs.setAdaptiveSticks(context, on) }.isSuccess - - fun setQuickButton(context: Context, layoutId: String, button: InputCommand, shown: Boolean): Boolean = runCatching { - update(context) { library -> library.layouts.firstOrNull { it.id == layoutId && it.editable }?.let { library.withLayout(it.withQuickButton(button, shown)) } ?: library } - }.isSuccess - fun defaultPositions(context: Context, library: InputLibrary, layout: SavedInputLayout): Pair, Float>? { val origin = layout.origin ?: layout.id InputStockLayouts.layouts().firstOrNull { it.id == origin }?.let { return it.elements to it.aspect } @@ -252,13 +239,12 @@ object InputLibraries { /** Gamepads saved by the old editor follow the virtual controller's kit again; their positions don't map onto the new controls. */ private fun kitGamepads(library: InputLibrary): InputLibrary { - var result = library - for (layout in library.layouts) { + return library.copy(layouts = library.layouts.map { layout -> val origin = layout.origin ?: layout.id - if (origin != OVERLAY && !origin.startsWith("migrated.layout.")) continue - result = result.withLayout(layout.copy(elements = emptyList(), origin = if (layout.id == OVERLAY) null else OVERLAY, aspect = 0f, scale = 1f)) - } - return result.validate() + if (origin != OVERLAY && !origin.startsWith("migrated.layout.")) return@map layout + val extras = layout.elements.filterNot { KitLayout.isKit(it.id) } + layout.copy(elements = extras, origin = if (layout.id == OVERLAY) null else OVERLAY, aspect = if (extras.isEmpty()) 0f else layout.aspect, scale = 1f) + }).validate() } private fun migrationBindingId(library: InputLibrary, binding: String, layout: String): String { diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt index e7e1c58a3..c96589573 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt @@ -38,8 +38,13 @@ data class InputSurfaceElement( ) { val hasClick get() = kind == InputElementKind.STICK || kind == InputElementKind.TRACKPAD - fun bounded() = copy(x = x.coerceIn(0f, 0.97f), y = y.coerceIn(0f, 0.97f), - width = width.coerceIn(0.03f, (1f - x.coerceIn(0f, 0.97f)).coerceAtLeast(0.03f)), height = height.coerceIn(0.03f, (1f - y.coerceIn(0f, 0.97f)).coerceAtLeast(0.03f))) + fun bounded() = copy(x = x.coerceIn(0f, 1f - MIN_SIZE), y = y.coerceIn(0f, 1f - MIN_SIZE), + width = width.coerceIn(MIN_SIZE, (1f - x.coerceIn(0f, 1f - MIN_SIZE)).coerceAtLeast(MIN_SIZE)), + height = height.coerceIn(MIN_SIZE, (1f - y.coerceIn(0f, 1f - MIN_SIZE)).coerceAtLeast(MIN_SIZE))) + + companion object { + const val MIN_SIZE = .01f + } } internal val QUICK_BUTTONS = listOf(InputCommand.STEAM, InputCommand.QUICK_ACCESS, InputCommand.KEYBOARD) @@ -51,15 +56,31 @@ val InputSurfaceElement.quickButton: InputCommand? get() = when { else -> null } -internal fun List.scaled(factor: Float): List = map { e -> +/** Controls whose boxes touch, grown by 15%, scale around one shared anchor so a cluster such as the face buttons keeps its shape. */ +internal fun List.scaled(factor: Float): List { fun anchor(centre: Float) = when { centre < 1f / 3f -> 0f; centre > 2f / 3f -> 1f; else -> .5f } - val w = (e.width * factor).coerceIn(.03f, 1f) - val h = (e.height * factor).coerceIn(.03f, 1f) + val group = IntArray(size) { it } + fun root(i: Int): Int = if (group[i] == i) i else root(group[i]).also { group[i] = it } + for (i in indices) for (j in i + 1 until size) { + val a = this[i]; val b = this[j] + val near = kotlin.math.abs(a.x + a.width / 2 - b.x - b.width / 2) < (a.width + b.width) / 2 * 1.15f && + kotlin.math.abs(a.y + a.height / 2 - b.y - b.height / 2) < (a.height + b.height) / 2 * 1.15f + if (near) group[root(i)] = root(j) + } + val anchors = indices.groupBy(::root).mapValues { (_, members) -> + anchor(members.map { this[it].x + this[it].width / 2 }.average().toFloat()) to anchor(members.map { this[it].y + this[it].height / 2 }.average().toFloat()) + } + return mapIndexed { i, e -> e.scaledAround(factor, anchors.getValue(root(i))) } +} + +private fun InputSurfaceElement.scaledAround(factor: Float, anchor: Pair): InputSurfaceElement { + val e = this + val w = (e.width * factor).coerceIn(InputSurfaceElement.MIN_SIZE, 1f) + val h = (e.height * factor).coerceIn(InputSurfaceElement.MIN_SIZE, 1f) val cx = e.x + e.width / 2 val cy = e.y + e.height / 2 - val ax = anchor(cx) - val ay = anchor(cy) - e.copy(x = (ax + (cx - ax) * factor - w / 2).coerceIn(0f, 1f - w), y = (ay + (cy - ay) * factor - h / 2).coerceIn(0f, 1f - h), + val (ax, ay) = anchor + return e.copy(x = (ax + (cx - ax) * factor - w / 2).coerceIn(0f, 1f - w), y = (ay + (cy - ay) * factor - h / 2).coerceIn(0f, 1f - h), width = w, height = h).bounded() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index e0ca23bf7..14e9d45af 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -7,24 +7,36 @@ import kotlin.math.min /** * Places a virtual controller's default on-screen controls. Each kit is drawn on a 1600 × 900 reference screen; controls keep - * their distance from the nearest edge, so wider screens spread them apart instead of stretching them. + * their distance from the nearest edge, so wider screens spread them apart instead of stretching them. Clusters such as the face + * buttons are placed by their centre so they move as one. In portrait the whole pad sits along the bottom edge, and the row left of + * the bottom edge always starts after DroidDeck's corner button. */ object KitLayout { const val DPAD_ID = "kit:dpad" const val KEYBOARD_ID = "builtin:keyboard" + + /** Whether [id] names one of a kit's own controls rather than a key or control the player added. */ + fun isKit(id: String) = id.startsWith("legacy:") || id == DPAD_ID || id == KEYBOARD_ID private const val REF_W = 1600f private const val REF_H = 900f + private const val PORTRAIT_W = 1200f + /** The widest pair of side controls on any kit: a larger size never pushes the two halves, or the rows, into each other. */ + private const val MIN_SPAN = 1200f private const val MAX_HEIGHT_MM = 80f + private const val CORNER_DP = 52f + private const val GAP_DP = 8f private class Spec(val control: InputControl, val cx: Float, val cy: Float, val hw: Float, val hh: Float = hw, val id: String = "legacy:${control.id}", - val kind: InputElementKind = InputElementKind.from(control), val shape: InputButtonShape = InputButtonShape.CIRCLE, val icon: Int = 0, val name: String = control.label) + val kind: InputElementKind = InputElementKind.from(control), val shape: InputButtonShape = InputButtonShape.CIRCLE, val icon: Int = 0, val name: String = control.label, + val ax: Float = cx, val ay: Float = cy) private fun shoulders() = listOf( Spec(InputControl.LT, 140f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.LB, 140f, 148f, 88f, 28f, shape = InputButtonShape.PILL), Spec(InputControl.RT, 1460f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.RB, 1460f, 148f, 88f, 28f, shape = InputButtonShape.PILL)) private fun face(cx: Float, cy: Float, r: Float, off: Float) = listOf( - Spec(InputControl.Y, cx, cy - off, r), Spec(InputControl.X, cx - off, cy, r), Spec(InputControl.B, cx + off, cy, r), Spec(InputControl.A, cx, cy + off, r)) + Spec(InputControl.Y, cx, cy - off, r, ax = cx, ay = cy), Spec(InputControl.X, cx - off, cy, r, ax = cx, ay = cy), + Spec(InputControl.B, cx + off, cy, r, ax = cx, ay = cy), Spec(InputControl.A, cx, cy + off, r, ax = cx, ay = cy)) private fun dpad(cx: Float, cy: Float, half: Float) = Spec(InputControl.LS, cx, cy, half, id = DPAD_ID, kind = InputElementKind.DPAD, shape = InputButtonShape.ROUNDED, name = "D-pad") @@ -33,8 +45,8 @@ object KitLayout { private fun specs(kit: PadKit): List = when { kit.steam -> shoulders() + listOf( - Spec(InputControl.L4, 30f, 470f, 30f, 62f, shape = InputButtonShape.ROUNDED), Spec(InputControl.L5, 30f, 590f, 30f, 62f, shape = InputButtonShape.ROUNDED), - Spec(InputControl.R4, 1570f, 470f, 30f, 62f, shape = InputButtonShape.ROUNDED), Spec(InputControl.R5, 1570f, 590f, 30f, 62f, shape = InputButtonShape.ROUNDED), + Spec(InputControl.L4, 30f, 470f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.L5, 30f, 590f, 30f, 58f, shape = InputButtonShape.ROUNDED), + Spec(InputControl.R4, 1570f, 470f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.R5, 1570f, 590f, 30f, 58f, shape = InputButtonShape.ROUNDED), dpad(215f, 330f, 100f)) + face(1385f, 330f, 50f, 82f) + listOf( Spec(InputControl.LS, 290f, 610f, 96f), Spec(InputControl.RS, 1310f, 610f, 96f), Spec(InputControl.LEFT_PAD, 480f, 345f, 95f, shape = InputButtonShape.ROUNDED), Spec(InputControl.RIGHT_PAD, 1120f, 345f, 95f, shape = InputButtonShape.ROUNDED), @@ -43,11 +55,11 @@ object KitLayout { keyboard(136f)) kit.playStation -> shoulders() + listOf(dpad(250f, 395f, 125f)) + face(1350f, 395f, 56f, 92f) + listOf( Spec(InputControl.LS, 565f, 690f, 100f), Spec(InputControl.RS, 1035f, 690f, 100f), - Spec(InputControl.L3, 420f, 790f, 42f), Spec(InputControl.R3, 1180f, 790f, 42f), + Spec(InputControl.L3, 430f, 590f, 42f, ax = 565f, ay = 690f), Spec(InputControl.R3, 1170f, 590f, 42f, ax = 1035f, ay = 690f), Spec(InputControl.SELECT, 640f, 150f, 50f, 30f, shape = InputButtonShape.PILL), Spec(InputControl.START, 960f, 150f, 50f, 30f, shape = InputButtonShape.PILL), Spec(InputControl.GUIDE, 800f, 250f, 46f), Spec(InputControl.QAM, 220f, 848f, 46f), keyboard(136f)) - else -> shoulders() + listOf(Spec(InputControl.LS, 235f, 400f, 104f), dpad(470f, 690f, 118f)) + face(1375f, 400f, 58f, 94f) + listOf( - Spec(InputControl.RS, 1130f, 690f, 104f), Spec(InputControl.L3, 385f, 290f, 42f), Spec(InputControl.R3, 1290f, 790f, 42f), + else -> shoulders() + listOf(Spec(InputControl.LS, 235f, 400f, 104f), dpad(470f, 675f, 118f)) + face(1375f, 400f, 58f, 94f) + listOf( + Spec(InputControl.RS, 1130f, 690f, 104f), Spec(InputControl.L3, 385f, 290f, 42f, ax = 235f, ay = 400f), Spec(InputControl.R3, 1290f, 790f, 42f, ax = 1130f, ay = 690f), Spec(InputControl.SELECT, 690f, 162f, 38f), Spec(InputControl.GUIDE, 800f, 162f, 54f), Spec(InputControl.START, 910f, 162f, 38f), Spec(InputControl.QAM, 220f, 848f, 46f), keyboard(136f)) } @@ -56,20 +68,29 @@ object KitLayout { fun elements(context: Context, kit: PadKit, width: Int, height: Int, safe: Rect = Rect(), scale: Float = 1f): List { if (width <= 0 || height <= 0) return emptyList() val w = width.toFloat(); val h = height.toFloat() - val unit = min(w / REF_W, h / REF_H) * cap(context, min(width, height)) * scale + val portrait = height > width + val unit = (min(w / if (portrait) PORTRAIT_W else REF_W, h / REF_H) * cap(context, min(width, height)) * scale).coerceAtMost(min(w / MIN_SPAN, h / REF_H)) fun x(ref: Float) = when { ref < REF_W / 3f -> safe.left + ref * unit ref > REF_W * 2f / 3f -> w - safe.right - (REF_W - ref) * unit else -> w / 2f + (ref - REF_W / 2f) * unit } fun y(ref: Float) = when { + portrait -> h - safe.bottom - (REF_H - ref) * unit ref < REF_H / 3f -> safe.top + ref * unit ref > REF_H * 2f / 3f -> h - safe.bottom - (REF_H - ref) * unit else -> h / 2f + (ref - REF_H / 2f) * unit } - return specs(kit).map { s -> - val cx = x(s.cx); val cy = y(s.cy); val hw = s.hw * unit; val hh = s.hh * unit - InputSurfaceElement(s.control, (cx - hw) / w, (cy - hh) / h, 2 * hw / w, 2 * hh / h, s.id, s.kind, s.name, + val density = context.resources.displayMetrics.density + var edge = safe.left + CORNER_DP * density + val specs = specs(kit) + val row = specs.filter { it.cy > REF_H * .88f && it.cx < REF_W / 3f }.sortedBy { it.cx }.associateWith { s -> + val hw = s.hw * unit + max(x(s.cx), edge + hw).also { edge = it + hw + GAP_DP * density } + } + return specs.map { s -> + val cx = row[s] ?: (x(s.ax) + (s.cx - s.ax) * unit); val cy = y(s.ay) + (s.cy - s.ay) * unit; val hw = s.hw * unit; val hh = s.hh * unit + InputSurfaceElement(s.control, (cx - hw) / w, (cy - hh) / h, 2 * hw / w, 2 * hh / h, s.id, s.kind, if (s.name == s.control.label) kit.name(s.control) else s.name, floating = s.kind == InputElementKind.STICK, buttonShape = s.shape, icon = s.icon).bounded() } } @@ -80,7 +101,7 @@ object KitLayout { val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait) val placed = mutableListOf() fun put(control: InputControl, box: GamepadGeometry.Box?, shape: InputButtonShape, id: String = "legacy:${control.id}", - kind: InputElementKind = InputElementKind.from(control), name: String = control.label) { + kind: InputElementKind = InputElementKind.from(control), name: String = kit.name(control)) { val b = box ?: return placed += InputSurfaceElement(control, b.left / w, b.top / h, b.width / w, b.height / h, id, kind, name, floating = false, buttonShape = shape).bounded() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index 4f81f2e9e..ef65bb1cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -62,7 +62,8 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo } private fun render() { - surface.updateCustomLayout(if (hidden != null) emptyList() else OnScreenLayout.elements(context, layout, viewWidth, viewHeight, safe, dock)) + val placed = OnScreenLayout.elements(context, layout, viewWidth, viewHeight, safe, dock) + surface.updateCustomLayout(if (hidden != null) placed.filter { it.alwaysShown } else placed) surface.updateStyle(layout?.style ?: InputSurfaceStyle()) corner.visibility = if (layout == null || dock != null) GONE else VISIBLE corner.alpha = (layout?.style?.opacity ?: 100) / 100f diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt index 32b3b73c8..8f15a33b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt @@ -19,16 +19,21 @@ object OnScreenLayout { } } - /** The built-in gamepad keeps no positions until it is edited; until then it follows the virtual controller's kit. */ - fun generated(layout: SavedInputLayout) = layout.elements.isEmpty() && (layout.id == InputLibraries.OVERLAY || layout.origin == InputLibraries.OVERLAY) + /** + * The built-in gamepad keeps no kit positions until its kit is edited; until then the kit follows the virtual controller and + * the layout stores only the keys and controls the player added on top. + */ + fun generated(layout: SavedInputLayout) = (layout.id == InputLibraries.OVERLAY || layout.origin == InputLibraries.OVERLAY) && + layout.elements.none { KitLayout.isKit(it.id) } fun elements(context: Context, layout: SavedInputLayout?, width: Int, height: Int, safe: Rect, dock: Dock? = null): List { layout ?: return emptyList() if (width <= 0 || height <= 0) return layout.elements if (generated(layout)) { val kit = PadKit.current(context) - return if (dock != null) KitLayout.dock(context, kit, width, height, dock.portrait, dock.left, dock.right) - else KitLayout.elements(context, kit, width, height, safe, layout.scale) + val extras = if (layout.elements.isEmpty()) emptyList() else fit(layout.elements, aspect(context, layout), 1f, width, height, safe) + return (if (dock != null) KitLayout.dock(context, kit, width, height, dock.portrait, dock.left, dock.right) + else KitLayout.elements(context, kit, width, height, safe, layout.scale)) + extras } return fit(layout.elements, aspect(context, layout), 1f, width, height, safe) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadKit.kt b/app/src/main/java/com/droiddeck/launcher/input/PadKit.kt index a81c3a4f1..59efeccfa 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadKit.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PadKit.kt @@ -25,6 +25,15 @@ enum class PadKit(val face: FaceGlyphs, val dpad: DpadStyle, val stick: StickCap else -> control.label } + /** What the player calls [control] on this controller. */ + fun name(control: InputControl): String = if (!playStation) label(control) else when (control) { + InputControl.A -> "Cross" + InputControl.B -> "Circle" + InputControl.X -> "Square" + InputControl.Y -> "Triangle" + else -> label(control) + } + companion object { fun of(type: String) = when (type) { SessionPrefs.CONTROLLER_STEAM -> STEAM_CONTROLLER diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 8838df53e..6932f46c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -379,15 +379,6 @@ class SteamTouchControls( for (i in -1..1) canvas.drawCircle(x + i * r * 0.3f, y + r * 0.22f, r * 0.08f, p) } - private fun drawKeyboardGlyph(canvas: Canvas, x: Float, y: Float, r: Float, color: Int) { - val p = Paint(Paint.ANTI_ALIAS_FLAG).apply { this.color = color; style = Paint.Style.STROKE; strokeWidth = lineWidth() * 0.8f } - val body = RectF(x - r * 0.6f, y - r * 0.34f, x + r * 0.6f, y + r * 0.34f) - canvas.drawRoundRect(body, r * 0.08f, r * 0.08f, p) - val dot = Paint(Paint.ANTI_ALIAS_FLAG).apply { this.color = color } - for (row in 0..1) for (i in 0..5) canvas.drawCircle(body.left + r * 0.15f + i * r * 0.18f, body.top + r * 0.18f + row * r * 0.17f, r * 0.035f, dot) - canvas.drawLine(x - r * 0.3f, body.bottom - r * 0.14f, x + r * 0.3f, body.bottom - r * 0.14f, p) - } - private val iconsLoading = HashSet() private val inkedIcons = android.util.LruCache(48) @@ -1494,11 +1485,5 @@ class SteamTouchControls( put(SteamTouchConfig.PASTE, 0L) } - private val LABEL_COLORS = mapOf( - SteamTouchConfig.A to Color.rgb(72, 133, 48), - SteamTouchConfig.B to Color.rgb(211, 68, 37), - SteamTouchConfig.X to Color.rgb(23, 60, 184), - SteamTouchConfig.Y to Color.rgb(235, 200, 70), - ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index 9b253d88a..2c11ffcab 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -69,8 +69,18 @@ object SessionDisplay { const val UNFOLDED_MIN_DP = 600 - fun unfoldedGameHeight(width: Int, height: Int, tabRow: Int = 0): Int = - (minOf(width * 9 / 16, (height * UNFOLDED_MAX_GAME_SHARE).toInt()) - tabRow.coerceAtLeast(0)).coerceAtLeast(0) and 1.inv() + /** + * The game's share of a screen with the controls below it, at the game's [aspect] across the full width. A tab row under the bar + * comes out of the controls while they keep [UNFOLDED_MIN_CONTROLS_SHARE] of the screen, and out of the game otherwise. + */ + fun unfoldedGameHeight(width: Int, height: Int, tabRow: Int = 0, aspect: Float = 16f / 9f): Int { + val game = minOf((width / aspect.coerceAtLeast(.5f)).toInt(), (height * UNFOLDED_MAX_GAME_SHARE).toInt()) + val tabs = tabRow.coerceAtLeast(0) + val roomy = height - game - tabs >= height * UNFOLDED_MIN_CONTROLS_SHARE + return (if (roomy) game else game - tabs).coerceAtLeast(0) and 1.inv() + } + + const val UNFOLDED_MIN_CONTROLS_SHARE = .45f fun unfoldedControlsWanted( enabled: Boolean, diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 15d6cdb35..6bdaf910a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1916,7 +1916,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("pipAutoEnter", enabled).apply() } - fun unfoldedControls(context: Context): Boolean = prefs(context).getBoolean("unfoldedControls", false) + fun unfoldedControls(context: Context): Boolean = prefs(context).getBoolean("unfoldedControls", true) fun controlsBelowWanted(context: Context, mode: String, width: Int, height: Int, pip: Boolean = false): Boolean = SessionDisplay.unfoldedControlsWanted( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputElementProperties.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputElementProperties.kt index 406e6f7f5..63257a313 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputElementProperties.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputElementProperties.kt @@ -38,7 +38,7 @@ internal fun InputElementProperties(element: InputSurfaceElement, action: InputA withContext(Dispatchers.IO) { InputButtonImages.import(context.applicationContext, uri) }?.let { change(current.copy(icon = 0, image = it)) } } } - ToggleRow(host, "element-toggle", stringResource(R.string.input_toggle_button), stringResource(R.string.input_toggle_button_hint), element.toggle) { onChange(element.copy(toggle = it)) } + ToggleRow(host, "element-toggle", stringResource(R.string.input_toggle_button), null, element.toggle) { onChange(element.copy(toggle = it)) } ChoiceRow(host, "element-shape", stringResource(R.string.input_button_shape), null, InputButtonShape.entries.map { it to stringResource(when (it) { InputButtonShape.ROUNDED -> R.string.input_shape_rounded; InputButtonShape.PILL -> R.string.input_shape_pill; InputButtonShape.CIRCLE -> R.string.input_shape_circle; InputButtonShape.RECTANGLE -> R.string.input_shape_rectangle }) }, element.buttonShape) { onChange(element.copy(buttonShape = it)) } @@ -63,7 +63,7 @@ internal fun InputElementProperties(element: InputSurfaceElement, action: InputA } } if (element.kind == InputElementKind.TRACKPAD) { - ToggleRow(rememberMenuHost(), "element-mouse-gestures", stringResource(R.string.input_mouse_gestures), stringResource(R.string.input_mouse_gestures_hint), element.mouseGestures) { onChange(element.copy(mouseGestures = it)) } + ToggleRow(rememberMenuHost(), "element-mouse-gestures", stringResource(R.string.input_mouse_gestures), null, element.mouseGestures) { onChange(element.copy(mouseGestures = it)) } } if (element.kind == InputElementKind.STICK) { val host = rememberMenuHost() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt index f35d3daa4..5687670bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt @@ -46,8 +46,9 @@ internal class InputLayoutPreviewView(context: Context) : View(context) { private var sourceHeight = 563 fun update(layout: SavedInputLayout, role: InputRole) { sourceHeight = if (role == InputRole.PRIMARY) 563 else 870 - renderer.updateCustomLayout(layout.elements) - renderer.updateStyle(layout.style.copy(opacity = 100)) + renderer.measure(MeasureSpec.makeMeasureSpec(1000, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(sourceHeight, MeasureSpec.EXACTLY)) + renderer.layout(0, 0, 1000, sourceHeight) + renderer.showLayout(layout.copy(style = layout.style.copy(opacity = 100))) renderer.measure(MeasureSpec.makeMeasureSpec(1000, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(sourceHeight, MeasureSpec.EXACTLY)) renderer.layout(0, 0, 1000, sourceHeight) contentDescription = layout.name @@ -65,28 +66,4 @@ internal class InputLayoutPreviewView(context: Context) : View(context) { } } -@Composable -internal fun InputColorRow(host: MenuHost, value: Int?, onPick: (Int?) -> Unit) { - val open = host.open == "layout-color" - val tints = listOf>(null to R.string.ctrl_tint_gray) + ControllerPrefs.tints - SettingsRow(stringResource(R.string.ctrl_color), null, highlighted = open) { - Box { - ValueChip(tints.firstOrNull { it.first == value }?.second?.let { stringResource(it) } - ?: stringResource(R.string.ctrl_custom), open, modifier = Modifier.testTag("setting-layout-color")) { - host.open = if (open) null else "layout-color" - } - AnchoredMenu(open, onDismiss = { if (host.open == "layout-color") host.open = null }, title = stringResource(R.string.ctrl_color)) { firstItemFocus -> - tints.forEachIndexed { index, (color, name) -> - MenuItem(stringResource(name), checked = value == color, leading = { - Box(Modifier.size(14.dp).background(Color(color ?: GRAY_SWATCH), CircleShape).border(1.dp, Color.White.copy(alpha = .35f), CircleShape)) - }, focusRequester = if (index == 0) firstItemFocus else null) { - onPick(color) - host.open = null - } - } - } - } - } -} - private const val GRAY_SWATCH = 0xFF26292E.toInt() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt deleted file mode 100644 index 3e53e3cce..000000000 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt +++ /dev/null @@ -1,81 +0,0 @@ -package com.droiddeck.launcher.ui - -import android.content.Context -import android.content.SharedPreferences -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.BorderStroke -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.ui.Alignment -import androidx.compose.ui.unit.dp -import androidx.compose.ui.platform.testTag -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.stringResource -import com.droiddeck.launcher.R -import com.droiddeck.launcher.input.* - -@Composable -internal fun InputQuickSettings(host: MenuHost, desktop: Boolean, onChanged: (InputRole?) -> Unit = {}, onEdit: () -> Unit = {}, track: (String) -> Modifier = { Modifier }) { - val context = LocalContext.current - var library by remember { mutableStateOf(InputLibraries.read(context)) } - var expanded by remember { mutableStateOf(false) } - var naming by remember { mutableStateOf(false) } - var failure by remember { mutableStateOf(null) } - DisposableEffect(context) { - val preferences = context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE) - val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key -> if (key == "library") library = InputLibraries.read(context) } - preferences.registerOnSharedPreferenceChangeListener(listener) - onDispose { preferences.unregisterOnSharedPreferenceChangeListener(listener) } - } - fun update(role: InputRole?, change: (InputLibrary) -> InputLibrary) { - runCatching { InputLibraries.update(context, change) }.onSuccess { library = it; onChanged(role) } - .onFailure { failure = it.message ?: context.getString(R.string.input_save_failed) } - } - val selection = library.selection(desktop) - val mixed = selection.parts.isNotEmpty() - val active = library.profile(library.activeId(desktop)) - val profiles = listOf(InputProfiles.AUTO to stringResource(R.string.input_quick_auto, if (desktop) library.profile(library.desktop).name else library.profile(library.steam).name)) + - library.profiles.map { it.id to it.name } + if (mixed) listOf("mixed" to stringResource(R.string.input_quick_mixed, active.name)) else emptyList() - Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - Row(Modifier.weight(1f).focusRow { expanded = !expanded }.padding(14.dp).testTag("input-profile-expand"), - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - Text(if (expanded) "▾" else "▸", color = MaterialTheme.colorScheme.onSurface) - Text(stringResource(R.string.input_profile), style = MaterialTheme.typography.titleMedium, color = MaterialTheme.colorScheme.onSurface) - } - Box(Modifier.padding(end = 14.dp).widthIn(max = 280.dp)) { - ChoiceChip(host, "input-profile", stringResource(R.string.input_profile), profiles, if (mixed) "mixed" else selection.profile, - modifier = track("input-profile")) { id -> if (id != "mixed") update(null) { it.selectProfile(desktop, id) } } - } - } - if (expanded) Surface( - modifier = Modifier.fillMaxWidth().padding(start = 18.dp, end = 12.dp, bottom = 14.dp).testTag("input-profile-parts"), - shape = RoundedCornerShape(12.dp), - color = MaterialTheme.colorScheme.primary.copy(alpha = .08f), - border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = .35f)), - ) { - Column(Modifier.padding(vertical = 6.dp)) { - for (role in InputRole.entries) { - val options = library.bindings.filter { binding -> - if (role == InputRole.PHYSICAL) binding.physical - else !binding.physical && library.layouts.any { it.id == binding.layoutId && it.supports(role) } - }.map { it.id to it.name } - ChoiceRow(host, "input-part-${role.name}", roleLabel(role), null, options, library.activePart(desktop, role).bindings, - chipModifier = track("input-part-${role.name}")) { id -> update(role) { it.selectPart(desktop, role, id) } } - } - if (mixed) SecondaryButton(stringResource(R.string.input_save_combination)) { naming = true } - ActionRow(stringResource(R.string.input_settings), null, stringResource(R.string.ctrl_edit), onEdit, - modifier = track("input-settings").testTag("input-profile-edit")) - } - } - if (naming) { - var name by remember { mutableStateOf("") } - AlertDialog(onDismissRequest = { naming = false }, title = { Text(stringResource(R.string.input_save_combination)) }, - text = { OutlinedTextField(name, { name = it.take(80) }, singleLine = true, label = { Text(stringResource(R.string.input_name)) }) }, - confirmButton = { PadTextButton(enabled = name.isNotBlank(), onClick = { update(null) { it.saveSelection(desktop, name) }; naming = false }) { Text(stringResource(R.string.gesture_save_changes)) } }, - dismissButton = { PadTextButton(onClick = { naming = false }) { Text(stringResource(R.string.common_cancel)) } }) - } - failure?.let { message -> AlertDialog(onDismissRequest = { failure = null }, title = { Text(stringResource(R.string.input_save_failed)) }, - text = { Text(message) }, confirmButton = { PadTextButton(onClick = { failure = null }) { Text(stringResource(R.string.common_ok)) } }) } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt index 9e55ae2a8..a0549bcb1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt @@ -278,18 +278,17 @@ private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embe else InputHint(layout.name) InputNavigationRow(stringResource(R.string.input_saved_layouts), stringResource(R.string.input_saved_layouts_hint)) { go(InputPage.LAYOUTS) } if (layout.editable) { - InputColorRow(host, layout.style.tint) { color -> update { it.withLayout(layout.copy(style = layout.style.copy(tint = color))) } } SliderRow(stringResource(R.string.ctrl_opacity), null, layout.style.opacity, 1..100, step = 1, format = { "$it%" }) { opacity -> update { it.withLayout(layout.copy(style = layout.style.copy(opacity = opacity))) } } - for (button in layout.quickButtons) ToggleRow(host, "quick-${button.name.lowercase()}", stringResource(quickButtonLabel(button)), null, - button !in layout.style.hidden) { on -> update { it.withLayout(layout.withQuickButton(button, on)) } } } if (role == InputRole.SECONDARY) InputHint(stringResource(R.string.input_second_screen_enable)) } SettingsGroup(stringResource(R.string.input_assign_actions)) { val users = library.usersOfBindings(preset.id) if (users.size > 1) InputHint(stringResource(R.string.input_shared_with, users.filterNot { it.id == profileId }.joinToString { it.name })) - val elements = layout?.takeIf { it.editable }?.elements + val elements = layout?.takeIf { it.editable }?.let { l -> + if (OnScreenLayout.generated(l)) InputLibraries.defaultPositions(context, library, l)?.first.orEmpty() + l.elements else l.elements + } if (elements != null) { if (elements.isEmpty()) InputHint(stringResource(R.string.input_empty_elements)) for (e in elements) { @@ -461,12 +460,6 @@ private fun InputNavigationRow(title: String, detail: String?, modifier: Modifie } } -internal fun quickButtonLabel(button: InputCommand) = when (button) { - InputCommand.STEAM -> R.string.ctrl_steam_button - InputCommand.QUICK_ACCESS -> R.string.ctrl_qam_button - else -> R.string.ctrl_keyboard_button -} - @Suppress("DEPRECATION") internal fun inputDisplayMetrics(context: Context, role: InputRole): DisplayMetrics = DisplayMetrics().also { metrics -> (context.findActivity() as? com.droiddeck.launcher.SessionActivity)?.inputEditorDisplay(role)?.getRealMetrics(metrics) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 55f45de33..03ccba9a4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -101,13 +101,26 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB scaleValue = percent; scaleBase = base.first to elements } fun resetPositions() { positioned?.let { checkpoint(); elements = it } } + private val restored get() = defaults?.let { refit(it, defaultsFrame) } + private fun matches(defaults: List, placed: List) = defaults.size == placed.size && defaults.all { a -> + placed.any { e -> e.copy(x = a.x, y = a.y, width = a.width, height = a.height) == a && + abs(e.x - a.x) < .002f && abs(e.y - a.y) < .002f && abs(e.width - a.width) < .002f && abs(e.height - a.height) < .002f } + } + val atDefaults get() = restored?.let { matches(it, elements) } == true + /** The kit's own controls are where the kit puts them, so only the added ones need saving. */ + val kitAtDefaults get() = restored?.let { matches(it, elements.filter { e -> KitLayout.isKit(e.id) }) } == true + fun reset() { + val d = restored?.takeIf { !atDefaults } ?: return + checkpoint(); elements = d; selected = null + actions = actions.filterKeys { id -> d.any { it.id == id } }; clicks = clicks.filterKeys { id -> d.any { it.id == id } } + } fun hiddenDefaults(): List = defaults?.let { refit(it, defaultsFrame) }?.filter { d -> elements.none { it.id == d.id } }.orEmpty() fun add(element: InputSurfaceElement) { checkpoint(); elements = elements + element; selected = element.id; popover = null } fun remove(id: String) { checkpoint(); elements = elements.filterNot { it.id == id }; actions = actions - id; clicks = clicks - id; selected = null } fun resizeSelected(factor: Float) { val e = element ?: return checkpoint() - val w = (e.width * factor).coerceIn(.03f, 1f); val h = (e.height * factor).coerceIn(.03f, 1f) + val w = (e.width * factor).coerceIn(InputSurfaceElement.MIN_SIZE, 1f); val h = (e.height * factor).coerceIn(InputSurfaceElement.MIN_SIZE, 1f) val cx = e.x + e.width / 2; val cy = e.y + e.height / 2 elements = elements.map { if (it.id == e.id) e.copy(x = (cx - w / 2).coerceIn(0f, 1f - w), y = (cy - h / 2).coerceIn(0f, 1f - h), width = w, height = h).bounded() else it } } @@ -127,7 +140,9 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> val bindingUsers = library.usersOfBindings(savedBindings.id).size val draft = remember { val defaults = InputLibraries.defaultPositions(context, library, savedLayout) - val start = if (OnScreenLayout.generated(savedLayout) && defaults != null) savedLayout.copy(elements = defaults.first, aspect = defaults.second) else savedLayout + val start = if (OnScreenLayout.generated(savedLayout) && defaults != null) savedLayout.copy(elements = defaults.first + + OnScreenLayout.fit(savedLayout.elements, savedLayout.aspect.takeIf { it > 0f } ?: defaults.second, 1f, (defaults.second * 1000).roundToInt(), 1000, Rect()), + aspect = defaults.second) else savedLayout SurfaceDraft(start, savedBindings, defaults?.first, defaults?.second ?: 0f, ControllerPrefs.snap(context)) } val manager = remember { context.getSystemService(DisplayManager::class.java) } @@ -148,7 +163,10 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> InputLibraries.update(context) { latest -> val l = latest.layouts.first { it.id == savedLayout.id } val p = latest.preset(savedBindings.id) - latest.withLayout(l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale)).withPreset(p.copy(elements = draft.actions.filterKeys { id -> draft.elements.any { it.id == id } }, + val generated = draft.kitAtDefaults && OnScreenLayout.generated(l.copy(elements = emptyList())) + val extras = draft.elements.filterNot { KitLayout.isKit(it.id) } + latest.withLayout(if (generated) l.copy(elements = extras, aspect = if (extras.isEmpty()) 0f else draft.aspect, scale = draft.layoutScale) + else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale)).withPreset(p.copy(elements = draft.actions.filterKeys { id -> draft.elements.any { it.id == id } }, clicks = draft.clicks.filterKeys { id -> draft.elements.any { it.id == id && it.hasClick } })) } }.onSuccess { onChanged(); onDismiss() }.onFailure { failure = it.message ?: context.getString(R.string.input_save_failed) } @@ -192,7 +210,27 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> val element = draft.element BackHandler { if (draft.properties) draft.properties = false else leave() } val editorScope = scope ?: if (layoutUsers > 1) stringResource(R.string.input_editor_shared, layoutUsers) else savedLayout.name + val propertiesEditor: @Composable (InputSurfaceElement) -> Unit = { element -> + var properties by remember(element.id) { mutableStateOf(element) } + InputActionEditor(if (draft.clickProperties) InputControl.A else element.control, + if (draft.clickProperties) draft.clickAction(element) else draft.action(element), + if (draft.clickProperties) stringResource(R.string.input_click_name, element.name) else element.name, + onBack = { draft.properties = false }, element = element, click = draft.clickProperties, + properties = { action -> + if (!draft.clickProperties) InputElementProperties(properties, action) { properties = it } + if (layoutUsers > 1) Text(stringResource(R.string.input_editor_shared, layoutUsers), + style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(bottom = 12.dp)) + }, detail = if (bindingUsers > 1) stringResource(R.string.input_shared_detail, savedBindings.name, bindingUsers) + else "${library.profile(profile).name} · ${roleLabel(role)}", onSave = { action -> + draft.checkpoint() + if (draft.clickProperties) draft.clicks = draft.clicks + (element.id to action) else draft.actions = draft.actions + (element.id to action) + draft.elements = draft.elements.map { if (it.id == element.id) properties.copy(name = properties.name.trim().ifBlank { element.name }) else it } + draft.properties = false + }) + } when { + (remote || target == null) && draft.properties && element != null -> propertiesEditor(element) target == null -> SettingsPage(rememberMenuHost(), savedLayout.name, ::leave) { Text(stringResource(R.string.input_display_unavailable)) PrimaryButton(stringResource(R.string.input_editor_done)) { save() } @@ -208,24 +246,8 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> EditorChrome(draft, editorScope, failure, ::save, ::leave, onDismiss) if (draft.properties && element != null) Surface(Modifier.align(Alignment.CenterEnd).fillMaxHeight().fillMaxWidth(.44f), color = MaterialTheme.colorScheme.surface, shadowElevation = 12.dp) { - var properties by remember(element.id) { mutableStateOf(element) } - InputActionEditor(if (draft.clickProperties) InputControl.A else element.control, - if (draft.clickProperties) draft.clickAction(element) else draft.action(element), - if (draft.clickProperties) stringResource(R.string.input_click_name, element.name) else element.name, - onBack = { draft.properties = false }, element = element, click = draft.clickProperties, - properties = { action -> - if (!draft.clickProperties) InputElementProperties(properties, action) { properties = it } - if (layoutUsers > 1) Text(stringResource(R.string.input_editor_shared, layoutUsers), - style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(bottom = 12.dp)) - }, detail = if (bindingUsers > 1) stringResource(R.string.input_shared_detail, savedBindings.name, bindingUsers) - else "${library.profile(profile).name} · ${roleLabel(role)}", onSave = { action -> - draft.checkpoint() - if (draft.clickProperties) draft.clicks = draft.clicks + (element.id to action) else draft.actions = draft.actions + (element.id to action) - draft.elements = draft.elements.map { if (it.id == element.id) properties.copy(name = properties.name.trim().ifBlank { element.name }) else it } - draft.properties = false - }) - } + propertiesEditor(element) + } } } } @@ -278,7 +300,7 @@ private fun EditorChrome(draft: SurfaceDraft, scope: String, failure: String?, o if (draft.defaults != null) SecondaryButton(stringResource(R.string.input_hidden_count, draft.hiddenDefaults().size), compact = true) { draft.popover = if (draft.popover == EditorPopover.HIDDEN) null else EditorPopover.HIDDEN } - if (draft.defaults != null) SecondaryButton(stringResource(R.string.input_reset_positions), enabled = draft.positioned != null, compact = true) { draft.resetPositions() } + if (draft.defaults != null) SecondaryButton(stringResource(R.string.hud_reset_button), enabled = !draft.atDefaults, compact = true) { draft.reset() } Row(verticalAlignment = Alignment.CenterVertically) { Checkbox(draft.snap, { draft.snap = it; ControllerPrefs.setSnap(context, it) }) Text(stringResource(R.string.ctrl_editor_snap)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt index 313334ca5..2af54e178 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt @@ -32,6 +32,8 @@ import com.droiddeck.launcher.input.InputButtonIcons import com.droiddeck.launcher.input.InputButtonShape import com.droiddeck.launcher.input.InputButtonImages import com.droiddeck.launcher.input.KitLayout +import com.droiddeck.launcher.input.OnScreenLayout +import com.droiddeck.launcher.input.SavedInputLayout import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PadKit import com.droiddeck.launcher.input.pcKeyLabel @@ -148,6 +150,21 @@ class InputSurfaceView( view.invalidate() } + private var generated: SavedInputLayout? = null + + /** Shows [layout]; a layout that has no elements of its own gets the virtual controller's defaults at this view's size. */ + fun showLayout(layout: SavedInputLayout?) { + generated = layout?.takeIf(OnScreenLayout::generated) + updateStyle(layout?.style ?: InputSurfaceStyle()) + updateCustomLayout(generated?.let { OnScreenLayout.elements(context, it, width, height, android.graphics.Rect(), null) } ?: layout?.elements.orEmpty()) + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + val layout = generated ?: return + post { if (generated === layout) updateCustomLayout(OnScreenLayout.elements(context, layout, width, height, android.graphics.Rect(), null)) } + } + fun updateCustomLayout(requested: List) { requestedLayout = requested val layout = surfaceStyle.shown(requested) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 91f87cd94..8ff82e86b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -286,7 +286,9 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: extras.drivers(s.gpuDrivers) } if (tab == SheetTab.CONTROLS) { - InputQuickSettings(host, desktop = s.mode == SessionService.MODE_DESKTOP, onEdit = a.onInputSettings) + SettingsGroup(stringResource(R.string.drawer_page_controller)) { + ActionRow(stringResource(R.string.input_remap_buttons), null, stringResource(R.string.ctrl_edit), a.onInputSettings) + } SettingsGroup(if (steam) stringResource(R.string.mode_touch_controls) else stringResource(R.string.mode_touch)) { ChoiceRow( host, "touch", stringResource(R.string.mode_touch), null, 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..0fe1f1006 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -244,8 +244,7 @@ class SecondScreenPresentation( if (!created || !currentMode.controls) return val controls = controlsView ?: return val layout = panelLayout(currentMode) - controls.updateCustomLayout(layout?.elements.orEmpty()) - controls.updateStyle(layout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) + controls.showLayout(layout) } fun showKeyboard(): Boolean { @@ -292,8 +291,7 @@ class SecondScreenPresentation( if (mode == SecondScreenMode.DECK_CONTROLS) deckPanel.value = SessionPrefs.deckPanel(context) bar(mode) val layout = panelLayout(mode) - val controls = InputSurfaceView(context, pad, layout?.elements.orEmpty(), - surfaceStyle = layout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) + val controls = InputSurfaceView(context, pad).also { it.showLayout(layout) } controlsView = controls root.addView(controls, weightParams()) attachKeyboard() 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 d25181ad4..2bb50e0f1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -296,7 +296,6 @@ class DrawerActions( val layoutGame: String? = null, val layoutOptions: List> = emptyList(), val layoutChoice: String = "", - val layoutHint: String? = null, val onLayout: (String) -> Unit = {}, val onEditLayout: (() -> Unit)? = null, val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null, @@ -660,18 +659,18 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } SessionDrawerPage.CONTROLLER -> { SettingsGroup(a.layoutGame?.let { stringResource(R.string.osc_group_for, it) } ?: stringResource(R.string.mode_osc)) { - if (a.layoutOptions.isNotEmpty()) ChoiceRow(host, "osc-layout", stringResource(R.string.osc_layout), a.layoutHint, + if (a.layoutOptions.isNotEmpty()) ChoiceRow(host, "osc-layout", stringResource(R.string.osc_layout), null, a.layoutOptions, a.layoutChoice, chipModifier = focus.track(page, "osc-layout"), onPick = a.onLayout) a.onEditLayout?.let { edit -> ActionRow(stringResource(R.string.osc_edit_layout), null, stringResource(R.string.ctrl_edit), { host.open = null; edit() }, modifier = focus.track(page, "osc-edit")) } - SettingsRow(stringResource(R.string.osc_show), stringResource(R.string.osc_show_hint), stacked = true) { + SettingsRow(stringResource(R.string.osc_show), null) { SegmentedTabs(listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), a.oscMode, tabModifier = { focus.track(page, "osc-$it") }, onPick = a.onOsc) } - ChoiceRow(host, "touch", stringResource(R.string.input_touches), stringResource(R.string.input_touches_hint), + ChoiceRow(host, "touch", stringResource(R.string.input_touches), null, listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_mouse), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), @@ -680,13 +679,13 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont RelativeMouseRow(host, a, focus.track(page, "relative-mouse")) if (a.touchActive == SessionPrefs.TOUCH_DIRECT) ToggleRow(host, "direct-cursor", stringResource(R.string.input_touch_cursor), - stringResource(R.string.input_touch_cursor_hint), a.directCursor, + null, a.directCursor, chipModifier = focus.track(page, "direct-cursor"), onChange = a.onDirectCursor) when (a.touchActive) { SessionPrefs.TOUCH_GESTURES -> ActionRow(stringResource(R.string.gesture_settings), null, stringResource(R.string.ctrl_edit), a.onGestureSettings, modifier = focus.track(page, "gesture-settings")) - SessionPrefs.TOUCH_DIRECT -> ChoiceRow(host, "long-press", stringResource(R.string.input_touch_hold), stringResource(R.string.input_touch_hold_hint), + SessionPrefs.TOUCH_DIRECT -> ChoiceRow(host, "long-press", stringResource(R.string.input_touch_hold), null, listOf(MOUSE_BEHAVIOR_NONE to stringResource(R.string.gesture_hold_left), MOUSE_BEHAVIOR_CLICK to stringResource(R.string.gesture_right_click), MOUSE_BEHAVIOR_HOLD to stringResource(R.string.gesture_hold_right)), @@ -694,17 +693,17 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont onPick = a.onDirectHoldBehavior) } if (a.steam && a.unfoldedControls != null) ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), - stringResource(R.string.unfolded_controls_hint), a.unfoldedControls, + null, a.unfoldedControls, chipModifier = focus.track(page, "unfolded-controls"), onChange = a.onUnfoldedControls) if (a.steam && a.unfoldedControls == true) ToggleRow(host, "unfolded-controls-with-controller", stringResource(R.string.unfolded_controls_with_controller), - stringResource(R.string.unfolded_controls_with_controller_hint), a.unfoldedControlsWithController, + null, a.unfoldedControlsWithController, chipModifier = focus.track(page, "unfolded-controls-with-controller"), onChange = a.onUnfoldedControlsWithController) } SettingsGroup(stringResource(R.string.drawer_page_controller)) { a.padType?.let { type -> - ChoiceRow(host, "pad-type", stringResource(R.string.input_virtual_controller), stringResource(R.string.input_virtual_controller_hint), + ChoiceRow(host, "pad-type", stringResource(R.string.input_virtual_controller), null, listOf(SessionPrefs.CONTROLLER_DECK to stringResource(R.string.mode_controller_deck), SessionPrefs.CONTROLLER_STEAM to stringResource(R.string.mode_controller_steam), SessionPrefs.CONTROLLER_DS4 to stringResource(R.string.mode_controller_ds4), @@ -716,7 +715,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ToggleRow(host, "rumble", stringResource(R.string.ctrl_rumble), null, c.rumble, chipModifier = focus.track(page, "rumble"), onChange = a.onRumble) } - ActionRow(stringResource(R.string.input_remap_buttons), stringResource(R.string.input_physical_hint), stringResource(R.string.ctrl_edit), + ActionRow(stringResource(R.string.input_remap_buttons), null, stringResource(R.string.ctrl_edit), a.onInputSettings, modifier = focus.track(page, "remap")) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { @@ -745,9 +744,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont { moreControls = !moreControls }, modifier = focus.track(page, "more-controls")) if (moreControls) { if (a.steam) ToggleRow(host, "back-hold", stringResource(R.string.back_hold), - stringResource(R.string.back_hold_hint), a.backHold, + null, a.backHold, chipModifier = focus.track(page, "back-hold"), onChange = a.onBackHold) - if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.input_back_taps), stringResource(R.string.input_back_taps_hint), + if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.input_back_taps), null, listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) if (a.steam) ChoiceRow(host, "back-double-tap", stringResource(R.string.back_double_tap_window), null, @@ -758,7 +757,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont stringResource(R.string.drawer_corner_tap_hint), a.cornerTap, chipModifier = focus.track(page, "corner-tap"), onChange = a.onCornerTap) ToggleRow(host, "low-latency", stringResource(R.string.drawer_low_latency), - stringResource(R.string.drawer_low_latency_hint), a.lowLatency, + null, a.lowLatency, chipModifier = focus.track(page, "low-latency"), onChange = a.onLowLatency) ToggleRow(host, "evdev-mouse", stringResource(R.string.drawer_evdev_mouse), null, a.evdevMouse, @@ -768,18 +767,18 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont val keyboardContext = LocalContext.current remember { PcKeyboardPrefs.load(keyboardContext) } SliderRow( - stringResource(R.string.pckb_size), stringResource(R.string.pckb_size_hint), + stringResource(R.string.pckb_size), null, PcKeyboardPrefs.size, SessionPrefs.PC_KEYBOARD_SIZE_RANGE, step = 1, format = { "$it%" }, modifier = focus.track(page, "pckb-size"), onChange = { PcKeyboardPrefs.setSize(keyboardContext, it) }) SliderRow( - stringResource(R.string.pckb_opacity), stringResource(R.string.pckb_opacity_hint), + stringResource(R.string.pckb_opacity), null, PcKeyboardPrefs.opacity, SessionPrefs.PC_KEYBOARD_OPACITY_RANGE, step = 5, format = { "$it%" }, modifier = focus.track(page, "pckb-opacity"), onChange = { PcKeyboardPrefs.setOpacity(keyboardContext, it) }) MultiRow( host, "pckb-hidden", stringResource(R.string.pckb_hidden_keys), - stringResource(R.string.pckb_hidden_keys_hint), + null, listOf( 0 to stringResource(R.string.pckb_group_function), 1 to stringResource(R.string.pckb_group_nav), @@ -830,7 +829,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont SessionDrawerPage.AGENT -> Unit SessionDrawerPage.SESSION -> { SettingsGroup(stringResource(R.string.drawer_support)) { - SettingsRow(stringResource(R.string.report_problem), stringResource(R.string.report_problem_hint)) { + SettingsRow(stringResource(R.string.report_problem), null) { DrawerOutlineButton(stringResource(R.string.drawer_share_logs), modifier = focus.track(page, "share-logs"), progress = com.droiddeck.launcher.session.SessionLogShare.progress) { host.open = null @@ -868,7 +867,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } SettingsGroup(stringResource(R.string.drawer_session_behavior)) { if (a.micAvailable) ToggleRow(host, "microphone", stringResource(R.string.mode_mic), - stringResource(R.string.drawer_mic_hint), a.micEnabled, + null, a.micEnabled, chipModifier = focus.track(page, "microphone"), onChange = a.onMicEnabled) ChoiceRow( host, "suspend", stringResource(R.string.mode_suspend), @@ -887,7 +886,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ) if (a.steam && a.suspendPolicy != SessionPrefs.SUSPEND_NEVER) ToggleRow( host, "background-downloads", stringResource(R.string.mode_background_downloads), - stringResource(R.string.mode_background_downloads_hint), + null, a.steamDownloadsInBackground, onChange = a.onSteamDownloadsInBackground, ) @@ -1104,20 +1103,20 @@ private fun ScreenEffectsGroup( SettingsGroup(stringResource(R.string.drawer_effects)) { ChoiceRow( host, "effects-profile", stringResource(R.string.screen_effects_target), - stringResource(R.string.screen_effects_target_hint), a.screenEffectsTargets, + null, a.screenEffectsTargets, a.screenEffectsTarget, chipModifier = track("effects-profile"), onPick = a.onScreenEffectsTarget, ) ActionRow( stringResource(R.string.screen_effects_reset), - stringResource(R.string.screen_effects_reset_hint), + null, stringResource(R.string.hud_reset_button), a.onScreenEffectsReset, modifier = track("effects-reset"), ) if (a.screenEffectsCanDelete) ActionRow( stringResource(R.string.screen_effects_delete), - stringResource(R.string.screen_effects_delete_hint), + null, stringResource(R.string.common_delete), a.onScreenEffectsDelete, modifier = track("effects-delete"), @@ -1200,7 +1199,7 @@ private fun ScreenEffectsGroup( private fun CardboardGroup(host: MenuHost, a: DrawerActions, track: (String) -> Modifier) { val c = a.cardboard SettingsGroup(stringResource(R.string.cardboard_title)) { - ToggleRow(host, "cardboard", stringResource(R.string.cardboard_mode), stringResource(R.string.cardboard_mode_hint), + ToggleRow(host, "cardboard", stringResource(R.string.cardboard_mode), null, c.enabled, chipModifier = track("cardboard")) { a.onCardboard(c.copy(enabled = it)) } if (!c.enabled) return@SettingsGroup ChoiceRow(host, "cardboard-source", stringResource(R.string.cardboard_source), null, @@ -1282,8 +1281,6 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) 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 @@ -1700,8 +1697,6 @@ internal fun ComponentDownloadsDrawerGroup( val installed = packages.map { it.file }.toSet() val nightlyPicked = remember { mutableStateMapOf() } SettingsGroup(stringResource(R.string.drawer_component_downloads)) { - Text(stringResource(R.string.drawer_component_downloads_hint), fontSize = 12.sp, - color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp)) SettingsRow(stringResource(R.string.comp_nightlies_checked, if (catalogAt > 0) java.text.DateFormat.getTimeInstance(java.text.DateFormat.SHORT) .format(java.util.Date(catalogAt * 1000)) else stringResource(R.string.comp_never)), null, stacked = true) { diff --git a/app/src/main/res/values-ar/input_library.xml b/app/src/main/res/values-ar/input_library.xml index 68f65da57..fa5a0dfdc 100644 --- a/app/src/main/res/values-ar/input_library.xml +++ b/app/src/main/res/values-ar/input_library.xml @@ -75,14 +75,9 @@ نسخة مستقلة بدء العصا عند موضع اللمس إخفاء العصا عند عدم الاستخدام - الأدوات - تلقائي (%1$s) - مخصص (%1$s) حفظ كملف تعريف جديد عناصر تحكم ملف التعريف - ملف التعريف إيماءات لوحة لمس الفأرة - عند تعيينها لمؤشر الفأرة: اضغط للنقر، واستمر للتمرير بالسحب، ومرّر بإصبعين. لدى %1$s تجاوز للقائمة السريعة. اختر تلقائي هناك لاستخدام ملف التعريف الافتراضي والأجزاء الثلاثة المحفوظة. إدخال DroidDeck يُحتجز أثناء تحريك العصا في أي اتجاه: يُضغط فوق 55% ويُحرّر تحت 35%. استخدم مفاتيح الاتجاه لتعيين كل اتجاه على حدة. تُنفَّذ أوامر DroidDeck مرة واحدة لكل انحراف. يُضبط النقر على العصا على حدة. @@ -103,19 +98,12 @@ رجوع · مرتان في Steam ومرة في سطح المكتب في وضع Steam. الاستمرار بالضغط على رجوع يفتح الوصول السريع أيضًا. الاستعادة إلى الافتراضي - يتم تذكر اختيار اللوحة. يفتح سطح المكتب مساحة عمل ثانية؛ ولا يغيّر الجلسة أو ملف تعريف الإدخال. وحدة تحكم افتراضية - نوع وحدة التحكم التي يراها Steam أو اللعبة. شاشة لمس - كيفية التعامل مع اللمسات على شاشة اللعبة. تحتفظ أزرار ملف التعريف بإجراءاتها المعيّنة. مؤشر اللمس - إظهار مؤشر للمسات المباشرة على شاشة اللعبة. اللمس والاستمرار - إجراء الفأرة عند الاستمرار بإصبع على شاشة اللعبة. نقرات زر رجوع - الإجراء الأول: نقرة واحدة. الإجراء الثاني: نقرتان. زر تبديل - اضغط للاستمرار، واضغط مرة أخرى للتحرير. فتح قائمة أو تبديل ملف التعريف يحرّر الزر. الشكل مستدير كبسولة diff --git a/app/src/main/res/values-ar/input_strings.xml b/app/src/main/res/values-ar/input_strings.xml index d375d35ff..f9edaba92 100644 --- a/app/src/main/res/values-ar/input_strings.xml +++ b/app/src/main/res/values-ar/input_strings.xml @@ -1,6 +1,5 @@ - ملفات تعريف الإدخال ملفات التعريف وحدة تحكم فعلية الشاشة الرئيسية @@ -23,7 +22,6 @@ فتح قائمة Steam فتح الوصول السريع في Steam إزالة عنصر التحكم - إضافة عنصر تحكم أزرار خاصة بالجهاز تعيين زر فعلي حرّر الزر ثم اختر تحرير أو إعادة المحاولة أو إلغاء. يلغي B أو رجوع بعد التحرير. diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e92f6f47e..3e8795a7b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -296,14 +296,10 @@ اللمس الزر الجانبي عناصر التحكم على الشاشة - Steam + QAM يعرض الخيار «تلقائي» عناصر التحكم عند عدم توصيل وحدة تحكم. - لمس Steam (تجريبي) - تبدأ عناصر التحكم باللمس من Steam مع جلسة Steam التالية تخطيط لمس Steam تصدير صورة - انقل عناصر التحكم باللمس لهذه اللعبة أو غيّر حجمها أو أخفها؛ ويتم الحفظ في Steam وحدة التحكم كيف يرى Steam وحدة التحكم لديك. يُطبَّق في الجلسة التالية. وحدة تحكم Steam Deck @@ -434,7 +430,6 @@ يتجاوز PulseAudio لتقليل زمن الاستجابة. الميكروفون للدردشة الصوتية. - شغّل التقاط الميكروفون أو أوقفه لهذه الجلسة. تعذّر تغيير الميكروفون. يُرجى المحاولة مرة أخرى. الشبكة اكتشاف Wi-Fi @@ -812,7 +807,6 @@ لوحة المفاتيح زمن الاستجابة وضع زمن الاستجابة المنخفض - يزيد استهلاك CPU والبطارية وحدة تحكم بزمن استجابة منخفض تبلغ وحدة التحكم بمعدل 1000 هرتز بدلًا من 250 هرتز. استهلاك معالج أعلى قليلًا. لمس بزمن استجابة منخفض @@ -1387,12 +1381,8 @@ العتامة %1$d%% حجم الأزرار - عصي تكيّفية اهتزاز اللعبة المنطقة الميتة لعصا التحكم - زر Steam - زر QAM - زر لوحة المفاتيح أجهزة Joy-Con كوحدات تحكم VR أثناء تشغيل SteamVR، يصبح كل Joy-Con يدًا. وجّهه إلى الأمام واضغط مطولًا على Home أو Capture لإعادة توسيطه. الرسوم المتحركة @@ -1525,8 +1515,6 @@ لوحة اللمس إغلاق عناصر التحكّم على الشاشة الثانية فتح قائمة Steam - لوحة اللمس اليمنى - لوحة اللمس اليسرى لوحة اللمس إظهار لوحة المفاتيح إخفاء لوحة المفاتيح @@ -1565,11 +1553,8 @@ لوحة مفاتيح Android إخفاء ✕ الحجم على الشاشة - نسبة الشاشة التي تشغلها لوحة المفاتيح، بما في ذلك الشريط العلوي. العتامة - قلّلها لرؤية اللعبة خلف لوحة المفاتيح. المفاتيح المخفية - المفاتيح التي نادرًا ما تستخدمها لا تظهر على لوحة المفاتيح. صف Esc ومفاتيح الوظائف Ins / Del / Home / End / PgUp / PgDn مفاتيح الأسهم @@ -1814,8 +1799,6 @@ تم تثبيت %1$s - اختره من القائمة انتظر حتى تنتهي إزالة بيئة التشغيل لعبة - لوحة اللمس - مباشر فشل التبديل: %1$s فشل حفظ ملف التعريف: %1$s تم إيقاف سطح المكتب مؤقتًا @@ -2107,15 +2090,6 @@ الانتقال لمستوى أعلى اختر مجلدًا اختر ملفًا - أزرق Steam - سماوي - أبيض - بنفسجي - أخضر - كهرماني - أحمر - وردي - رمادي الزر A الزر B الزر X @@ -3262,7 +3236,6 @@ تتبّع تجريبي لحركة الرأس لنظارة Pro 2. لا يُدعم بعد ضبط السطوع ومستوى الصوت أو تبديل وضع العرض. Cardboard VR وضع Cardboard - عرض للعين اليسرى وآخر لليمنى لنظارة واقع افتراضي للهاتف. الصورة شاشة افتراضية ثلاثي الأبعاد جنبًا إلى جنب @@ -3285,7 +3258,6 @@ غير متوفر في هذه الجلسة. لم يستجب SteamVR؛ تحقّق من سجل الجلسة. تنزيل المكوّنات - التنزيلات مشتركة مع صفحة «المكوّنات». اختر نسخة منزّلة أعلاه لاستخدامها عند التشغيل التالي للعبة. اختر نسخة لتنزيلها المطوّر الناشر 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..d850c1a7f 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 @@ -75,14 +75,9 @@ Copia independiente Iniciar la palanca en el punto de toque Ocultar la palanca cuando no se use - Herramientas - Auto (%1$s) - Personalizado (%1$s) Guardar como perfil nuevo Controles del perfil - Perfil Gestos del panel táctil del mouse - Si se asigna al puntero del mouse: toca para hacer clic, mantén para arrastrar y desplaza con dos dedos. %1$s tiene una anulación del menú rápido. Selecciona Auto allí para usar su perfil predeterminado y sus tres partes guardadas. Entrada de DroidDeck Se mantiene mientras la palanca se mueve en cualquier dirección: se presiona por encima del 55 %, se suelta por debajo del 35 %. Usa Teclas de dirección para asignar cada dirección por separado. Los comandos de DroidDeck se ejecutan una vez por desvío. El clic de la palanca se configura aparte. @@ -103,19 +98,12 @@ 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 - Cómo se manejan los toques en la pantalla del juego. Los botones del perfil mantienen sus acciones asignadas. Cursor táctil - Muestra un puntero para toques directos en la pantalla del juego. Tocar y mantener - Acción del mouse al mantener un dedo en la pantalla del juego. Toques del botón Atrás - Primera acción: un toque. Segunda acción: doble toque. Botón de alternar - Toca para mantener, toca de nuevo para soltar. Abrir un menú o cambiar de perfil suelta el botón. Forma Redondeada Píldora diff --git a/app/src/main/res/values-b+es+419/input_strings.xml b/app/src/main/res/values-b+es+419/input_strings.xml index 744979897..588991fb7 100644 --- a/app/src/main/res/values-b+es+419/input_strings.xml +++ b/app/src/main/res/values-b+es+419/input_strings.xml @@ -1,6 +1,5 @@ - Perfiles de entrada Perfiles Control físico Pantalla principal @@ -23,7 +22,6 @@ Abrir el menú de Steam Abrir el acceso rápido de Steam Quitar control - Agregar control Botones específicos del dispositivo Asignar un botón físico Suelta el botón y elige Editar, Reintentar o Cancelar. B o Atrás cancela después de soltarlo. 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 c75468997..9e9b3e76e 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -296,14 +296,10 @@ Táctil Botón lateral Controles en pantalla - Steam + QAM Auto muestra los controles en pantalla cuando no hay ningún control conectado. - Táctil de Steam (beta) - Los controles táctiles de Steam se activan en la próxima sesión de Steam Disposición táctil de Steam Exportar Imagen - Mueve, cambia de tamaño u oculta los controles táctiles de este juego; se guarda en Steam Control Cómo ve Steam tu control. Se aplica en la próxima sesión. Control de Steam Deck @@ -431,7 +427,6 @@ Evita PulseAudio para menor latencia. Micrófono Para el chat de voz. - Activa o desactiva la captura del micrófono en esta sesión. No se pudo cambiar el micrófono. Inténtalo de nuevo. Red Detección de redes Wi-Fi @@ -785,7 +780,6 @@ HDR simulado Cardboard VR Modo Cardboard - Vistas para el ojo izquierdo y el derecho para un visor de RV para celular. Imagen Pantalla virtual 3D lado a lado @@ -830,7 +824,6 @@ Teclado Latencia Modo de baja latencia - Aumenta el uso de CPU y batería Control de baja latencia El control informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU. Táctil de baja latencia @@ -882,7 +875,6 @@ Original Importa y elimina en la página Componentes. Descargar componentes - Las descargas se comparten con la página Componentes. Elige arriba una versión descargada para usarla al iniciar el próximo juego. Elige una versión para descargar Hecho Requiere atención @@ -1393,12 +1385,8 @@ Opacidad %1$d%% Tamaño de botones - Sticks adaptables Vibración en juegos Zona muerta de la palanca - Botón Steam - Botón QAM - Botón de teclado Joy-Con como controles de RV Mientras SteamVR está activo, cada Joy-Con es una mano. Apúntalo al frente y mantén Home o Captura para recentrarlo. Sin ningún mando conectado, la cámara del teléfono rastrea tus manos en realidad virtual: pellizca con el pulgar y el índice para hacer clic, cierra la mano para agarrar y gira la palma hacia ti y pellizca para abrir el menú. Con los mandos Joy-Con emparejados, la cámara rastrea su posición mientras los mandos Joy-Con proporcionan la rotación y las entradas de los botones. Las imágenes se procesan en este dispositivo y nunca se guardan ni se envían. @@ -1571,8 +1559,6 @@ Trackpad Cerrar controles de la segunda pantalla Abrir menú de Steam - Trackpad derecho - Trackpad izquierdo Trackpad Mostrar teclado Ocultar teclado @@ -1611,11 +1597,8 @@ Teclado de Android Ocultar ✕ Tamaño en pantalla - Parte de la pantalla que ocupa el teclado, encabezado incluido. Opacidad - Bájala para ver el juego detrás del teclado. Teclas ocultas - Las teclas que casi no usas no aparecen en el teclado. Esc y fila de funciones Ins / Del / Home / End / PgUp / PgDn Teclas de dirección @@ -1836,8 +1819,6 @@ %1$s instalado - elígelo en el menú Espera a que termine la eliminación del runtime Juego - touchpad - directo El reemplazo falló: %1$s No se pudo guardar el perfil: %1$s El escritorio está en pausa @@ -2102,15 +2083,6 @@ Subir un nivel Elige una carpeta Elige un archivo - Azul Steam - Celeste - Blanco - Violeta - Verde - Ámbar - Rojo - Rosa - Gris Botón A Botón B Botón X diff --git a/app/src/main/res/values-bg/input_library.xml b/app/src/main/res/values-bg/input_library.xml index 53f210315..189c4332f 100644 --- a/app/src/main/res/values-bg/input_library.xml +++ b/app/src/main/res/values-bg/input_library.xml @@ -75,14 +75,9 @@ Независимо копие Стартиране на стика от точката на докосване Скриване на стика, когато не се използва - Инструменти - Автоматично (%1$s) - Персонализирано (%1$s) Запазване като нов профил Управление на профила - Профил Жестове на тъчпада на мишката - Когато е зададено на показалеца на мишката: докоснете за щракване, задръжте за плъзгане и превъртайте с два пръста. %1$s има замяна на бързото меню. Изберете Автоматично, за да използвате профила по подразбиране и трите запазени части. Вход на DroidDeck Задържа се, докато стикът е отместен в която и да е посока: натиска при над 55%, отпуска под 35%. Използвайте Клавиши за посока, за да зададете всяка посока отделно. Командите на DroidDeck се изпълняват веднъж на отклонение. Щракването на стика се настройва отделно. @@ -103,19 +98,12 @@ Назад · два пъти в Steam, веднъж в работен плот В режим Steam. Задържането на Назад отваря и бързия достъп. Връщане към подразбирането - Изборът на панел се запомня. Работният плот отваря второ работно пространство; не сменя сесията или профила ѝ за вход. Виртуален контролер - Типът контролер, който Steam или играта виждат. Сензорен екран - Как се обработват докосванията на екрана на играта. Бутоните на профила запазват зададените си действия. Курсор за докосване - Показва показалец за директни докосвания на екрана на играта. Докосване и задържане - Действие на мишката при задържане на пръст на екрана на играта. Докосвания на бутона Назад - Първо действие: едно докосване. Второ действие: двойно докосване. Превключващ бутон - Докоснете за задържане, докоснете отново за освобождаване. Отваряне на меню или смяна на профил освобождава бутона. Форма Заоблена Капсула diff --git a/app/src/main/res/values-bg/input_strings.xml b/app/src/main/res/values-bg/input_strings.xml index 3e16a7059..4988b4bf7 100644 --- a/app/src/main/res/values-bg/input_strings.xml +++ b/app/src/main/res/values-bg/input_strings.xml @@ -1,6 +1,5 @@ - Профили за вход Профили Физически контролер Основен екран @@ -23,7 +22,6 @@ Отваряне на менюто на Steam Отваряне на бързия достъп на Steam Премахване на контрола - Добавяне на контрол Бутони, специфични за устройството Задаване на физически бутон Отпуснете бутона, след което изберете Редакция, Повторение или Отказ. B или Назад отменя след отпускането. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e5c8de89c..f271d1d40 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -296,14 +296,10 @@ Докосване Страничен бутон Екранни контроли - Steam + QAM Автоматично показва контролите, когато няма свързан контролер. - Докосване в Steam (бета) - Сензорните контроли на Steam ще стартират от следващата сесия на Steam Разположение на докосването в Steam Експорт Изображение - Премествайте, преоразмерявайте или скривайте сензорните контроли на тази игра; записва се в Steam Контролер Как Steam разпознава контролера ви. Прилага се от следващата сесия. Контролер на Steam Deck @@ -430,7 +426,6 @@ Пропуска PulseAudio за по-ниска латентност. Микрофон За гласов чат. - Включване или изключване на записа от микрофона за тази сесия. Микрофонът не можа да бъде променен. Опитайте пак. Мрежа Откриване на Wi-Fi @@ -804,7 +799,6 @@ Клавиатура Закъснение Режим на ниска латентност - Увеличава използването на CPU и батерията Контролер с ниско закъснение Контролерът докладва при 1000 Hz вместо 250 Hz. Малко повече CPU. Докосване с ниско закъснение @@ -1359,12 +1353,8 @@ Прозрачност %1$d%% Размер на бутоните - Адаптивни стикове Вибрация от играта Мъртва зона на стика - Бутон Steam - Бутон QAM - Бутон за клавиатура Joy-Con като VR контролери Докато SteamVR работи, всеки Joy-Con става ръка. Насочете го напред и задръжте Home или Capture, за да го центрирате отново. Анимации @@ -1493,8 +1483,6 @@ Тракпад Затваряне на контролите за втория екран Отваряне на менюто на Steam - Десен тракпад - Ляв тракпад Тракпад Показване на клавиатурата Скриване на клавиатурата @@ -1533,11 +1521,8 @@ Клавиатура на Android Скриване ✕ Размер на екрана - Каква част от екрана заема клавиатурата, включително заглавката. Непрозрачност - Намалете я, за да виждате играта зад клавиатурата. Скрити клавиши - Рядко използваните клавиши не се показват на клавиатурата. Esc и ред с функционални клавиши Ins / Del / Home / End / PgUp / PgDn Клавиши със стрелки @@ -1750,8 +1735,6 @@ Инсталирано: %1$s - избери го от менюто Изчакай премахването на средата да приключи Игра - тракпад - директно Размяната се провали: %1$s Запазването на профила се провали: %1$s Работният плот е на пауза @@ -2007,15 +1990,6 @@ Едно ниво нагоре Избор на папка Избор на файл - Синьо на Steam - Небесно - Бяло - Виолетово - Зелено - Кехлибарено - Червено - Розово - Сиво Бутон A Бутон B Бутон X @@ -3142,7 +3116,6 @@ Експериментално проследяване на движенията на главата за Pro 2. Регулирането на яркостта и силата на звука и превключването на режима на показване все още не се поддържат. Cardboard VR Режим Cardboard - Изображения за лявото и дясното око за VR очила за телефон. Картина Виртуален екран 3D един до друг @@ -3165,7 +3138,6 @@ Не е налично в тази сесия. SteamVR не отговори; проверете лога на сесията. Изтегляне на компоненти - Изтеглянията са общи със страницата Компоненти. Изберете по-горе изтеглена версия, за да се използва при следващото стартиране на играта. Изберете версия за изтегляне Разработчик Издател diff --git a/app/src/main/res/values-cs/input_library.xml b/app/src/main/res/values-cs/input_library.xml index 10783695c..2b67a7976 100644 --- a/app/src/main/res/values-cs/input_library.xml +++ b/app/src/main/res/values-cs/input_library.xml @@ -75,14 +75,9 @@ Nezávislá kopie Spustit páčku v místě dotyku Skrýt páčku, když se nepoužívá - Nástroje - Automaticky (%1$s) - Vlastní (%1$s) Uložit jako nový profil Ovládání profilu - Profil Gesta touchpadu myši - Při přiřazení k ukazateli myši: klepnutím kliknete, podržením táhnete a dvěma prsty posouváte. %1$s má přepsání rychlé nabídky. Vyberte Automaticky, chcete-li použít výchozí profil a všechny tři uložené části. Vstup DroidDeck Drženo, když je páčka vychýlena jakýmkoli směrem: stisk nad 55 %, uvolnění pod 35 %. Pomocí Směrových kláves přiřaďte každý směr zvlášť. Příkazy DroidDeck se spustí jednou za vychýlení. Kliknutí páčky se nastavuje zvlášť. @@ -103,19 +98,12 @@ 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 - Jak se zpracovávají dotyky na obrazovce hry. Tlačítka profilu si zachovávají přiřazené akce. Kurzor dotyku - Zobrazí ukazatel pro přímé dotyky na obrazovce hry. Dotknout se a podržet - Akce myši při podržení prstu na obrazovce hry. Klepnutí tlačítka Zpět - První akce: jedno klepnutí. Druhá akce: dvojité klepnutí. Přepínací tlačítko - Klepnutím podržíte, dalším klepnutím uvolníte. Otevření nabídky nebo přepnutí profilu tlačítko uvolní. Tvar Zaoblený Kapsle diff --git a/app/src/main/res/values-cs/input_strings.xml b/app/src/main/res/values-cs/input_strings.xml index 6cd32d90b..86c55d2f0 100644 --- a/app/src/main/res/values-cs/input_strings.xml +++ b/app/src/main/res/values-cs/input_strings.xml @@ -1,6 +1,5 @@ - Profily vstupu Profily Fyzický ovladač Hlavní obrazovka @@ -23,7 +22,6 @@ Otevřít nabídku Steam Otevřít rychlý přístup Steam Odebrat prvek - Přidat prvek Tlačítka specifická pro zařízení Přiřadit fyzické tlačítko Uvolněte tlačítko a zvolte Upravit, Znovu nebo Zrušit. B nebo Zpět zruší po uvolnění. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 370a0eea6..fc64f5af0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -296,14 +296,10 @@ Dotyk Boční tlačítko Ovládání na obrazovce - Steam + QAM Automaticky zobrazí ovládání, pokud není připojen žádný ovladač. - Dotykové ovládání Steamu (beta) - Dotykové ovládání Steamu se spustí od příští relace Steamu Rozvržení dotykového ovládání Steamu Exportovat Obrázek - Přesuňte, změňte velikost nebo skryjte dotykové ovládání této hry; uloží se do Steamu Ovladač Jak Steam vidí váš ovladač. Použije se od příští relace. Ovladač Steam Deck @@ -432,7 +428,6 @@ Obchází PulseAudio pro nižší latenci. Mikrofon Pro hlasový chat. - Zapnout nebo vypnout snímání mikrofonu pro tuto relaci. Mikrofon se nepodařilo změnit. Zkuste to znovu. Síť Vyhledávání Wi-Fi @@ -808,7 +803,6 @@ Klávesnice Zpoždění Režim nízkého zpoždění - Zvyšuje využití CPU a baterie Ovladač s nízkým zpožděním Ovladač hlásí na 1000 Hz místo 250 Hz. O něco víc CPU. Dotek s nízkým zpožděním @@ -1373,12 +1367,8 @@ Průhlednost %1$d%% Velikost tlačítek - Adaptivní páčky Vibrace ve hře Mrtvá zóna páčky - Tlačítko Steam - Tlačítko QAM - Tlačítko klávesnice Joy-Cony jako ovladače VR Když běží SteamVR, každý Joy-Con slouží jako ruka. Namiřte ho dopředu a podržením Home nebo Capture ho znovu vycentrujete. Animace @@ -1509,8 +1499,6 @@ Trackpad Zavřít ovládání druhé obrazovky Otevřít nabídku Steamu - Pravý trackpad - Levý trackpad Trackpad Zobrazit klávesnici Skrýt klávesnici @@ -1549,11 +1537,8 @@ Klávesnice Androidu Skrýt ✕ Velikost na obrazovce - Podíl obrazovky, který klávesnice zabírá, včetně záhlaví. Neprůhlednost - Snižte ji, abyste viděli hru za klávesnicí. Skryté klávesy - Klávesy, které používáte zřídka, se na klávesnici nezobrazují. Esc a řada funkčních kláves Ins / Del / Home / End / PgUp / PgDn Klávesy se šipkami @@ -1782,8 +1767,6 @@ Nainstalováno %1$s - vyberte ho v nabídce Počkejte, až skončí odstranění runtime Hra - touchpad - přímý Přepnutí se nezdařilo: %1$s Uložení profilu se nezdařilo: %1$s Plocha je na pauze @@ -2057,15 +2040,6 @@ O úroveň výš Vybrat složku Vybrat soubor - Steam modrá - Nebeská - Bílá - Fialová - Zelená - Ambrová - Červená - Růžová - Šedá Tlačítko A Tlačítko B Tlačítko X @@ -3202,7 +3176,6 @@ Experimentální sledování pohybu hlavy pro Pro 2. Nastavení jasu, hlasitosti a přepínání režimů zobrazení zatím nejsou podporovány. Cardboard VR Režim Cardboard - Obraz pro levé a pravé oko pro VR brýle pro telefon. Obraz Virtuální obrazovka 3D vedle sebe @@ -3225,7 +3198,6 @@ V této relaci není k dispozici. SteamVR neodpovídá; zkontrolujte protokol relace. Stáhnout komponenty - Stažené soubory se sdílejí se stránkou Komponenty. Výběrem stažené verze výše ji použijete při dalším spuštění hry. Vyberte verzi ke stažení Vývojář Vydavatel diff --git a/app/src/main/res/values-da/input_library.xml b/app/src/main/res/values-da/input_library.xml index f3fd6e80a..ca20501cf 100644 --- a/app/src/main/res/values-da/input_library.xml +++ b/app/src/main/res/values-da/input_library.xml @@ -75,14 +75,9 @@ Uafhængig kopi Start stikket ved berøringspunktet Skjul stikket, når det ikke bruges - Værktøjer - Auto (%1$s) - Brugerdefineret (%1$s) Gem som ny profil Profilbetjening - Profil Musetouchpadbevægelser - Når tildelt musemarkøren: tryk for at klikke, hold for at trække, og rul med to fingre. %1$s har en tilsidesættelse af hurtigmenuen. Vælg Auto for at bruge dens standardprofil og alle tre gemte dele. DroidDeck-input Holdes, mens styrepinden flyttes i en vilkårlig retning: tryk over 55 %, slip under 35 %. Brug Retningstaster til at tildele hver retning separat. DroidDeck-kommandoer kører én gang pr. udsving. Stikklikket konfigureres separat. @@ -103,19 +98,12 @@ 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 - Hvordan berøringer på spilskærmen håndteres. Profilknapper beholder deres tildelte handlinger. Berøringsmarkør - Viser en markør ved direkte berøringer på spilskærmen. Rør og hold - Musehandling, når du holder en finger på spilskærmen. Tryk på Tilbage-knappen - Første handling: enkelt tryk. Anden handling: dobbelttryk. Skifteknap - Tryk for at holde, tryk igen for at slippe. Åbning af en menu eller skift af profil slipper knappen. Form Afrundet Pille diff --git a/app/src/main/res/values-da/input_strings.xml b/app/src/main/res/values-da/input_strings.xml index 2e4e23b45..97d67bc24 100644 --- a/app/src/main/res/values-da/input_strings.xml +++ b/app/src/main/res/values-da/input_strings.xml @@ -1,6 +1,5 @@ - Inputprofiler Profiler Fysisk controller Hovedskærm @@ -23,7 +22,6 @@ Åbn Steam-menuen Åbn Steams hurtigadgang Fjern kontrol - Tilføj kontrol Enhedsspecifikke knapper Tildel en fysisk knap Slip knappen, og vælg Rediger, Prøv igen eller Annuller. B eller Tilbage annullerer efter slip. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ea39e14de..f4a816b44 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -296,14 +296,10 @@ Berøring Sideknap Kontroller på skærmen - Steam + QAM Auto viser kontrollerne, når ingen controller er tilsluttet. - Steam-berøring (beta) - Steams berøringskontroller starter med næste Steam-session Steam-berøringslayout Eksportér Billede - Flyt, tilpas størrelsen på eller skjul dette spils berøringskontroller; gemmes til Steam Controller Hvordan Steam ser din controller. Gælder fra næste session. Steam Deck-controller @@ -430,7 +426,6 @@ Går uden om PulseAudio for lavere forsinkelse. Mikrofon Til voicechat. - Slå mikrofonoptagelse til eller fra for denne session. Kunne ikke ændre mikrofonen. Prøv igen. Netværk Wi-Fi-søgning @@ -804,7 +799,6 @@ Tastatur Forsinkelse Lav forsinkelse - Øger CPU- og batteriforbrug Controller med lav forsinkelse Controlleren rapporterer ved 1000 Hz i stedet for 250 Hz. Lidt mere CPU. Berøring med lav forsinkelse @@ -1359,12 +1353,8 @@ Gennemsigtighed %1$d%% Knapstørrelse - Adaptive styrepinde Spilvibration Dødzone for styrepind - Steam-knap - QAM-knap - Tastaturknap Joy-Cons som VR-controllere Mens SteamVR kører, bliver hver Joy-Con en hånd. Peg den fremad, og hold Home eller Capture nede for at centrere den igen. Animationer @@ -1493,8 +1483,6 @@ Trackpad Luk kontrollerne til den anden skærm Åbn Steam-menuen - Højre trackpad - Venstre trackpad Trackpad Vis tastatur Skjul tastatur @@ -1533,11 +1521,8 @@ Android-tastatur Skjul ✕ Størrelse på skærmen - Den del af skærmen, tastaturet fylder, inklusive header. Uigennemsigtighed - Sænk den for at se spillet bag tastaturet. Skjulte taster - Taster, du sjældent bruger, vises ikke på tastaturet. Esc og funktionsrækken Ins / Del / Home / End / PgUp / PgDn Piletaster @@ -1750,8 +1735,6 @@ Installeret %1$s - vælg den i menuen Vent til fjernelse af runtime er færdig Spil - touchpad - direkte Udskiftning mislykkedes: %1$s Lagring af profil mislykkedes: %1$s Skrivebordet er sat på pause @@ -2007,15 +1990,6 @@ Et niveau op Vælg en mappe Vælg en fil - Steam-blå - Himmelblå - Hvid - Violet - Grøn - Ravgul - Rød - Pink - Grå A-knap B-knap X-knap @@ -3142,7 +3116,6 @@ Eksperimentel hovedsporing til Pro 2. Justering af lysstyrke og lydstyrke samt skift af visningstilstand understøttes endnu ikke. Cardboard VR Cardboard-tilstand - Billeder til venstre og højre øje til en VR-brille til telefonen. Billede Virtuel skærm Side-by-side-3D @@ -3165,7 +3138,6 @@ Ikke tilgængelig i denne session. SteamVR svarede ikke; se sessionsloggen. Download komponenter - Downloads deles med siden Komponenter. Vælg en downloadet version ovenfor for at bruge den fra næste spilstart. Vælg en version at downloade Udvikler Udgiver diff --git a/app/src/main/res/values-de/input_library.xml b/app/src/main/res/values-de/input_library.xml index 8ba2b07f5..3db1a6838 100644 --- a/app/src/main/res/values-de/input_library.xml +++ b/app/src/main/res/values-de/input_library.xml @@ -75,14 +75,9 @@ Unabhängige Kopie Stick an der Berührungsstelle starten Stick ausblenden, wenn nicht benutzt - Werkzeuge - Auto (%1$s) - Benutzerdefiniert (%1$s) Als neues Profil speichern Profilsteuerung - Profil Maus-Touchpad-Gesten - Wenn dem Mauszeiger zugewiesen: Tippen zum Klicken, Halten zum Ziehen, mit zwei Fingern scrollen. %1$s hat eine Schnellmenü-Überschreibung. Wähle dort Auto, um sein Standardprofil und alle drei gespeicherten Teile zu verwenden. DroidDeck Input Gehalten, während der Stick in eine beliebige Richtung bewegt wird: drücken über 55 %, loslassen unter 35 %. Mit Richtungstasten jede Richtung einzeln zuweisen. DroidDeck-Aktionen laufen einmal pro Ausschlag. Der Stick-Klick wird separat konfiguriert. @@ -103,19 +98,12 @@ 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 - Wie Berührungen auf dem Spielbildschirm behandelt werden. Profiltasten behalten ihre zugewiesenen Aktionen. Touch-Cursor - Zeigt einen Zeiger für direkte Berührungen auf dem Spielbildschirm. Berühren und halten - Mausaktion beim Halten eines Fingers auf dem Spielbildschirm. Zurück-Taste tippen - Erste Aktion: einmal tippen. Zweite Aktion: zweimal tippen. Umschalttaste - Tippen zum Halten, erneut tippen zum Loslassen. Das Öffnen eines Menüs oder ein Profilwechsel lässt die Taste los. Form Abgerundet Pille diff --git a/app/src/main/res/values-de/input_strings.xml b/app/src/main/res/values-de/input_strings.xml index b37b9c2b7..cdff5d7a2 100644 --- a/app/src/main/res/values-de/input_strings.xml +++ b/app/src/main/res/values-de/input_strings.xml @@ -1,6 +1,5 @@ - Eingabeprofile Profile Physischer Controller Hauptbildschirm @@ -23,7 +22,6 @@ Steam-Menü öffnen Steam-Schnellzugriff öffnen Steuerung entfernen - Steuerung hinzufügen Gerätespezifische Tasten Physische Taste zuweisen Taste loslassen, dann Bearbeiten, Wiederholen oder Abbrechen wählen. B oder Zurück bricht nach dem Loslassen ab. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8b4ccd02..fb7ed37e2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -296,14 +296,10 @@ Touch Seitentaste Bildschirmsteuerung - Steam + QAM Auto zeigt die Steuerung an, wenn kein Controller verbunden ist. - Steam-Touch (Beta) - Steams Touch-Steuerung startet mit der nächsten Steam-Sitzung Steam-Touch-Layout Exportieren Bild - Touch-Steuerung dieses Spiels verschieben, skalieren oder ausblenden; wird in Steam gespeichert Controller Wie Steam deinen Controller erkennt. Gilt ab der nächsten Sitzung. Steam-Deck-Controller @@ -430,7 +426,6 @@ Umgeht PulseAudio für geringere Latenz. Mikrofon Für Sprachchat. - Mikrofonaufnahme für diese Sitzung ein- oder ausschalten. Das Mikrofon konnte nicht umgeschaltet werden. Bitte versuch es erneut. Netzwerk Wi-Fi-Erkennung @@ -804,7 +799,6 @@ Tastatur Latenz Modus mit geringer Latenz - Erhöht CPU- und Akkuverbrauch Controller mit geringer Latenz Der Controller meldet mit 1000 Hz statt 250 Hz. Die CPU-Last ist etwas höher. Touch mit geringer Latenz @@ -1351,12 +1345,8 @@ Deckkraft %1$d %% Tastengröße - Adaptive Sticks Spielvibration Stick-Totzone - Steam-Taste - QAM-Taste - Tastatur-Taste Joy-Cons als VR-Controller Während SteamVR läuft, wird jeder Joy-Con zu einer Hand. Richte ihn nach vorn und halte HOME oder Capture gedrückt, um ihn neu auszurichten. Animationen @@ -1485,8 +1475,6 @@ Trackpad Steuerung auf dem Zweitbildschirm schließen Steam-Menü öffnen - Rechtes Trackpad - Linkes Trackpad Trackpad Tastatur einblenden Tastatur ausblenden @@ -1525,11 +1513,8 @@ Android-Tastatur Ausblenden ✕ Größe auf dem Bildschirm - Anteil des Bildschirms, den die Tastatur einnimmt, inklusive Kopfzeile. Deckkraft - Verringern, um das Spiel hinter der Tastatur zu sehen. Ausgeblendete Tasten - Tasten, die du selten nutzt, bleiben auf der Tastatur ausgeblendet. Esc- und Funktionstastenreihe Ins / Del / Home / End / PgUp / PgDn Pfeiltasten @@ -1742,8 +1727,6 @@ %1$s installiert - wähle ihn im Menü aus Warte, bis die Laufzeit entfernt ist Spiel - Touchpad - direkt Austausch fehlgeschlagen: %1$s Profil konnte nicht gespeichert werden: %1$s Der Desktop ist pausiert @@ -1999,15 +1982,6 @@ Eine Ebene nach oben Ordner auswählen Datei auswählen - Steam-Blau - Himmelblau - Weiß - Violett - Grün - Bernstein - Rot - Pink - Grau A-Taste B-Taste X-Taste @@ -3131,7 +3105,6 @@ Experimentelles Kopftracking für Pro 2. Das Einstellen von Helligkeit und Lautstärke sowie das Umschalten des Anzeigemodus werden noch nicht unterstützt. Cardboard VR Cardboard-Modus - Bilder für linkes und rechtes Auge für eine Smartphone-VR-Brille. Bild Virtueller Bildschirm Side-by-Side-3D @@ -3154,7 +3127,6 @@ In dieser Sitzung nicht verfügbar. SteamVR hat nicht reagiert; Sitzungsprotokoll prüfen. Komponenten herunterladen - Downloads werden mit der Seite „Komponenten“ geteilt. Wähle oben eine heruntergeladene Version, um sie beim nächsten Spielstart zu verwenden. Version zum Herunterladen wählen Entwickler Publisher diff --git a/app/src/main/res/values-el/input_library.xml b/app/src/main/res/values-el/input_library.xml index c9f40579e..7237c6763 100644 --- a/app/src/main/res/values-el/input_library.xml +++ b/app/src/main/res/values-el/input_library.xml @@ -75,14 +75,9 @@ Ανεξάρτητο αντίγραφο Έναρξη μοχλού στο σημείο αφής Απόκρυψη μοχλού όταν δεν χρησιμοποιείται - Εργαλεία - Αυτόματο (%1$s) - Προσαρμοσμένο (%1$s) Αποθήκευση ως νέο προφίλ Χειριστήρια προφίλ - Προφίλ Χειρονομίες touchpad ποντικιού - Όταν αντιστοιχιστεί στον δείκτη του ποντικιού: πατήστε για κλικ, κρατήστε για μεταφορά και κυλήστε με δύο δάχτυλα. Το %1$s έχει παράκαμψη γρήγορου μενού. Επιλέξτε Αυτόματο εκεί για να χρησιμοποιήσετε το προεπιλεγμένο προφίλ και τα τρία αποθηκευμένα μέρη. Είσοδος DroidDeck Κρατείται όσο ο μοχλός κινείται προς οποιαδήποτε κατεύθυνση: πάτημα πάνω από 55%, απελευθέρωση κάτω από 35%. Χρησιμοποιήστε Πλήκτρα κατεύθυνσης για κάθε κατεύθυνση ξεχωριστά. Οι εντολές DroidDeck εκτελούνται μία φορά ανά εκτροπή. Το κλικ του μοχλού ρυθμίζεται ξεχωριστά. @@ -103,19 +98,12 @@ Πίσω · δύο φορές στο Steam, μία στην επιφάνεια εργασίας Σε λειτουργία Steam. Το κράτημα του Πίσω ανοίγει και τη γρήγορη πρόσβαση. Επαναφορά στις προεπιλογές - Η επιλογή πίνακα απομνημονεύεται. Η επιφάνεια εργασίας ανοίγει δεύτερο χώρο εργασίας· δεν αλλάζει τη συνεδρία ούτε το προφίλ εισόδου της. Εικονικό χειριστήριο - Ο τύπος χειριστηρίου που βλέπουν το Steam ή το παιχνίδι. Οθόνη αφής - Πώς χειρίζονται τα αγγίγματα στην οθόνη του παιχνιδιού. Τα κουμπιά του προφίλ διατηρούν τις αντιστοιχισμένες ενέργειες. Δείκτης αφής - Εμφανίζει δείκτη για άμεσα αγγίγματα στην οθόνη του παιχνιδιού. Άγγιγμα και κράτημα - Ενέργεια ποντικιού όταν κρατάτε το δάχτυλό σας στην οθόνη του παιχνιδιού. Πατήματα του κουμπιού Πίσω - Πρώτη ενέργεια: ένα πάτημα. Δεύτερη ενέργεια: διπλό πάτημα. Κουμπί εναλλαγής - Πατήστε για κράτημα, πατήστε ξανά για απελευθέρωση. Το άνοιγμα μενού ή η αλλαγή προφίλ απελευθερώνει το κουμπί. Σχήμα Στρογγυλεμένο Κάψουλα diff --git a/app/src/main/res/values-el/input_strings.xml b/app/src/main/res/values-el/input_strings.xml index 58b5bce71..935464ffb 100644 --- a/app/src/main/res/values-el/input_strings.xml +++ b/app/src/main/res/values-el/input_strings.xml @@ -1,6 +1,5 @@ - Προφίλ εισόδου Προφίλ Φυσικό χειριστήριο Κύρια οθόνη @@ -23,7 +22,6 @@ Άνοιγμα μενού Steam Άνοιγμα γρήγορης πρόσβασης Steam Αφαίρεση στοιχείου - Προσθήκη στοιχείου Κουμπιά ειδικά για τη συσκευή Αντιστοίχιση φυσικού κουμπιού Αφήστε το κουμπί και επιλέξτε Επεξεργασία, Επανάληψη ή Ακύρωση. Το B ή το Πίσω ακυρώνει αφού αφήσετε το κουμπί. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 42baf8965..103d46cac 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -296,14 +296,10 @@ Αφή Πλαϊνό κουμπί Χειριστήρια στην οθόνη - Steam + QAM Το Αυτόματο εμφανίζει τα χειριστήρια όταν δεν είναι συνδεδεμένο χειριστήριο. - Αφή Steam (beta) - Τα χειριστήρια αφής του Steam ξεκινούν από την επόμενη συνεδρία Steam Διάταξη αφής Steam Εξαγωγή Εικόνα - Μετακινήστε, αλλάξτε μέγεθος ή αποκρύψτε τα χειριστήρια αφής αυτού του παιχνιδιού· αποθηκεύεται στο Steam Χειριστήριο Πώς βλέπει το Steam το χειριστήριό σας. Εφαρμόζεται στην επόμενη συνεδρία. Χειριστήριο Steam Deck @@ -430,7 +426,6 @@ Παρακάμπτει το PulseAudio για μικρότερη καθυστέρηση. Μικρόφωνο Για φωνητική συνομιλία. - Ενεργοποίηση ή απενεργοποίηση της λήψης μικροφώνου για αυτή τη συνεδρία. Δεν ήταν δυνατή η αλλαγή του μικροφώνου. Δοκιμάστε ξανά. Δίκτυο Εντοπισμός Wi-Fi @@ -804,7 +799,6 @@ Πληκτρολόγιο Καθυστέρηση Λειτουργία χαμηλής καθυστέρησης - Αυξάνει τη χρήση CPU και μπαταρίας Χειριστήριο χαμηλής καθυστέρησης Το χειριστήριο αναφέρει στα 1000 Hz αντί για 250 Hz. Λίγο περισσότερο CPU. Αφή χαμηλής καθυστέρησης @@ -1359,12 +1353,8 @@ Διαφάνεια %1$d%% Μέγεθος κουμπιών - Προσαρμοστικοί μοχλοί Κραδασμός παιχνιδιού Νεκρή ζώνη μοχλού - Κουμπί Steam - Κουμπί QAM - Κουμπί πληκτρολογίου Joy-Con ως χειριστήρια VR Όσο εκτελείται το SteamVR, κάθε Joy-Con γίνεται χέρι. Στρέψτε το μπροστά και κρατήστε πατημένο το Home ή το Capture για να το επανακεντράρετε. Κινήσεις @@ -1493,8 +1483,6 @@ Πινακίδα αφής Κλείσιμο χειριστηρίων δεύτερης οθόνης Άνοιγμα μενού Steam - Δεξιά πινακίδα αφής - Αριστερή πινακίδα αφής Πινακίδα αφής Εμφάνιση πληκτρολογίου Απόκρυψη πληκτρολογίου @@ -1533,11 +1521,8 @@ Πληκτρολόγιο Android Απόκρυψη ✕ Μέγεθος στην οθόνη - Ποσοστό της οθόνης που καταλαμβάνει το πληκτρολόγιο, συμπεριλαμβανομένης της κεφαλίδας. Αδιαφάνεια - Μειώστε την για να βλέπετε το παιχνίδι πίσω από το πληκτρολόγιο. Κρυφά πλήκτρα - Τα πλήκτρα που χρησιμοποιείτε σπάνια δεν εμφανίζονται στο πληκτρολόγιο. Esc και σειρά λειτουργιών Ins / Del / Home / End / PgUp / PgDn Πλήκτρα βελών @@ -1750,8 +1735,6 @@ Εγκατεστημένο %1$s - επιλέξτε το στο μενού Περιμένετε να ολοκληρωθεί η κατάργηση του runtime Παιχνίδι - πινακίδα αφής - απευθείας Η εναλλαγή απέτυχε: %1$s Η αποθήκευση προφίλ απέτυχε: %1$s Η επιφάνεια εργασίας είναι σε παύση @@ -2007,15 +1990,6 @@ Ένα επίπεδο πάνω Επιλέξτε φάκελο Επιλέξτε αρχείο - Μπλε Steam - Γαλάζιο - Λευκό - Βιολετί - Πράσινο - Κεχριμπαρί - Κόκκινο - Ροζ - Γκρι Κουμπί A Κουμπί B Κουμπί X @@ -3142,7 +3116,6 @@ Πειραματική παρακολούθηση κεφαλής για Pro 2. Η ρύθμιση της φωτεινότητας και της έντασης ήχου και η αλλαγή λειτουργίας οθόνης δεν υποστηρίζονται ακόμη. Cardboard VR Λειτουργία Cardboard - Εικόνες για το αριστερό και το δεξί μάτι, για γυαλιά VR κινητού. Εικόνα Εικονική οθόνη 3D δίπλα-δίπλα @@ -3165,7 +3138,6 @@ Δεν είναι διαθέσιμο σε αυτή τη συνεδρία. Το SteamVR δεν αποκρίθηκε· ελέγξτε το αρχείο καταγραφής της συνεδρίας. Λήψη στοιχείων - Οι λήψεις είναι κοινές με τη σελίδα Στοιχεία. Επιλέξτε παραπάνω μια έκδοση που έχει ληφθεί για να χρησιμοποιηθεί στην επόμενη εκκίνηση παιχνιδιού. Επιλέξτε έκδοση για λήψη Δημιουργός Εκδότης diff --git a/app/src/main/res/values-es/input_library.xml b/app/src/main/res/values-es/input_library.xml index fe2ee1789..1b9378e4b 100644 --- a/app/src/main/res/values-es/input_library.xml +++ b/app/src/main/res/values-es/input_library.xml @@ -75,14 +75,9 @@ Copia independiente Iniciar el stick en el punto de toque Ocultar el stick cuando no se use - Herramientas - Auto (%1$s) - Personalizado (%1$s) Guardar como perfil nuevo Controles del perfil - Perfil Gestos del panel táctil del ratón - Si se asigna al puntero del ratón: toca para hacer clic, mantén para arrastrar y desplaza con dos dedos. %1$s tiene una anulación del menú rápido. Selecciona Auto allí para usar su perfil predeterminado y sus tres partes guardadas. Entrada de DroidDeck Se mantiene mientras el stick se mueve en cualquier dirección: se pulsa por encima del 55 %, se suelta por debajo del 35 %. Usa Teclas de dirección para asignar cada dirección por separado. Los comandos de DroidDeck se ejecutan una vez por desvío. El clic del stick se configura aparte. @@ -103,19 +98,12 @@ 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 - Cómo se manejan los toques en la pantalla del juego. Los botones del perfil mantienen sus acciones asignadas. Cursor táctil - Muestra un puntero para toques directos en la pantalla del juego. Tocar y mantener - Acción del ratón al mantener un dedo en la pantalla del juego. Toques del botón Atrás - Primera acción: un toque. Segunda acción: doble toque. Botón de alternar - Toca para mantener, toca de nuevo para soltar. Abrir un menú o cambiar de perfil suelta el botón. Forma Redondeada Píldora diff --git a/app/src/main/res/values-es/input_strings.xml b/app/src/main/res/values-es/input_strings.xml index e6e5a5bec..2e5513799 100644 --- a/app/src/main/res/values-es/input_strings.xml +++ b/app/src/main/res/values-es/input_strings.xml @@ -1,6 +1,5 @@ - Perfiles de entrada Perfiles Mando físico Pantalla principal @@ -23,7 +22,6 @@ Abrir el menú de Steam Abrir el acceso rápido de Steam Quitar control - Añadir control Botones específicos del dispositivo Asignar un botón físico Suelta el botón y elige Editar, Reintentar o Cancelar. B o Atrás cancela tras soltarlo. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38ada10bd..a4fb131cd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -296,14 +296,10 @@ Táctil Botón lateral Controles en pantalla - Steam + QAM Auto muestra los controles cuando no hay ningún mando conectado. - Táctil de Steam (beta) - Los controles táctiles de Steam se activan en la próxima sesión de Steam Disposición táctil de Steam Exportar Imagen - Mueve, cambia de tamaño u oculta los controles táctiles de este juego; se guarda en Steam Mando Cómo ve Steam tu mando. Se aplica en la próxima sesión. Mando de Steam Deck @@ -431,7 +427,6 @@ Evita PulseAudio para menor latencia. Micrófono Para el chat de voz. - Activa o desactiva la captura del micrófono en esta sesión. No se ha podido cambiar el micrófono. Inténtalo de nuevo. Red Detección de redes Wi-Fi @@ -806,7 +801,6 @@ Teclado Latencia Modo de baja latencia - Aumenta el uso de CPU y batería Mando de baja latencia El mando informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU. Táctil de baja latencia @@ -1366,12 +1360,8 @@ Opacidad %1$d%% Tamaño de botones - Sticks adaptables Vibración en juegos Zona muerta de la palanca - Botón Steam - Botón QAM - Botón de teclado Joy-Con como mandos de RV Mientras SteamVR está activo, cada Joy-Con es una mano. Apúntalo al frente y mantén Home o Captura para recentrarlo. Animaciones @@ -1501,8 +1491,6 @@ Trackpad Cerrar controles de la segunda pantalla Abrir menú de Steam - Trackpad derecho - Trackpad izquierdo Trackpad Mostrar teclado Ocultar teclado @@ -1541,11 +1529,8 @@ Teclado de Android Ocultar ✕ Tamaño en pantalla - Proporción de la pantalla que ocupa el teclado, cabecera incluida. Opacidad - Redúcela para ver el juego detrás del teclado. Teclas ocultas - Las teclas que apenas usas no aparecen en el teclado. Esc y fila de teclas de función Ins / Supr / Inicio / Fin / RePág / AvPág Teclas de dirección @@ -1766,8 +1751,6 @@ %1$s instalado - elígelo en el menú Espera a que termine la eliminación del runtime Juego - touchpad - directo El reemplazo falló: %1$s No se pudo guardar el perfil: %1$s El escritorio está en pausa @@ -2032,15 +2015,6 @@ Subir un nivel Elige una carpeta Elige un archivo - Azul Steam - Celeste - Blanco - Violeta - Verde - Ámbar - Rojo - Rosa - Gris Botón A Botón B Botón X @@ -3166,7 +3140,6 @@ %1$d min Cardboard VR Modo Cardboard - Vistas para el ojo izquierdo y el derecho para un visor de RV para móvil. Imagen Pantalla virtual 3D lado a lado @@ -3189,7 +3162,6 @@ No disponible en esta sesión. SteamVR no respondió; revisa el registro de la sesión. Descargar componentes - Las descargas se comparten con la página Componentes. Elige arriba una versión descargada para usarla al iniciar el próximo juego. Elige una versión para descargar Cliente de Steam FEX %1$s diff --git a/app/src/main/res/values-fi/input_library.xml b/app/src/main/res/values-fi/input_library.xml index 846dae260..7f5cfd83e 100644 --- a/app/src/main/res/values-fi/input_library.xml +++ b/app/src/main/res/values-fi/input_library.xml @@ -75,14 +75,9 @@ Itsenäinen kopio Aloita tikku kosketuskohdasta Piilota tikku, kun sitä ei käytetä - Työkalut - Automaattinen (%1$s) - Mukautettu (%1$s) Tallenna uutena profiilina Profiilin ohjaimet - Profiili Hiiren kosketuslevyn eleet - Kun määritetty hiiren osoittimelle: napauta klikataksesi, pidä painettuna vetääksesi ja vieritä kahdella sormella. Kohteella %1$s on pikavalikon ohitus. Valitse Automaattinen käyttääksesi sen oletusprofiilia ja kaikkia kolmea tallennettua osaa. DroidDeck-syöte Pidetään, kun tikkua liikutetaan mihin tahansa suuntaan: painetaan yli 55 %:ssa, vapautetaan alle 35 %:ssa. Määritä jokainen suunta erikseen Suuntanäppäimillä. DroidDeck-komennot suoritetaan kerran poikkeamaa kohti. Tikun napsautus määritetään erikseen. @@ -103,19 +98,12 @@ 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ö - Miten pelinäytön kosketuksia käsitellään. Profiilin painikkeet säilyttävät määritetyt toimintonsa. Kosketuskursori - Näyttää osoittimen suorille kosketuksille pelinäytöllä. Kosketa ja pidä - Hiiren toiminto, kun pidät sormea pelinäytöllä. Takaisin-painikkeen napautukset - Ensimmäinen toiminto: yksi napautus. Toinen toiminto: kaksoisnapautus. Vaihtopainike - Napauta pitääksesi, napauta uudelleen vapauttaaksesi. Valikon avaaminen tai profiilin vaihto vapauttaa painikkeen. Muoto Pyöristetty Kapseli diff --git a/app/src/main/res/values-fi/input_strings.xml b/app/src/main/res/values-fi/input_strings.xml index 945b60689..d9212fb36 100644 --- a/app/src/main/res/values-fi/input_strings.xml +++ b/app/src/main/res/values-fi/input_strings.xml @@ -1,6 +1,5 @@ - Syöttöprofiilit Profiilit Fyysinen ohjain Päänäyttö @@ -23,7 +22,6 @@ Avaa Steam-valikko Avaa Steamin pikakäyttö Poista ohjain - Lisää ohjain Laittekohtaiset painikkeet Määritä fyysinen painike Vapauta painike ja valitse Muokkaa, Yritä uudelleen tai Peruuta. B tai Takaisin peruuttaa vapauttamisen jälkeen. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b912a7cf0..92460d64d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -296,14 +296,10 @@ Kosketus Sivupainike Näytön ohjaimet - Steam + QAM Automaattinen näyttää ohjaimet, kun yhtään ohjainta ei ole kytketty. - Steam-kosketus (beta) - Steamin kosketusohjaimet otetaan käyttöön seuraavassa Steam-istunnossa Steamin kosketusasettelu Vie Kuva - Siirrä, muuta kokoa tai piilota tämän pelin kosketusohjaimet; tallennetaan Steamiin Ohjain Miten Steam näkee ohjaimesi. Tulee voimaan seuraavassa istunnossa. Steam Deck -ohjain @@ -430,7 +426,6 @@ Ohittaa PulseAudion pienempää viivettä varten. Mikrofoni Äänichattia varten. - Kytke mikrofonin äänitys päälle tai pois tässä istunnossa. Mikrofonia ei voitu muuttaa. Yritä uudelleen. Verkko Wi-Fi-haku @@ -804,7 +799,6 @@ Näppäimistö Viive Matalan viiveen tila - Lisää CPU:n ja akun käyttöä Matalan viiveen ohjain Ohjain raportoi 1000 Hz:n taajuudella 250 Hz:n sijaan. Hieman enemmän CPU:ta. Matalan viiveen kosketus @@ -1359,12 +1353,8 @@ Peittävyys %1$d %% Painikkeiden koko - Mukautuvat sauvat Pelin tärinä Ohjaussauvan kuollut alue - Steam-painike - QAM-painike - Näppäimistöpainike Joy-Conit VR-ohjaimina Kun SteamVR on käynnissä, jokainen Joy-Con toimii kätenä. Osoita sillä eteenpäin ja pidä Home- tai Capture-painiketta pohjassa keskittääksesi sen uudelleen. Animaatiot @@ -1493,8 +1483,6 @@ Kosketuslevy Sulje toisen näytön ohjaimet Avaa Steam-valikko - Oikea kosketuslevy - Vasen kosketuslevy Kosketuslevy Näytä näppäimistö Piilota näppäimistö @@ -1533,11 +1521,8 @@ Android-näppäimistö Piilota ✕ Koko näytöllä - Näytön osuus, jonka näppäimistö vie, yläpalkki mukaan lukien. Peittävyys - Laske sitä, jotta peli näkyy näppäimistön takaa. Piilotetut näppäimet - Harvoin käyttämäsi näppäimet pysyvät pois näppäimistöstä. Esc ja funktiorivi Ins / Del / Home / End / PgUp / PgDn Nuolinäppäimet @@ -1750,8 +1735,6 @@ Asennettu %1$s - valitse se valikosta Odota, että ajoympäristön poisto päättyy Peli - kosketuslevy - suora Vaihto epäonnistui: %1$s Profiilin tallennus epäonnistui: %1$s Työpöytä on keskeytetty @@ -2007,15 +1990,6 @@ Ylös yksi taso Valitse kansio Valitse tiedosto - Steam-sininen - Taivaansininen - Valkoinen - Violetti - Vihreä - Meripihka - Punainen - Pinkki - Harmaa A-painike B-painike X-painike @@ -3142,7 +3116,6 @@ Kokeellinen päänliikkeiden seuranta Pro 2:lle. Kirkkauden ja äänenvoimakkuuden säätöä sekä näyttötilan vaihtamista ei vielä tueta. Cardboard VR Cardboard-tila - Vasemman ja oikean silmän kuvat puhelimen VR-laseille. Kuva Virtuaalinen näyttö Rinnakkais-3D @@ -3165,7 +3138,6 @@ Ei käytettävissä tässä istunnossa. SteamVR ei vastannut; tarkista istunnon loki. Lataa komponentteja - Lataukset jaetaan Komponentit-sivun kanssa. Valitse yltä ladattu versio, niin sitä käytetään seuraavalla pelin käynnistyksellä. Valitse ladattava versio Kehittäjä Julkaisija diff --git a/app/src/main/res/values-fr/input_library.xml b/app/src/main/res/values-fr/input_library.xml index 4e899b637..24e1d67d4 100644 --- a/app/src/main/res/values-fr/input_library.xml +++ b/app/src/main/res/values-fr/input_library.xml @@ -75,14 +75,9 @@ Copie indépendante Démarrer le stick au point de contact Masquer le stick lorsqu\'il n\'est pas utilisé - Outils - Auto (%1$s) - Personnalisé (%1$s) Enregistrer comme nouveau profil Contrôles du profil - Profil Gestes du pavé tactile de la souris - Si assigné au pointeur de la souris : toucher pour cliquer, maintenir pour faire glisser, défiler avec deux doigts. %1$s a une dérogation de menu rapide. Sélectionnez Auto pour utiliser son profil par défaut et ses trois parties enregistrées. Entrée DroidDeck Maintenu lorsque le stick est déplacé dans n\'importe quelle direction : appui au-dessus de 55 %, relâchement sous 35 %. Utilisez Touches de direction pour assigner chaque direction séparément. Les commandes DroidDeck s\'exécutent une fois par déflexion. Le clic du stick se configure séparément. @@ -103,19 +98,12 @@ 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 - Comment les touchers sur l\'écran du jeu sont gérés. Les boutons du profil gardent leurs actions assignées. Curseur tactile - Affiche un pointeur pour les touchers directs sur l\'écran du jeu. Toucher et maintenir - Action de la souris en maintenant un doigt sur l\'écran du jeu. Appuis du bouton Retour - Première action : appui simple. Deuxième action : appui double. Bouton à bascule - Touchez pour maintenir, touchez encore pour relâcher. Ouvrir un menu ou changer de profil relâche le bouton. Forme Arrondie Pilule diff --git a/app/src/main/res/values-fr/input_strings.xml b/app/src/main/res/values-fr/input_strings.xml index eb2182ad4..ef886b695 100644 --- a/app/src/main/res/values-fr/input_strings.xml +++ b/app/src/main/res/values-fr/input_strings.xml @@ -1,6 +1,5 @@ - Profils d\'entrée Profils Manette physique Écran principal @@ -23,7 +22,6 @@ Ouvrir le menu Steam Ouvrir l\'accès rapide Steam Supprimer le contrôle - Ajouter un contrôle Boutons propres à l\'appareil Assigner un bouton physique Relâchez le bouton, puis choisissez Modifier, Réessayer ou Annuler. B ou Retour annule après le relâchement. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c88981831..043f1bdea 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -296,14 +296,10 @@ Tactile Bouton latéral Commandes à l\'écran - Steam + QAM Le mode automatique affiche les commandes à l\'écran lorsqu\'aucune manette n\'est connectée. - Tactile Steam (bêta) - Les commandes tactiles de Steam s\'activeront à la prochaine session Steam Disposition tactile Steam Exporter Image - Déplacez, redimensionnez ou masquez les commandes tactiles de ce jeu ; enregistré dans Steam Manette Comment Steam reconnaît votre manette. Prendra effet à la prochaine session. Manette Steam Deck @@ -431,7 +427,6 @@ Contourne PulseAudio pour réduire la latence. Microphone Utilisé pour le chat vocal. - Activer ou désactiver la capture du microphone pour cette session. Impossible de modifier le microphone. Veuillez réessayer. Réseau Découverte Wi-Fi @@ -806,7 +801,6 @@ Clavier Latence Mode faible latence - Augmente l\'utilisation du CPU et de la batterie Manette à faible latence La manette émet à 1000 Hz au lieu de 250 Hz. Un peu plus de CPU. Tactile à faible latence @@ -1365,12 +1359,8 @@ Opacité %1$d%% Taille des boutons - Joystick adaptatif Vibration du jeu Zone morte du stick - Bouton Steam - Bouton QAM - Bouton clavier Joy-Con comme manettes VR Pendant que SteamVR tourne, chaque Joy-Con devient une main. Pointez-le devant vous et maintenez Home ou Capture pour le recentrer. Animations @@ -1500,8 +1490,6 @@ Pavé tactile Fermer les commandes du deuxième écran Ouvrir le menu Steam - Pavé tactile droit - Pavé tactile gauche Pavé tactile Afficher le clavier Masquer le clavier @@ -1540,11 +1528,8 @@ Clavier Android Masquer ✕ Taille à l\'écran - Part de l\'écran occupée par le clavier, y compris l\'en-tête. Opacité - Réduisez-la pour voir le jeu derrière le clavier. Touches masquées - Les touches que vous utilisez rarement ne s\'affichent pas sur le clavier. Échap et rangée des touches de fonction Ins / Suppr / Début / Fin / PgPréc / PgSuiv Touches fléchées @@ -1765,8 +1750,6 @@ %1$s installé - choisissez-le dans le menu Attendez la fin de la suppression de l\'environnement d\'exécution Jeu - pavé tactile - direct Échec du remplacement : %1$s Échec de l\'enregistrement du profil : %1$s Le bureau est en pause @@ -2031,15 +2014,6 @@ Remonter d\'un niveau Choisir un dossier Choisir un fichier - Bleu Steam - Ciel - Blanc - Violet - Vert - Ambre - Rouge - Rose - Gris Bouton A Bouton B Bouton X @@ -3176,7 +3150,6 @@ %1$d min Cardboard VR Mode Cardboard - Vues pour l\'œil gauche et l\'œil droit, pour un casque VR pour téléphone. Image Écran virtuel 3D côte à côte @@ -3199,7 +3172,6 @@ Indisponible dans cette session. SteamVR ne répond pas ; consultez le journal de session. Télécharger des composants - Les téléchargements sont partagés avec la page « Composants ». Choisissez une version téléchargée ci-dessus pour l\'utiliser au prochain lancement du jeu. Choisissez une version à télécharger Espace libre insuffisant : %1$s nécessaires, seulement %2$s libres Espace insuffisant (%1$s libres, %2$s nécessaires) diff --git a/app/src/main/res/values-hi/input_library.xml b/app/src/main/res/values-hi/input_library.xml index 81147024d..4496965c3 100644 --- a/app/src/main/res/values-hi/input_library.xml +++ b/app/src/main/res/values-hi/input_library.xml @@ -75,14 +75,9 @@ स्वतंत्र प्रति स्पर्श स्थान से स्टिक शुरू करें उपयोग में न हो तो स्टिक छिपाएँ - टूल - Auto (%1$s) - कस्टम (%1$s) नए प्रोफ़ाइल के रूप में सहेजें प्रोफ़ाइल नियंत्रण - प्रोफ़ाइल माउस टचपैड इशारे - माउस पॉइंटर पर असाइन होने पर: क्लिक के लिए टैप करें, खींचने के लिए दबाए रखें, और दो उँगलियों से स्क्रॉल करें। %1$s में क्विक-मेन्यू ओवरराइड है। वहाँ Auto चुनें ताकि उसका डिफ़ॉल्ट प्रोफ़ाइल और तीनों सहेजे भाग उपयोग हों। DroidDeck इनपुट स्टिक को किसी भी दिशा में हिलाने पर दबा रहता है: 55% से ऊपर दबाएँ, 35% से नीचे छोड़ें। प्रत्येक दिशा अलग असाइन करने के लिए दिशा कुंजियाँ उपयोग करें। DroidDeck क्रियाएँ प्रति झुकाव एक बार चलती हैं। स्टिक क्लिक अलग से सेट होता है। @@ -103,19 +98,12 @@ वापस · Steam में दो बार, डेस्कटॉप में एक बार Steam मोड में। वापस दबाए रखने से क्विक एक्सेस भी खुलता है। डिफ़ॉल्ट पर पुनर्स्थापित करें - आपका पैनल चयन याद रखा जाता है। डेस्कटॉप दूसरा कार्यक्षेत्र खोलता है; यह सत्र या उसका इनपुट प्रोफ़ाइल नहीं बदलता। वर्चुअल कंट्रोलर - Steam या गेम द्वारा देखा जाने वाला कंट्रोलर प्रकार। टचस्क्रीन - गेम स्क्रीन पर स्पर्श कैसे संभाले जाते हैं। प्रोफ़ाइल बटन अपनी असाइन की गई क्रियाएँ रखते हैं। टच कर्सर - गेम स्क्रीन पर सीधे स्पर्श के लिए पॉइंटर दिखाएँ। स्पर्श करें और दबाए रखें - गेम स्क्रीन पर उँगली दबाए रखने पर माउस क्रिया। वापस बटन टैप - पहली क्रिया: एक टैप। दूसरी क्रिया: दो टैप। टॉगल बटन - दबाए रखने के लिए टैप करें, छोड़ने के लिए फिर टैप करें। मेन्यू खोलने या प्रोफ़ाइल बदलने पर बटन छूट जाता है। आकार गोल गोली diff --git a/app/src/main/res/values-hi/input_strings.xml b/app/src/main/res/values-hi/input_strings.xml index 4a0fb0a0f..18f501391 100644 --- a/app/src/main/res/values-hi/input_strings.xml +++ b/app/src/main/res/values-hi/input_strings.xml @@ -1,6 +1,5 @@ - इनपुट प्रोफ़ाइल प्रोफ़ाइल भौतिक कंट्रोलर मुख्य स्क्रीन @@ -23,7 +22,6 @@ Steam मेन्यू खोलें Steam त्वरित पहुँच खोलें नियंत्रण हटाएँ - नियंत्रण जोड़ें डिवाइस-विशिष्ट बटन भौतिक बटन असाइन करें बटन छोड़ें, फिर संपादित करें, पुनः प्रयास करें या रद्द करें चुनें। छोड़ने के बाद B या वापस रद्द करता है। diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d26bbc324..5c3801056 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -296,14 +296,10 @@ टच साइड बटन ऑन-स्क्रीन कंट्रोल - Steam + QAM कोई कंट्रोलर कनेक्ट न होने पर ऑटो कंट्रोल दिखाता है। - Steam टच (बीटा) - Steam के टच कंट्रोल अगले Steam सेशन से शुरू होंगे Steam टच लेआउट निर्यात छवि - इस गेम के टच कंट्रोल को घुमाएं, आकार बदलें या छिपाएं; Steam में सेव होता है कंट्रोलर Steam आपके कंट्रोलर को किस तरह पहचानता है। अगले सेशन से लागू होता है। Steam Deck कंट्रोलर @@ -430,7 +426,6 @@ कम लेटेंसी के लिए PulseAudio को बायपास करता है। माइक्रोफ़ोन वॉइस चैट के लिए। - इस सेशन के लिए माइक्रोफ़ोन कैप्चर चालू या बंद करें। माइक्रोफ़ोन बदला नहीं जा सका। कृपया फिर कोशिश करें। नेटवर्क Wi-Fi खोज @@ -804,7 +799,6 @@ कीबोर्ड लेटेंसी लो लेटेंसी मोड - CPU और बैटरी का इस्तेमाल बढ़ाता है कम लेटेंसी कंट्रोलर कंट्रोलर 250 Hz के बजाय 1000 Hz पर रिपोर्ट करता है। थोड़ा ज़्यादा CPU। कम लेटेंसी टच @@ -1359,12 +1353,8 @@ ओपैसिटी %1$d%% बटन का आकार - एडैप्टिव स्टिक गेम वाइब्रेशन स्टिक का डेड ज़ोन - Steam बटन - QAM बटन - कीबोर्ड बटन Joy-Con को VR कंट्रोलर की तरह SteamVR चलते समय हर Joy-Con एक हाथ बन जाता है। उसे सामने की ओर करें और फिर से केंद्रित करने के लिए Home या Capture दबाए रखें। एनिमेशन @@ -1493,8 +1483,6 @@ ट्रैकपैड दूसरी स्क्रीन के कंट्रोल बंद करें Steam मेनू खोलें - दायां ट्रैकपैड - बायां ट्रैकपैड ट्रैकपैड कीबोर्ड दिखाएं कीबोर्ड छिपाएं @@ -1533,11 +1521,8 @@ Android कीबोर्ड छिपाएं ✕ स्क्रीन पर आकार - कीबोर्ड स्क्रीन का कितना हिस्सा घेरता है, हेडर समेत। अपारदर्शिता - कीबोर्ड के पीछे गेम दिखाने के लिए इसे घटाएँ। छिपी कुंजियाँ - जिन कुंजियों का आप कम इस्तेमाल करते हैं, वे कीबोर्ड पर नहीं रहतीं। Esc और फ़ंक्शन पंक्ति Ins / Del / Home / End / PgUp / PgDn कुंजियाँ तीर कुंजियाँ @@ -1750,8 +1735,6 @@ इंस्टॉल है %1$s - इसे मेनू में चुनें रनटाइम हटाना खत्म होने का इंतज़ार करें गेम - टचपैड - डायरेक्ट स्वैप विफल: %1$s प्रोफ़ाइल सेव विफल: %1$s डेस्कटॉप रुका हुआ है @@ -2007,15 +1990,6 @@ एक लेवल ऊपर फ़ोल्डर चुनें फ़ाइल चुनें - Steam ब्लू - स्काई - सफ़ेद - वायलेट - हरा - एम्बर - लाल - गुलाबी - धूसर A बटन B बटन X बटन @@ -3142,7 +3116,6 @@ Pro 2 के लिए प्रायोगिक हेड ट्रैकिंग। चमक और वॉल्यूम बदलना और डिस्प्ले मोड स्विच करना अभी समर्थित नहीं है। Cardboard VR Cardboard मोड - फ़ोन VR व्यूअर के लिए बाईं और दाईं आंख के व्यू। तस्वीर वर्चुअल स्क्रीन साइड-बाय-साइड 3D @@ -3165,7 +3138,6 @@ इस सेशन में उपलब्ध नहीं है। SteamVR ने जवाब नहीं दिया; सेशन लॉग देखें। कंपोनेंट डाउनलोड करें - डाउनलोड Components पेज के साथ साझा होते हैं। अगली बार गेम शुरू होने पर इस्तेमाल करने के लिए ऊपर डाउनलोड किया गया वर्शन चुनें। डाउनलोड करने के लिए वर्शन चुनें डेवलपर पब्लिशर diff --git a/app/src/main/res/values-hu/input_library.xml b/app/src/main/res/values-hu/input_library.xml index ceeaeaf94..c728c2c9a 100644 --- a/app/src/main/res/values-hu/input_library.xml +++ b/app/src/main/res/values-hu/input_library.xml @@ -75,14 +75,9 @@ Független másolat Kar indítása az érintési ponttól Kar elrejtése, ha nincs használatban - Eszközök - Automatikus (%1$s) - Egyéni (%1$s) Mentés új profilként Profil vezérlői - Profil Egér érintőfelület-gesztusok - Ha az egérkurzorhoz van rendelve: koppintson a kattintáshoz, tartsa nyomva a húzáshoz, és két ujjal görgessen. A(z) %1$s gyorsmenü-felülírással rendelkezik. Válassza ott az Automatikust, hogy az alapértelmezett profilját és mindhárom mentett részét használja. DroidDeck bemenet Nyomva tartva, amíg a kart bármely irányba mozgatja: nyomás 55% felett, elengedés 35% alatt. Az Iránybillentyűkkel külön rendelhető minden irány. A DroidDeck parancsok kitérésenként egyszer futnak. A kar kattintása külön állítható. @@ -103,19 +98,12 @@ 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ő - Hogyan kezelődnek a játék képernyőjén történő érintések. A profilgombok megtartják hozzárendelt műveleteiket. Érintéskurzor - Mutatót jelenít meg a játék képernyőjén történő közvetlen érintésekhez. Érintés és nyomva tartás - Egér művelet, amikor ujját a játék képernyőjén tartja. Vissza gomb koppintásai - Első művelet: egy koppintás. Második művelet: dupla koppintás. Kapcsológomb - Koppintson a tartáshoz, koppintson újra az elengedéshez. Menü megnyitása vagy profilváltás elengedi a gombot. Forma Lekerekített Kapszula diff --git a/app/src/main/res/values-hu/input_strings.xml b/app/src/main/res/values-hu/input_strings.xml index 1fb45dd72..628d43390 100644 --- a/app/src/main/res/values-hu/input_strings.xml +++ b/app/src/main/res/values-hu/input_strings.xml @@ -1,6 +1,5 @@ - Beviteli profilok Profilok Fizikai vezérlő Fő képernyő @@ -23,7 +22,6 @@ Steam menü megnyitása Steam gyorselérés megnyitása Vezérlőelem eltávolítása - Vezérlőelem hozzáadása Eszközspecifikus gombok Fizikai gomb hozzárendelése Engedje el a gombot, majd válassza a Szerkesztés, Újra vagy Mégse lehetőséget. A B vagy a Vissza elengedés után megszakítja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6563b39d2..c7699900a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -296,14 +296,10 @@ Érintés Oldalsó gomb Képernyőn megjelenő vezérlők - Steam + QAM Az Automatikus megjeleníti a vezérlőket, ha nincs csatlakoztatott kontroller. - Steam érintés (béta) - A Steam érintésvezérlői a következő Steam-munkamenettől lépnek életbe Steam érintéskiosztás Exportálás Kép - Mozgassa, méretezze vagy rejtse el a játék érintésvezérlőit; a Steamben mentve Kontroller Hogyan látja a Steam a kontrollerét. A következő munkamenettől érvényes. Steam Deck kontroller @@ -430,7 +426,6 @@ Megkerüli a PulseAudiót a kisebb késleltetés érdekében. Mikrofon Hangos csevegéshez. - A mikrofonrögzítés be- vagy kikapcsolása ebben a munkamenetben. Nem sikerült módosítani a mikrofont. Próbálja újra. Hálózat Wi-Fi felderítés @@ -804,7 +799,6 @@ Billentyűzet Késleltetés Alacsony késleltetésű mód - Növeli a CPU- és akkumulátorhasználatot Alacsony késleltetésű kontroller A kontroller 250 Hz helyett 1000 Hz-en jelent. Kicsit több CPU. Alacsony késleltetésű érintés @@ -1359,12 +1353,8 @@ Átlátszatlanság %1$d%% Gombméret - Adaptív karok Játékvibráció Kar holtzónája - Steam gomb - QAM gomb - Billentyűzet gomb Joy-Conok VR-kontrollerként Amíg a SteamVR fut, minden Joy-Con egy kéz lesz. Irányítsa előre, és tartsa lenyomva a Home vagy a Capture gombot az újraközpontosításhoz. Animációk @@ -1493,8 +1483,6 @@ Érintőpad Második képernyős vezérlők bezárása Steam-menü megnyitása - Jobb érintőpad - Bal érintőpad Érintőpad Billentyűzet megjelenítése Billentyűzet elrejtése @@ -1533,11 +1521,8 @@ Android billentyűzet Elrejtés ✕ Méret a képernyőn - A képernyő hányadát foglalja el a billentyűzet, a fejlécet is beleszámítva. Átlátszatlanság - Csökkentsd, hogy lásd a billentyűzet mögötti játékot. Rejtett billentyűk - A ritkán használt billentyűk nem jelennek meg a billentyűzeten. Esc és a funkcióbillentyűk sora Ins / Del / Home / End / PgUp / PgDn Nyílbillentyűk @@ -1750,8 +1735,6 @@ %1$s telepítve – válassza ki a menüben Várja meg a futtatókörnyezet eltávolításának befejezését Játék - érintőpad - közvetlen A csere sikertelen: %1$s A profil mentése sikertelen: %1$s Az asztal szünetel @@ -2007,15 +1990,6 @@ Egy szinttel feljebb Válasszon mappát Válasszon fájlt - Steam kék - Égszínkék - Fehér - Lila - Zöld - Borostyán - Piros - Rózsaszín - Szürke A gomb B gomb X gomb @@ -3142,7 +3116,6 @@ Kísérleti fejkövetés a Pro 2-höz. A fényerő és a hangerő beállítása, valamint a megjelenítési mód váltása még nem támogatott. Cardboard VR Cardboard mód - Bal és jobb szem képe telefonos VR-szemüveghez. Kép Virtuális képernyő Egymás melletti 3D @@ -3165,7 +3138,6 @@ Ebben a munkamenetben nem érhető el. A SteamVR nem válaszolt; nézd meg a munkamenet naplóját. Összetevők letöltése - A letöltések közösek az Összetevők oldallal. Fent válassz egy letöltött verziót, hogy a következő játékindítástól azt használd. Válassz letöltendő verziót Fejlesztő Kiadó diff --git a/app/src/main/res/values-in/input_library.xml b/app/src/main/res/values-in/input_library.xml index f24780d5c..057e76064 100644 --- a/app/src/main/res/values-in/input_library.xml +++ b/app/src/main/res/values-in/input_library.xml @@ -75,14 +75,9 @@ Salinan independen Mulai stik di posisi sentuh Sembunyikan stik saat tidak digunakan - Alat - Otomatis (%1$s) - Khusus (%1$s) Simpan sebagai profil baru Kontrol profil - Profil Gestur touchpad mouse - Jika ditetapkan ke penunjuk mouse: ketuk untuk klik, tahan untuk menyeret, dan gulir dengan dua jari. %1$s memiliki penggantian menu cepat. Pilih Otomatis di sana untuk memakai profil bawaan dan ketiga bagian tersimpannya. Input DroidDeck Ditahan saat stik digerakkan ke segala arah: tekan di atas 55%, lepas di bawah 35%. Gunakan Tombol arah untuk menetapkan tiap arah secara terpisah. Perintah DroidDeck berjalan sekali per defleksi. Klik stik diatur terpisah. @@ -103,19 +98,12 @@ 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 - Cara sentuhan di layar game ditangani. Tombol profil tetap memakai tindakan yang ditetapkan. Kursor sentuh - Tampilkan penunjuk untuk sentuhan langsung di layar game. Sentuh dan tahan - Tindakan mouse saat menahan jari di layar game. Ketukan tombol Kembali - Tindakan pertama: satu ketuk. Tindakan kedua: dua ketuk. Tombol sakelar - Ketuk untuk menahan, ketuk lagi untuk melepas. Membuka menu atau mengganti profil melepas tombol. Bentuk Membulat Pil diff --git a/app/src/main/res/values-in/input_strings.xml b/app/src/main/res/values-in/input_strings.xml index c115e8a9e..427023a43 100644 --- a/app/src/main/res/values-in/input_strings.xml +++ b/app/src/main/res/values-in/input_strings.xml @@ -1,6 +1,5 @@ - Profil input Profil Pengontrol fisik Layar utama @@ -23,7 +22,6 @@ Buka menu Steam Buka akses cepat Steam Hapus kontrol - Tambah kontrol Tombol khusus perangkat Tetapkan tombol fisik Lepaskan tombol, lalu pilih Edit, Coba lagi, atau Batal. B atau Kembali membatalkan setelah dilepas. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1cc8c8a9c..03ce7b7eb 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -296,14 +296,10 @@ Sentuhan Tombol samping Kontrol di layar - Steam + QAM Otomatis menampilkan kontrol saat tidak ada pengontrol yang terhubung. - Sentuhan Steam (beta) - Kontrol sentuh Steam dimulai pada sesi Steam berikutnya Tata letak sentuh Steam Ekspor Gambar - Pindahkan, ubah ukuran, atau sembunyikan kontrol sentuh gim ini; disimpan ke Steam Pengontrol Cara Steam mendeteksi pengontrol Anda. Berlaku pada sesi berikutnya. Pengontrol Steam Deck @@ -429,7 +425,6 @@ Melewati PulseAudio untuk latensi yang lebih rendah. Mikrofon Untuk obrolan suara. - Aktifkan atau nonaktifkan perekaman mikrofon untuk sesi ini. Tidak dapat mengubah mikrofon. Coba lagi. Jaringan Pencarian Wi-Fi @@ -802,7 +797,6 @@ Keyboard Latensi Mode latensi rendah - Meningkatkan penggunaan CPU dan baterai Pengontrol latensi rendah Pengontrol melapor pada 1000 Hz, bukan 250 Hz. Sedikit lebih banyak CPU. Sentuh latensi rendah @@ -1353,12 +1347,8 @@ Opasitas %1$d%% Ukuran tombol - Stik adaptif Getaran gim Zona mati stik - Tombol Steam - Tombol QAM - Tombol keyboard Joy-Con sebagai pengontrol VR Saat SteamVR berjalan, setiap Joy-Con menjadi tangan. Arahkan ke depan lalu tahan Home atau Capture untuk memusatkannya kembali. Animasi @@ -1486,8 +1476,6 @@ Trackpad Tutup kontrol layar kedua Buka menu Steam - Trackpad kanan - Trackpad kiri Trackpad Tampilkan keyboard Sembunyikan keyboard @@ -1526,11 +1514,8 @@ Keyboard Android Sembunyikan ✕ Ukuran di layar - Porsi layar yang dipakai keyboard, termasuk header. Opasitas - Turunkan agar game di belakang keyboard terlihat. Tombol tersembunyi - Tombol yang jarang dipakai tidak ditampilkan di keyboard. Baris Esc dan fungsi Ins / Del / Home / End / PgUp / PgDn Tombol panah @@ -1735,8 +1720,6 @@ Terinstal %1$s - pilih di menu Tunggu penghapusan runtime selesai Game - touchpad - langsung Pergantian gagal: %1$s Penyimpanan profil gagal: %1$s Desktop dijeda @@ -1983,15 +1966,6 @@ Naik satu tingkat Pilih folder Pilih file - Biru Steam - Langit - Putih - Ungu - Hijau - Ambar - Merah - Merah muda - Abu-abu Tombol A Tombol B Tombol X @@ -3113,7 +3087,6 @@ Pelacakan kepala Pro 2 eksperimental. Pengaturan kecerahan, volume, dan pergantian mode tampilan belum didukung. Cardboard VR Mode Cardboard - Tampilan mata kiri dan kanan untuk kacamata VR ponsel. Gambar Layar virtual 3D berdampingan @@ -3136,7 +3109,6 @@ Tidak tersedia di sesi ini. SteamVR tidak merespons; periksa log sesi. Unduh komponen - Unduhan dipakai bersama halaman Komponen. Pilih versi yang sudah diunduh di atas untuk memakainya pada peluncuran gim berikutnya. Pilih versi untuk diunduh Pengembang Penerbit diff --git a/app/src/main/res/values-it/input_library.xml b/app/src/main/res/values-it/input_library.xml index 87061db29..cbe7403b1 100644 --- a/app/src/main/res/values-it/input_library.xml +++ b/app/src/main/res/values-it/input_library.xml @@ -75,14 +75,9 @@ Copia indipendente Avvia lo stick nel punto toccato Nascondi lo stick quando non è in uso - Strumenti - Auto (%1$s) - Personalizzato (%1$s) Salva come nuovo profilo Controlli profilo - Profilo Gesti del touchpad del mouse - Se assegnato al puntatore del mouse: tocca per fare clic, tieni premuto per trascinare e scorri con due dita. %1$s ha una sostituzione del menu rapido. Seleziona Auto per usare il suo profilo predefinito e tutte e tre le parti salvate. Input DroidDeck Mantenuto mentre lo stick è mosso in qualsiasi direzione: pressione sopra il 55%, rilascio sotto il 35%. Usa Tasti direzionali per assegnare ogni direzione separatamente. I comandi DroidDeck vengono eseguiti una volta per deflessione. Il clic dello stick si configura a parte. @@ -103,19 +98,12 @@ 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 - Come vengono gestiti i tocchi sullo schermo di gioco. I pulsanti del profilo mantengono le azioni assegnate. Cursore tattile - Mostra un puntatore per i tocchi diretti sullo schermo di gioco. Tocca e tieni premuto - Azione del mouse quando tieni un dito sullo schermo di gioco. Tocchi del pulsante Indietro - Prima azione: tocco singolo. Seconda azione: doppio tocco. Pulsante a interruttore - Tocca per tenere premuto, tocca di nuovo per rilasciare. Aprire un menu o cambiare profilo rilascia il pulsante. Forma Arrotondata Pillola diff --git a/app/src/main/res/values-it/input_strings.xml b/app/src/main/res/values-it/input_strings.xml index a5e401d1c..4805b049e 100644 --- a/app/src/main/res/values-it/input_strings.xml +++ b/app/src/main/res/values-it/input_strings.xml @@ -1,6 +1,5 @@ - Profili di input Profili Controller fisico Schermo principale @@ -23,7 +22,6 @@ Apri il menu Steam Apri l\'accesso rapido di Steam Rimuovi controllo - Aggiungi controllo Tasti specifici del dispositivo Assegna un tasto fisico Rilascia il tasto, poi scegli Modifica, Riprova o Annulla. B o Indietro annulla dopo il rilascio. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 296ea93f8..23ca6a0a1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -296,14 +296,10 @@ Tocco Tasto laterale Controlli su schermo - Steam + QAM Auto mostra i controlli quando non è collegato nessun controller. - Touch di Steam (beta) - I controlli touch di Steam partono dalla prossima sessione Steam Layout touch di Steam Esporta Immagine - Sposta, ridimensiona o nascondi i controlli touch di questo gioco; vengono salvati su Steam Controller Come Steam vede il tuo controller. Si applica dalla prossima sessione. Controller di Steam Deck @@ -431,7 +427,6 @@ Bypassa PulseAudio per ridurre la latenza. Microfono Per la chat vocale. - Attiva o disattiva l\'acquisizione del microfono per questa sessione. Impossibile cambiare il microfono. Riprova. Rete Rilevamento Wi-Fi @@ -806,7 +801,6 @@ Tastiera Latenza Modalità bassa latenza - Aumenta l\'uso di CPU e batteria Controller a bassa latenza Il controller invia dati a 1000 Hz invece di 250 Hz. Un po\' più di CPU. Touch a bassa latenza @@ -1357,12 +1351,8 @@ Opacità %1$d%% Dimensione dei tasti - Levette adattive Vibrazione di gioco Zona morta dello stick - Tasto Steam - Tasto QAM - Tasto tastiera Joy-Con come controller VR Mentre SteamVR è in esecuzione, ogni Joy-Con diventa una mano. Puntalo in avanti e tieni premuto Home o Capture per ricentrarlo. Animazioni @@ -1492,8 +1482,6 @@ Trackpad Chiudi i controlli sul secondo schermo Apri il menu Steam - Trackpad destro - Trackpad sinistro Trackpad Mostra tastiera Nascondi tastiera @@ -1532,11 +1520,8 @@ Tastiera Android Nascondi ✕ Dimensioni sullo schermo - Porzione dello schermo occupata dalla tastiera, intestazione inclusa. Opacità - Riducila per vedere il gioco dietro la tastiera. Tasti nascosti - I tasti che usi raramente non compaiono sulla tastiera. Esc e riga dei tasti funzione Ins / Canc / Home / Fine / PgSu / PgGiù Tasti freccia @@ -1757,8 +1742,6 @@ Installato %1$s - sceglilo nel menu Attendi la fine della rimozione del runtime Gioco - touchpad - diretto Sostituzione non riuscita: %1$s Salvataggio del profilo non riuscito: %1$s Il desktop è in pausa @@ -2023,15 +2006,6 @@ Livello superiore Scegli una cartella Scegli un file - Blu Steam - Cielo - Bianco - Viola - Verde - Ambra - Rosso - Rosa - Grigio Pulsante A Pulsante B Pulsante X @@ -3160,7 +3134,6 @@ Tracciamento sperimentale della testa per Pro 2. La regolazione di luminosità e volume e il cambio della modalità di visualizzazione non sono ancora supportati. Cardboard VR Modalità Cardboard - Immagini per l\'occhio sinistro e destro, per un visore VR per telefono. Immagine Schermo virtuale 3D affiancato @@ -3183,7 +3156,6 @@ Non disponibile in questa sessione. SteamVR non ha risposto; controlla il log della sessione. Scarica componenti - I download sono condivisi con la pagina Componenti. Scegli sopra una versione scaricata per usarla al prossimo avvio del gioco. Scegli una versione da scaricare Sviluppatore Editore diff --git a/app/src/main/res/values-ja/input_library.xml b/app/src/main/res/values-ja/input_library.xml index ecf218c49..5e58a3ebc 100644 --- a/app/src/main/res/values-ja/input_library.xml +++ b/app/src/main/res/values-ja/input_library.xml @@ -75,14 +75,9 @@ 独立したコピー タッチ位置からスティックを開始 未使用時はスティックを隠す - ツール - 自動 (%1$s) - カスタム (%1$s) 新しいプロファイルとして保存 プロファイルコントロール - プロファイル マウスタッチパッドのジェスチャー - マウスポインターに割り当てた場合: タップでクリック、長押しでドラッグ、2 本指でスクロールします。 %1$s にはクイックメニューの上書きがあります。[自動] を選ぶと既定のプロファイルと保存済みの 3 つのパーツを使用します。 DroidDeck 入力 スティックをどの方向に動かしている間も保持されます: 55% を超えると押下、35% を下回ると解放。方向キーで各方向を個別に割り当てます。DroidDeck コマンドは 1 回の傾きにつき 1 回実行されます。スティックのクリックは別に設定します。 @@ -103,19 +98,12 @@ 戻る · Steam では 2 回、デスクトップでは 1 回 Steam モード時。戻るを長押しするとクイックアクセスも開きます。 既定に戻す - パネルの選択は記憶されます。デスクトップは 2 つ目のワークスペースを開くだけで、セッションやその入力プロファイルを切り替えません。 仮想コントローラー - Steam またはゲームが認識するコントローラーの種類。 タッチスクリーン - ゲーム画面のタッチの扱い方。プロファイルのボタンは割り当て済みのアクションを保ちます。 タッチカーソル - ゲーム画面への直接タッチにポインターを表示します。 タッチして長押し - ゲーム画面で指を押し続けたときのマウス動作。 戻るボタンのタップ - 1 つ目のアクション: シングルタップ。2 つ目のアクション: ダブルタップ。 トグルボタン - タップで保持、もう一度タップで解放。メニューを開くかプロファイルを切り替えるとボタンは解放されます。 形 角丸 ピル diff --git a/app/src/main/res/values-ja/input_strings.xml b/app/src/main/res/values-ja/input_strings.xml index ac60ca8e5..e11c58003 100644 --- a/app/src/main/res/values-ja/input_strings.xml +++ b/app/src/main/res/values-ja/input_strings.xml @@ -1,6 +1,5 @@ - 入力プロファイル プロファイル 物理コントローラー メイン画面 @@ -23,7 +22,6 @@ Steam メニューを開く Steam クイックアクセスを開く コントロールを削除 - コントロールを追加 デバイス固有のボタン 物理ボタンを割り当て ボタンを離してから、編集・再試行・キャンセルのいずれかを選択します。B または戻るは離した後にキャンセルします。 diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3a616a857..266d3c6fa 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -296,14 +296,10 @@ タッチ サイドボタン 画面コントローラー - Steam + QAM 自動では、コントローラーが接続されていないときに画面コントローラーを表示します。 - Steamタッチ(ベータ版) - Steamのタッチコントロールは次回のSteamセッションから有効になります Steamタッチのレイアウト エクスポート 画像 - このゲームのタッチコントロールを移動、サイズ変更、非表示にします。Steamに保存されます コントローラー Steamがコントローラーを認識する方法。次回のセッションで有効になります。 Steam Deckコントローラー @@ -429,7 +425,6 @@ PulseAudioをバイパスして遅延を減らします。 マイク ボイスチャットに使用します。 - このセッションのマイク入力をオンまたはオフにします。 マイクを変更できませんでした。もう一度お試しください。 ネットワーク Wi-Fi検出 @@ -802,7 +797,6 @@ キーボード 遅延 低遅延モード - CPUとバッテリーの使用量が増えます 低遅延コントローラー コントローラーが 250 Hz ではなく 1000 Hz で報告されます。CPU 使用率がわずかに上がります。 低遅延タッチ @@ -1353,12 +1347,8 @@ 不透明度 %1$d%% ボタンのサイズ - アダプティブスティック ゲームの振動 スティックのデッドゾーン - Steamボタン - QAMボタン - キーボードボタン Joy-ConをVRコントローラーとして使う SteamVRの実行中は各Joy-Conが手になります。前に向けてHOMEボタンかキャプチャーボタンを長押しすると、向きを合わせ直します。 アニメーション @@ -1486,8 +1476,6 @@ トラックパッド セカンドスクリーンコントロールを閉じる Steamメニューを開く - 右トラックパッド - 左トラックパッド トラックパッド キーボードを表示 キーボードを隠す @@ -1526,11 +1514,8 @@ Androidキーボード 隠す ✕ 画面上のサイズ - ヘッダーを含め、キーボードが画面に占める割合。 不透明度 - 下げると、キーボードの背後にあるゲームが見えます。 非表示のキー - ほとんど使わないキーはキーボードに表示されません。 Esc とファンクションキー列 Ins / Del / Home / End / PgUp / PgDn 矢印キー @@ -1735,8 +1720,6 @@ %1$sをインストールしました - メニューで選択してください 実行環境の削除が完了するまでお待ちください ゲーム - トラックパッド - ダイレクト 置き換えに失敗しました:%1$s プロファイルの保存に失敗しました:%1$s デスクトップは一時停止中です @@ -1983,15 +1966,6 @@ 1つ上の階層へ フォルダを選択 ファイルを選択 - Steamブルー - スカイ - ホワイト - バイオレット - グリーン - アンバー - レッド - ピンク - グレー Aボタン Bボタン Xボタン @@ -3121,7 +3095,6 @@ %1$d分 Cardboard VR Cardboardモード - スマホ用VRビューアー向けの左右の目の映像です。 映像 仮想スクリーン サイドバイサイド3D @@ -3144,7 +3117,6 @@ このセッションでは利用できません。 SteamVRが応答しませんでした。セッションログを確認してください。 コンポーネントをダウンロード - ダウンロードは「コンポーネント」ページと共有されます。上でダウンロード済みのバージョンを選ぶと、次回のゲーム起動時に使用されます。 ダウンロードするバージョンを選択 画面の位置 上 diff --git a/app/src/main/res/values-ko/input_library.xml b/app/src/main/res/values-ko/input_library.xml index d19c198c7..6318f75ba 100644 --- a/app/src/main/res/values-ko/input_library.xml +++ b/app/src/main/res/values-ko/input_library.xml @@ -75,14 +75,9 @@ 독립 사본 터치한 위치에서 스틱 시작 사용하지 않을 때 스틱 숨기기 - 도구 - 자동 (%1$s) - 사용자 지정 (%1$s) 새 프로필로 저장 프로필 컨트롤 - 프로필 마우스 터치패드 제스처 - 마우스 포인터에 할당된 경우: 탭하여 클릭, 길게 눌러 드래그, 두 손가락으로 스크롤합니다. %1$s에는 빠른 메뉴 재정의가 있습니다. 자동을 선택하면 기본 프로필과 저장된 세 부분을 모두 사용합니다. DroidDeck 입력 스틱을 어느 방향으로든 움직이는 동안 유지됩니다: 55% 초과 시 누름, 35% 미만 시 해제. 방향 키로 각 방향을 따로 지정합니다. DroidDeck 명령은 기울기마다 한 번 실행됩니다. 스틱 클릭은 따로 설정합니다. @@ -103,19 +98,12 @@ 뒤로 · Steam에서는 두 번, 데스크톱에서는 한 번 Steam 모드에서. 뒤로를 길게 누르면 빠른 액세스도 열립니다. 기본값으로 복원 - 패널 선택이 기억됩니다. 데스크톱은 두 번째 작업 공간을 열 뿐 세션이나 입력 프로필을 전환하지 않습니다. 가상 컨트롤러 - Steam 또는 게임이 인식하는 컨트롤러 유형입니다. 터치스크린 - 게임 화면의 터치 처리 방식입니다. 프로필 버튼은 지정된 동작을 유지합니다. 터치 커서 - 게임 화면의 직접 터치에 포인터를 표시합니다. 터치 후 유지 - 게임 화면에서 손가락을 누르고 있을 때의 마우스 동작입니다. 뒤로 버튼 탭 - 첫 번째 동작: 한 번 탭. 두 번째 동작: 두 번 탭. 토글 버튼 - 탭하여 유지, 다시 탭하여 해제. 메뉴를 열거나 프로필을 전환하면 버튼이 해제됩니다. 모양 둥근 모서리 알약 diff --git a/app/src/main/res/values-ko/input_strings.xml b/app/src/main/res/values-ko/input_strings.xml index b38fa335b..21a143844 100644 --- a/app/src/main/res/values-ko/input_strings.xml +++ b/app/src/main/res/values-ko/input_strings.xml @@ -1,6 +1,5 @@ - 입력 프로필 프로필 물리 컨트롤러 기본 화면 @@ -23,7 +22,6 @@ Steam 메뉴 열기 Steam 빠른 액세스 열기 컨트롤 제거 - 컨트롤 추가 기기별 버튼 물리 버튼 지정 버튼을 놓은 다음 편집, 다시 시도 또는 취소를 선택하세요. B 또는 뒤로는 놓은 후 취소합니다. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 78182d217..63db111b0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -296,14 +296,10 @@ 터치 측면 버튼 화면 컨트롤 - Steam + QAM 자동 모드에서는 컨트롤러가 연결되지 않은 경우 화면 컨트롤을 표시합니다. - Steam 터치(베타) - Steam 터치 컨트롤은 다음 Steam 세션부터 적용됩니다 Steam 터치 레이아웃 내보내기 이미지 - 이 게임의 터치 컨트롤을 옮기거나 크기를 바꾸거나 숨깁니다. Steam에 저장됩니다 컨트롤러 Steam이 컨트롤러를 인식하는 방식입니다. 다음 세션에 적용됩니다. Steam Deck 컨트롤러 @@ -429,7 +425,6 @@ PulseAudio를 우회하여 지연 시간을 줄입니다. 마이크 음성 채팅에 사용됩니다. - 이 세션의 마이크 캡처를 켜거나 끕니다. 마이크를 변경할 수 없습니다. 다시 시도하세요. 네트워크 Wi-Fi 검색 @@ -802,7 +797,6 @@ 키보드 지연 저지연 모드 - CPU 및 배터리 사용량이 늘어납니다 저지연 컨트롤러 컨트롤러가 250 Hz 대신 1000 Hz로 보고됩니다. CPU 사용량이 약간 늘어납니다. 저지연 터치 @@ -1353,12 +1347,8 @@ 불투명도 %1$d%% 버튼 크기 - 적응형 스틱 게임 진동 스틱 데드존 - Steam 버튼 - QAM 버튼 - 키보드 버튼 Joy-Con을 VR 컨트롤러로 사용 SteamVR이 실행되는 동안 각 Joy-Con이 손이 됩니다. 앞을 향하게 한 채 HOME 또는 캡처 버튼을 길게 누르면 다시 가운데로 맞춥니다. 애니메이션 @@ -1486,8 +1476,6 @@ 터치패드 보조 화면 컨트롤 닫기 Steam 메뉴 열기 - 오른쪽 터치패드 - 왼쪽 터치패드 터치패드 키보드 표시 키보드 숨기기 @@ -1526,11 +1514,8 @@ Android 키보드 숨기기 ✕ 화면상 크기 - 헤더를 포함해 키보드가 화면에서 차지하는 비율입니다. 불투명도 - 낮추면 키보드 뒤의 게임이 보입니다. 숨긴 키 - 자주 쓰지 않는 키는 키보드에 표시되지 않습니다. Esc 및 기능 키 행 Ins / Del / Home / End / PgUp / PgDn 화살표 키 @@ -1735,8 +1720,6 @@ %1$s 설치됨 - 메뉴에서 선택하세요 런타임 제거가 끝날 때까지 기다려 주세요 게임 - 터치패드 - 직접 터치 교체 실패: %1$s 프로필 저장 실패: %1$s 데스크톱이 일시 중지됨 @@ -1983,15 +1966,6 @@ 상위 폴더로 폴더 선택 파일 선택 - Steam 블루 - 하늘색 - 흰색 - 보라색 - 초록색 - 호박색 - 빨간색 - 분홍색 - 회색 A 버튼 B 버튼 X 버튼 @@ -3121,7 +3095,6 @@ %1$d분 Cardboard VR Cardboard 모드 - 휴대폰 VR 뷰어용 왼쪽 및 오른쪽 눈 화면입니다. 화면 가상 스크린 사이드 바이 사이드 3D @@ -3144,7 +3117,6 @@ 이 세션에서는 사용할 수 없습니다. SteamVR이 응답하지 않았습니다. 세션 로그를 확인하세요. 구성 요소 다운로드 - 다운로드는 구성 요소 페이지와 공유됩니다. 위에서 다운로드한 버전을 선택하면 다음 게임 실행 시 사용됩니다. 다운로드할 버전 선택 화면 위치 위 diff --git a/app/src/main/res/values-ms/input_library.xml b/app/src/main/res/values-ms/input_library.xml index bd4b45512..601220737 100644 --- a/app/src/main/res/values-ms/input_library.xml +++ b/app/src/main/res/values-ms/input_library.xml @@ -75,14 +75,9 @@ Salinan bebas Mulakan kayu pada kedudukan sentuhan Sembunyikan kayu apabila tidak digunakan - Alat - Auto (%1$s) - Tersuai (%1$s) Simpan sebagai profil baharu Kawalan profil - Profil Gerak isyarat pad sentuh tetikus - Apabila ditetapkan pada penuding tetikus: ketik untuk klik, tahan untuk seret, dan tatal dengan dua jari. %1$s mempunyai penggantian menu pantas. Pilih Auto di sana untuk menggunakan profil lalainya dan ketiga-tiga bahagian tersimpan. Input DroidDeck Ditetapkan semasa kayu digerakkan ke mana-mana arah: tekan melebihi 55%, lepas di bawah 35%. Gunakan Kekunci arah untuk menetapkan setiap arah secara berasingan. Perintah DroidDeck berjalan sekali setiap pesongan. Klik kayu ditetapkan secara berasingan. @@ -103,19 +98,12 @@ 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 - Bagaimana sentuhan pada skrin permainan dikendalikan. Butang profil kekal dengan tindakan yang ditetapkan. Kursor sentuh - Tunjukkan penuding untuk sentuhan langsung pada skrin permainan. Sentuh dan tahan - Tindakan tetikus apabila menahan jari pada skrin permainan. Ketikan butang Kembali - Tindakan pertama: satu ketikan. Tindakan kedua: dua ketikan. Butang togol - Ketik untuk menahan, ketik lagi untuk melepaskan. Membuka menu atau menukar profil melepaskan butang. Bentuk Bulat Pil diff --git a/app/src/main/res/values-ms/input_strings.xml b/app/src/main/res/values-ms/input_strings.xml index e96a230e1..df6ae4c73 100644 --- a/app/src/main/res/values-ms/input_strings.xml +++ b/app/src/main/res/values-ms/input_strings.xml @@ -1,6 +1,5 @@ - Profil input Profil Pengawal fizikal Skrin utama @@ -23,7 +22,6 @@ Buka menu Steam Buka akses pantas Steam Alih keluar kawalan - Tambah kawalan Butang khusus peranti Tetapkan butang fizikal Lepaskan butang, kemudian pilih Edit, Cuba lagi atau Batal. B atau Kembali membatalkan selepas dilepaskan. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 8ac9fe26e..90bcde36e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -296,14 +296,10 @@ Sentuhan Butang sisi Kawalan pada skrin - Steam + QAM Auto memaparkan kawalan apabila tiada pengawal disambungkan. - Sentuhan Steam (beta) - Kawalan sentuh Steam bermula pada sesi Steam seterusnya Susun atur sentuh Steam Eksport Imej - Gerakkan, ubah saiz atau sembunyikan kawalan sentuh permainan ini; disimpan ke Steam Pengawal Cara Steam mengesan pengawal anda. Berkuat kuasa pada sesi seterusnya. Pengawal Steam Deck @@ -429,7 +425,6 @@ Memintas PulseAudio untuk kependaman yang lebih rendah. Mikrofon Untuk sembang suara. - Hidupkan atau matikan tangkapan mikrofon untuk sesi ini. Tidak dapat menukar mikrofon. Sila cuba lagi. Rangkaian Penemuan Wi-Fi @@ -802,7 +797,6 @@ Papan kekunci Kependaman Mod kependaman rendah - Meningkatkan penggunaan CPU dan bateri Pengawal kependaman rendah Pengawal melapor pada 1000 Hz dan bukan 250 Hz. Sedikit lebih banyak CPU. Sentuh kependaman rendah @@ -1353,12 +1347,8 @@ Kelegapan %1$d%% Saiz butang - Stik adaptif Getaran permainan Zon mati kayu bedik - Butang Steam - Butang QAM - Butang papan kekunci Joy-Con sebagai pengawal VR Semasa SteamVR berjalan, setiap Joy-Con menjadi tangan. Halakan ke hadapan dan tahan Home atau Capture untuk memusatkannya semula. Animasi @@ -1486,8 +1476,6 @@ Trackpad Tutup kawalan skrin kedua Buka menu Steam - Trackpad kanan - Trackpad kiri Trackpad Papar papan kekunci Sembunyikan papan kekunci @@ -1526,11 +1514,8 @@ Papan kekunci Android Sembunyi ✕ Saiz pada skrin - Bahagian skrin yang digunakan papan kekunci, termasuk pengepala. Kelegapan - Turunkan untuk melihat permainan di belakang papan kekunci. Kekunci tersembunyi - Kekunci yang jarang digunakan tidak dipaparkan pada papan kekunci. Esc dan baris kekunci fungsi Ins / Del / Home / End / PgUp / PgDn Kekunci anak panah @@ -1735,8 +1720,6 @@ %1$s dipasang - pilih dalam menu Tunggu pengalihan keluar masa jalan selesai Permainan - touchpad - langsung Penukaran gagal: %1$s Penyimpanan profil gagal: %1$s Desktop dijeda @@ -1983,15 +1966,6 @@ Naik satu tahap Pilih folder Pilih fail - Biru Steam - Langit - Putih - Ungu - Hijau - Ambar - Merah - Merah jambu - Kelabu Butang A Butang B Butang X @@ -3113,7 +3087,6 @@ Penjejakan kepala Pro 2 secara eksperimen. Pelarasan kecerahan, kelantangan dan pertukaran mod paparan belum disokong. Cardboard VR Mod Cardboard - Paparan mata kiri dan kanan untuk kaca mata VR telefon. Gambar Skrin maya 3D sebelah-menyebelah @@ -3136,7 +3109,6 @@ Tidak tersedia dalam sesi ini. SteamVR tidak memberi respons; semak log sesi. Muat turun komponen - Muat turun dikongsi dengan halaman Komponen. Pilih versi yang telah dimuat turun di atas untuk menggunakannya pada pelancaran permainan seterusnya. Pilih versi untuk dimuat turun Pembangun Penerbit diff --git a/app/src/main/res/values-nb/input_library.xml b/app/src/main/res/values-nb/input_library.xml index e810fed5a..a9f1d865e 100644 --- a/app/src/main/res/values-nb/input_library.xml +++ b/app/src/main/res/values-nb/input_library.xml @@ -75,14 +75,9 @@ Uavhengig kopi Start stikka ved berøringspunktet Skjul stikka når den ikke brukes - Verktøy - Auto (%1$s) - Egendefinert (%1$s) Lagre som ny profil Profilkontroller - Profil Musestyreflatebevegelser - Når tilordnet musepekeren: trykk for å klikke, hold for å dra, og rull med to fingre. %1$s har en overstyring av hurtigmenyen. Velg Auto der for å bruke standardprofilen og alle tre lagrede delene. DroidDeck-inndata Holdes mens stikka flyttes i en hvilken som helst retning: trykk over 55 %, slipp under 35 %. Bruk Retningstaster for å tildele hver retning separat. DroidDeck-kommandoer kjøres én gang per utslag. Stikkklikket konfigureres separat. @@ -103,19 +98,12 @@ 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 - Hvordan berøringer på spillskjermen håndteres. Profilknappene beholder sine tilordnede handlinger. Berøringsmarkør - Vis en peker for direkte berøringer på spillskjermen. Berør og hold - Musehandling når du holder en finger på spillskjermen. Trykk på Tilbake-knappen - Første handling: enkelt trykk. Andre handling: dobbeltrykk. Veksleknapp - Trykk for å holde, trykk igjen for å slippe. Å åpne en meny eller bytte profil slipper knappen. Form Avrundet Pille diff --git a/app/src/main/res/values-nb/input_strings.xml b/app/src/main/res/values-nb/input_strings.xml index 92e1af4ef..01ec68737 100644 --- a/app/src/main/res/values-nb/input_strings.xml +++ b/app/src/main/res/values-nb/input_strings.xml @@ -1,6 +1,5 @@ - Inndataprofiler Profiler Fysisk kontroller Hovedskjerm @@ -23,7 +22,6 @@ Åpne Steam-menyen Åpne Steams hurtigtilgang Fjern kontroll - Legg til kontroll Enhetsspesifikke knapper Tildel en fysisk knapp Slipp knappen, og velg Rediger, Prøv igjen eller Avbryt. B eller Tilbake avbryter etter slipp. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index dc2dc6ec1..c10de04c8 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -296,14 +296,10 @@ Berøring Sideknapp Skjermkontroller - Steam + QAM Auto viser kontrollene når ingen kontroller er tilkoblet. - Steam-berøring (beta) - Steams berøringskontroller starter med neste Steam-sesjon Steam-berøringslayout Eksporter Bilde - Flytt, endre størrelse på eller skjul dette spillets berøringskontroller; lagres til Steam Kontroller Hvordan Steam ser kontrolleren din. Gjelder fra neste sesjon. Steam Deck-kontroller @@ -430,7 +426,6 @@ Går forbi PulseAudio for lavere ventetid. Mikrofon For talechat. - Slå mikrofonopptak av eller på for denne sesjonen. Kunne ikke endre mikrofonen. Prøv igjen. Nettverk Wi-Fi-oppdagelse @@ -804,7 +799,6 @@ Tastatur Forsinkelse Modus for lav forsinkelse - Øker CPU- og batteribruk Kontroller med lav forsinkelse Kontrolleren rapporterer ved 1000 Hz i stedet for 250 Hz. Litt mer CPU. Berøring med lav forsinkelse @@ -1359,12 +1353,8 @@ Opasitet %1$d%% Knappestørrelse - Adaptive stikker Spillvibrasjon Dødsone for styrespak - Steam-knapp - QAM-knapp - Tastatur-knapp Joy-Con som VR-kontrollere Mens SteamVR kjører, blir hver Joy-Con en hånd. Pek den fremover og hold inne Home eller Capture for å sentrere den på nytt. Animasjoner @@ -1493,8 +1483,6 @@ Styreflate Lukk kontroller for andre skjerm Åpne Steam-menyen - Høyre styreflate - Venstre styreflate Styreflate Vis tastatur Skjul tastatur @@ -1533,11 +1521,8 @@ Android-tastatur Skjul ✕ Størrelse på skjermen - Andelen av skjermen tastaturet tar, inkludert toppfeltet. Ugjennomsiktighet - Senk den for å se spillet bak tastaturet. Skjulte taster - Taster du sjelden bruker vises ikke på tastaturet. Esc og funksjonsrad Ins / Del / Home / End / PgUp / PgDn Piltaster @@ -1750,8 +1735,6 @@ Installert %1$s – velg den i menyen Vent til fjerning av kjøretiden er ferdig Spill - styreflate - direkte Bytting mislyktes: %1$s Lagring av profil mislyktes: %1$s Skrivebordet er pauset @@ -2007,15 +1990,6 @@ Opp ett nivå Velg en mappe Velg en fil - Steam-blå - Himmel - Hvit - Fiolett - Grønn - Amber - Rød - Rosa - Grå A-knapp B-knapp X-knapp @@ -3142,7 +3116,6 @@ Eksperimentell hodesporing for Pro 2. Justering av lysstyrke og volum samt bytte av visningsmodus støttes ikke ennå. Cardboard VR Cardboard-modus - Bilder for venstre og høyre øye til en VR-brille for mobil. Bilde Virtuell skjerm Side-ved-side-3D @@ -3165,7 +3138,6 @@ Ikke tilgjengelig i denne økten. SteamVR svarte ikke; sjekk sesjonsloggen. Last ned komponenter - Nedlastinger deles med Komponenter-siden. Velg en nedlastet versjon ovenfor for å bruke den fra neste spilløkt. Velg en versjon å laste ned Utvikler Utgiver diff --git a/app/src/main/res/values-nl/input_library.xml b/app/src/main/res/values-nl/input_library.xml index 80f96a853..3576c3035 100644 --- a/app/src/main/res/values-nl/input_library.xml +++ b/app/src/main/res/values-nl/input_library.xml @@ -75,14 +75,9 @@ Onafhankelijke kopie Stick starten op aanraakpunt Stick verbergen als die niet wordt gebruikt - Gereedschap - Auto (%1$s) - Aangepast (%1$s) Opslaan als nieuw profiel Profielbediening - Profiel Muis-touchpadgebaren - Bij toewijzing aan de muisaanwijzer: tik om te klikken, houd vast om te slepen en scroll met twee vingers. %1$s heeft een snelmenu-overschrijving. Kies daar Auto om het standaardprofiel en alle drie opgeslagen delen te gebruiken. DroidDeck-invoer Vastgehouden terwijl de stick in een willekeurige richting wordt bewogen: ingedrukt boven 55%, losgelaten onder 35%. Gebruik Richtingtoetsen om elke richting apart toe te wijzen. DroidDeck-opdrachten worden één keer per uitslag uitgevoerd. De stickklik wordt apart ingesteld. @@ -103,19 +98,12 @@ 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 - Hoe aanrakingen op het spelscherm worden afgehandeld. Profielknoppen behouden hun toegewezen acties. Aanraakcursor - Toon een aanwijzer voor directe aanrakingen op het spelscherm. Aanraken en vasthouden - Muisactie wanneer je een vinger op het spelscherm houdt. Tikken op de terugknop - Eerste actie: één tik. Tweede actie: dubbeltik. Schakelknop - Tik om vast te houden, tik opnieuw om los te laten. Een menu openen of van profiel wisselen laat de knop los. Vorm Afgerond Pil diff --git a/app/src/main/res/values-nl/input_strings.xml b/app/src/main/res/values-nl/input_strings.xml index df68d569f..bed390c51 100644 --- a/app/src/main/res/values-nl/input_strings.xml +++ b/app/src/main/res/values-nl/input_strings.xml @@ -1,6 +1,5 @@ - Invoerprofielen Profielen Fysieke controller Hoofdscherm @@ -23,7 +22,6 @@ Steam-menu openen Steam-sneltoegang openen Besturing verwijderen - Besturing toevoegen Apparaatspecifieke knoppen Een fysieke knop toewijzen Laat de knop los en kies Bewerken, Opnieuw of Annuleren. B of Terug annuleert na loslaten. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1ae36c1ca..1b00b2d21 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -296,14 +296,10 @@ Aanraken Zijknop Schermbediening - Steam + QAM Automatisch toont de bediening als er geen controller is verbonden. - Steam-aanraakbediening (bèta) - De aanraakbediening van Steam start bij de volgende Steam-sessie Steam-aanraakindeling Exporteren Afbeelding - Verplaats, schaal of verberg de aanraakbediening van deze game; opgeslagen in Steam Controller Hoe Steam je controller ziet. Geldt vanaf de volgende sessie. Steam Deck-controller @@ -430,7 +426,6 @@ Omzeilt PulseAudio voor minder vertraging. Microfoon Voor spraakchat. - Zet microfoonopname aan of uit voor deze sessie. Kan de microfoon niet wijzigen. Probeer het opnieuw. Netwerk Wi-Fi-detectie @@ -804,7 +799,6 @@ Toetsenbord Latentie Modus voor lage latentie - Verhoogt CPU- en batterijgebruik Controller met lage latentie De controller rapporteert op 1000 Hz in plaats van 250 Hz. Iets meer CPU. Aanraking met lage latentie @@ -1359,12 +1353,8 @@ Transparantie %1$d%% Knopgrootte - Adaptieve sticks Trillen in games Dode zone van stick - Steam-knop - QAM-knop - Toetsenbordknop Joy-Cons als VR-controllers Zolang SteamVR draait, wordt elke Joy-Con een hand. Richt hem naar voren en houd Home of Capture ingedrukt om hem opnieuw te centreren. Animaties @@ -1493,8 +1483,6 @@ Trackpad Bediening op tweede scherm sluiten Steam-menu openen - Rechtertrackpad - Linkertrackpad Trackpad Toetsenbord tonen Toetsenbord verbergen @@ -1533,11 +1521,8 @@ Android-toetsenbord Verbergen ✕ Grootte op scherm - Het deel van het scherm dat het toetsenbord inneemt, inclusief de header. Dekking - Verlaag deze om het spel achter het toetsenbord te zien. Verborgen toetsen - Toetsen die je zelden gebruikt staan niet op het toetsenbord. Esc en functierij Ins / Del / Home / End / PgUp / PgDn Pijltjestoetsen @@ -1750,8 +1735,6 @@ %1$s geïnstalleerd - kies hem in het menu Wacht tot de runtime is verwijderd Game - touchpad - direct Wisselen mislukt: %1$s Profiel opslaan mislukt: %1$s De desktop is gepauzeerd @@ -2007,15 +1990,6 @@ Eén niveau omhoog Kies een map Kies een bestand - Steam-blauw - Hemelsblauw - Wit - Violet - Groen - Amber - Rood - Roze - Grijs A-knop B-knop X-knop @@ -3142,7 +3116,6 @@ Experimentele hoofdtracking voor Pro 2. Het aanpassen van helderheid en volume en het wisselen van weergavemodus worden nog niet ondersteund. Cardboard VR Cardboard-modus - Beelden voor linker- en rechteroog voor een VR-bril voor je telefoon. Beeld Virtueel scherm Side-by-side 3D @@ -3165,7 +3138,6 @@ Niet beschikbaar in deze sessie. SteamVR reageerde niet; controleer het sessielog. Componenten downloaden - Downloads worden gedeeld met de pagina Componenten. Kies hierboven een gedownloade versie om die bij de volgende start van een game te gebruiken. Kies een versie om te downloaden Ontwikkelaar Uitgever diff --git a/app/src/main/res/values-pl/input_library.xml b/app/src/main/res/values-pl/input_library.xml index 1193c2a12..8daf6a15b 100644 --- a/app/src/main/res/values-pl/input_library.xml +++ b/app/src/main/res/values-pl/input_library.xml @@ -75,14 +75,9 @@ Niezależna kopia Zacznij drążek w miejscu dotknięcia Ukryj drążek, gdy nie jest używany - Narzędzia - Auto (%1$s) - Niestandardowy (%1$s) Zapisz jako nowy profil Sterowanie profilu - Profil Gesty touchpada myszy - Po przypisaniu do wskaźnika myszy: dotknij, aby kliknąć, przytrzymaj, aby przeciągnąć, i przewijaj dwoma palcami. %1$s ma zastąpienie szybkiego menu. Wybierz tam Auto, aby użyć profilu domyślnego i wszystkich trzech zapisanych części. Wejście DroidDeck Przytrzymywane, gdy drążek jest wychylony w dowolnym kierunku: naciśnięcie powyżej 55%, zwolnienie poniżej 35%. Użyj Klawiszy kierunkowych, aby przypisać każdy kierunek osobno. Polecenia DroidDeck działają raz na wychylenie. Kliknięcie drążka ustawia się osobno. @@ -103,19 +98,12 @@ 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 - Jak obsługiwane są dotknięcia na ekranie gry. Przyciski profilu zachowują przypisane akcje. Kursor dotyku - Pokazuj wskaźnik dla bezpośrednich dotknięć na ekranie gry. Dotknij i przytrzymaj - Akcja myszy przy przytrzymaniu palca na ekranie gry. Dotknięcia przycisku Wstecz - Pierwsza akcja: jedno dotknięcie. Druga akcja: dwukrotne dotknięcie. Przycisk przełączania - Dotknij, aby przytrzymać, dotknij ponownie, aby zwolnić. Otwarcie menu lub zmiana profilu zwalnia przycisk. Kształt Zaokrąglony Kapsułka diff --git a/app/src/main/res/values-pl/input_strings.xml b/app/src/main/res/values-pl/input_strings.xml index fcd5fdf9d..7b775c2ff 100644 --- a/app/src/main/res/values-pl/input_strings.xml +++ b/app/src/main/res/values-pl/input_strings.xml @@ -1,6 +1,5 @@ - Profile wejścia Profile Fizyczny kontroler Główny ekran @@ -23,7 +22,6 @@ Otwórz menu Steam Otwórz szybki dostęp Steam Usuń element sterujący - Dodaj element sterujący Przyciski specyficzne dla urządzenia Przypisz przycisk fizyczny Zwolnij przycisk, a następnie wybierz Edytuj, Ponów lub Anuluj. B lub Wstecz anuluje po zwolnieniu. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index dd47a73b5..3c03522f4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -296,14 +296,10 @@ Dotyk Przycisk boczny Sterowanie ekranowe - Steam + QAM Auto pokazuje sterowanie, gdy nie jest podłączony żaden kontroler. - Dotyk Steam (beta) - Sterowanie dotykowe Steam zacznie działać od następnej sesji Steam Układ dotykowy Steam Eksportuj Obraz - Przesuwaj, zmieniaj rozmiar lub ukrywaj sterowanie dotykowe tej gry; zapisywane w Steam Kontroler Jak Steam widzi Twój kontroler. Działa od następnej sesji. Kontroler Steam Deck @@ -432,7 +428,6 @@ Omija PulseAudio, aby zmniejszyć opóźnienie. Mikrofon Do czatu głosowego. - Włącz lub wyłącz przechwytywanie mikrofonu w tej sesji. Nie udało się zmienić mikrofonu. Spróbuj ponownie. Sieć Wykrywanie Wi-Fi @@ -808,7 +803,6 @@ Klawiatura Opóźnienie Tryb niskiego opóźnienia - Zwiększa użycie CPU i baterii Kontroler o niskim opóźnieniu Kontroler raportuje z częstotliwością 1000 Hz zamiast 250 Hz. Nieco więcej CPU. Dotyk o niskim opóźnieniu @@ -1373,12 +1367,8 @@ Przezroczystość %1$d%% Rozmiar przycisków - Adaptacyjne gałki Wibracje gry Martwa strefa drążka - Przycisk Steam - Przycisk QAM - Przycisk klawiatury Joy-Cony jako kontrolery VR Gdy działa SteamVR, każdy Joy-Con staje się dłonią. Skieruj go przed siebie i przytrzymaj Home lub Capture, aby go wyśrodkować. Animacje @@ -1509,8 +1499,6 @@ Trackpad Zamknij sterowanie na drugim ekranie Otwórz menu Steam - Prawy trackpad - Lewy trackpad Trackpad Pokaż klawiaturę Ukryj klawiaturę @@ -1549,11 +1537,8 @@ Klawiatura Android Ukryj ✕ Rozmiar na ekranie - Część ekranu zajmowana przez klawiaturę, wliczając nagłówek. Krycie - Zmniejsz je, aby zobaczyć grę za klawiaturą. Ukryte klawisze - Klawisze, których rzadko używasz, nie pojawiają się na klawiaturze. Esc i rząd klawiszy funkcyjnych Ins / Del / Home / End / PgUp / PgDn Klawisze strzałek @@ -1782,8 +1767,6 @@ Zainstalowano %1$s – wybierz go w menu Poczekaj na zakończenie usuwania środowiska Gra - touchpad - bezpośredni Zamiana nie powiodła się: %1$s Zapis profilu nie powiódł się: %1$s Pulpit jest wstrzymany @@ -2057,15 +2040,6 @@ Poziom wyżej Wybierz folder Wybierz plik - Niebieski Steam - Błękitny - Biały - Fioletowy - Zielony - Bursztynowy - Czerwony - Różowy - Szary Przycisk A Przycisk B Przycisk X @@ -3202,7 +3176,6 @@ Eksperymentalne śledzenie ruchów głowy dla Pro 2. Regulacja jasności i głośności oraz przełączanie trybu wyświetlania nie są jeszcze obsługiwane. Cardboard VR Tryb Cardboard - Obraz dla lewego i prawego oka do gogli VR na telefon. Obraz Wirtualny ekran 3D obok siebie @@ -3225,7 +3198,6 @@ Niedostępne w tej sesji. SteamVR nie odpowiada; sprawdź dziennik sesji. Pobierz komponenty - Pobrane pliki są wspólne ze stroną Komponenty. Wybierz powyżej pobraną wersję, aby użyć jej przy następnym uruchomieniu gry. Wybierz wersję do pobrania Producent Wydawca 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..71ebbb7ff 100644 --- a/app/src/main/res/values-pt-rPT/input_library.xml +++ b/app/src/main/res/values-pt-rPT/input_library.xml @@ -75,14 +75,9 @@ Cópia independente Iniciar o analógico no ponto de toque Ocultar o analógico quando não está a ser usado - Ferramentas - Auto (%1$s) - Personalizado (%1$s) Guardar como novo perfil Controlos do perfil - Perfil Gestos do touchpad do rato - Quando atribuído ao ponteiro do rato: toque para clicar, mantenha para arrastar e desloque com dois dedos. %1$s tem uma substituição do menu rápido. Selecione Auto para usar o perfil predefinido e as três partes guardadas. Entrada DroidDeck Mantido enquanto o analógico é movido em qualquer direção: pressiona acima de 55%, liberta abaixo de 35%. Use Teclas de direção para atribuir cada direção em separado. Os comandos DroidDeck correm uma vez por desvio. O clique do analógico configura-se à parte. @@ -103,19 +98,12 @@ 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 - Como os toques no ecrã do jogo são tratados. Os botões do perfil mantêm as ações atribuídas. Cursor tátil - Mostra um ponteiro para toques diretos no ecrã do jogo. Tocar e manter - Ação do rato ao manter um dedo no ecrã do jogo. Toques do botão Voltar - Primeira ação: toque único. Segunda ação: duplo toque. Botão de alternância - Toque para manter, toque novamente para libertar. Abrir um menu ou mudar de perfil liberta o botão. Forma Arredondada Cápsula diff --git a/app/src/main/res/values-pt-rPT/input_strings.xml b/app/src/main/res/values-pt-rPT/input_strings.xml index 0d8183485..99c292f72 100644 --- a/app/src/main/res/values-pt-rPT/input_strings.xml +++ b/app/src/main/res/values-pt-rPT/input_strings.xml @@ -1,6 +1,5 @@ - Perfis de entrada Perfis Comando físico Ecrã principal @@ -23,7 +22,6 @@ Abrir o menu do Steam Abrir o acesso rápido do Steam Remover controlo - Adicionar controlo Botões específicos do dispositivo Atribuir um botão físico Largue o botão e escolha Editar, Repetir ou Cancelar. B ou Voltar cancela após largar. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index fdb7974b5..3e1e41005 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -296,14 +296,10 @@ Toque Botão lateral Controlos no ecrã - Steam + QAM Em Automático, os controlos aparecem quando não há nenhum comando ligado. - Controlos táteis do Steam (beta) - Os controlos táteis do Steam começam na próxima sessão do Steam Esquema tátil do Steam Exportar Imagem - Mova, redimensione ou oculte os controlos táteis deste jogo; é guardado no Steam Comando Como o Steam vê o seu comando. Aplica-se na próxima sessão. Comando Steam Deck @@ -431,7 +427,6 @@ Ignora o PulseAudio para reduzir a latência. Microfone Para chat de voz. - Ativa ou desativa a captura do microfone nesta sessão. Não foi possível alterar o microfone. Tente novamente. Rede Deteção de Wi-Fi @@ -806,7 +801,6 @@ Teclado Latência Modo de baixa latência - Aumenta o consumo de CPU e de bateria Comando de baixa latência O comando comunica a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU. Toque de baixa latência @@ -1357,12 +1351,8 @@ Opacidade %1$d%% Tamanho dos botões - Analógicos adaptáveis Vibração do jogo Zona morta do manípulo - Botão Steam - Botão QAM - Botão do teclado Joy-Con como comandos de RV Enquanto o SteamVR está a correr, cada Joy-Con torna-se uma mão. Aponte-o para a frente e mantenha Home ou Capture premido para o recentrar. Animações @@ -1492,8 +1482,6 @@ Trackpad Fechar controlos do segundo ecrã Abrir menu Steam - Trackpad direito - Trackpad esquerdo Trackpad Mostrar teclado Ocultar teclado @@ -1532,11 +1520,8 @@ Teclado Android Ocultar ✕ Tamanho no ecrã - Percentagem do ecrã ocupada pelo teclado, incluindo o cabeçalho. Opacidade - Reduza-a para ver o jogo por trás do teclado. Teclas ocultas - As teclas que raramente usa não aparecem no teclado. Esc e linha das teclas de função Ins / Del / Home / End / PgUp / PgDn Teclas de direção @@ -1757,8 +1742,6 @@ %1$s instalado - escolha-o no menu Aguarde que a remoção do runtime termine Jogo - painel tátil - direto Falha na troca: %1$s Falha ao guardar o perfil: %1$s O ambiente de trabalho está em pausa @@ -2023,15 +2006,6 @@ Subir um nível Escolha uma pasta Escolha um ficheiro - Azul Steam - Céu - Branco - Violeta - Verde - Âmbar - Vermelho - Rosa - Cinzento Botão A Botão B Botão X @@ -3160,7 +3134,6 @@ Seguimento experimental dos movimentos da cabeça para Pro 2. O ajuste do brilho e do volume e a mudança do modo de ecrã ainda não são suportados. Cardboard VR Modo Cardboard - Imagens para o olho esquerdo e o direito, para uns óculos de RV para telemóvel. Imagem Ecrã virtual 3D lado a lado @@ -3183,7 +3156,6 @@ Indisponível nesta sessão. O SteamVR não respondeu; verifica o registo da sessão. Transferir componentes - As transferências são partilhadas com a página Componentes. Escolhe acima uma versão transferida para a usar quando iniciares o próximo jogo. Escolhe uma versão para transferir Programadora Editora diff --git a/app/src/main/res/values-pt/input_library.xml b/app/src/main/res/values-pt/input_library.xml index ae84ba99c..a74220564 100644 --- a/app/src/main/res/values-pt/input_library.xml +++ b/app/src/main/res/values-pt/input_library.xml @@ -75,14 +75,9 @@ Cópia independente Iniciar o analógico no ponto de toque Ocultar o analógico quando não estiver em uso - Ferramentas - Auto (%1$s) - Personalizado (%1$s) Salvar como novo perfil Controles do perfil - Perfil Gestos do touchpad do mouse - Quando atribuído ao ponteiro do mouse: toque para clicar, segure para arrastar e role com dois dedos. %1$s tem uma substituição do menu rápido. Selecione Auto lá para usar o perfil padrão e as três partes salvas. Entrada do DroidDeck Mantido enquanto o analógico é movido em qualquer direção: pressiona acima de 55%, solta abaixo de 35%. Use Teclas de direção para atribuir cada direção separadamente. Os comandos do DroidDeck rodam uma vez por deflexão. O clique do analógico é configurado à parte. @@ -103,19 +98,12 @@ 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 - Como os toques na tela do jogo são tratados. Os botões do perfil mantêm as ações atribuídas. Cursor de toque - Mostra um ponteiro para toques diretos na tela do jogo. Tocar e segurar - Ação do mouse ao segurar um dedo na tela do jogo. Toques do botão Voltar - Primeira ação: toque único. Segunda ação: toque duplo. Botão de alternância - Toque para manter, toque de novo para soltar. Abrir um menu ou trocar de perfil solta o botão. Forma Arredondada Pílula diff --git a/app/src/main/res/values-pt/input_strings.xml b/app/src/main/res/values-pt/input_strings.xml index 5847aa3ac..e4e5d2fca 100644 --- a/app/src/main/res/values-pt/input_strings.xml +++ b/app/src/main/res/values-pt/input_strings.xml @@ -1,6 +1,5 @@ - Perfis de entrada Perfis Controle físico Tela principal @@ -23,7 +22,6 @@ Abrir o menu do Steam Abrir o acesso rápido do Steam Remover controle - Adicionar controle Botões específicos do dispositivo Atribuir um botão físico Solte o botão e escolha Editar, Repetir ou Cancelar. B ou Voltar cancela após soltar. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d29261a8a..2344d779e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -296,14 +296,10 @@ Toque Botão lateral Controles na tela - Steam + QAM No Automático, os controles na tela aparecem quando não há um controle conectado. - Toque da Steam (beta) - Os controles de toque da Steam começam na próxima sessão da Steam Layout de toque da Steam Exportar Imagem - Mova, redimensione ou oculte os controles de toque deste jogo; salvo na Steam Controle Como a Steam vê seu controle. Vale a partir da próxima sessão. Controle do Steam Deck @@ -431,7 +427,6 @@ Ignora o PulseAudio para reduzir a latência. Microfone Para chat de voz. - Ativa ou desativa a captura do microfone nesta sessão. Não foi possível alterar o microfone. Tente novamente. Rede Descoberta de Wi-Fi @@ -774,12 +769,9 @@ Modo de escala Nitidez da escala Perfil de efeitos - Escolha qual perfil terá os efeitos de tela editados. Jogo atual (automático) Redefinir efeitos - Define os efeitos deste perfil como desativados por padrão. Excluir configuração salva - Remove os efeitos salvos deste jogo para ele herdar o perfil padrão. Efeitos de tela Em tempo real. Custa um pouco de tempo de GPU enquanto algum efeito estiver ativado. Predefinições @@ -813,7 +805,6 @@ Teclado Latência Modo de baixa latência - Aumenta o uso de CPU e bateria Controle de baixa latência O controle envia dados a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU. Toque de baixa latência @@ -1365,12 +1356,8 @@ Opacidade %1$d%% Tamanho dos botões - Analógicos adaptáveis Vibração do jogo Zona morta do analógico - Botão Steam - Botão QAM - Botão do teclado Joy-Cons como controles de RV Enquanto o SteamVR está rodando, cada Joy-Con vira uma mão. Aponte-o para a frente e segure Home ou Capture para recentralizá-lo. Animações @@ -1500,8 +1487,6 @@ Trackpad Fechar controles da segunda tela Abrir o menu Steam - Trackpad direito - Trackpad esquerdo Trackpad Mostrar teclado Ocultar teclado @@ -1540,11 +1525,8 @@ Teclado do Android Ocultar ✕ Tamanho na tela - Parte da tela ocupada pelo teclado, incluindo o cabeçalho. Opacidade - Reduza para ver o jogo atrás do teclado. Teclas ocultas - Teclas que você usa raramente não aparecem no teclado. Esc e fileira de teclas de função Ins / Del / Home / End / PgUp / PgDn Teclas de seta @@ -1765,8 +1747,6 @@ %1$s instalado - escolha-o no menu Aguarde a remoção do runtime terminar Jogo - touchpad - direto Falha na troca: %1$s Falha ao salvar o perfil: %1$s A área de trabalho está pausada @@ -2031,15 +2011,6 @@ Subir um nível Escolha uma pasta Escolha um arquivo - Azul Steam - Céu - Branco - Violeta - Verde - Âmbar - Vermelho - Rosa - Cinza Botão A Botão B Botão X @@ -3168,7 +3139,6 @@ Rastreamento experimental da cabeça para Pro 2. Os ajustes de brilho e volume e a troca do modo de exibição ainda não são compatíveis. Cardboard VR Modo Cardboard - Imagens para o olho esquerdo e o direito, para um óculos de RV de celular. Imagem Tela virtual 3D lado a lado @@ -3191,7 +3161,6 @@ Indisponível nesta sessão. O SteamVR não respondeu; veja o registro da sessão. Baixar componentes - Os downloads são compartilhados com a página Componentes. Escolha acima uma versão baixada para usá-la na próxima vez que um jogo for aberto. Escolha uma versão para baixar Desenvolvedora Publicadora diff --git a/app/src/main/res/values-ro/input_library.xml b/app/src/main/res/values-ro/input_library.xml index 5a3648d50..3dbecd2cc 100644 --- a/app/src/main/res/values-ro/input_library.xml +++ b/app/src/main/res/values-ro/input_library.xml @@ -75,14 +75,9 @@ Copie independentă Pornește maneta la punctul de atingere Ascunde maneta când nu este folosită - Instrumente - Auto (%1$s) - Personalizat (%1$s) Salvează ca profil nou Comenzile profilului - Profil Gesturi touchpad mouse - Când este atribuit indicatorului mouse-ului: atinge pentru clic, ține pentru tragere și derulează cu două degete. %1$s are o suprascriere a meniului rapid. Selectează Auto acolo pentru a folosi profilul implicit și toate cele trei părți salvate. Intrare DroidDeck Ținut cât timp maneta este mișcată în orice direcție: apăsat peste 55%, eliberat sub 35%. Folosește Tastele direcționale pentru a atribui fiecare direcție separat. Comenzile DroidDeck rulează o dată per deviere. Clicul manetei se configurează separat. @@ -103,19 +98,12 @@ Î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 - Cum sunt tratate atingerile pe ecranul jocului. Butoanele profilului își păstrează acțiunile atribuite. Cursor tactil - Afișează un indicator pentru atingeri directe pe ecranul jocului. Atinge și ține - Acțiunea mouse-ului când ții un deget pe ecranul jocului. Atingeri ale butonului Înapoi - Prima acțiune: o atingere. A doua acțiune: atingere dublă. Buton de comutare - Atinge pentru a ține, atinge din nou pentru a elibera. Deschiderea unui meniu sau schimbarea profilului eliberează butonul. Formă Rotunjit Capsulă diff --git a/app/src/main/res/values-ro/input_strings.xml b/app/src/main/res/values-ro/input_strings.xml index 1603f7b26..1f9948541 100644 --- a/app/src/main/res/values-ro/input_strings.xml +++ b/app/src/main/res/values-ro/input_strings.xml @@ -1,6 +1,5 @@ - Profiluri de intrare Profiluri Controller fizic Ecran principal @@ -23,7 +22,6 @@ Deschide meniul Steam Deschide accesul rapid Steam Elimină controlul - Adaugă control Butoane specifice dispozitivului Atribuie un buton fizic Eliberează butonul, apoi alege Editează, Reîncearcă sau Anulează. B sau Înapoi anulează după eliberare. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fff6f6269..b17267af8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -296,14 +296,10 @@ Atingere Buton lateral Comenzi pe ecran - Steam + QAM Automat afișează comenzile când niciun controller nu este conectat. - Atingere Steam (beta) - Comenzile tactile Steam pornesc odată cu următoarea sesiune Steam Aranjament tactil Steam Exportă Imagine - Mută, redimensionează sau ascunde comenzile tactile ale acestui joc; salvate în Steam Controller Cum vede Steam controllerul tău. Se aplică la sesiunea următoare. Controller Steam Deck @@ -431,7 +427,6 @@ Evită PulseAudio pentru o latență mai mică. Microfon Pentru chat vocal. - Activează sau dezactivează captarea microfonului pentru această sesiune. Microfonul nu a putut fi schimbat. Încearcă din nou. Rețea Descoperire Wi-Fi @@ -806,7 +801,6 @@ Tastatură Latență Mod latență redusă - Crește consumul de CPU și baterie Controller cu latență mică Controllerul raportează la 1000 Hz în loc de 250 Hz. Consum CPU puțin mai mare. Atingere cu latență mică @@ -1366,12 +1360,8 @@ Opacitate %1$d%% Dimensiunea butoanelor - Manșe adaptive Vibrații de joc Zonă moartă a manetei - Butonul Steam - Butonul QAM - Butonul tastaturii Joy-Con ca controllere VR Cât timp rulează SteamVR, fiecare Joy-Con devine o mână. Îndreaptă-l înainte și ține apăsat Home sau Capture pentru a-l recentra. Animații @@ -1501,8 +1491,6 @@ Trackpad Închide comenzile celui de-al doilea ecran Deschide meniul Steam - Trackpad-ul drept - Trackpad-ul stâng Trackpad Arată tastatura Ascunde tastatura @@ -1541,11 +1529,8 @@ Tastatura Android Ascunde ✕ Dimensiune pe ecran - Partea din ecran ocupată de tastatură, inclusiv antetul. Opacitate - Reduceți-o pentru a vedea jocul din spatele tastaturii. Taste ascunse - Tastele pe care le folosiți rar nu apar pe tastatură. Esc și rândul tastelor funcționale Ins / Del / Home / End / PgUp / PgDn Tastele cu săgeți @@ -1766,8 +1751,6 @@ Instalat %1$s - alege-l în meniu Așteaptă să se termine eliminarea mediului de execuție Joc - touchpad - direct Comutarea a eșuat: %1$s Salvarea profilului a eșuat: %1$s Desktopul este pus pe pauză @@ -2032,15 +2015,6 @@ Un nivel mai sus Alege un folder Alege un fișier - Albastru Steam - Cer - Alb - Violet - Verde - Chihlimbariu - Roșu - Roz - Gri Butonul A Butonul B Butonul X @@ -3172,7 +3146,6 @@ Urmărire experimentală a mișcărilor capului pentru Pro 2. Reglarea luminozității și a volumului și schimbarea modului de afișare nu sunt încă acceptate. Cardboard VR Mod Cardboard - Imagini pentru ochiul stâng și cel drept, pentru un vizor VR pentru telefon. Imagine Ecran virtual 3D alăturat @@ -3195,7 +3168,6 @@ Indisponibil în această sesiune. SteamVR nu a răspuns; verifică jurnalul sesiunii. Descarcă componente - Descărcările sunt comune cu pagina Componente. Alege mai sus o versiune descărcată pentru a o folosi la următoarea lansare a jocului. Alege o versiune de descărcat Dezvoltator Editor diff --git a/app/src/main/res/values-ru/input_library.xml b/app/src/main/res/values-ru/input_library.xml index d02df2ffe..b065fed79 100644 --- a/app/src/main/res/values-ru/input_library.xml +++ b/app/src/main/res/values-ru/input_library.xml @@ -75,14 +75,9 @@ Независимая копия Запускать стик от точки касания Скрывать стик, когда он не используется - Инструменты - Авто (%1$s) - Пользовательский (%1$s) Сохранить как новый профиль Управление профиля - Профиль Жесты тачпада мыши - Если назначено указателю мыши: касание — клик, удержание — перетаскивание, прокрутка двумя пальцами. Для %1$s задано переопределение быстрого меню. Выберите «Авто», чтобы использовать профиль по умолчанию и все три сохранённые части. Ввод DroidDeck Удерживается, пока стик отклонён в любом направлении: нажатие выше 55%, отпускание ниже 35%. Используйте «Клавиши направлений», чтобы назначить каждое направление отдельно. Команды DroidDeck срабатывают один раз за отклонение. Нажатие стика настраивается отдельно. @@ -103,19 +98,12 @@ Назад · дважды в Steam, один раз в рабочем столе В режиме Steam. Удержание «Назад» также открывает быстрый доступ. Вернуть по умолчанию - Выбор панели запоминается. Рабочий стол открывает второе рабочее пространство; он не переключает сеанс или его профиль ввода. Виртуальный контроллер - Тип контроллера, который видят Steam или игра. Сенсорный экран - Как обрабатываются касания на экране игры. Кнопки профиля сохраняют назначенные действия. Касание-курсор - Показывать указатель для прямых касаний на экране игры. Коснуться и удерживать - Действие мыши при удержании пальца на экране игры. Нажатия кнопки «Назад» - Первое действие: одно нажатие. Второе действие: двойное нажатие. Кнопка-переключатель - Коснитесь, чтобы удерживать, коснитесь снова, чтобы отпустить. Открытие меню или смена профиля отпускает кнопку. Форма Скруглённая Капсула diff --git a/app/src/main/res/values-ru/input_strings.xml b/app/src/main/res/values-ru/input_strings.xml index 9f041bfb2..4de6367b0 100644 --- a/app/src/main/res/values-ru/input_strings.xml +++ b/app/src/main/res/values-ru/input_strings.xml @@ -1,6 +1,5 @@ - Профили ввода Профили Физический контроллер Основной экран @@ -23,7 +22,6 @@ Открыть меню Steam Открыть быстрый доступ Steam Удалить элемент - Добавить элемент Кнопки конкретного устройства Назначить физическую кнопку Отпустите кнопку и выберите «Изменить», «Повторить» или «Отмена». B или «Назад» отменяет после отпускания. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c1e27d2a5..0714d5669 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -296,14 +296,10 @@ Сенсорный ввод Боковая кнопка Экранные элементы управления - Steam + QAM Автоматический режим показывает экранные элементы управления, если контроллер не подключен. - Сенсорное управление Steam (бета) - Сенсорное управление Steam включится со следующей сессии Steam Сенсорная раскладка Steam Экспорт Изображение - Перемещайте, меняйте размер или скрывайте сенсорные кнопки этой игры; сохраняется в Steam Контроллер Как Steam распознает ваш контроллер. Вступит в силу в следующей сессии. Контроллер Steam Deck @@ -432,7 +428,6 @@ Обходит PulseAudio для снижения задержки. Микрофон Используется для голосового чата. - Включить или отключить захват микрофона в этой сессии. Не удалось изменить микрофон. Повторите попытку. Сеть Обнаружение Wi-Fi @@ -808,7 +803,6 @@ Клавиатура Задержка Режим низкой задержки - Увеличивает нагрузку на CPU и расход батареи Контроллер с низкой задержкой Контроллер опрашивается на 1000 Гц вместо 250 Гц. Немного больше нагрузки на CPU. Сенсор с низкой задержкой @@ -1373,12 +1367,8 @@ Непрозрачность %1$d%% Размер кнопок - Адаптивные стики Вибрация в играх Мёртвая зона стика - Кнопка Steam - Кнопка QAM - Кнопка клавиатуры Joy-Con как VR-контроллеры Пока работает SteamVR, каждый Joy-Con становится рукой. Направьте его вперёд и удерживайте Home или Capture, чтобы снова его отцентрировать. Анимации @@ -1509,8 +1499,6 @@ Тачпад Закрыть управление вторым экраном Открыть меню Steam - Правый тачпад - Левый тачпад Тачпад Показать клавиатуру Скрыть клавиатуру @@ -1549,11 +1537,8 @@ Клавиатура Android Скрыть ✕ Размер на экране - Какую часть экрана занимает клавиатура вместе с заголовком. Непрозрачность - Уменьшите, чтобы видеть игру за клавиатурой. Скрытые клавиши - Клавиши, которыми вы редко пользуетесь, не показываются на клавиатуре. Esc и ряд F-клавиш Ins / Del / Home / End / PgUp / PgDn Стрелки @@ -1782,8 +1767,6 @@ Установлен %1$s — выберите его в меню Дождитесь завершения удаления среды выполнения Игра - тачпад - прямой Ошибка замены: %1$s Ошибка сохранения профиля: %1$s Рабочий стол приостановлен @@ -2057,15 +2040,6 @@ На уровень вверх Выберите папку Выберите файл - Синий Steam - Небесный - Белый - Фиолетовый - Зеленый - Янтарный - Красный - Розовый - Серый Кнопка A Кнопка B Кнопка X @@ -3207,7 +3181,6 @@ %1$d мин Cardboard VR Режим Cardboard - Изображения для левого и правого глаза для VR-очков под телефон. Изображение Виртуальный экран Стереопара 3D @@ -3230,7 +3203,6 @@ Недоступно в этой сессии. SteamVR не отвечает; проверьте журнал сессии. Скачать компоненты - Загрузки общие со страницей «Компоненты». Выберите выше скачанную версию, чтобы использовать её при следующем запуске игры. Выберите версию для скачивания Недостаточно свободного места: нужно %1$s, свободно только %2$s Недостаточно места (свободно %1$s, нужно %2$s) diff --git a/app/src/main/res/values-sv/input_library.xml b/app/src/main/res/values-sv/input_library.xml index dfe410236..7272f5c8f 100644 --- a/app/src/main/res/values-sv/input_library.xml +++ b/app/src/main/res/values-sv/input_library.xml @@ -75,14 +75,9 @@ Oberoende kopia Starta spaken vid beröringspunkten Dölj spaken när den inte används - Verktyg - Auto (%1$s) - Anpassad (%1$s) Spara som ny profil Profilstyrning - Profil Musstyrplattesgester - När tilldelad muspekaren: tryck för att klicka, håll för att dra och rulla med två fingrar. %1$s har en åsidosättning av snabbmenyn. Välj Auto där för att använda standardprofilen och alla tre sparade delarna. DroidDeck-inmatning Hålls medan spaken rörs i valfri riktning: tryck över 55 %, släpp under 35 %. Använd Riktningstangenter för att tilldela varje riktning separat. DroidDeck-kommandon körs en gång per utslag. Spakens klick konfigureras separat. @@ -103,19 +98,12 @@ 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 - Hur beröringar på spelskärmen hanteras. Profilknapparna behåller sina tilldelade åtgärder. Pekmarkör - Visa en pekare för direkta beröringar på spelskärmen. Tryck och håll - Musåtgärd när du håller ett finger på spelskärmen. Tryck på Tillbaka-knappen - Första åtgärden: ett tryck. Andra åtgärden: dubbeltryck. Växlingsknapp - Tryck för att hålla, tryck igen för att släppa. Att öppna en meny eller byta profil släpper knappen. Form Rundad Kapsel diff --git a/app/src/main/res/values-sv/input_strings.xml b/app/src/main/res/values-sv/input_strings.xml index ae79aa864..eec793ffa 100644 --- a/app/src/main/res/values-sv/input_strings.xml +++ b/app/src/main/res/values-sv/input_strings.xml @@ -1,6 +1,5 @@ - Inmatningsprofiler Profiler Fysisk handkontroll Huvudskärm @@ -23,7 +22,6 @@ Öppna Steam-menyn Öppna Steams snabbåtkomst Ta bort kontroll - Lägg till kontroll Enhetsspecifika knappar Tilldela en fysisk knapp Släpp knappen och välj Redigera, Försök igen eller Avbryt. B eller Tillbaka avbryter efter släpp. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f2732a0c9..35a26507e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -296,14 +296,10 @@ Pekskärm Sidoknapp Skärmkontroller - Steam + QAM Auto visar kontrollerna när ingen handkontroll är ansluten. - Steam-pekstyrning (beta) - Steams pekstyrning startar med nästa Steam-session Steams peklayout Exportera Bild - Flytta, ändra storlek på eller dölj spelets pekkontroller; sparas i Steam Handkontroll Hur Steam ser din handkontroll. Gäller från nästa session. Steam Deck-kontroll @@ -430,7 +426,6 @@ Kringgår PulseAudio för lägre latens. Mikrofon För röstchatt. - Slå på eller av mikrofoninspelning för den här sessionen. Det gick inte att ändra mikrofonen. Försök igen. Nätverk Wi-Fi-identifiering @@ -804,7 +799,6 @@ Tangentbord Latens Läge för låg latens - Ökar CPU- och batteriförbrukningen Handkontroll med låg latens Handkontrollen rapporterar i 1000 Hz i stället för 250 Hz. Något mer CPU. Pekning med låg latens @@ -1359,12 +1353,8 @@ Opacitet %1$d %% Knappstorlek - Adaptiva spakar Spelvibration Styrspakens dödzon - Steam-knappen - QAM-knappen - Tangentbordsknappen Joy-Con som VR-handkontroller Medan SteamVR körs blir varje Joy-Con en hand. Rikta den framåt och håll in Home eller Capture för att centrera den igen. Animationer @@ -1493,8 +1483,6 @@ Styrplatta Stäng kontrollerna på andra skärmen Öppna Steam-menyn - Höger styrplatta - Vänster styrplatta Styrplatta Visa tangentbord Dölj tangentbord @@ -1533,11 +1521,8 @@ Android-tangentbord Dölj ✕ Storlek på skärmen - Andel av skärmen som tangentbordet tar upp, inklusive toppfältet. Opacitet - Sänk den för att se spelet bakom tangentbordet. Dolda tangenter - Tangenter du sällan använder hålls borta från tangentbordet. Raden med Esc och funktionstangenter Ins / Del / Home / End / PgUp / PgDn Piltangenter @@ -1750,8 +1735,6 @@ Installerad %1$s - välj den i menyn Vänta tills borttagningen av körmiljön är klar Spel - pekplatta - direkt Bytet misslyckades: %1$s Kunde inte spara profilen: %1$s Skrivbordet är pausat @@ -2007,15 +1990,6 @@ Upp en nivå Välj en mapp Välj en fil - Steamblå - Himmelsblå - Vit - Lila - Grön - Bärnsten - Röd - Rosa - Grå A-knappen B-knappen X-knappen @@ -3142,7 +3116,6 @@ Experimentell huvudspårning för Pro 2. Justering av ljusstyrka och volym samt byte av visningsläge stöds inte ännu. Cardboard VR Cardboard-läge - Bilder för vänster och höger öga till ett VR-headset för mobilen. Bild Virtuell skärm Sida vid sida-3D @@ -3165,7 +3138,6 @@ Inte tillgängligt i den här sessionen. SteamVR svarade inte; kontrollera sessionsloggen. Ladda ned komponenter - Nedladdningar delas med sidan Komponenter. Välj en nedladdad version ovan för att använda den nästa gång ett spel startas. Välj en version att ladda ned Utvecklare Utgivare diff --git a/app/src/main/res/values-th/input_library.xml b/app/src/main/res/values-th/input_library.xml index 944a4aaa7..8bc21ecfd 100644 --- a/app/src/main/res/values-th/input_library.xml +++ b/app/src/main/res/values-th/input_library.xml @@ -75,14 +75,9 @@ สำเนาอิสระ เริ่มก้านที่ตำแหน่งแตะ ซ่อนก้านเมื่อไม่ใช้งาน - เครื่องมือ - อัตโนมัติ (%1$s) - กำหนดเอง (%1$s) บันทึกเป็นโปรไฟล์ใหม่ การควบคุมโปรไฟล์ - โปรไฟล์ ท่าทางทัชแพดเมาส์ - เมื่อกำหนดให้ตัวชี้เมาส์: แตะเพื่อคลิก กดค้างเพื่อลาก และเลื่อนด้วยสองนิ้ว %1$s มีการแทนที่เมนูด่วน เลือกอัตโนมัติที่นั่นเพื่อใช้โปรไฟล์เริ่มต้นและทั้งสามส่วนที่บันทึกไว้ อินพุต DroidDeck ถูกกดค้างขณะก้านถูกเลื่อนไปทุกทิศทาง: กดเมื่อเกิน 55% ปล่อยเมื่อต่ำกว่า 35% ใช้ปุ่มทิศทางเพื่อกำหนดแต่ละทิศแยกกัน คำสั่ง DroidDeck ทำงานครั้งเดียวต่อการเอียง คลิกก้านตั้งค่าแยก @@ -103,19 +98,12 @@ ย้อนกลับ · สองครั้งใน Steam หนึ่งครั้งบนเดสก์ท็อป ในโหมด Steam การกดย้อนกลับค้างจะเปิดการเข้าถึงด่วนด้วย คืนค่าเริ่มต้น - ตัวเลือกแผงของคุณจะถูกจำไว้ เดสก์ท็อปจะเปิดพื้นที่ทำงานที่สอง ไม่ได้สลับเซสชันหรือโปรไฟล์อินพุต คอนโทรลเลอร์เสมือน - ชนิดคอนโทรลเลอร์ที่ Steam หรือเกมมองเห็น หน้าจอสัมผัส - วิธีจัดการการสัมผัสบนหน้าจอเกม ปุ่มโปรไฟล์ยังคงการทำงานที่กำหนดไว้ เคอร์เซอร์สัมผัส - แสดงตัวชี้สำหรับการสัมผัสโดยตรงบนหน้าจอเกม แตะแล้วกดค้าง - การทำงานของเมาส์เมื่อกดนิ้วค้างบนหน้าจอเกม การแตะปุ่มย้อนกลับ - การทำงานแรก: แตะครั้งเดียว การทำงานที่สอง: แตะสองครั้ง ปุ่มสลับ - แตะเพื่อกดค้าง แตะอีกครั้งเพื่อปล่อย การเปิดเมนูหรือสลับโปรไฟล์จะปล่อยปุ่ม รูปร่าง มุมมน แคปซูล diff --git a/app/src/main/res/values-th/input_strings.xml b/app/src/main/res/values-th/input_strings.xml index de9275d0a..17a9eac49 100644 --- a/app/src/main/res/values-th/input_strings.xml +++ b/app/src/main/res/values-th/input_strings.xml @@ -1,6 +1,5 @@ - โปรไฟล์อินพุต โปรไฟล์ คอนโทรลเลอร์จริง หน้าจอหลัก @@ -23,7 +22,6 @@ เปิดเมนู Steam เปิดการเข้าถึงด่วนของ Steam ลบการควบคุม - เพิ่มการควบคุม ปุ่มเฉพาะอุปกรณ์ กำหนดปุ่มจริง ปล่อยปุ่ม แล้วเลือก แก้ไข ลองอีกครั้ง หรือยกเลิก B หรือย้อนกลับจะยกเลิกหลังปล่อย diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 89147a62c..36cc3dbf2 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -296,14 +296,10 @@ การสัมผัส ปุ่มด้านข้าง ปุ่มควบคุมบนหน้าจอ - Steam + QAM อัตโนมัติจะแสดงปุ่มควบคุมเมื่อไม่มีคอนโทรลเลอร์เชื่อมต่ออยู่ - การสัมผัสของ Steam (ทดลอง) - ปุ่มสัมผัสของ Steam จะเริ่มใช้งานในเซสชัน Steam ถัดไป รูปแบบปุ่มสัมผัสของ Steam ส่งออก รูปภาพ - ย้าย ปรับขนาด หรือซ่อนปุ่มสัมผัสของเกมนี้ บันทึกไปยัง Steam คอนโทรลเลอร์ วิธีที่ Steam มองเห็นคอนโทรลเลอร์ของคุณ จะมีผลในเซสชันถัดไป คอนโทรลเลอร์ Steam Deck @@ -429,7 +425,6 @@ ข้าม PulseAudio เพื่อลดความหน่วง ไมโครโฟน สำหรับการแชทด้วยเสียง - เปิดหรือปิดการรับเสียงจากไมโครโฟนสำหรับเซสชันนี้ เปลี่ยนไมโครโฟนไม่ได้ โปรดลองอีกครั้ง เครือข่าย การค้นหา Wi-Fi @@ -802,7 +797,6 @@ แป้นพิมพ์ ความหน่วง โหมดหน่วงเวลาต่ำ - ใช้ CPU และแบตเตอรี่มากขึ้น คอนโทรลเลอร์ความหน่วงต่ำ คอนโทรลเลอร์รายงานที่ 1000 Hz แทน 250 Hz ใช้ CPU เพิ่มขึ้นเล็กน้อย การสัมผัสความหน่วงต่ำ @@ -1353,12 +1347,8 @@ ความโปร่งใส %1$d%% ขนาดปุ่ม - สติ๊กแบบปรับอัตโนมัติ การสั่นของเกม เดดโซนของแอนะล็อกสติ๊ก - ปุ่ม Steam - ปุ่ม QAM - ปุ่มแป้นพิมพ์ ใช้ Joy-Con เป็นคอนโทรลเลอร์ VR ขณะที่ SteamVR ทำงาน Joy-Con แต่ละตัวจะกลายเป็นมือ ชี้ไปข้างหน้าแล้วกด Home หรือ Capture ค้างไว้เพื่อจัดให้อยู่ตรงกลางอีกครั้ง ภาพเคลื่อนไหว @@ -1486,8 +1476,6 @@ แทร็กแพด ปิดการควบคุมหน้าจอที่สอง เปิดเมนู Steam - แทร็กแพดขวา - แทร็กแพดซ้าย แทร็กแพด แสดงแป้นพิมพ์ ซ่อนแป้นพิมพ์ @@ -1526,11 +1514,8 @@ แป้นพิมพ์ Android ซ่อน ✕ ขนาดบนหน้าจอ - สัดส่วนหน้าจอที่คีย์บอร์ดใช้ รวมแถบหัวด้วย ความทึบแสง - ลดค่านี้เพื่อให้เห็นเกมด้านหลังคีย์บอร์ด ปุ่มที่ซ่อนไว้ - ปุ่มที่ใช้ไม่บ่อยจะไม่แสดงบนคีย์บอร์ด Esc และแถวปุ่มฟังก์ชัน Ins / Del / Home / End / PgUp / PgDn ปุ่มลูกศร @@ -1735,8 +1720,6 @@ ติดตั้ง %1$s แล้ว - เลือกจากเมนู รอให้การลบรันไทม์เสร็จสิ้น เกม - ทัชแพด - โดยตรง สลับล้มเหลว: %1$s บันทึกโปรไฟล์ล้มเหลว: %1$s เดสก์ท็อปหยุดชั่วคราว @@ -1983,15 +1966,6 @@ ขึ้นหนึ่งระดับ เลือกโฟลเดอร์ เลือกไฟล์ - ฟ้า Steam - ฟ้าสดใส - ขาว - ม่วง - เขียว - อำพัน - แดง - ชมพู - เทา ปุ่ม A ปุ่ม B ปุ่ม X @@ -3113,7 +3087,6 @@ การติดตามศีรษะแบบทดลองสำหรับ Pro 2 ยังไม่รองรับการปรับความสว่าง ระดับเสียง และการสลับโหมดการแสดงผล Cardboard VR โหมด Cardboard - ภาพสำหรับตาซ้ายและตาขวาสำหรับแว่น VR ของโทรศัพท์ ภาพ หน้าจอเสมือน 3D แบบเคียงข้าง @@ -3136,7 +3109,6 @@ ใช้ไม่ได้ในเซสชันนี้ SteamVR ไม่ตอบสนอง ตรวจสอบบันทึกเซสชัน ดาวน์โหลดคอมโพเนนต์ - ไฟล์ที่ดาวน์โหลดใช้ร่วมกับหน้า Components เลือกเวอร์ชันที่ดาวน์โหลดแล้วด้านบนเพื่อใช้ในการเปิดเกมครั้งถัดไป เลือกเวอร์ชันที่จะดาวน์โหลด ผู้พัฒนา ผู้จัดจำหน่าย diff --git a/app/src/main/res/values-tr/input_library.xml b/app/src/main/res/values-tr/input_library.xml index 12d264ee8..910d56cdb 100644 --- a/app/src/main/res/values-tr/input_library.xml +++ b/app/src/main/res/values-tr/input_library.xml @@ -75,14 +75,9 @@ Bağımsız kopya Çubuğu dokunma noktasında başlat Kullanılmadığında çubuğu gizle - Araçlar - Otomatik (%1$s) - Özel (%1$s) Yeni profil olarak kaydet Profil kontrolleri - Profil Fare dokunmatik yüzey hareketleri - Fare işaretçisine atandığında: tıklamak için dokunun, sürüklemek için basılı tutun ve iki parmakla kaydırın. %1$s için hızlı menü geçersiz kılması var. Varsayılan profilini ve üç kayıtlı bölümünü kullanmak için orada Otomatik seçin. DroidDeck girişi Çubuk herhangi bir yöne hareket ettirildiğinde basılı tutulur: %55 üzerinde basılır, %35 altında bırakılır. Her yönü ayrı atamak için Yön tuşlarını kullanın. DroidDeck komutları her sapma için bir kez çalışır. Çubuk tıklaması ayrıca yapılandırılır. @@ -103,19 +98,12 @@ 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 - Oyun ekranındaki dokunuşların nasıl işlendiği. Profil düğmeleri atanmış eylemlerini korur. Dokunma imleci - Oyun ekranındaki doğrudan dokunuşlar için işaretçi göster. Dokun ve tut - Oyun ekranında parmağınızı tutarken fare eylemi. Geri düğmesi dokunuşları - İlk eylem: tek dokunuş. İkinci eylem: çift dokunuş. Aç/kapa düğmesi - Basılı tutmak için dokunun, bırakmak için tekrar dokunun. Menü açmak veya profil değiştirmek düğmeyi bırakır. Şekil Yuvarlatılmış Kapsül diff --git a/app/src/main/res/values-tr/input_strings.xml b/app/src/main/res/values-tr/input_strings.xml index 1a3fa61ca..d071c4b77 100644 --- a/app/src/main/res/values-tr/input_strings.xml +++ b/app/src/main/res/values-tr/input_strings.xml @@ -1,6 +1,5 @@ - Giriş profilleri Profiller Fiziksel denetleyici Ana ekran @@ -23,7 +22,6 @@ Steam menüsünü aç Steam hızlı erişimini aç Denetimi kaldır - Denetim ekle Cihaza özel düğmeler Fiziksel düğme ata Düğmeyi bırakın, ardından Düzenle, Yeniden dene veya İptal seçin. B veya Geri, bıraktıktan sonra iptal eder. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 84ccc32c3..ce681b142 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -296,14 +296,10 @@ Dokunma Yan düğme Ekran üstü kontroller - Steam + QAM Otomatik, kumanda bağlı değilken kontrolleri gösterir. - Steam dokunmatik (beta) - Steam\'in dokunmatik kontrolleri sonraki Steam oturumunda başlar Steam dokunmatik düzeni Dışa aktar Görsel - Bu oyunun dokunmatik kontrollerini taşıyın, boyutlandırın veya gizleyin; Steam\'e kaydedilir Kumanda Steam\'in kumandanızı nasıl gördüğü. Sonraki oturumda uygulanır. Steam Deck kumandası @@ -430,7 +426,6 @@ Daha düşük gecikme için PulseAudio\'yu atlar. Mikrofon Sesli sohbet için. - Bu oturum için mikrofon kaydını açın veya kapatın. Mikrofon değiştirilemedi. Lütfen tekrar deneyin. Ağ Wi-Fi keşfi @@ -804,7 +799,6 @@ Klavye Gecikme Düşük gecikme modu - CPU ve pil kullanımını artırır Düşük gecikmeli kumanda Kumanda 250 Hz yerine 1000 Hz bildirir. CPU kullanımı biraz artar. Düşük gecikmeli dokunma @@ -1351,12 +1345,8 @@ Opaklık %1$d%% Düğme boyutu - Uyarlanabilir çubuklar Oyun titreşimi Çubuk ölü bölgesi - Steam düğmesi - QAM düğmesi - Klavye düğmesi VR kumandası olarak Joy-Con\'lar SteamVR çalışırken her Joy-Con bir el olur. Öne doğrultun ve yeniden ortalamak için Home veya Capture düğmesini basılı tutun. Animasyonlar @@ -1485,8 +1475,6 @@ Dokunmatik yüzey İkinci ekran kontrollerini kapat Steam menüsünü aç - Sağ dokunmatik yüzey - Sol dokunmatik yüzey Dokunmatik yüzey Klavyeyi göster Klavyeyi gizle @@ -1525,11 +1513,8 @@ Android klavyesi Gizle ✕ Ekrandaki boyut - Başlık dahil, klavyenin ekranda kapladığı oran. Opaklık - Klavyenin arkasındaki oyunu görmek için azaltın. Gizli tuşlar - Az kullandığınız tuşlar klavyede gösterilmez. Esc ve işlev tuşları sırası Ins / Del / Home / End / PgUp / PgDn Ok tuşları @@ -1742,8 +1727,6 @@ %1$s yüklendi - menüden seçin Çalışma ortamının kaldırılmasının bitmesini bekleyin Oyun - dokunmatik yüzey - doğrudan Değiştirme başarısız oldu: %1$s Profil kaydedilemedi: %1$s Masaüstü duraklatıldı @@ -1999,15 +1982,6 @@ Bir üst düzey Bir klasör seçin Bir dosya seçin - Steam mavisi - Gök mavisi - Beyaz - Mor - Yeşil - Kehribar - Kırmızı - Pembe - Gri A düğmesi B düğmesi X düğmesi @@ -3131,7 +3105,6 @@ Pro 2 için deneysel baş takibi. Parlaklık ve ses düzeyi ayarı ile ekran modu değiştirme henüz desteklenmiyor. Cardboard VR Cardboard modu - Telefon VR gözlüğü için sol ve sağ göz görüntüleri. Görüntü Sanal ekran Yan yana 3D @@ -3154,7 +3127,6 @@ Bu oturumda kullanılamaz. SteamVR yanıt vermedi; oturum günlüğünü kontrol et. Bileşenleri indir - İndirmeler Bileşenler sayfasıyla paylaşılır. Bir sonraki oyun başlatmada kullanmak için yukarıdan indirilmiş bir sürüm seç. İndirilecek sürümü seç Geliştirici Yayıncı diff --git a/app/src/main/res/values-uk/input_library.xml b/app/src/main/res/values-uk/input_library.xml index f2504dde5..b5f93ba4b 100644 --- a/app/src/main/res/values-uk/input_library.xml +++ b/app/src/main/res/values-uk/input_library.xml @@ -75,14 +75,9 @@ Незалежна копія Починати стік від точки дотику Ховати стік, коли він не використовується - Інструменти - Авто (%1$s) - Користувацький (%1$s) Зберегти як новий профіль Керування профілю - Профіль Жести тачпада миші - Якщо призначено вказівнику миші: торкніться для кліку, утримуйте для перетягування та прокручуйте двома пальцями. Для %1$s задано перевизначення швидкого меню. Виберіть «Авто», щоб використати профіль за замовчуванням і всі три збережені частини. Введення DroidDeck Утримується, поки стік відхилено в будь-якому напрямку: натискання вище 55%, відпускання нижче 35%. Використовуйте «Клавіші напрямків», щоб призначити кожен напрямок окремо. Команди DroidDeck спрацьовують раз на відхилення. Натискання стіка налаштовується окремо. @@ -103,19 +98,12 @@ Назад · двічі в Steam, один раз у робочому столі У режимі Steam. Утримання «Назад» також відкриває швидкий доступ. Відновити типове - Ваш вибір панелі запам\'ятовується. Робочий стіл відкриває другий робочий простір; він не перемикає сеанс або його профіль введення. Віртуальний контролер - Тип контролера, який бачать Steam або гра. Сенсорний екран - Як обробляються дотики на екрані гри. Кнопки профілю зберігають призначені дії. Курсор дотику - Показувати вказівник для прямих дотиків на екрані гри. Торкнутися й утримувати - Дія миші при утриманні пальця на екрані гри. Натискання кнопки «Назад» - Перша дія: одне натискання. Друга дія: подвійне натискання. Кнопка-перемикач - Торкніться, щоб утримувати, торкніться ще раз, щоб відпустити. Відкриття меню або зміна профілю відпускає кнопку. Форма Заокруглена Капсула diff --git a/app/src/main/res/values-uk/input_strings.xml b/app/src/main/res/values-uk/input_strings.xml index 665ae8d46..456963a24 100644 --- a/app/src/main/res/values-uk/input_strings.xml +++ b/app/src/main/res/values-uk/input_strings.xml @@ -1,6 +1,5 @@ - Профілі введення Профілі Фізичний контролер Головний екран @@ -23,7 +22,6 @@ Відкрити меню Steam Відкрити швидкий доступ Steam Видалити елемент - Додати елемент Кнопки конкретного пристрою Призначити фізичну кнопку Відпустіть кнопку, потім виберіть «Редагувати», «Повторити» або «Скасувати». B або «Назад» скасовує після відпускання. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 17d3a8383..4ab72b177 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -296,14 +296,10 @@ Сенсорне введення Бічна кнопка Екранне керування - Steam + QAM «Авто» показує екранне керування, коли контролер не під’єднано. - Сенсорне керування Steam (бета) - Сенсорне керування Steam увімкнеться з наступним сеансом Steam Розкладка сенсорного керування Steam Експорт Зображення - Переміщуйте, змінюйте розмір або приховуйте сенсорні елементи керування цієї гри; зберігається в Steam Контролер Яким Steam бачить ваш контролер. Застосовується в наступному сеансі. Контролер Steam Deck @@ -432,7 +428,6 @@ Обходить PulseAudio для меншої затримки. Мікрофон Для голосового чату. - Увімкнути або вимкнути захоплення мікрофона в цьому сеансі. Не вдалося змінити мікрофон. Спробуйте ще раз. Мережа Пошук Wi-Fi @@ -808,7 +803,6 @@ Клавіатура Затримка Режим низької затримки - Збільшує навантаження на CPU та витрату батареї Контролер із низькою затримкою Контролер звітує на 1000 Hz замість 250 Hz. Трохи більше навантаження на CPU. Дотик із низькою затримкою @@ -1373,12 +1367,8 @@ Непрозорість %1$d%% Розмір кнопок - Адаптивні стики Вібрація гри Мертва зона стіка - Кнопка Steam - Кнопка QAM - Кнопка клавіатури Joy-Con як VR-контролери Поки працює SteamVR, кожен Joy-Con стає рукою. Спрямуйте його вперед і утримуйте Home або Capture, щоб знову його відцентрувати. Анімації @@ -1509,8 +1499,6 @@ Трекпад Закрити керування на другому екрані Відкрити меню Steam - Правий трекпад - Лівий трекпад Трекпад Показати клавіатуру Сховати клавіатуру @@ -1549,11 +1537,8 @@ Клавіатура Android Сховати ✕ Розмір на екрані - Частка екрана, яку займає клавіатура, включно з заголовком. Непрозорість - Зменште, щоб бачити гру під клавіатурою. Приховані клавіші - Клавіші, якими ви рідко користуєтеся, не відображаються на клавіатурі. Esc і рядок функційних клавіш Ins / Del / Home / End / PgUp / PgDn Клавіші зі стрілками @@ -1782,8 +1767,6 @@ Встановлено %1$s — виберіть його в меню Дочекайтеся завершення видалення середовища Гра - тачпад - прямий Не вдалося замінити: %1$s Не вдалося зберегти профіль: %1$s Робочий стіл призупинено @@ -2057,15 +2040,6 @@ На рівень вище Виберіть папку Виберіть файл - Синій Steam - Небесний - Білий - Фіолетовий - Зелений - Бурштиновий - Червоний - Рожевий - Сірий Кнопка A Кнопка B Кнопка X @@ -3202,7 +3176,6 @@ Експериментальне відстеження рухів голови для Pro 2. Налаштування яскравості й гучності та перемикання режимів відображення ще не підтримуються. Cardboard VR Режим Cardboard - Зображення для лівого й правого ока для VR-окулярів під телефон. Зображення Віртуальний екран Стереопара 3D @@ -3225,7 +3198,6 @@ Недоступно в цій сесії. SteamVR не відповідає; перевірте журнал сесії. Завантажити компоненти - Завантаження спільні зі сторінкою «Компоненти». Виберіть вище завантажену версію, щоб використати її під час наступного запуску гри. Виберіть версію для завантаження Розробник Видавець diff --git a/app/src/main/res/values-vi/input_library.xml b/app/src/main/res/values-vi/input_library.xml index 6b75fe7fd..c22509276 100644 --- a/app/src/main/res/values-vi/input_library.xml +++ b/app/src/main/res/values-vi/input_library.xml @@ -75,14 +75,9 @@ Bản sao độc lập Bắt đầu cần tại điểm chạm Ẩn cần khi không dùng - Công cụ - Tự động (%1$s) - Tùy chỉnh (%1$s) Lưu thành hồ sơ mới Điều khiển hồ sơ - Hồ sơ Cử chỉ bàn di chuột - Khi gán cho con trỏ chuột: chạm để nhấp, giữ để kéo và cuộn bằng hai ngón. %1$s có ghi đè menu nhanh. Chọn Tự động ở đó để dùng hồ sơ mặc định và cả ba phần đã lưu. Đầu vào DroidDeck Giữ khi cần được đẩy theo mọi hướng: nhấn trên 55%, nhả dưới 35%. Dùng Phím hướng để gán từng hướng riêng. Lệnh DroidDeck chạy một lần mỗi lần lệch. Nhấp cần được cấu hình riêng. @@ -103,19 +98,12 @@ 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 - Cách xử lý các lần chạm trên màn hình trò chơi. Các nút hồ sơ giữ hành động đã gán. Con trỏ chạm - Hiện con trỏ cho các lần chạm trực tiếp trên màn hình trò chơi. Chạm và giữ - Hành động chuột khi giữ ngón tay trên màn hình trò chơi. Chạm nút Quay lại - Hành động thứ nhất: một lần chạm. Hành động thứ hai: hai lần chạm. Nút bật/tắt - Chạm để giữ, chạm lại để nhả. Mở menu hoặc đổi hồ sơ sẽ nhả nút. Hình dạng Bo tròn Viên nang diff --git a/app/src/main/res/values-vi/input_strings.xml b/app/src/main/res/values-vi/input_strings.xml index 3b2a6cff5..c7dcbbc48 100644 --- a/app/src/main/res/values-vi/input_strings.xml +++ b/app/src/main/res/values-vi/input_strings.xml @@ -1,6 +1,5 @@ - Hồ sơ đầu vào Hồ sơ Tay cầm vật lý Màn hình chính @@ -23,7 +22,6 @@ Mở menu Steam Mở truy cập nhanh Steam Xóa điều khiển - Thêm điều khiển Nút riêng cho thiết bị Gán một nút vật lý Nhả nút, sau đó chọn Sửa, Thử lại hoặc Hủy. B hoặc Quay lại sẽ hủy sau khi nhả. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 34ec1d90b..873b7398c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -296,14 +296,10 @@ Chạm Nút bên Điều khiển trên màn hình - Steam + QAM Tự động hiện các nút điều khiển khi không có tay cầm kết nối. - Chạm Steam (beta) - Các nút chạm của Steam bắt đầu từ phiên Steam kế tiếp Bố cục chạm Steam Xuất Hình ảnh - Di chuyển, đổi kích thước hoặc ẩn các nút chạm của game này; được lưu vào Steam Tay cầm Cách Steam nhận dạng tay cầm của bạn. Áp dụng từ phiên sau. Tay cầm Steam Deck @@ -429,7 +425,6 @@ Bỏ qua PulseAudio để giảm độ trễ. Micro Dùng cho chat bằng giọng nói. - Bật hoặc tắt thu micro cho phiên này. Không thể thay đổi micro. Vui lòng thử lại. Mạng Dò tìm Wi-Fi @@ -802,7 +797,6 @@ Bàn phím Độ trễ Chế độ độ trễ thấp - Tăng mức dùng CPU và pin Tay cầm độ trễ thấp Tay cầm báo cáo ở 1000 Hz thay vì 250 Hz. Tốn thêm một chút CPU. Cảm ứng độ trễ thấp @@ -1353,12 +1347,8 @@ Độ mờ %1$d%% Kích thước nút - Cần thích ứng Rung khi chơi game Vùng chết của cần điều khiển - Nút Steam - Nút QAM - Nút bàn phím Dùng Joy-Con làm tay cầm VR Khi SteamVR đang chạy, mỗi Joy-Con trở thành một bàn tay. Hướng nó về phía trước rồi giữ Home hoặc Capture để căn giữa lại. Hiệu ứng chuyển động @@ -1486,8 +1476,6 @@ Trackpad Đóng điều khiển màn hình phụ Mở menu Steam - Trackpad phải - Trackpad trái Trackpad Hiện bàn phím Ẩn bàn phím @@ -1526,11 +1514,8 @@ Bàn phím Android Ẩn ✕ Kích thước trên màn hình - Tỷ lệ màn hình mà bàn phím chiếm, bao gồm cả thanh tiêu đề. Độ mờ - Giảm giá trị này để thấy game phía sau bàn phím. Phím ẩn - Những phím ít dùng sẽ không xuất hiện trên bàn phím. Esc và hàng phím chức năng Ins / Del / Home / End / PgUp / PgDn Phím mũi tên @@ -1735,8 +1720,6 @@ Đã cài %1$s - chọn nó trong menu Chờ việc gỡ runtime hoàn tất Game - touchpad - trực tiếp Thay thất bại: %1$s Lưu hồ sơ thất bại: %1$s Desktop đang tạm dừng @@ -1983,15 +1966,6 @@ Lên một cấp Chọn một thư mục Chọn một tệp - Xanh Steam - Xanh da trời - Trắng - Tím - Xanh lá - Hổ phách - Đỏ - Hồng - Xám Nút A Nút B Nút X @@ -3113,7 +3087,6 @@ Theo dõi chuyển động đầu thử nghiệm cho Pro 2. Chưa hỗ trợ điều chỉnh độ sáng, âm lượng và chuyển chế độ hiển thị. Cardboard VR Chế độ Cardboard - Hình cho mắt trái và mắt phải dành cho kính VR điện thoại. Hình ảnh Màn hình ảo 3D cạnh nhau @@ -3136,7 +3109,6 @@ Không khả dụng trong phiên này. SteamVR không phản hồi; hãy xem nhật ký phiên. Tải thành phần - Bản tải xuống được dùng chung với trang Components. Chọn một phiên bản đã tải ở trên để dùng vào lần khởi chạy game kế tiếp. Chọn phiên bản để tải Nhà phát triển Nhà phát hành 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..ed67f34cf 100644 --- a/app/src/main/res/values-zh-rCN/input_library.xml +++ b/app/src/main/res/values-zh-rCN/input_library.xml @@ -75,14 +75,9 @@ 独立副本 从按下位置开始 不使用时隐藏摇杆 - 工具 - 自动 (%1$s) - 自定义 (%1$s) 另存为新配置 配置控制 - 配置 鼠标触控板手势 - 绑定到鼠标指针时:轻点点击、按住拖动、双指滚动。 %1$s 有快捷菜单覆盖。在那里选「自动」会使用它的默认配置和全部三个已保存部分。 DroidDeck 输入 摇杆朝任意方向推动期间保持:超过 55% 时按下,低于 35% 时松开。用「方向键」逐方向指定。DroidDeck 动作每次推动只执行一次。摇杆点击单独设置。 @@ -103,19 +98,12 @@ 返回 · Steam 里两下,桌面上一下 Steam 模式下。按住返回也会打开快捷菜单。 恢复默认 - 面板选择会被记住。桌面会打开第二个工作区,不切换会话或它的输入配置。 虚拟手柄 - Steam 或游戏看到的手柄类型。 触摸屏 - 游戏画面上的触摸如何处理。配置里的按键保持各自指定的动作。 触摸光标 - 在游戏画面上直接触摸时显示指针。 触摸并按住 - 手指按住游戏画面时的鼠标动作。 返回键点击 - 第一个动作:单击。第二个动作:双击。 开关按键 - 点一下按住,再点一下松开。打开菜单或切换配置会松开按键。 形状 圆角 胶囊 diff --git a/app/src/main/res/values-zh-rCN/input_strings.xml b/app/src/main/res/values-zh-rCN/input_strings.xml index dabfb3b4e..752003c42 100644 --- a/app/src/main/res/values-zh-rCN/input_strings.xml +++ b/app/src/main/res/values-zh-rCN/input_strings.xml @@ -1,6 +1,5 @@ - 输入配置 配置 物理手柄 主屏 @@ -23,7 +22,6 @@ 打开 Steam 菜单 打开 Steam 快捷菜单 移除控件 - 添加控件 本设备专用按键 指定物理按键 松开按键,然后选择编辑、重试或取消。松开后按 B 或返回可取消。 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index aa10c5ccf..234847fc5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -296,14 +296,10 @@ 触摸 侧键 屏幕控制 - Steam + QAM 自动模式会在未连接手柄时显示屏幕控制。 - Steam 触控(测试版) - Steam 的触控按键将从下次 Steam 会话开始生效 Steam 触控布局 导出 图片 - 移动、调整大小或隐藏此游戏的触控按键;保存到 Steam 手柄 决定 Steam 把你的手柄识别为哪种类型,将在下次会话生效。 Steam Deck 手柄 @@ -429,7 +425,6 @@ 绕过 PulseAudio 以降低延迟。 麦克风 用于语音聊天。 - 为此会话开启或关闭麦克风采集。 无法更改麦克风设置。请重试。 网络 Wi-Fi 网络发现 @@ -802,7 +797,6 @@ 键盘 延迟 低延迟模式 - 会增加 CPU 和电池消耗 低延迟手柄 手柄以 1000 Hz 而非 250 Hz 上报。CPU 占用略高。 低延迟触控 @@ -1436,12 +1430,8 @@ 不透明度 %1$d%% 按钮大小 - 自适应摇杆 游戏震动 摇杆死区 - Steam 按钮 - QAM 按钮 - 键盘按钮 将 Joy-Con 用作 VR 手柄 SteamVR 运行时,每个 Joy-Con 都会成为一只手。将其指向前方并按住 HOME 键或截图键即可重新居中。 动画 @@ -1569,8 +1559,6 @@ 触控板 关闭副屏控制 打开 Steam 菜单 - 右触控板 - 左触控板 触控板 显示键盘 隐藏键盘 @@ -1609,11 +1597,8 @@ Android 键盘 隐藏 ✕ 屏幕占比 - 键盘占屏幕的比例,含标题栏 不透明度 - 调低即可看见键盘后的游戏 隐藏按键 - 很少用的按键不显示在键盘上 Esc 和功能键行 Ins / Del / Home / End / PgUp / PgDn 方向键 @@ -1812,8 +1797,6 @@ 已安装 %1$s — 请在菜单中选择它 请等待运行时移除完成 游戏 - 触控板 - 直接 替换失败:%1$s 配置档案保存失败:%1$s 桌面已暂停 @@ -2060,15 +2043,6 @@ 返回上一级 选择文件夹 选择文件 - Steam 蓝 - 天蓝 - 白色 - 紫罗兰 - 绿色 - 琥珀 - 红色 - 粉色 - 灰色 A 键 B 键 X 键 @@ -3121,7 +3095,6 @@ %1$d 分钟 Cardboard VR Cardboard 模式 - 为手机 VR 眼镜提供左右眼画面。 画面 虚拟屏幕 左右并排 3D @@ -3144,7 +3117,6 @@ 此会话中不可用。 SteamVR 未响应;请查看会话日志。 下载组件 - 下载内容与“组件”页面共享。在上方选择已下载的版本,即可在下次启动游戏时使用。 选择要下载的版本 画面位置 置顶 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..05774dac0 100644 --- a/app/src/main/res/values-zh-rHK/input_library.xml +++ b/app/src/main/res/values-zh-rHK/input_library.xml @@ -75,14 +75,9 @@ 獨立副本 從按下位置開始 不使用時隱藏搖桿 - 工具 - 自動 (%1$s) - 自訂 (%1$s) 另存為新設定檔 設定檔控制 - 設定檔 滑鼠觸控板手勢 - 綁定到滑鼠指標時:輕點點擊、按住拖曳、雙指捲動。 %1$s 有快速選單覆寫。在那裡選「自動」會使用它的預設設定檔與全部三個已儲存部分。 DroidDeck 輸入 搖桿朝任意方向推動期間保持:超過 55% 時按下,低於 35% 時放開。用「方向鍵」逐方向指定。DroidDeck 動作每次推動只執行一次。搖桿點擊另外設定。 @@ -103,19 +98,12 @@ 返回 · Steam 裡兩下,桌面上一下 Steam 模式下。按住返回也會開啟快速選單。 恢復預設 - 面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。 虛擬控制器 - Steam 或遊戲看到的控制器類型。 觸控螢幕 - 遊戲畫面上的觸碰如何處理。設定檔裡的按鍵保持各自指定的動作。 觸碰游標 - 在遊戲畫面上直接觸碰時顯示指標。 觸碰並按住 - 手指按住遊戲畫面時的滑鼠動作。 返回鍵點擊 - 第一個動作:單擊。第二個動作:雙擊。 開關按鍵 - 點一下按住,再點一下放開。開啟選單或切換設定檔會放開按鍵。 形狀 圓角 膠囊 diff --git a/app/src/main/res/values-zh-rHK/input_strings.xml b/app/src/main/res/values-zh-rHK/input_strings.xml index 713cc729e..2ba76aa42 100644 --- a/app/src/main/res/values-zh-rHK/input_strings.xml +++ b/app/src/main/res/values-zh-rHK/input_strings.xml @@ -1,6 +1,5 @@ - 輸入設定檔 設定檔 實體控制器 主螢幕 @@ -23,7 +22,6 @@ 開啟 Steam 選單 開啟 Steam 快速選單 移除控制項 - 新增控制項 此裝置專用按鍵 指定實體按鍵 放開按鍵,然後選擇編輯、重試或取消。放開後按 B 或返回可取消。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d86325fe0..a2eeb3b08 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -296,14 +296,10 @@ 觸控 側鍵 螢幕控制 - Steam + QAM 「自動」會在未連接控制器時顯示螢幕控制。 - Steam 觸控(測試版) - Steam 的觸控控制會在下次 Steam 會話啟用 Steam 觸控佈局 匯出 圖片 - 移動、調整大小或隱藏此遊戲的觸控控制;會儲存至 Steam 控制器 Steam 如何識別你的控制器。下次會話生效。 Steam Deck 控制器 @@ -429,7 +425,6 @@ 繞過 PulseAudio 以減低延遲。 麥克風 用於語音聊天。 - 為此會話開啟或關閉麥克風收音。 無法變更麥克風設定,請再試一次。 網絡 Wi-Fi 探索 @@ -802,7 +797,6 @@ 鍵盤 延遲 低延遲模式 - 會增加 CPU 和電池用量 低延遲控制器 控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。 低延遲觸控 @@ -1352,12 +1346,8 @@ 不透明度 %1$d%% 按鍵大小 - 自動調整搖桿 遊戲震動 搖桿死區 - Steam 按鈕 - QAM 按鈕 - 鍵盤按鈕 將 Joy-Con 用作 VR 控制器 SteamVR 執行時,每個 Joy-Con 都會變成一隻手。將它指向前方並按住 HOME 鍵或擷取鍵,即可重新置中。 動畫 @@ -1485,8 +1475,6 @@ 觸控板 關閉第二螢幕控制 開啟 Steam 選單 - 右側觸控板 - 左側觸控板 觸控板 顯示鍵盤 隱藏鍵盤 @@ -1525,11 +1513,8 @@ Android 鍵盤 隱藏 ✕ 畫面佔比 - 鍵盤佔用的畫面比例,包括標題列。 不透明度 - 調低即可看到鍵盤後方的遊戲畫面。 隱藏按鍵 - 少用的按鍵不會顯示在鍵盤上。 Esc 與功能鍵列 Ins / Del / Home / End / PgUp / PgDn 方向鍵 @@ -1734,8 +1719,6 @@ 已安裝 %1$s - 請在選單中選擇 請等待運行環境移除完成 遊戲 - 觸控板 - 直接 替換失敗:%1$s 設定檔儲存失敗:%1$s 桌面已暫停 @@ -1982,15 +1965,6 @@ 返回上一層 選擇資料夾 選擇檔案 - Steam 藍 - 天藍 - 白色 - 紫羅蘭 - 綠色 - 琥珀色 - 紅色 - 粉紅色 - 灰色 A 鍵 B 鍵 X 鍵 @@ -3118,7 +3092,6 @@ %1$d 分鐘 Cardboard VR Cardboard 模式 - 為手機 VR 眼鏡提供左右眼畫面。 畫面 虛擬螢幕 左右並排 3D @@ -3141,7 +3114,6 @@ 此工作階段中無法使用。 SteamVR 沒有回應;請查看工作階段日誌。 下載元件 - 下載內容與「元件」頁面共用。在上方選擇已下載的版本,即可在下次啟動遊戲時使用。 選擇要下載的版本 畫面位置 置頂 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..05774dac0 100644 --- a/app/src/main/res/values-zh-rTW/input_library.xml +++ b/app/src/main/res/values-zh-rTW/input_library.xml @@ -75,14 +75,9 @@ 獨立副本 從按下位置開始 不使用時隱藏搖桿 - 工具 - 自動 (%1$s) - 自訂 (%1$s) 另存為新設定檔 設定檔控制 - 設定檔 滑鼠觸控板手勢 - 綁定到滑鼠指標時:輕點點擊、按住拖曳、雙指捲動。 %1$s 有快速選單覆寫。在那裡選「自動」會使用它的預設設定檔與全部三個已儲存部分。 DroidDeck 輸入 搖桿朝任意方向推動期間保持:超過 55% 時按下,低於 35% 時放開。用「方向鍵」逐方向指定。DroidDeck 動作每次推動只執行一次。搖桿點擊另外設定。 @@ -103,19 +98,12 @@ 返回 · Steam 裡兩下,桌面上一下 Steam 模式下。按住返回也會開啟快速選單。 恢復預設 - 面板選擇會被記住。桌面會開啟第二個工作區,不切換工作階段或其輸入設定檔。 虛擬控制器 - Steam 或遊戲看到的控制器類型。 觸控螢幕 - 遊戲畫面上的觸碰如何處理。設定檔裡的按鍵保持各自指定的動作。 觸碰游標 - 在遊戲畫面上直接觸碰時顯示指標。 觸碰並按住 - 手指按住遊戲畫面時的滑鼠動作。 返回鍵點擊 - 第一個動作:單擊。第二個動作:雙擊。 開關按鍵 - 點一下按住,再點一下放開。開啟選單或切換設定檔會放開按鍵。 形狀 圓角 膠囊 diff --git a/app/src/main/res/values-zh-rTW/input_strings.xml b/app/src/main/res/values-zh-rTW/input_strings.xml index 713cc729e..2ba76aa42 100644 --- a/app/src/main/res/values-zh-rTW/input_strings.xml +++ b/app/src/main/res/values-zh-rTW/input_strings.xml @@ -1,6 +1,5 @@ - 輸入設定檔 設定檔 實體控制器 主螢幕 @@ -23,7 +22,6 @@ 開啟 Steam 選單 開啟 Steam 快速選單 移除控制項 - 新增控制項 此裝置專用按鍵 指定實體按鍵 放開按鍵,然後選擇編輯、重試或取消。放開後按 B 或返回可取消。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cb8df3aec..76d7d67f3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -296,14 +296,10 @@ 觸控 側鍵 螢幕控制 - Steam + QAM 自動模式會在未連接控制器時顯示螢幕控制。 - Steam 觸控(測試版) - Steam 觸控控制會在下次 Steam 工作階段啟用 Steam 觸控版面配置 匯出 圖片 - 移動、調整大小或隱藏這款遊戲的觸控控制;會儲存到 Steam 控制器 Steam 辨識你的控制器的方式。下次工作階段生效。 Steam Deck 控制器 @@ -429,7 +425,6 @@ 繞過 PulseAudio 以降低延遲。 麥克風 用於語音聊天。 - 為此工作階段開啟或關閉麥克風收音。 無法變更麥克風設定,請再試一次。 網路 Wi-Fi 探索 @@ -802,7 +797,6 @@ 鍵盤 延遲 低延遲模式 - 會增加 CPU 和電池用量 低延遲控制器 控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。 低延遲觸控 @@ -1352,12 +1346,8 @@ 不透明度 %1$d%% 按鍵大小 - 自適應搖桿 遊戲震動 搖桿死區 - Steam 按鈕 - QAM 按鈕 - 鍵盤按鈕 將 Joy-Con 當作 VR 控制器 SteamVR 執行時,每個 Joy-Con 都會變成一隻手。將它指向前方並按住 HOME 鍵或擷取鍵,即可重新置中。 動畫 @@ -1485,8 +1475,6 @@ 觸控板 關閉第二螢幕控制 開啟 Steam 選單 - 右側觸控板 - 左側觸控板 觸控板 顯示鍵盤 隱藏鍵盤 @@ -1525,11 +1513,8 @@ Android 鍵盤 隱藏 ✕ 在螢幕上的大小 - 鍵盤佔用螢幕的比例,包含標題列。 不透明度 - 調低即可看見鍵盤後方的遊戲畫面。 隱藏按鍵 - 少用的按鍵不會顯示在鍵盤上。 Esc 與功能鍵列 Ins / Del / Home / End / PgUp / PgDn 方向鍵 @@ -1734,8 +1719,6 @@ 已安裝 %1$s - 請在選單中選擇 請等待執行環境移除完成 遊戲 - 觸控板 - 直接 換入失敗:%1$s 設定檔儲存失敗:%1$s 桌面已暫停 @@ -1982,15 +1965,6 @@ 返回上一層 選擇資料夾 選擇檔案 - Steam 藍 - 天藍 - 白色 - 紫羅蘭 - 綠色 - 琥珀 - 紅色 - 粉紅 - 灰色 A 按鈕 B 按鈕 X 按鈕 @@ -3118,7 +3092,6 @@ %1$d 分鐘 Cardboard VR Cardboard 模式 - 為手機 VR 眼鏡提供左右眼畫面。 畫面 虛擬螢幕 左右並排 3D @@ -3141,7 +3114,6 @@ 這個工作階段無法使用。 SteamVR 沒有回應;請查看工作階段記錄。 下載元件 - 下載內容與「元件」頁面共用。在上方選擇已下載的版本,即可在下次啟動遊戲時使用。 選擇要下載的版本 畫面位置 置頂 diff --git a/app/src/main/res/values/input_library.xml b/app/src/main/res/values/input_library.xml index 27d018b6e..fa082e4d7 100644 --- a/app/src/main/res/values/input_library.xml +++ b/app/src/main/res/values/input_library.xml @@ -75,14 +75,9 @@ Independent copy Start stick at touch position Hide stick when not in use - Tools - Auto (%1$s) - Custom (%1$s) Save as new profile Profile controls - Profile Mouse touchpad gestures - When assigned to the mouse pointer: tap to click, hold to drag, and scroll with two fingers. %1$s has a quick-menu override. Select Auto there to use its default profile and all three saved parts. DroidDeck Input Held while the stick is moved in any direction: press above 55%, release below 35%. Use Direction keys to assign each direction separately. DroidDeck commands run once per deflection. The stick click is configured separately. @@ -103,19 +98,12 @@ 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 - How touches on the game screen are handled. Profile buttons keep their assigned actions. Touch cursor - Show a pointer for direct touches on the game screen. Touch and hold - Mouse action when holding a finger on the game screen. Back button taps - First action: single tap. Second action: double tap. Toggle button - Tap to hold, tap again to release. Opening a menu or switching profiles releases the button. Shape Rounded Pill diff --git a/app/src/main/res/values/input_strings.xml b/app/src/main/res/values/input_strings.xml index bc18c561a..91b85c54b 100644 --- a/app/src/main/res/values/input_strings.xml +++ b/app/src/main/res/values/input_strings.xml @@ -1,5 +1,4 @@ - Input profiles Profiles Physical controller Main screen @@ -22,7 +21,6 @@ Open Steam menu Open Steam quick access Remove control - Add control Device-specific buttons Assign a physical button Release the button, then choose Edit, Retry, or Cancel. B or Back cancels after release. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62bfb65a5..8f4b5dacc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -324,22 +324,16 @@ Touch Side button On-screen controls - Steam + QAM Auto shows the controls when no controller is connected. - Steam touch (beta) On-screen controls · %1$s Layout Gamepad Steam layout - Saved for this game - Default for games without their own Edit layout Show - Auto hides them while you use a controller. More controller settings Shortcuts, latency and the PC keyboard Touches elsewhere - What touches outside the controls do. Remap buttons Mouse Keep editing @@ -352,11 +346,9 @@ %1$s · saved for %2$s %1$s · default for games without their own Controller in use. Touch the screen to show the controls. - Steam\'s touch controls start with the next Steam session Steam touch layout Image Export - Move, resize or hide this game\'s touch controls; saved to Steam Controller How Steam sees your controller. Applies next session. Steam Deck controller @@ -483,7 +475,6 @@ Bypasses PulseAudio for lower latency. Microphone For voice chat. - Turn microphone capture on or off for this session. Could not change the microphone. Please try again. Network Wi-Fi discovery @@ -825,12 +816,9 @@ Scaling mode Scaling sharpness Edit profile - Choose which profile to change screen effects for. Current session (automatic) Reset effects - Restore the default-off effect values for this profile. Delete saved override - Remove saved effects for this game so it inherits the Default profile. Screen effects Live. Costs a little GPU time while any effect is on. Presets @@ -843,7 +831,6 @@ Fake HDR Cardboard VR Cardboard mode - Left and right eye views for a phone VR viewer. Picture Virtual screen Side-by-side 3D @@ -890,7 +877,6 @@ Keyboard Latency Low latency mode - Increases CPU and battery usage Low-latency controller Pad reports at 1000 Hz instead of 250 Hz. Slightly more CPU. Low-latency touch @@ -941,7 +927,6 @@ Original Import and delete on the Components page. Download components - Downloads are shared with the Components page. Choose a downloaded version above to use it on the next game launch. Choose a version to download Done Needs attention @@ -1523,12 +1508,8 @@ Opacity %1$d%% Button size - Adaptive sticks Game vibration Stick dead zone - Steam button - QAM button - Keyboard button Joy-Cons as VR controllers While SteamVR runs, each Joy-Con becomes a hand. Point it ahead and hold Home or Capture to recenter it. Animations @@ -1718,8 +1699,6 @@ Trackpad Close second-screen controls Open Steam menu - Right trackpad - Left trackpad Trackpad Show keyboard Hide keyboard @@ -1758,11 +1737,8 @@ Android keyboard Hide ✕ Size on screen - Share of the screen the keyboard takes, header included. Opacity - Lower it to see the game behind the keyboard. Hidden keys - Keys you rarely use stay off the keyboard. Esc and function row Ins / Del / Home / End / PgUp / PgDn Arrow keys @@ -1981,8 +1957,6 @@ Wait for runtime removal to finish Game - touchpad - direct Swap failed: %1$s Profile save failed: %1$s The desktop is paused @@ -2239,15 +2213,6 @@ Up one level Choose a folder Choose a file - Steam blue - Sky - White - Violet - Green - Amber - Red - Pink - Gray A button B button X button @@ -4306,7 +4271,6 @@ Steam games use the Frame Limit in Steam\'s quick menu › Performance Open Report a problem - Shares this session\'s logs for a bug report Back opens this menu · Back twice opens Steam\'s menu Back opens this menu %1$s opens this menu diff --git a/app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt new file mode 100644 index 000000000..056b387aa --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.input + +import com.droiddeck.launcher.input.ControlsPresenter.Place +import com.droiddeck.launcher.input.ControlsPresenter.State +import com.droiddeck.launcher.input.OnScreenControls.Hidden +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.Assert.* +import org.junit.Test + +class ControlsPresenterTest { + private val modes = listOf(SessionPrefs.OSC_AUTO, SessionPrefs.OSC_ALWAYS, SessionPrefs.OSC_NEVER) + + private fun states() = sequence { + for (mode in modes) for (bits in 0 until 128) { + fun bit(i: Int) = bits and (1 shl i) != 0 + yield(State(mode, desktop = bit(0), virtualPad = bit(1), covered = bit(2), controllerInUse = bit(3), hiddenByTap = bit(4), + steamLayout = bit(5), bottomScreen = bit(6))) + } + } + + @Test fun everyStateGetsThePlanTheRulesDescribe() { + for (state in states()) { + val plan = ControlsPresenter.plan(state) + val off = state.covered || !state.virtualPad || state.mode == SessionPrefs.OSC_NEVER || state.mode == SessionPrefs.OSC_AUTO && state.desktop + if (off) { + assertEquals(state.toString(), ControlsPresenter.Plan(Place.NONE), plan) + assertFalse(plan.shown) + continue + } + val place = if (state.steamLayout) Place.STEAM else if (state.bottomScreen) Place.BOTTOM else Place.MAIN + val hidden = if (state.hiddenByTap) Hidden.BY_TAP else if (state.mode == SessionPrefs.OSC_AUTO && state.controllerInUse) Hidden.BY_CONTROLLER else null + assertEquals(state.toString(), ControlsPresenter.Plan(place, hidden), plan) + assertEquals(state.toString(), hidden == null, plan.shown) + } + } + + private val playing = State(SessionPrefs.OSC_AUTO, desktop = false, virtualPad = true, covered = false, controllerInUse = false, + hiddenByTap = false, steamLayout = false, bottomScreen = false) + + @Test fun autoHidesForAControllerButAlwaysKeepsTheControls() { + assertEquals(ControlsPresenter.Plan(Place.MAIN), ControlsPresenter.plan(playing)) + assertEquals(Hidden.BY_CONTROLLER, ControlsPresenter.plan(playing.copy(controllerInUse = true)).hidden) + assertNull(ControlsPresenter.plan(playing.copy(mode = SessionPrefs.OSC_ALWAYS, controllerInUse = true)).hidden) + } + + @Test fun aTapHideWinsOverAControllerHide() { + assertEquals(Hidden.BY_TAP, ControlsPresenter.plan(playing.copy(controllerInUse = true, hiddenByTap = true)).hidden) + assertEquals(Hidden.BY_TAP, ControlsPresenter.plan(playing.copy(mode = SessionPrefs.OSC_ALWAYS, hiddenByTap = true)).hidden) + } + + @Test fun theSteamLayoutWinsOverTheBottomScreen() { + assertEquals(Place.STEAM, ControlsPresenter.plan(playing.copy(steamLayout = true, bottomScreen = true)).place) + assertEquals(Place.BOTTOM, ControlsPresenter.plan(playing.copy(bottomScreen = true)).place) + } + + @Test fun theDesktopShowsControlsOnlyWhenAlwaysIsChosen() { + assertEquals(Place.NONE, ControlsPresenter.plan(playing.copy(desktop = true)).place) + assertEquals(Place.MAIN, ControlsPresenter.plan(playing.copy(desktop = true, mode = SessionPrefs.OSC_ALWAYS)).place) + } + + @Test fun aCoveringPanelOrNoVirtualPadRemovesTheControls() { + assertEquals(Place.NONE, ControlsPresenter.plan(playing.copy(covered = true)).place) + assertEquals(Place.NONE, ControlsPresenter.plan(playing.copy(virtualPad = false, mode = SessionPrefs.OSC_ALWAYS)).place) + assertEquals(Place.NONE, ControlsPresenter.plan(playing.copy(mode = SessionPrefs.OSC_NEVER, steamLayout = true)).place) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt index cdaa68a77..70013a34d 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt @@ -58,25 +58,17 @@ class InputLayoutToolsTest { @Test fun builtInGamepadDefaultsComeFromTheGamepadGenerator() { val library = InputLibraries.read(context) val gamepad = library.layouts.first { it.id == InputLibraries.OVERLAY } - val defaults = InputLibraries.defaultPositions(context, library, gamepad)!!.first - assertEquals(gamepad.elements.map { it.id }.toSet(), defaults.map { it.id }.toSet()) + val (defaults, aspect) = InputLibraries.defaultPositions(context, library, gamepad)!! + assertTrue(gamepad.elements.isEmpty()) + val (display, metrics) = InputLibraries.primaryDisplay(context) + val w = maxOf(metrics.widthPixels, metrics.heightPixels); val h = minOf(metrics.widthPixels, metrics.heightPixels) + assertEquals(KitLayout.elements(display, PadKit.current(context), w, h), defaults) + assertEquals(w.toFloat() / h, aspect, .0001f) + val copy = SavedInputLayout("mine", "Mine", origin = InputLibraries.OVERLAY) + assertEquals(defaults, InputLibraries.defaultPositions(context, library, copy)!!.first) assertNull(InputLibraries.defaultPositions(context, library, SavedInputLayout("new", "New"))) } - @Test fun quickButtonsHideWithoutRemovingElementsAndPersist() { - val library = InputLibraries.read(context) - val gamepad = library.layouts.first { it.id == InputLibraries.OVERLAY } - assertTrue(InputCommand.KEYBOARD in gamepad.quickButtons) - assertTrue(InputLibraries.setQuickButton(context, gamepad.id, InputCommand.KEYBOARD, false)) - val hidden = InputLibraries.read(context).layouts.first { it.id == gamepad.id } - assertEquals(gamepad.elements, hidden.elements) - assertEquals(setOf(InputCommand.KEYBOARD), hidden.style.hidden) - val shown = hidden.style.shown(hidden.elements) - assertEquals(gamepad.elements.filterNot { it.id == "builtin:keyboard" }, shown) - assertTrue(InputLibraries.setQuickButton(context, gamepad.id, InputCommand.KEYBOARD, true)) - assertEquals(gamepad, InputLibraries.read(context).layouts.first { it.id == gamepad.id }) - } - @Test fun onlySteamQuickAccessAndKeyboardCanBeHidden() { val library = InputLibraries.read(context) val gamepad = library.layouts.first { it.id == InputLibraries.OVERLAY } @@ -87,35 +79,6 @@ class InputLayoutToolsTest { assertFalse(InputSurfaceStyle(hidden = QUICK_BUTTONS.toSet()).hides(custom)) } - private fun overlapping(elements: List, width: Int, height: Int): List> { - fun round(e: InputSurfaceElement) = e.buttonShape == InputButtonShape.CIRCLE && e.kind != InputElementKind.STICK - val result = mutableListOf>() - for ((i, a) in elements.withIndex()) for (b in elements.drop(i + 1)) { - val ax = (a.x + a.width / 2) * width; val ay = (a.y + a.height / 2) * height - val bx = (b.x + b.width / 2) * width; val by = (b.y + b.height / 2) * height - val hit = if (round(a) && round(b)) { - val ra = minOf(a.width * width, a.height * height) / 2; val rb = minOf(b.width * width, b.height * height) / 2 - kotlin.math.hypot(ax - bx, ay - by) < ra + rb - .5f - } else kotlin.math.abs(ax - bx) < (a.width + b.width) * width / 2 - .5f && kotlin.math.abs(ay - by) < (a.height + b.height) * height / 2 - .5f - if (hit) result += a.id to b.id - } - return result - } - - @Test fun generatedGamepadSpacingFollowsButtonSize() { - for ((w, h) in listOf(1920 to 1080, 1280 to 960)) { - val normal = LegacyGamepadLayout(context, w, h).elements() - for (scale in listOf(.8f, 1.25f)) { - val elements = LegacyGamepadLayout(context, w, h, scale = scale).elements() - assertEquals("$w x $h at $scale", emptyList>(), overlapping(elements, w, h)) - val face = listOf("legacy:a", "legacy:y").map { id -> elements.first { it.id == id } } - val faceNormal = listOf("legacy:a", "legacy:y").map { id -> normal.first { it.id == id } } - val gap = (face[0].y - face[1].y) / (faceNormal[0].y - faceNormal[1].y) - if (scale > 1f) assertTrue(gap > 1f) else assertTrue(gap < 1f) - } - } - } - @Test fun scalingACustomLayoutScalesTheGapsBetweenNeighbours() { val left = listOf(InputSurfaceElement(InputControl.A, .05f, .5f, .08f, .1f, "one", name = "One"), InputSurfaceElement(InputControl.A, .16f, .5f, .08f, .1f, "two", name = "Two")) @@ -131,87 +94,4 @@ class InputLayoutToolsTest { } } - @Test fun aScaledGamepadStaysGeneratedAndRegeneratesOnRotation() { - val (display, metrics) = InputLibraries.primaryDisplay(context) - val long = maxOf(metrics.widthPixels, metrics.heightPixels) - val short = minOf(metrics.widthPixels, metrics.heightPixels) - val gamepad = InputLibraries.read(context).layouts.first { it.id == InputLibraries.OVERLAY } - val scaled = gamepad.copy(scale = 1.25f, elements = LegacyGamepadLayout(display, long, short, scale = 1.25f).regenerate(gamepad.elements)) - assertEquals(long to short, OnScreenLayout.generatedSize(context, scaled, long, short)) - val rotated = OnScreenLayout.elements(context, scaled, short, long, android.graphics.Rect()) - assertEquals(LegacyGamepadLayout(context, short, long, scale = 1.25f).regenerate(scaled.elements), rotated) - assertNull(OnScreenLayout.generatedSize(context, scaled.copy(scale = 1f), long, short)) - InputLibraries.update(context) { it.withLayout(scaled) } - assertEquals(1.25f, InputLibraries.read(context).layouts.first { it.id == gamepad.id }.scale) - } - - private fun assertCross(elements: List, width: Int, height: Int, ids: List) { - val (up, right, down, left) = ids.map { id -> elements.first { it.id == id }.let { (it.x + it.width / 2) * width to (it.y + it.height / 2) * height } } - val cx = (up.first + right.first + down.first + left.first) / 4 - val cy = (up.second + right.second + down.second + left.second) / 4 - assertEquals(up.first, down.first, 1f) - assertEquals(left.second, right.second, 1f) - assertTrue(up.second < down.second && left.first < right.first) - val reach = listOf(up, right, down, left).map { kotlin.math.hypot(it.first - cx, it.second - cy) } - reach.forEach { assertEquals(reach[0], it, 1f) } - } - - private fun assertGamepadShape(elements: List, width: Int, height: Int, label: String) { - assertCross(elements, width, height, listOf("legacy:y", "legacy:b", "legacy:a", "legacy:x")) - assertCross(elements, width, height, listOf("legacy:up", "legacy:right", "legacy:down", "legacy:left")) - assertEquals(label, emptyList>(), overlapping(elements, width, height)) - } - - private fun assertStickView(elements: List, width: Int, height: Int, label: String) { - for (control in listOf(InputControl.LS, InputControl.RS)) { - val stick = elements.first { it.control == control } - assertTrue("$label ${stick.id} keeps its widened travel width", stick.width * width >= stick.height * height * 1.25f - 1f) - assertTrue("$label ${stick.id} stays on screen", stick.x >= 0f && stick.x + stick.width <= 1.0001f) - } - } - - @Test fun sticksKeepTheirFullViewAtSurfaceEdges() { - for ((width, height) in listOf(2608 to 1200, 1920 to 1080, 1280 to 960)) { - ControllerPrefs.setLayout(context, width, height, mapOf("ls" to (0f to .5f), "rs" to (1f to .5f))) - val elements = LegacyGamepadLayout(context, width, height).elements() - assertStickView(elements, width, height, "$width x $height") - ControllerPrefs.resetLayout(context, width, height) - } - } - - @Test @Config(qualifiers = "w833dp-h468dp-land-369dpi") - fun buttonSizeKeepsTheGamepadShapeAtHandheldDensity() { - for ((w, h) in listOf(1920 to 1080, 1920 to 1200)) { - val normal = LegacyGamepadLayout(context, w, h).elements() - assertGamepadShape(normal, w, h, "$w x $h") - val right = setOf("legacy:a", "legacy:b", "legacy:x", "legacy:y", "legacy:rs", "legacy:rb", "legacy:rt", "legacy:start") - val left = setOf("legacy:up", "legacy:right", "legacy:down", "legacy:left", "legacy:ls", "legacy:lb", "legacy:lt", "legacy:select") - val moved = normal.map { e -> - when (e.id) { - in right -> e.copy(x = e.x + 21f / w, y = e.y + 18f / h) - in left -> e.copy(x = e.x - 20f / w, y = e.y + 15f / h) - else -> e - } - } - for (scale in listOf(.8f, 1.25f)) { - val generator = LegacyGamepadLayout(context, w, h, scale = scale) - assertGamepadShape(generator.elements(), w, h, "$w x $h generated at $scale") - val rescaled = generator.rescale(moved, LegacyGamepadLayout(context, w, h)) - assertGamepadShape(rescaled, w, h, "$w x $h moved at $scale") - val a = rescaled.first { it.id == "legacy:a" } - val generatedA = generator.elements().first { it.id == "legacy:a" } - assertEquals(generatedA.x + 21f / w, a.x, .001f) - assertEquals(generatedA.y + 18f / h, a.y, .001f) - assertEquals(moved, LegacyGamepadLayout(context, w, h).rescale(rescaled, generator).let { back -> - back.zip(moved).map { (b, m) -> if (kotlin.math.abs(b.x - m.x) < .001f && kotlin.math.abs(b.y - m.y) < .001f && kotlin.math.abs(b.width - m.width) < .001f) m else b } - }) - } - } - } - - @Test @Config(qualifiers = "w745dp-h343dp-land-420dpi") - fun wideHighDensityGamepadKeepsItsShape() { - val elements = LegacyGamepadLayout(context, 2608, 1200).elements() - assertGamepadShape(elements, 2608, 1200, "2608 x 1200") - } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt index 9c81655b0..95f28ef13 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt @@ -237,144 +237,22 @@ class InputLibraryTest { bindings = original.bindings.map { if (it.layoutId == InputLibraries.OVERLAY) it.copy(layoutId = null, elements = emptyMap(), clicks = emptyMap()) else it }) val raw = org.json.JSONObject(InputLibraries.encode(fixed)).put("version", 2).toString() prefs.edit().putString("library", raw).commit() - ControllerPrefs.setStickClick(context, false) - ControllerPrefs.setKeyboardButton(context, true) - val size = context.resources.displayMetrics - ControllerPrefs.setLayout(context, size.widthPixels, size.heightPixels, mapOf("a" to (.5f to .5f), "ls" to (.3f to .4f))) - ControllerPrefs.setLayout(context, 1600, 900, mapOf("ls" to (.3f to .4f))) + LegacyControllerPrefs.setOpacity(context, 60) val migrated = InputLibraries.read(context) val saved = prefs.getString("library", null) assertEquals(migrated, InputLibraries.read(context)) assertEquals(saved, prefs.getString("library", null)) assertFalse(migrated.layouts.any { it.template == InputLayoutTemplate.OVERLAY }) - assertTrue(migrated.layouts.any { it.id == "migrated.layout.1600x900" }) assertEquals(original.layout("game", InputRole.SECONDARY), migrated.layout("game", InputRole.SECONDARY)) assertEquals(original.preset(original.profile("game").binding(InputRole.PHYSICAL)), migrated.preset(migrated.profile("game").binding(InputRole.PHYSICAL))) val layout = migrated.layout("game", InputRole.PRIMARY)!! val preset = migrated.preset(migrated.profile("game").binding(InputRole.PRIMARY)) assertTrue(layout.editable) - assertEquals(InputAction.Command(InputCommand.KEYBOARD), preset.elements["builtin:keyboard"]) - assertEquals(InputAction.Disabled, preset.clickAction(layout.elements.first { it.control == InputControl.LS })) - } - - @Test fun oldGamepadPlacementAndVisibilityBecomeEditableElements() { - ControllerPrefs.setLayout(context, 1200, 800, mapOf("ls" to (.4f to .5f))) - ControllerPrefs.setSteamButton(context, false) - ControllerPrefs.setTarget(context, "b", ControllerPrefs.OFF) - val elements = LegacyGamepadLayout(context, 1200, 800).elements() - val stick = elements.first { it.control == InputControl.LS } - assertEquals(.4f, stick.x + stick.width - stick.height * 800f / 1200f / 2f, .0001f) - assertEquals(.5f, stick.y + stick.height / 2f, .0001f) - assertFalse(elements.any { it.control == InputControl.GUIDE || it.control == InputControl.B }) - assertTrue(elements.all { it == it.bounded() }) - } - - @Test fun gamepadControlsAreRoundWithShoulderPillsAndACompactKeyboard() { - val elements = LegacyGamepadLayout(context, 1200, 800).elements() - val density = context.resources.displayMetrics.density - for (element in elements.filter { it.id.startsWith("legacy:") }) { - val shoulder = element.control in setOf(InputControl.LB, InputControl.RB, InputControl.LT, InputControl.RT) - assertEquals(element.control.id, if (shoulder) InputButtonShape.PILL else InputButtonShape.CIRCLE, element.buttonShape) - } - val keyboard = elements.single { it.id == "builtin:keyboard" } - assertEquals(InputButtonIcons.KEYBOARD, keyboard.icon) - assertEquals(InputButtonShape.CIRCLE, keyboard.buttonShape) - assertEquals(36 * density / 1200f, keyboard.width, .0001f) - assertEquals(90 * density / 1200f, keyboard.x + keyboard.width / 2f, .0001f) - assertEquals(1f - 34 * density / 800f, keyboard.y + keyboard.height / 2f, .0001f) - } - - @Test fun dpadButtonsMatchTheFaceButtonsInSizeAndSpacing() { - val elements = LegacyGamepadLayout(context, 1200, 800).elements() - fun centre(c: InputControl) = elements.single { it.id == "legacy:${c.id}" }.let { (it.x + it.width / 2f) * 1200 to (it.y + it.height / 2f) * 800 } - fun size(c: InputControl) = elements.single { it.id == "legacy:${c.id}" }.width * 1200 - assertEquals(size(InputControl.A), size(InputControl.UP), .01f) - assertEquals(centre(InputControl.A).second - centre(InputControl.Y).second, centre(InputControl.DOWN).second - centre(InputControl.UP).second, .01f) - assertEquals(centre(InputControl.B).first - centre(InputControl.X).first, centre(InputControl.RIGHT).first - centre(InputControl.LEFT).first, .01f) - } - - @Test fun anUntouchedSavedDpadIsResizedAroundItsCentreAndAMovedOneIsKept() { - val fresh = LegacyGamepadLayout(context, 1200, 800) - val target = fresh.elements().filter { it.control in setOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT) } - val cx = target.map { it.x + it.width / 2f }.average().toFloat() - val cy = target.map { it.y + it.height / 2f }.average().toFloat() - val scale = 26f / 30f - val old = target.map { e -> - val ex = cx + (e.x + e.width / 2f - cx) * 52f / 50f - val ey = cy + (e.y + e.height / 2f - cy) * 52f / 50f - e.copy(x = ex - e.width * scale / 2f, y = ey - e.height * scale / 2f, width = e.width * scale, height = e.height * scale, buttonShape = InputButtonShape.ROUNDED) - } - val restyled = fresh.restyle(old) - for ((want, got) in target.zip(restyled)) { - assertEquals(want.x, got.x, .0005f); assertEquals(want.y, got.y, .0005f) - assertEquals(want.width, got.width, .0005f); assertEquals(InputButtonShape.CIRCLE, got.buttonShape) - } - val moved = old.mapIndexed { i, e -> if (i == 0) e.copy(buttonShape = InputButtonShape.RECTANGLE) else e } - assertEquals(moved.drop(1).map { it.width }, fresh.restyle(moved).drop(1).map { it.width }) - val shifted = old.mapIndexed { i, e -> if (i == 0) e.copy(x = e.x + .03f) else e } - assertEquals(shifted.map { listOf(it.x, it.y, it.width, it.height) }, fresh.restyle(shifted).map { listOf(it.x, it.y, it.width, it.height) }) - } - - @Test fun stickTouchAreasReachFurtherOutwardButKeepTheirInnerEdge() { - val elements = LegacyGamepadLayout(context, 1200, 800).elements() - for (control in listOf(InputControl.LS, InputControl.RS)) { - val stick = elements.single { it.control == control } - assertEquals(control.id, stick.height * 800f * 1.25f, stick.width * 1200f, 1f) - } - val left = elements.single { it.control == InputControl.LS } - val right = elements.single { it.control == InputControl.RS } - ControllerPrefs.setLayout(context, 1200, 800, mapOf("ls" to (.3f to .5f), "rs" to (.7f to .5f))) - val placed = LegacyGamepadLayout(context, 1200, 800).elements() - val ls = placed.single { it.control == InputControl.LS } - val rs = placed.single { it.control == InputControl.RS } - assertEquals(.3f, ls.x + ls.width - ls.height * 800f / 1200f / 2f, .0001f) - assertEquals(.7f, rs.x + rs.height * 800f / 1200f / 2f, .0001f) - assertTrue(left.width > left.height * 800f / 1200f && right.width > right.height * 800f / 1200f) - } - - @Test fun adaptiveSticksToggleChangesOnlyTheSticksOfThatLayout() { - val library = InputLibraries.read(context) - val overlay = library.layouts.single { it.id == InputLibraries.OVERLAY } - assertEquals(true, overlay.adaptiveSticks) - InputLibraries.setAdaptiveSticks(context, overlay.id, false) - val off = InputLibraries.read(context) - val changed = off.layouts.single { it.id == overlay.id } - assertEquals(false, changed.adaptiveSticks) - assertFalse(ControllerPrefs.read(context).adaptiveSticks) - assertEquals(overlay.elements.filter { it.kind != InputElementKind.STICK }, changed.elements.filter { it.kind != InputElementKind.STICK }) - assertEquals(library.layouts.filter { it.id != overlay.id }, off.layouts.filter { it.id != overlay.id }) - assertNull(off.layouts.single { it.id == InputLibraries.DECK }.adaptiveSticks) - assertTrue(InputLibraries.setAdaptiveSticks(context, overlay.id, true)) - assertEquals(true, InputLibraries.read(context).layouts.single { it.id == overlay.id }.adaptiveSticks) - prefs.edit().putString("library", JSONObject().put("version", 99).toString()).commit() - assertFalse(InputLibraries.setAdaptiveSticks(context, overlay.id, false)) - assertTrue(ControllerPrefs.read(context).adaptiveSticks) - } - - @Test fun savedGamepadsFromTheFirstUnifiedBuildGetTheRoundLookOnce() { - val fresh = InputLibraries.read(context) - val overlay = fresh.layouts.single { it.id == InputLibraries.OVERLAY } - val old = overlay.copy(elements = overlay.elements.map { e -> - if (e.id == "builtin:keyboard") InputSurfaceElement(InputControl.A, .02f, .9f, .12f, .08f, "builtin:keyboard", name = "Keyboard") - else if (e.control == InputControl.A) e.copy(buttonShape = InputButtonShape.RECTANGLE, x = .5f) - else e.copy(buttonShape = InputButtonShape.ROUNDED) - }) - val custom = SavedInputLayout("mine", "Mine", listOf(InputSurfaceElement(InputControl.B, .1f, .1f, .1f, .1f))) - val stored = fresh.withLayout(old).withLayout(custom) - val renamed = InputSurfaceElement(InputControl.A, .02f, .9f, .12f, .08f, "builtin:keyboard", name = "Keys") - assertEquals(renamed, LegacyGamepadLayout(context, 1200, 800).restyle(listOf(renamed)).single()) - prefs.edit().putString("library", JSONObject(InputLibraries.encode(stored)).put("version", 8).toString()).commit() - val upgraded = InputLibraries.read(context) - val restyled = upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.elements - assertEquals(overlay.elements.single { it.id == "builtin:keyboard" }, restyled.single { it.id == "builtin:keyboard" }) - assertEquals(InputButtonShape.RECTANGLE, restyled.single { it.control == InputControl.A && it.id.startsWith("legacy:") }.buttonShape) - assertEquals(.5f, restyled.single { it.control == InputControl.A && it.id.startsWith("legacy:") }.x, .0001f) - assertEquals(InputButtonShape.PILL, restyled.single { it.control == InputControl.LB }.buttonShape) - assertEquals(InputButtonShape.CIRCLE, restyled.single { it.control == InputControl.UP }.buttonShape) - assertEquals(InputButtonShape.ROUNDED, upgraded.layouts.single { it.id == "mine" }.elements.single().buttonShape) - assertEquals(upgraded, InputLibraries.read(context)) - for (desktop in listOf(false, true)) - assertEquals(InputAction.Command(InputCommand.KEYBOARD), upgraded.compileActive(desktop).elementAction(InputRole.PRIMARY, "builtin:keyboard", InputControl.A)) + assertTrue(OnScreenLayout.generated(layout)) + assertEquals(60, layout.style.opacity) + assertEquals(InputAction.Command(InputCommand.KEYBOARD), migrated.compile("game").elementAction(InputRole.PRIMARY, KitLayout.KEYBOARD_ID, InputControl.A)) + assertEquals(InputAction.Native(), migrated.compile("game").elementAction(InputRole.PRIMARY, KitLayout.DPAD_ID, InputControl.LS)) + assertEquals(InputAction.Native(), preset.action(InputSurfaceElement(InputControl.A, .1f, .1f, .1f, .1f))) } @Test fun quickPartsAreModeSpecificAndDoNotEditSavedProfiles() { @@ -505,7 +383,7 @@ class InputLibraryTest { assertNull(fresh.layouts.single { it.id == InputLibraries.DECK }.style.tint) assertNull(fresh.layouts.single { it.id == InputLibraries.TRACKPAD }.style.tint) assertEquals(ControllerPrefs.STEAM_BLUE, fresh.layouts.single { it.id == InputLibraries.OVERLAY }.style.tint) - val red = ControllerPrefs.tints.last().first + val red = 0xFFFF6FB5.toInt() val blue = fresh.layouts.map { it.copy(style = it.style.copy(tint = if (it.id == InputLibraries.TRACKPAD) red else ControllerPrefs.STEAM_BLUE)) } val mine = SavedInputLayout("mine", "Mine", listOf(InputSurfaceElement(InputControl.B, .1f, .1f, .1f, .1f))) val old = JSONObject(InputLibraries.encode(blue.fold(fresh) { library, layout -> library.withLayout(layout) }.withLayout(mine))).put("version", 8) diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputProfilesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputProfilesTest.kt index e5fc41f09..fabc895da 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputProfilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputProfilesTest.kt @@ -20,9 +20,9 @@ class InputProfilesTest { } @Test fun migrationKeepsLegacyTouchMappingSeparateFromPhysicalControls() { - ControllerPrefs.setTarget(context, "a", "b") - ControllerPrefs.setTarget(context, "x", "off") - ControllerPrefs.setSelectSteam(context, true) + LegacyControllerPrefs.setTarget(context, "a", "b") + LegacyControllerPrefs.setTarget(context, "x", "off") + LegacyControllerPrefs.setSelectSteam(context, true) val game = InputProfiles.read(context, InputProfile.GAME) assertEquals(InputAction.Native(InputControl.B), game.action(InputRole.PRIMARY, InputControl.A)) assertEquals(InputAction.Disabled, game.action(InputRole.PRIMARY, InputControl.X)) @@ -35,7 +35,7 @@ class InputProfilesTest { } @Test fun migrationPreservesSavedDesktopSelectBinding() { - ControllerPrefs.setSelectSteam(context, true) + LegacyControllerPrefs.setSelectSteam(context, true) context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE).edit().putString("profile.desktop", """{"version":1,"bindings":[{"role":"PHYSICAL","control":"select","action":{"type":"disabled"}}]}""").commit() assertEquals(InputAction.Disabled, InputProfiles.read(context, InputProfile.DESKTOP) @@ -68,9 +68,8 @@ class InputProfilesTest { .putString("profile.game", """{"version":999,"bindings":[]} """).commit() val profile = InputProfiles.read(context, InputProfile.GAME) assertEquals(InputProfile.defaults(InputProfile.GAME).bindings, profile.bindings) - assertEquals(mapOf( - InputRole.PRIMARY to mapOf("builtin:keyboard" to InputAction.Command(InputCommand.KEYBOARD)), - ), profile.elements) + assertEquals(InputProfile.defaults(InputProfile.GAME).elements, profile.elements) + assertEquals(InputAction.Command(InputCommand.KEYBOARD), profile.elementAction(InputRole.PRIMARY, KitLayout.KEYBOARD_ID, InputControl.A)) } @Test fun layoutsPersistIndependentOfBindingsAndStayInsideScreen() { diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt new file mode 100644 index 000000000..373eea937 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -0,0 +1,241 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.graphics.Rect +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import kotlin.math.hypot + +private const val HANDHELD = "w833dp-h468dp-land-369dpi" + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, qualifiers = HANDHELD) +class KitLayoutTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + private val sizes = listOf(1080 to 1920, 1920 to 1080, 1240 to 1080, 2400 to 1080, 1080 to 2400, 1600 to 900, 1280 to 960) + + private fun px(e: InputSurfaceElement, w: Int, h: Int) = floatArrayOf(e.x * w, e.y * h, e.width * w, e.height * h) + private fun centre(e: InputSurfaceElement, w: Int, h: Int) = (e.x + e.width / 2) * w to (e.y + e.height / 2) * h + + private fun overlapping(elements: List, w: Int, h: Int): List> { + val result = mutableListOf>() + for ((i, a) in elements.withIndex()) for (b in elements.drop(i + 1)) { + val (ax, ay) = centre(a, w, h); val (bx, by) = centre(b, w, h) + val round = a.buttonShape == InputButtonShape.CIRCLE && b.buttonShape == InputButtonShape.CIRCLE + val hit = if (round) hypot(ax - bx, ay - by) < (minOf(a.width * w, a.height * h) + minOf(b.width * w, b.height * h)) / 2 - .5f + else kotlin.math.abs(ax - bx) < (a.width + b.width) * w / 2 - .5f && kotlin.math.abs(ay - by) < (a.height + b.height) * h / 2 - .5f + if (hit) result += a.id to b.id + } + return result + } + + private fun ids(kit: PadKit) = KitLayout.elements(context, kit, 1920, 1080).map { it.id }.toSet() + + @Test fun everyKitHasTheCommonControlsOnceEach() { + val common = setOf("legacy:lt", "legacy:lb", "legacy:rt", "legacy:rb", "legacy:a", "legacy:b", "legacy:x", "legacy:y", "legacy:ls", "legacy:rs", + "legacy:select", "legacy:start", "legacy:guide", "legacy:qam", KitLayout.DPAD_ID, KitLayout.KEYBOARD_ID) + for (kit in PadKit.entries) { + val elements = KitLayout.elements(context, kit, 1920, 1080) + assertEquals(kit.name, elements.size, elements.map { it.id }.distinct().size) + assertTrue(kit.name, elements.map { it.id }.containsAll(common)) + } + } + + @Test fun steamKitsAddGripsAndTrackpadsAndTheOthersAddStickClicks() { + val grips = setOf("legacy:l4", "legacy:l5", "legacy:r4", "legacy:r5") + val pads = setOf(InputControl.LEFT_PAD, InputControl.RIGHT_PAD) + val clicks = setOf("legacy:l3", "legacy:r3") + for (kit in PadKit.entries) { + val elements = KitLayout.elements(context, kit, 1920, 1080) + assertEquals(kit.name, kit.steam, elements.map { it.id }.containsAll(grips)) + assertEquals(kit.name, if (kit.steam) pads else emptySet(), elements.filter { it.kind == InputElementKind.TRACKPAD }.map { it.control }.toSet()) + assertEquals(kit.name, !kit.steam, elements.map { it.id }.containsAll(clicks)) + assertTrue(kit.name, elements.none { kit.steam && it.id in clicks || !kit.steam && it.id in grips }) + } + assertEquals(KitLayout.elements(context, PadKit.STEAM_DECK, 1920, 1080), KitLayout.elements(context, PadKit.STEAM_CONTROLLER, 1920, 1080)) + assertEquals(KitLayout.elements(context, PadKit.DUALSHOCK, 1920, 1080), KitLayout.elements(context, PadKit.DUALSENSE, 1920, 1080)) + assertNotEquals(ids(PadKit.STEAM_DECK), ids(PadKit.XBOX)) + } + + @Test fun onlySticksFloatAndTheDpadAndKeyboardAreKitElements() { + for (kit in PadKit.entries) { + val elements = KitLayout.elements(context, kit, 1920, 1080) + for (e in elements) assertEquals(e.id, e.kind == InputElementKind.STICK, e.floating) + assertEquals(InputElementKind.DPAD, elements.single { it.id == KitLayout.DPAD_ID }.kind) + assertEquals(InputButtonIcons.KEYBOARD, elements.single { it.id == KitLayout.KEYBOARD_ID }.icon) + for (shoulder in listOf("legacy:lt", "legacy:lb", "legacy:rt", "legacy:rb")) assertEquals(InputButtonShape.PILL, elements.single { it.id == shoulder }.buttonShape) + } + } + + @Test fun controlsStayOnScreenAndApartAtEverySize() { + for (kit in PadKit.entries) for ((w, h) in sizes) for (scale in listOf(.8f, 1f, 1.25f)) { + val elements = KitLayout.elements(context, kit, w, h, scale = scale) + for (e in elements) assertEquals("$kit $w x $h ${e.id}", e, e.bounded()) + assertEquals("$kit $w x $h at $scale", emptyList>(), overlapping(elements, w, h)) + } + } + + @Test fun buttonsAreRoundAndStayRoundOnEveryAspect() { + for (kit in PadKit.entries) for ((w, h) in sizes) { + for (e in KitLayout.elements(context, kit, w, h).filter { it.buttonShape == InputButtonShape.CIRCLE }) + assertEquals("$kit $w x $h ${e.id}", e.width * w, e.height * h, 1f) + } + } + + @Test fun theFaceButtonsFormACross() { + for (kit in PadKit.entries) { + val e = KitLayout.elements(context, kit, 2400, 1080).associateBy { it.id } + val (yx, yy) = centre(e.getValue("legacy:y"), 2400, 1080); val (ax, ay) = centre(e.getValue("legacy:a"), 2400, 1080) + val (xx, xy) = centre(e.getValue("legacy:x"), 2400, 1080); val (bx, by) = centre(e.getValue("legacy:b"), 2400, 1080) + assertEquals(yx, ax, .5f); assertEquals(xy, by, .5f) + assertTrue(yy < xy && xy < ay && xx < yx && yx < bx) + assertEquals(ay - yy, bx - xx, .5f) + } + } + + @Test fun safeInsetsMoveEdgeControlsInByTheInsetOnly() { + val safe = Rect(120, 30, 60, 40) + for (kit in PadKit.entries) { + val plain = KitLayout.elements(context, kit, 2400, 1080).associateBy { it.id } + val inset = KitLayout.elements(context, kit, 2400, 1080, safe) + for (e in inset) { + val (x, y, ew, eh) = px(e, 2400, 1080).toList() + assertTrue("$kit ${e.id}", x >= safe.left - .5f && y >= safe.top - .5f && x + ew <= 2400 - safe.right + .5f && y + eh <= 1080 - safe.bottom + .5f) + } + val a = plain.getValue("legacy:lt"); val b = inset.single { it.id == "legacy:lt" } + assertEquals(safe.left.toFloat(), (b.x - a.x) * 2400, .5f) + assertEquals(safe.top.toFloat(), (b.y - a.y) * 1080, .5f) + val r = plain.getValue("legacy:rt"); val s = inset.single { it.id == "legacy:rt" } + assertEquals(-safe.right.toFloat(), (s.x - r.x) * 2400, .5f) + } + } + + @Test fun widerScreensSpreadTheControlsInsteadOfStretchingThem() { + for (kit in PadKit.entries) { + val narrow = KitLayout.elements(context, kit, 1920, 1080).associateBy { it.id } + val wide = KitLayout.elements(context, kit, 2400, 1080).associateBy { it.id } + for ((id, n) in narrow) { + val v = wide.getValue(id) + assertEquals("$kit $id width", n.width * 1920, v.width * 2400, .5f) + assertEquals("$kit $id y", n.y * 1080, v.y * 1080, .5f) + val (nx, _) = centre(n, 1920, 1080); val (vx, _) = centre(v, 2400, 1080) + val shift = vx - nx + assertTrue("$kit $id moved $shift", listOf(0f, 240f, 480f).any { kotlin.math.abs(shift - it) < .5f }) + } + } + } + + @Test fun theCentreOfTheScreenStaysClear() { + for (kit in PadKit.entries) for ((w, h) in sizes.filter { it.first > it.second }) { + val box = android.graphics.RectF(w * .4f, h * .35f, w * .6f, h * .65f) + for (e in KitLayout.elements(context, kit, w, h)) { + val (x, y, ew, eh) = px(e, w, h).toList() + assertFalse("$kit $w x $h ${e.id}", android.graphics.RectF.intersects(box, android.graphics.RectF(x, y, x + ew, y + eh))) + } + } + } + + @Test @Config(qualifiers = "mdpi") + fun aBigScreenCapsTheControlsAtAHandheldHeight() { + val metrics = context.resources.displayMetrics + val dpi = metrics.ydpi.takeIf { it > metrics.densityDpi * .6f && it < metrics.densityDpi * 1.6f } ?: metrics.densityDpi.toFloat() + val small = KitLayout.elements(context, PadKit.XBOX, 1600, 900).single { it.id == "legacy:a" } + val big = KitLayout.elements(context, PadKit.XBOX, 3200, 1800).single { it.id == "legacy:a" } + assertEquals(small.height * 900, big.height * 1800, 1f) + val mm = small.height * 900 / dpi * 25.4f + assertEquals(116f / 900f * 80f, mm, .3f) + } + + @Test fun aHandheldScreenUsesTheFullReferenceSize() { + val a = KitLayout.elements(context, PadKit.XBOX, 1920, 1080).single { it.id == "legacy:a" } + assertEquals(116f * 1.2f, a.height * 1080, 1f) + } + + @Test fun noDefaultControlSitsUnderTheCornerButton() { + val density = context.resources.displayMetrics.density + val corner = android.graphics.RectF(4 * density, 1080 - 52 * density, 52 * density, 1080 - 4 * density) + for (kit in PadKit.entries) for (e in KitLayout.elements(context, kit, 1920, 1080)) { + val (cx, cy) = centre(e, 1920, 1080) + val r = minOf(e.width * 1920, e.height * 1080) / 2 + val nx = cx.coerceIn(corner.left, corner.right); val ny = cy.coerceIn(corner.top, corner.bottom) + val touches = if (e.buttonShape == InputButtonShape.CIRCLE) hypot(cx - nx, cy - ny) < r - 1f + else android.graphics.RectF.intersects(corner, android.graphics.RectF(e.x * 1920, e.y * 1080, (e.x + e.width) * 1920, (e.y + e.height) * 1080)) + assertFalse("$kit ${e.id} is under the corner button", touches) + } + } + + @Test fun clustersStayTogetherOnTallAndSquareScreens() { + val ratio = mapOf(PadKit.STEAM_DECK to 82f / 50f, PadKit.STEAM_CONTROLLER to 82f / 50f, PadKit.XBOX to 94f / 58f, + PadKit.DUALSHOCK to 92f / 56f, PadKit.DUALSENSE to 92f / 56f) + for (kit in PadKit.entries) for ((w, h) in listOf(1080 to 1920, 1240 to 1080, 2400 to 1080)) { + val e = KitLayout.elements(context, kit, w, h).associateBy { it.id } + val face = listOf("legacy:y", "legacy:x", "legacy:b", "legacy:a").map { centre(e.getValue(it), w, h) } + val cx = face.map { it.first }.average().toFloat(); val cy = face.map { it.second }.average().toFloat() + val radius = e.getValue("legacy:a").height * h / 2 + for ((x, y) in face) assertEquals("$kit $w x $h", radius * ratio.getValue(kit), hypot(x - cx, y - cy), 1f) + if (kit == PadKit.XBOX) { + val (lx, ly) = centre(e.getValue("legacy:ls"), w, h); val (cx3, cy3) = centre(e.getValue("legacy:l3"), w, h) + val unit = e.getValue("legacy:ls").height * h / 208f + assertEquals("$w x $h", hypot(150f, 110f) * unit, hypot(cx3 - lx, cy3 - ly), 1f) + } + } + } + + @Test @Config(qualifiers = "mdpi") + fun smallControlsKeepTheirShapeOnABigLowDensityScreen() { + for (kit in PadKit.entries) { + val elements = KitLayout.elements(context, kit, 1920, 1080) + for (e in elements.filter { it.buttonShape == InputButtonShape.CIRCLE }) assertEquals("$kit ${e.id}", e.width * 1920, e.height * 1080, 1f) + assertEquals(kit.name, emptyList>(), overlapping(elements, 1920, 1080)) + } + } + + @Test fun theBottomLeftRowStartsRightOfTheCornerButtonWithGaps() { + val density = context.resources.displayMetrics.density + for (safe in listOf(Rect(), Rect(120, 0, 0, 40))) for (kit in PadKit.entries) for ((w, h) in sizes) { + val elements = KitLayout.elements(context, kit, w, h, safe) + val keyboard = elements.single { it.id == KitLayout.KEYBOARD_ID } + val row = elements.filter { e -> val cy = e.y + e.height / 2; cy > keyboard.y && cy < keyboard.y + keyboard.height && e.x + e.width / 2 < .5f } + .sortedBy { it.x } + assertEquals("$kit $w x $h", keyboard, row.first()) + assertTrue("$kit $w x $h $safe keyboard at ${keyboard.x * w}", keyboard.x * w >= safe.left + 52 * density - .5f) + for ((a, b) in row.zipWithNext()) assertTrue("$kit $w x $h ${a.id} ${b.id}", (b.x - a.x - a.width) * w >= 8 * density - .5f) + } + } + + @Test fun portraitSurfacesKeepEveryControlInTheBottomBlock() { + for (kit in PadKit.entries) for ((w, h) in listOf(1080 to 1920, 1200 to 2000)) { + val elements = KitLayout.elements(context, kit, w, h) + val unit = w / 1200f + val top = elements.minOf { it.y } * h + assertTrue("$kit $w x $h top $top", top >= h - 900 * unit - .5f) + assertEquals("$kit $w x $h", h.toFloat(), elements.maxOf { (it.y + it.height) * h }, 900 * unit * .1f) + val tall = KitLayout.elements(context, kit, w, h + 100).associateBy { it.id } + for (e in elements.filter { it.height > .031f && tall.getValue(it.id).height > .031f }) { + val t = tall.getValue(e.id) + assertEquals("$kit ${e.id}", (1 - e.y - e.height / 2) * h, (1 - t.y - t.height / 2) * (h + 100), 1f) + } + } + } + + @Test fun anEmptySurfaceHasNoControls() { + assertTrue(KitLayout.elements(context, PadKit.STEAM_DECK, 0, 1080).isEmpty()) + assertTrue(KitLayout.elements(context, PadKit.STEAM_DECK, 1920, 0).isEmpty()) + } + + @Test fun theDockedStripAddsGripsOnlyForSteamKitsAndNeverSystemButtons() { + val density = context.resources.displayMetrics.density + for (kit in PadKit.entries) { + val placed = KitLayout.dock(context, kit, 1080, 1300, true, InputControl.LS, InputControl.RS) + val boxes = GamepadGeometry.layout(1080f, 1300f, density, true) + assertEquals(kit.name, kit.steam && boxes.containsKey(GamepadGeometry.Slot.L4), placed.any { it.control == InputControl.L4 }) + assertNull(placed.firstOrNull { it.control == InputControl.GUIDE || it.control == InputControl.QAM }) + assertEquals(1, placed.count { it.id == KitLayout.DPAD_ID }) + assertTrue(placed.none { it.floating }) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/LegacyControllerPrefs.kt b/app/src/test/java/com/droiddeck/launcher/input/LegacyControllerPrefs.kt new file mode 100644 index 000000000..b055dc0b3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/LegacyControllerPrefs.kt @@ -0,0 +1,14 @@ +package com.droiddeck.launcher.input + +import android.content.Context + +/** Writes the controller settings older builds saved, so tests can seed the migrations that read them. */ +internal object LegacyControllerPrefs { + private fun edit(context: Context) = ControllerPrefs.prefs(context).edit() + + fun setTarget(context: Context, id: String, target: String) { edit(context).putString("map.$id", target).commit() } + fun target(context: Context, id: String): String = ControllerPrefs.read(context).mapping[id] ?: id + fun setSelectSteam(context: Context, on: Boolean) { edit(context).putBoolean("selectSteam", on).commit() } + fun setOpacity(context: Context, percent: Int) { edit(context).putInt("opacity", percent).commit() } + fun setStickClick(context: Context, on: Boolean) { edit(context).putBoolean("stickClick", on).commit() } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt new file mode 100644 index 000000000..ba8e31590 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt @@ -0,0 +1,129 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import com.droiddeck.launcher.session.SessionPrefs +import org.json.JSONObject +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE) +class OnScreenControlPrefsTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + private val session get() = context.getSharedPreferences("session", Context.MODE_PRIVATE) + private val library get() = context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE) + + @Before fun reset() { + for (name in listOf("session", "game-controls", "input-profiles", "input-surfaces", "controller")) context.getSharedPreferences(name, Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun oldShowModesMapOntoAutoAlwaysAndNever() { + assertEquals(SessionPrefs.OSC_AUTO, SessionPrefs.oscMode(context)) + for ((saved, mode) in listOf(SessionPrefs.OSC_AUTO to SessionPrefs.OSC_AUTO, SessionPrefs.OSC_ALWAYS to SessionPrefs.OSC_ALWAYS, + SessionPrefs.OSC_NEVER to SessionPrefs.OSC_NEVER, SessionPrefs.OSC_STEAM_QAM to SessionPrefs.OSC_ALWAYS, + SessionPrefs.OSC_STEAM_TOUCH to SessionPrefs.OSC_AUTO, "buttons" to SessionPrefs.OSC_AUTO)) { + session.edit().putString("osc", saved).commit() + assertEquals(saved, mode, SessionPrefs.oscMode(context)) + } + } + + @Test fun theOldSteamTouchModeBecomesTheSteamLayoutUntilChanged() { + assertFalse(SessionPrefs.steamTouchLayout(context)) + session.edit().putString("osc", SessionPrefs.OSC_STEAM_TOUCH).commit() + assertTrue(SessionPrefs.steamTouchLayout(context)) + SessionPrefs.setSteamTouchLayout(context, false) + assertFalse(SessionPrefs.steamTouchLayout(context)) + session.edit().putString("osc", SessionPrefs.OSC_ALWAYS).putBoolean("steamTouchLayout", true).commit() + assertTrue(SessionPrefs.steamTouchLayout(context)) + } + + @Test fun eachGameKeepsItsOwnLayoutChoice() { + assertNull(GameControls.bindings(context, null)) + assertNull(GameControls.bindings(context, 7)) + GameControls.choose(context, 7, "mine.bindings", steam = false) + assertEquals("mine.bindings", GameControls.bindings(context, 7)) + assertNull(GameControls.bindings(context, 8)) + assertFalse(GameControls.steamLayout(context, 7)) + GameControls.choose(context, 7, null, steam = true) + assertNull(GameControls.bindings(context, 7)) + assertTrue(GameControls.steamLayout(context, 7)) + } + + @Test fun gamesWithoutAChoiceFollowTheDefaultSteamLayout() { + SessionPrefs.setSteamTouchLayout(context, true) + assertTrue(GameControls.steamLayout(context, null)) + assertTrue(GameControls.steamLayout(context, 9)) + GameControls.choose(context, 9, null, steam = false) + assertFalse(GameControls.steamLayout(context, 9)) + assertTrue(GameControls.steamLayout(context, 10)) + } + + @Test fun kitElementsWithoutSavedBindingsGetTheirDefaultActions() { + val profile = InputProfile("empty") + assertEquals(InputAction.Native(), profile.elementAction(InputRole.PRIMARY, KitLayout.DPAD_ID, InputControl.LS)) + assertEquals(InputAction.Command(InputCommand.KEYBOARD), profile.elementAction(InputRole.PRIMARY, KitLayout.KEYBOARD_ID, InputControl.A)) + assertEquals(InputAction.Native(), profile.elementAction(InputRole.PRIMARY, "legacy:a", InputControl.A)) + assertEquals(InputAction.Disabled, profile.elementAction(InputRole.PRIMARY, "custom:1", InputControl.A)) + val mapped = profile.copy(bindings = mapOf(InputRole.PRIMARY to mapOf(InputControl.A to InputAction.Keys(listOf(57)))), + elements = mapOf(InputRole.PRIMARY to mapOf(KitLayout.KEYBOARD_ID to InputAction.Disabled))) + assertEquals(InputAction.Keys(listOf(57)), mapped.elementAction(InputRole.PRIMARY, "legacy:a", InputControl.A)) + assertEquals(InputAction.Disabled, mapped.elementAction(InputRole.PRIMARY, KitLayout.KEYBOARD_ID, InputControl.A)) + + val bindings = SavedInputBindings("b", "B", false, "layout") + assertEquals(InputAction.Native(), bindings.action(InputSurfaceElement(InputControl.LS, 0f, 0f, .1f, .1f, KitLayout.DPAD_ID, InputElementKind.DPAD))) + assertEquals(InputAction.Command(InputCommand.KEYBOARD), bindings.action(InputSurfaceElement(InputControl.A, 0f, 0f, .1f, .1f, KitLayout.KEYBOARD_ID))) + assertEquals(InputAction.Disabled, bindings.action(InputSurfaceElement(InputControl.A, 0f, 0f, .1f, .1f, "custom:1"))) + } + + private fun storeAt(version: Int, change: (InputLibrary) -> InputLibrary) { + val stored = change(InputLibraries.read(context)) + library.edit().putString("library", JSONObject(InputLibraries.encode(stored)).put("version", version).toString()).commit() + } + + @Test fun gamepadsSavedByTheOldEditorFollowTheKitAgainOnce() { + val placed = KitLayout.elements(context, PadKit.STEAM_DECK, 1920, 1080) + val custom = SavedInputLayout("custom", "Custom", listOf(InputSurfaceElement(InputControl.B, .1f, .1f, .1f, .1f)), aspect = 2f) + storeAt(14) { lib -> + val overlay = lib.layouts.single { it.id == InputLibraries.OVERLAY } + lib.withLayout(overlay.copy(elements = placed, aspect = 16f / 9, scale = 1.25f)) + .withLayout(SavedInputLayout("copy", "Copy", placed, aspect = 16f / 9, origin = InputLibraries.OVERLAY)) + .withLayout(SavedInputLayout("migrated.layout.1600x900", "Gamepad", placed, aspect = 16f / 9)) + .withLayout(custom) + } + val before = InputLibraries.decode(library.getString("library", null)!!)!! + val upgraded = InputLibraries.read(context) + for (id in listOf(InputLibraries.OVERLAY, "copy", "migrated.layout.1600x900")) { + val layout = upgraded.layouts.single { it.id == id } + assertTrue(id, layout.elements.isEmpty()) + assertEquals(id, 0f, layout.aspect) + assertEquals(id, 1f, layout.scale) + assertTrue(id, OnScreenLayout.generated(layout)) + } + assertNull(upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.origin) + assertEquals(InputLibraries.OVERLAY, upgraded.layouts.single { it.id == "migrated.layout.1600x900" }.origin) + assertEquals(custom, upgraded.layouts.single { it.id == "custom" }) + for (id in listOf(InputLibraries.DECK, InputLibraries.TRACKPAD)) assertEquals(before.layouts.single { it.id == id }, upgraded.layouts.single { it.id == id }) + assertEquals(upgraded, InputLibraries.read(context)) + val edited = upgraded.withLayout(upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.copy(elements = placed, aspect = 16f / 9)) + InputLibraries.update(context) { edited } + assertEquals(placed, InputLibraries.read(context).layouts.single { it.id == InputLibraries.OVERLAY }.elements) + } + + @Test fun theKitUpgradeKeepsScreenKeysMergedIntoTheGamepad() { + val key = InputSurfaceElement(InputControl.A, .45f, .1f, .1f, .1f, "imported:0", name = "Find", alwaysShown = true) + storeAt(14) { lib -> + val overlay = lib.layouts.single { it.id == InputLibraries.OVERLAY } + val bindings = lib.preset(lib.activePart(false, InputRole.PRIMARY).bindings) + lib.withLayout(overlay.copy(elements = KitLayout.elements(context, PadKit.STEAM_DECK, 1920, 1080) + key, aspect = 16f / 9)) + .withPreset(bindings.copy(elements = bindings.elements + (key.id to InputAction.Keys(listOf(29, 33))))) + } + val upgraded = InputLibraries.read(context) + assertEquals(listOf(key.id), upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.elements.map { it.id }.filter { it.startsWith("imported:") }) + assertEquals(InputAction.Keys(listOf(29, 33)), upgraded.compileActive(false).elementAction(InputRole.PRIMARY, key.id, InputControl.A)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt index 2c9745693..f29546499 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt @@ -1,6 +1,13 @@ package com.droiddeck.launcher.input import android.content.Context +import android.os.Looper +import android.view.ViewConfiguration +import com.droiddeck.launcher.session.SessionPrefs +import java.time.Duration +import org.robolectric.Shadows.shadowOf +import org.robolectric.Robolectric +import androidx.activity.ComponentActivity import android.view.MotionEvent import android.view.View import android.widget.FrameLayout @@ -105,25 +112,11 @@ class OnScreenControlsTest { view.updateLayout(SavedInputLayout("test", "Test", listOf(left.copy(floating = floating)), aspect = ASPECT)) measure(view) touch(MotionEvent.ACTION_DOWN, 3 to (230f to 300f)) - assertEquals(if (floating) 0f else .5f, state().leftX, .001f) + assertEquals(if (floating) 0f else .5f, state().leftX, .01f) touch(MotionEvent.ACTION_UP, 3 to (230f to 300f)) } } - @Test fun systemOnlyVisibilityMovesSteamAndQamToTheBottomCornersAndReleasesOtherButtons() { - val guide = InputSurfaceElement(InputControl.GUIDE, .4f, .7f, .1f, .2f) - view.updateLayout(SavedInputLayout("test", "Test", listOf(button, guide), aspect = ASPECT)) - measure(view) - touch(MotionEvent.ACTION_DOWN, 0 to (800f to 250f)) - view.setButtonsOnly(true) - measure(view) - assertFalse(state().isDown(PadState.A)) - assertFalse(view.takesTouchAt(800f, 250f)) - assertFalse(view.takesTouchAt(450f, 480f)) - assertTrue(view.takesTouchAt(44f, 556f)) - assertTrue(view.takesTouchAt(956f, 556f)) - } - @Test fun aCancelledSecondFingerDoesNotArmAStickClick() { touch(MotionEvent.ACTION_DOWN, 7 to (800f to 250f)) touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (800f to 250f), 9 to (200f to 300f)) @@ -177,54 +170,99 @@ class OnScreenControlsTest { assertFalse(state().isDown(PadState.L3)) } - @Test fun theQuickToggleHidesEverythingButTheKeyboardAndShowsItAgain() { - val keyboard = InputSurfaceElement(InputControl.A, .4f, .4f, .1f, .1f, "builtin:keyboard", name = "Keyboard") - view.updateLayout(SavedInputLayout("test", "Test", listOf(left, button, keyboard), aspect = ASPECT)) - measure(view) - val density = context.resources.displayMetrics.density - val x = 34 * density - val y = 600 - 34 * density - assertTrue(view.takesTouchAt(x, y)) - touch(MotionEvent.ACTION_UP, 4 to (x to y)) - touch(MotionEvent.ACTION_DOWN, 5 to (x to y)); touch(MotionEvent.ACTION_CANCEL, 5 to (x to y)); touch(MotionEvent.ACTION_UP, 5 to (x to y)) - assertFalse(view.isQuickHidden) + private val corner get() = 26 * context.resources.displayMetrics.density to 600 - 26 * context.resources.displayMetrics.density + + private fun tapCorner() { + val (x, y) = corner touch(MotionEvent.ACTION_DOWN, 1 to (x to y)); touch(MotionEvent.ACTION_UP, 1 to (x to y)) + shadowOf(Looper.getMainLooper()).idle() measure(view) - assertTrue(view.isQuickHidden) - assertFalse(view.takesTouchAt(800f, 250f)) - assertTrue(view.takesTouchAt(450f, 270f)) - touch(MotionEvent.ACTION_DOWN, 2 to (800f to 250f)); touch(MotionEvent.ACTION_UP, 2 to (800f to 250f)) - assertTrue(view.isQuickHidden) - touch(MotionEvent.ACTION_DOWN, 3 to (x to y)); touch(MotionEvent.ACTION_UP, 3 to (x to y)) - measure(view) - assertFalse(view.isQuickHidden) - assertTrue(view.takesTouchAt(800f, 250f)) - view.setButtonsOnly(true) - measure(view) - touch(MotionEvent.ACTION_DOWN, 6 to (x to y)); touch(MotionEvent.ACTION_UP, 6 to (x to y)) - assertFalse(view.isQuickHidden) } - @Test fun hidingTheGamepadKeepsAlwaysShownKeysDrawnAndTouchable() { - val key = InputSurfaceElement(InputControl.A, .45f, .1f, .1f, .1f, "imported:0", name = "Find", alwaysShown = true) - view.updateLayout(SavedInputLayout("test", "Test", listOf(left, button, key), aspect = ASPECT)) + @Test fun tappingTheCornerHidesTheControlsAndTappingAgainShowsThem() { + val taps = mutableListOf() + view.onCornerTap = { taps += it } + touch(MotionEvent.ACTION_DOWN, 4 to (800f to 250f)) + assertTrue(state().isDown(PadState.A)) + val (x, y) = corner + assertTrue(view.cornerTakes(x, y)) + assertFalse(view.cornerTakes(800f, 250f)) + touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 4 to (800f to 250f), 1 to (x to y)) + touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 4 to (800f to 250f), 1 to (x to y)) + shadowOf(Looper.getMainLooper()).idle() measure(view) - assertTrue(view.hasPinned) - view.setPinnedOnly(true) - measure(view) - assertTrue(view.takesTouchAt(500f, 90f)) + assertEquals(OnScreenControls.Hidden.BY_TAP, view.hidden) + assertFalse(state().isDown(PadState.A)) assertFalse(view.takesTouchAt(800f, 250f)) - assertFalse(view.takesTouchAt(200f, 300f)) - view.setPinnedOnly(false) - measure(view) + assertTrue(view.takesTouchAt(x, y)) + touch(MotionEvent.ACTION_UP, 4 to (800f to 250f)) + tapCorner() + assertNull(view.hidden) assertTrue(view.takesTouchAt(800f, 250f)) - assertTrue(view.takesTouchAt(500f, 90f)) - view.setQuickHidden(true) + assertEquals(listOf(OnScreenControls.Hidden.BY_TAP, null), taps) + } + + @Test fun holdingTheCornerOpensTheMenuOnLiftWithoutHiding() { + var held = 0 + val taps = mutableListOf() + view.onCornerHold = { held++ } + view.onCornerTap = { taps += it } + val activity = Robolectric.buildActivity(ComponentActivity::class.java).setup().get() + activity.setContentView(view, FrameLayout.LayoutParams(1000, 600)) measure(view) - assertTrue(view.takesTouchAt(500f, 90f)) + val (x, y) = corner + touch(MotionEvent.ACTION_DOWN, 1 to (x to y)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 50L)) + assertEquals(0, held) + touch(MotionEvent.ACTION_UP, 1 to (x to y)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(1, held) + assertNull(view.hidden) + assertTrue(taps.isEmpty()) + touch(MotionEvent.ACTION_DOWN, 1 to (x to y)) + touch(MotionEvent.ACTION_CANCEL, 1 to (x to y)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 50L)) + touch(MotionEvent.ACTION_UP, 1 to (x to y)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(1, held) + assertNull(view.hidden) + assertTrue(taps.isEmpty()) + } + + @Test fun aControllerHideReleasesHeldControlsAndATapBringsThemBack() { + touch(MotionEvent.ACTION_DOWN, 4 to (800f to 250f)) + view.setHidden(OnScreenControls.Hidden.BY_CONTROLLER) + measure(view) + assertFalse(state().isDown(PadState.A)) assertFalse(view.takesTouchAt(800f, 250f)) + touch(MotionEvent.ACTION_UP, 4 to (800f to 250f)) + tapCorner() + assertNull(view.hidden) + assertTrue(view.takesTouchAt(800f, 250f)) + } + + @Test fun theCornerIsGoneWithoutALayoutAndOnTheDockedStrip() { + val (x, y) = corner + view.updateLayout(null) + measure(view) + assertFalse(view.cornerTakes(x, y)) + assertFalse(view.takesTouchAt(x, y)) + val docked = OnScreenControls(context, bridge, OnScreenLayout.Dock(false, grips = true)) + docked.updateLayout(SavedInputLayout("test", "Test", listOf(button), aspect = ASPECT)) + measure(docked) + assertFalse(docked.cornerTakes(x, y)) + docked.releaseAll() + } + + @Test fun switchingTheVirtualControllerRedrawsTheSameLayoutWithTheNewKit() { + assertEquals(PadKit.STEAM_DECK, view.inputSurface.kit) + SessionPrefs.setSteamController(context, SessionPrefs.CONTROLLER_DS4) view.updateLayout(SavedInputLayout("test", "Test", listOf(left, button), aspect = ASPECT)) - assertFalse(view.hasPinned) + assertEquals(PadKit.DUALSHOCK, view.inputSurface.kit) + SessionPrefs.setSteamController(context, SessionPrefs.CONTROLLER_XBOX360) + view.reload() + assertEquals(PadKit.XBOX, view.inputSurface.kit) + SessionPrefs.setSteamController(context, SessionPrefs.CONTROLLER_DECK) } private companion object { const val ASPECT = 1000f / 600f } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt index cfe027586..e07362e25 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.input import android.content.Context import android.graphics.Rect +import com.droiddeck.launcher.session.SessionPrefs import org.json.JSONObject import org.junit.Assert.* import org.junit.Before @@ -38,39 +39,6 @@ class OnScreenLayoutTest { } } - @Test fun theBuiltInGamepadIsRegeneratedForEverySizeWithoutStretching() { - val layout = gamepad() - for ((w, h) in listOf(1200 to 540, 540 to 1200, 900 to 850)) { - val placed = OnScreenLayout.elements(context, layout, w, h, Rect()) - assertEquals(layout.elements.map { it.id }, placed.map { it.id }) - assertEquals(LegacyGamepadLayout(context, w, h).regenerate(layout.elements), placed) - for (id in listOf("legacy:a", "legacy:up", "legacy:guide")) assertSquare(placed.first { it.id == id }, w, h) - assertInside(placed, w, h) - } - } - - @Test @Config(qualifiers = "w745dp-h343dp-land-420dpi") - fun aBuiltInGamepadSavedAtTheDisplaySizeRegeneratesForTheMeasuredSurface() { - val saved = gamepad().copy(elements = LegacyGamepadLayout(context, 2608, 1200).elements(), aspect = 2608f / 1200) - val placed = OnScreenLayout.elements(context, saved, 2048, 1200, Rect()) - assertEquals(LegacyGamepadLayout(context, 2048, 1200).regenerate(saved.elements), placed) - } - - @Test @Config(qualifiers = "w745dp-h343dp-land-420dpi") - fun previouslyGeneratedEdgeSticksRegenerateWithoutOverridingCustomGeometry() { - val w = 2608 - val h = 1200 - ControllerPrefs.setLayout(context, w, h, mapOf("ls" to (0f to .5f), "rs" to (1f to .5f))) - val generator = LegacyGamepadLayout(context, w, h) - val old = generator.elements(previousStickGeometry = true) - val current = generator.elements() - assertTrue(old.filter { it.control == InputControl.LS || it.control == InputControl.RS }.zip(current.filter { it.control == InputControl.LS || it.control == InputControl.RS }).any { (a, b) -> kotlin.math.abs(a.width - b.width) > .01f }) - val saved = gamepad().copy(elements = old, aspect = w.toFloat() / h) - assertEquals(LegacyGamepadLayout(context, 2048, h).regenerate(old), OnScreenLayout.elements(context, saved, 2048, h, Rect())) - val custom = saved.copy(elements = old.map { if (it.id == "legacy:a") it.copy(x = .4f) else it }) - assertEquals(OnScreenLayout.fit(custom.elements, custom.aspect, 1f, 2048, h, Rect()), OnScreenLayout.elements(context, custom, 2048, h, Rect())) - } - @Test fun savingTheEditorFrameKeepsEveryControlWhereTheEditorShowsIt() { val w = 2608 val h = 1200 @@ -90,6 +58,27 @@ class OnScreenLayoutTest { } } + @Test fun onlyAnUntouchedBuiltInGamepadOrACopyOfOneFollowsTheKit() { + assertTrue(OnScreenLayout.generated(gamepad())) + assertTrue(OnScreenLayout.generated(SavedInputLayout("copy", "Copy", origin = InputLibraries.OVERLAY))) + assertFalse(OnScreenLayout.generated(SavedInputLayout("custom", "Custom"))) + assertFalse(OnScreenLayout.generated(SavedInputLayout("copy", "Copy", origin = InputLibraries.DECK))) + val edited = gamepad().copy(elements = listOf(InputSurfaceElement(InputControl.A, .5f, .5f, .1f, .1f)), aspect = 2f) + assertFalse(OnScreenLayout.generated(edited)) + assertEquals(listOf("legacy:a"), OnScreenLayout.elements(context, edited, 2000, 1000, Rect()).map { it.id }) + } + + @Test fun theBuiltInGamepadFollowsTheVirtualControllersKitAndScale() { + for ((type, kit) in listOf(SessionPrefs.CONTROLLER_DECK to PadKit.STEAM_DECK, SessionPrefs.CONTROLLER_XBOX360 to PadKit.XBOX, + SessionPrefs.CONTROLLER_DUALSENSE to PadKit.DUALSENSE)) { + SessionPrefs.setSteamController(context, type) + val safe = Rect(40, 0, 20, 10) + assertEquals(KitLayout.elements(context, kit, 2400, 1080, safe), OnScreenLayout.elements(context, gamepad(), 2400, 1080, safe)) + assertEquals(KitLayout.elements(context, kit, 2400, 1080, safe, 1.25f), OnScreenLayout.elements(context, gamepad().copy(scale = 1.25f), 2400, 1080, safe)) + } + assertEquals(emptyList(), OnScreenLayout.elements(context, null, 2400, 1080, Rect())) + } + @Test fun editorAndGameUseTheSamePixelRectsOnWideAndStandardScreens() { val layout = gamepad() for ((w, h) in listOf(2000 to 900, 1600 to 900)) { @@ -105,7 +94,7 @@ class OnScreenLayoutTest { @Test fun editedGeneratedAndCustomLayoutsKeepTheirPixelRectsAcrossRefreshes() { for ((w, h) in listOf(2000 to 900, 1600 to 900)) { val generated = gamepad() - val generatedEdit = generated.elements.map { if (it.id == "legacy:a") it.copy(x = .3f, y = .4f, width = .12f, height = .12f) else it } + val generatedEdit = KitLayout.elements(context, PadKit.current(context), w, h).map { if (it.id == "legacy:a") it.copy(x = .3f, y = .4f, width = .12f, height = .12f) else it } val generatedSaved = generated.copy(elements = generatedEdit, aspect = w.toFloat() / h) val generatedPixels = px(OnScreenLayout.elements(context, generatedSaved, w, h, Rect()).first { it.id == "legacy:a" }, w, h) val generatedRefresh = px(OnScreenLayout.editorElements(context, generatedSaved, w, h, edited = true).first { it.id == "legacy:a" }, w, h) @@ -117,25 +106,6 @@ class OnScreenLayoutTest { } } - @Test fun resetPositionsRestoresGeneratedGeometryAfterAnEdit() { - for ((w, h) in listOf(2000 to 900, 1600 to 900)) { - val original = gamepad() - val moved = original.copy(elements = original.elements.map { if (it.id == "legacy:a") it.copy(x = .3f) else it }, aspect = w.toFloat() / h) - val reset = LegacyGamepadLayout(context, w, h).regenerate(moved.elements) - assertEquals(LegacyGamepadLayout(context, w, h).regenerate(original.elements), OnScreenLayout.elements(context, moved.copy(elements = reset), w, h, Rect())) - } - } - - @Test fun regenerationKeepsTheUsersButtonStylesAndRemovedButtons() { - val layout = gamepad().let { g -> g.copy(elements = g.elements.filterNot { it.id == "legacy:y" }.map { if (it.id == "legacy:a") it.copy(opacity = .4f, icon = 0, name = "Jump") else it }) } - val placed = OnScreenLayout.elements(context, layout, 2000, 1000, Rect()) - assertNull(placed.firstOrNull { it.id == "legacy:y" }) - val a = placed.first { it.id == "legacy:a" } - assertEquals(.4f, a.opacity) - assertEquals("Jump", a.name) - assertEquals(LegacyGamepadLayout(context, 2000, 1000).elements().first { it.id == "legacy:a" }.x, a.x, .0001f) - } - @Test fun anEditedLayoutKeepsItsAspectAndCornersWhenTheScreenRotates() { val corner = InputSurfaceElement(InputControl.A, .85f, .7f, .1f, .2f) val left = InputSurfaceElement(InputControl.LS, .05f, .5f, .2f, .4f) @@ -167,26 +137,6 @@ class OnScreenLayoutTest { assertInside(OnScreenLayout.elements(context, edge, 2400, 1080, safe), 2400, 1080, safe) } - @Test fun steamAndQamOnlyModePutsLargeButtonsInTheBottomCornersAndTheKeyboardBetween() { - val safe = Rect(80, 0, 30, 20) - val placed = OnScreenLayout.elements(context, gamepad(), 1000, 500, safe, buttonsOnly = true) - assertEquals(setOf(InputControl.GUIDE, InputControl.QAM, InputControl.A), placed.map { it.control }.toSet()) - val radius = 30 * density - val inset = 44 * density - fun centre(e: InputSurfaceElement) = (e.x + e.width / 2f) * 1000 to (e.y + e.height / 2f) * 500 - val guide = placed.first { it.control == InputControl.GUIDE } - val qam = placed.first { it.control == InputControl.QAM } - val keyboard = placed.first { it.id == "builtin:keyboard" } - assertEquals(2 * radius, guide.width * 1000, .5f) - assertEquals(80 + inset, centre(guide).first, .5f) - assertEquals(500 - 20 - inset, centre(guide).second, .5f) - assertEquals(1000 - 30 - inset, centre(qam).first, .5f) - assertEquals(500f, centre(keyboard).first, .5f) - assertEquals(500 - 20 - inset, centre(keyboard).second, .5f) - val user = SavedInputLayout("edited", "Edited", listOf(InputSurfaceElement(InputControl.A, .5f, .5f, .1f, .1f))) - assertEquals(setOf(InputControl.GUIDE, InputControl.QAM), OnScreenLayout.elements(context, user, 2000, 1000, Rect(), buttonsOnly = true).map { it.control }.toSet()) - } - @Test fun theUnfoldedStripUsesTheDockGeometryInLandscapeAndPortrait() { for ((size, portrait) in listOf((2208 to 800) to false, (1080 to 1300) to true)) { val (w, h) = size @@ -233,8 +183,15 @@ class OnScreenLayoutTest { assertTrue(migrated.profiles.any { it.id == "migrated.screenkeys.0" }) assertTrue(prefs.getBoolean(LegacyScreenKeyMigration.MERGED, false)) assertEquals(migrated, InputLibraries.read(context)) - val placed = OnScreenLayout.elements(context, layout, 2400, 1080, Rect()) - assertEquals(layout.elements.map { it.id }, placed.map { it.id }) + } + + @Test fun migratedScreenKeysAreDrawnNextToTheKitGamepad() { + prefs.edit().clear().commit() + ControllerPrefs.prefs(context).edit().putString("screenKeys", legacyKeys).commit() + val layout = InputLibraries.read(context).activeLayout(false, InputRole.PRIMARY)!! + val placed = OnScreenLayout.elements(context, layout, 2400, 1080, Rect()).map { it.id } + assertTrue(placed.contains("imported:0")) + assertTrue(placed.containsAll(listOf("legacy:a", KitLayout.DPAD_ID, "legacy:ls"))) } @Test fun librariesMigratedBeforeTheMergeGetTheirScreenKeysBackOnceWithoutLosingEdits() { @@ -266,20 +223,6 @@ class OnScreenLayoutTest { assertEquals(selected, LegacyScreenKeyMigration.merge(selected, shown)) } - @Test fun alwaysShownKeysStayInButtonsOnlyModeAndLeaveTheUnfoldedStrip() { - val key = InputSurfaceElement(InputControl.A, .45f, .1f, .1f, .1f, "imported:0", name = "Find", alwaysShown = true) - val plain = InputSurfaceElement(InputControl.A, .45f, .4f, .1f, .1f, "imported:1", name = "Jump") - val layout = gamepad().let { it.copy(elements = it.elements + key + plain) } - val buttons = OnScreenLayout.elements(context, layout, 1000, 500, Rect(), buttonsOnly = true) - assertTrue(buttons.any { it.id == key.id }) - assertFalse(buttons.any { it.id == plain.id }) - assertEquals(OnScreenLayout.elements(context, gamepad(), 1000, 500, Rect(), buttonsOnly = true), buttons.filterNot { it.id == key.id }) - val strip = OnScreenLayout.elements(context, layout, 2208, 800, Rect(), dock = OnScreenLayout.Dock(false, grips = false)) - assertFalse(strip.any { it.id == key.id }) - assertTrue(strip.any { it.id == plain.id }) - assertTrue(OnScreenLayout.elements(context, layout, 1000, 500, Rect()).map { it.id }.containsAll(listOf(key.id, plain.id))) - } - @Test fun migratedScreenKeysAreAlwaysShownButOtherElementsAreNot() { prefs.edit().clear().commit() ControllerPrefs.prefs(context).edit().putString("screenKeys", legacyKeys).commit() diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadKitTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadKitTest.kt new file mode 100644 index 000000000..05c715e25 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/PadKitTest.kt @@ -0,0 +1,73 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.After +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE) +class PadKitTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + @After fun reset() { context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } + + @Test fun eachVirtualControllerGetsItsOwnKit() { + assertEquals(PadKit.STEAM_DECK, PadKit.of(SessionPrefs.CONTROLLER_DECK)) + assertEquals(PadKit.STEAM_CONTROLLER, PadKit.of(SessionPrefs.CONTROLLER_STEAM)) + assertEquals(PadKit.XBOX, PadKit.of(SessionPrefs.CONTROLLER_XBOX360)) + assertEquals(PadKit.DUALSHOCK, PadKit.of(SessionPrefs.CONTROLLER_DS4)) + assertEquals(PadKit.DUALSENSE, PadKit.of(SessionPrefs.CONTROLLER_DUALSENSE)) + assertEquals(PadKit.STEAM_DECK, PadKit.of(SessionPrefs.CONTROLLER_NONE)) + assertEquals(PadKit.STEAM_DECK, PadKit.of("switchpro")) + } + + @Test fun theKitFollowsTheChosenVirtualController() { + assertEquals(PadKit.STEAM_DECK, PadKit.current(context)) + SessionPrefs.setSteamController(context, SessionPrefs.CONTROLLER_DUALSENSE) + assertEquals(PadKit.DUALSENSE, PadKit.current(context)) + } + + @Test fun steamAndPlayStationKitsAreGroupedForTheirLayouts() { + assertEquals(setOf(PadKit.STEAM_DECK, PadKit.STEAM_CONTROLLER), PadKit.entries.filter { it.steam }.toSet()) + assertEquals(setOf(PadKit.DUALSHOCK, PadKit.DUALSENSE), PadKit.entries.filter { it.playStation }.toSet()) + assertFalse(PadKit.XBOX.steam || PadKit.XBOX.playStation) + } + + @Test fun faceGlyphsMatchTheRealControllers() { + assertEquals(FaceGlyphs.MONO_LETTERS, PadKit.STEAM_DECK.face) + assertEquals(FaceGlyphs.MONO_LETTERS, PadKit.STEAM_CONTROLLER.face) + assertEquals(FaceGlyphs.COLOR_LETTERS, PadKit.XBOX.face) + assertEquals(FaceGlyphs.COLOR_SYMBOLS, PadKit.DUALSHOCK.face) + assertEquals(FaceGlyphs.MONO_SYMBOLS, PadKit.DUALSENSE.face) + assertEquals(DpadStyle.ARROWS, PadKit.DUALSHOCK.dpad) + assertEquals(DpadStyle.ARROWS, PadKit.DUALSENSE.dpad) + } + + @Test fun onlyXboxNamesItsShouldersBumpersAndTriggers() { + val shoulders = listOf(InputControl.LB, InputControl.RB, InputControl.LT, InputControl.RT) + assertEquals(listOf("LB", "RB", "LT", "RT"), shoulders.map(PadKit.XBOX::label)) + for (kit in PadKit.entries - PadKit.XBOX) assertEquals(kit.name, listOf("L1", "R1", "L2", "R2"), shoulders.map(kit::label)) + for (kit in PadKit.entries) assertEquals(InputControl.A.label, kit.label(InputControl.A)) + } + + @Test fun playStationFaceButtonsAreNamedByTheirSymbols() { + val face = listOf(InputControl.A, InputControl.B, InputControl.X, InputControl.Y) + for (kit in listOf(PadKit.DUALSHOCK, PadKit.DUALSENSE)) { + assertEquals(kit.name, listOf("Cross", "Circle", "Square", "Triangle"), face.map(kit::name)) + assertEquals("L1", kit.name(InputControl.LB)) + val elements = KitLayout.elements(context, kit, 1920, 1080).associateBy { it.id } + assertEquals("Triangle", elements.getValue("legacy:y").name) + assertEquals("Cross", elements.getValue("legacy:a").name) + } + for (kit in listOf(PadKit.STEAM_DECK, PadKit.STEAM_CONTROLLER, PadKit.XBOX)) { + assertEquals(kit.name, face.map { it.label }, face.map(kit::name)) + assertEquals(kit.label(InputControl.LT), kit.name(InputControl.LT)) + assertEquals(InputControl.Y.label, KitLayout.elements(context, kit, 1920, 1080).single { it.id == "legacy:y" }.name) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/PhysicalShortcutsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PhysicalShortcutsTest.kt index d41aabbdd..1726e81da 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PhysicalShortcutsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PhysicalShortcutsTest.kt @@ -177,8 +177,8 @@ class PhysicalShortcutsTest { } @Test fun resetAndRemovalPreserveOtherControllerSettings() { - ControllerPrefs.setSelectSteam(context, true) - ControllerPrefs.setTarget(context, "a", "b") + LegacyControllerPrefs.setSelectSteam(context, true) + LegacyControllerPrefs.setTarget(context, "a", "b") assign(key(), Action.STEAM) assign(key(KeyEvent.KEYCODE_BUTTON_2), Action.QAM) PhysicalShortcuts.remove(context, PhysicalShortcuts.read(context).first()) @@ -186,7 +186,7 @@ class PhysicalShortcutsTest { PhysicalShortcuts.remove(context, PhysicalShortcuts.read(context).single()) assertTrue(PhysicalShortcuts.read(context).isEmpty()) assertTrue(ControllerPrefs.read(context).selectSteam) - assertEquals("b", ControllerPrefs.target(context, "a")) + assertEquals("b", LegacyControllerPrefs.target(context, "a")) assign(key(), Action.STEAM) ControllerPrefs.resetAll(context) assertTrue(PhysicalShortcuts.read(context).isEmpty()) diff --git a/app/src/test/java/com/droiddeck/launcher/input/SelectProfileRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SelectProfileRoutingTest.kt index 3cbdaacc4..9ccef58fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SelectProfileRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SelectProfileRoutingTest.kt @@ -36,7 +36,7 @@ class SelectProfileRoutingTest { @Before fun setUp() { context.getSharedPreferences("input-profiles", 0).edit().clear().commit() context.getSharedPreferences("controller", 0).edit().clear().commit() - ControllerPrefs.setSelectSteam(context, true) + LegacyControllerPrefs.setSelectSteam(context, true) shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device) bridge.setInputRouter(InputRouter(output)) bridge.setInputProfile(InputProfiles.active(context, desktop = false)) diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt index 7ba52e168..16a466005 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt @@ -80,7 +80,8 @@ class SessionKeyboardPadTest { ReflectionHelpers.setField(activity, "steamTouchOptions", SteamTouchConfig.Options(inputMode = SteamTouchConfig.INPUT_CONTROLLER)) SessionPrefs.setTouchMode(activity, SessionPrefs.TOUCH_DIRECT) - SessionPrefs.setOscMode(activity, SessionPrefs.OSC_STEAM_TOUCH) + SessionPrefs.setOscMode(activity, SessionPrefs.OSC_ALWAYS) + SessionPrefs.setSteamTouchLayout(activity, true) update() assertEquals(View.VISIBLE, steam.visibility) assertEquals(SessionPrefs.TOUCH_OFF, routedTouchMode()) diff --git a/app/src/test/java/com/droiddeck/launcher/input/ShowLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ShowLayoutTest.kt new file mode 100644 index 000000000..34aa4bc09 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/ShowLayoutTest.kt @@ -0,0 +1,45 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.view.View +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.InputSurfaceView +import org.junit.After +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, qualifiers = "w833dp-h468dp-land-369dpi") +class ShowLayoutTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + @After fun close() { context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } + + private fun sized(view: View, w: Int, h: Int) { + view.measure(View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY)) + view.layout(0, 0, w, h) + } + + @Test fun aGeneratedLayoutIsDrawnFromTheKitAtTheViewSize() { + SessionPrefs.setSteamController(context, SessionPrefs.CONTROLLER_XBOX360) + val view = InputSurfaceView(context) + sized(view, 1240, 1080) + view.showLayout(SavedInputLayout(InputLibraries.OVERLAY, "Gamepad")) + assertEquals(KitLayout.elements(context, PadKit.XBOX, 1240, 1080), view.shownElements) + view.releaseInputs() + } + + @Test fun aSavedLayoutIsDrawnAsSaved() { + val saved = listOf(InputSurfaceElement(InputControl.A, .4f, .4f, .1f, .1f)) + val view = InputSurfaceView(context) + sized(view, 1240, 1080) + view.showLayout(SavedInputLayout("mine", "Mine", saved)) + assertEquals(saved, view.shownElements) + view.showLayout(null) + assertTrue(view.shownElements.isEmpty()) + view.releaseInputs() + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/StickDeadZoneTest.kt b/app/src/test/java/com/droiddeck/launcher/input/StickDeadZoneTest.kt index cfa85a0de..57d22b43d 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/StickDeadZoneTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/StickDeadZoneTest.kt @@ -61,7 +61,7 @@ class StickDeadZoneTest { val button = PhysicalShortcuts.Button("test-pad", "Test pad", KeyEvent.KEYCODE_BUTTON_MODE, 0) val binding = PhysicalShortcuts.Binding(button, PhysicalShortcuts.Action.QAM) PhysicalShortcuts.assign(context, button, binding.action) - ControllerPrefs.setTarget(context, "a", "b") + LegacyControllerPrefs.setTarget(context, "a", "b") ControllerPrefs.setRumble(context, false) for (percent in ControllerPrefs.deadZones) { ControllerPrefs.setDeadZone(context, percent) @@ -395,27 +395,22 @@ class StickDeadZoneTest { @Test fun neutralScreenStickPressClearsRetainedPhysicalInput() { val device = device() for (adaptive in listOf(false, true)) { - ControllerPrefs.setAdaptiveSticks(context, adaptive) - ControllerPrefs.setLayout(context, 1200, 800, mapOf("ls" to (0.45f to 0.5f), "rs" to (0.55f to 0.5f))) for (id in listOf("ls", "rs")) { motion(device, MotionEvent.AXIS_X to 0.6f, MotionEvent.AXIS_Z to 0.7f) val view = OnScreenControls(context, bridge) - val elements = LegacyGamepadLayout(context, 1200, 800).elements() - view.updateLayout(SavedInputLayout("test", "Test", elements)) + val elements = KitLayout.elements(context, PadKit.STEAM_DECK, 1200, 800).map { if (it.kind == InputElementKind.STICK) it.copy(floating = adaptive) else it } + view.updateLayout(SavedInputLayout("test", "Test", elements, aspect = 1200f / 800f)) view.measure(android.view.View.MeasureSpec.makeMeasureSpec(1200, android.view.View.MeasureSpec.EXACTLY), android.view.View.MeasureSpec.makeMeasureSpec(800, android.view.View.MeasureSpec.EXACTLY)) view.layout(0, 0, 1200, 800) - val control = elements.first { it.control.id == id } - val left = (control.x * 1200).toInt() - val top = (control.y * 800).toInt() - val height = (control.height * 800).toInt() - val x = left + if (id == "ls") (control.width * 1200).toInt() - height / 2f else height / 2f - val y = top + height / 2f + val control = elements.first { it.id == "legacy:$id" } + val x = (control.x + control.width / 2) * 1200 + val y = (control.y + control.height / 2) * 800 val down = MotionEvent.obtain(1000, 1000, MotionEvent.ACTION_DOWN, x, y, 0) try { assertTrue(view.dispatchTouchEvent(down)) } finally { down.recycle() } - assertEquals(0f, if (id == "ls") pad().leftX else pad().rightX, 0f) + assertEquals(0f, if (id == "ls") pad().leftX else pad().rightX, .05f) assertTrue((if (id == "ls") pad().rightX else pad().leftX) > 0f) bridge.setStickDeadZone(25) - assertEquals(0f, if (id == "ls") pad().leftX else pad().rightX, 0f) + assertEquals(0f, if (id == "ls") pad().leftX else pad().rightX, .05f) motion(device, MotionEvent.AXIS_X to 0.6f, MotionEvent.AXIS_Z to 0.7f) val button = elements.first { it.control == InputControl.A } val bx = (button.x + button.width / 2) * 1200 diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 1835b6b85..74659f2b9 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -60,6 +60,20 @@ class SessionDisplayTest { assertEquals(864, SessionDisplay.unfoldedGameHeight(1920, 1080)) } + @Test fun unfoldedControlsFitTheGamesOwnAspectUnderTheCap() { + assertEquals(810, SessionDisplay.unfoldedGameHeight(1080, 1920, aspect = 4f / 3f)) + assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920, aspect = 16f / 9f)) + assertEquals((1920 * SessionDisplay.UNFOLDED_MAX_GAME_SHARE).toInt() and 1.inv(), SessionDisplay.unfoldedGameHeight(1080, 1920, aspect = 9f / 16f)) + assertEquals(SessionDisplay.unfoldedGameHeight(1080, 1920, aspect = .5f), SessionDisplay.unfoldedGameHeight(1080, 1920, aspect = .1f)) + assertEquals(810, SessionDisplay.unfoldedGameHeight(1080, 1920, 136, aspect = 4f / 3f)) + assertEquals(1240, SessionDisplay.unfoldedGameHeight(2448, 1848, 136, aspect = 16f / 9f)) + } + + @Test fun aTallScreenTakesTheTabRowFromTheControlsSoTheGameKeepsTheFullWidth() { + assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920, 146)) + assertEquals(1080, SessionDisplay.unfoldedGameHeight(1080, 2400, 146, aspect = 1f)) + } + @Test fun aTabRowUnderTheBarComesOutOfTheGameNotTheControls() { assertEquals(1376, SessionDisplay.unfoldedGameHeight(2448, 1848, 0)) assertEquals(1240, SessionDisplay.unfoldedGameHeight(2448, 1848, 136)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt index bc49532c6..f7265a60c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt @@ -9,6 +9,7 @@ import com.droiddeck.launcher.input.InputControl import com.droiddeck.launcher.input.InputProfile import com.droiddeck.launcher.input.InputProfiles import com.droiddeck.launcher.input.InputRole +import com.droiddeck.launcher.input.LegacyControllerPrefs import com.droiddeck.launcher.input.InputSurfaceLayout import org.junit.Assert.* import org.junit.Before @@ -52,7 +53,7 @@ class SettingsResetTest { SessionPrefs.setHudOpacity(app, 40) SessionPrefs.setDroidDeckHudConfig(app, "hudSize=mega,showFPSGraph=0") SessionPrefs.setDroidDeckHudPosition(app, 120f, 40f) - ControllerPrefs.setOpacity(app, 40) + LegacyControllerPrefs.setOpacity(app, 40) AppUiPrefs.setScale(app, 150) FrameGen.set(app, FrameGen.Mode(FrameGen.ENGINE_DDFG, 3)) prefs("steam_touch").edit().putBoolean("gyro", false).commit() @@ -154,7 +155,7 @@ class SettingsResetTest { val defaultGame = InputProfiles.read(app, InputProfile.GAME) val defaultDesktop = InputProfiles.read(app, InputProfile.DESKTOP) val defaultSurface = InputSurfaceLayout.read(app, InputProfile.DESKTOP) - ControllerPrefs.setTarget(app, "a", "b") + LegacyControllerPrefs.setTarget(app, "a", "b") InputProfiles.select(app, InputProfile.DESKTOP) InputProfiles.save(app, InputProfile.defaults(InputProfile.GAME) .withBinding(InputRole.PHYSICAL, InputControl.A, InputAction.Disabled)) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt index 8def5601a..83023dbca 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt @@ -60,42 +60,12 @@ class InputSettingsTest { ModeSettingsActions(onResolution = {}, onHdr = {}, onTouch = {}, onSuspendPolicy = {}, onOsc = {}, onInputSettings = { opened++ }, onDirectAudio = {}, onMic = {}, onDismiss = {}), SheetTab.CONTROLS) } } - compose.onNodeWithTag("input-profile-expand").performClick() - compose.onNodeWithText(context.getString(R.string.ctrl_edit)).performClick() + compose.onNodeWithText(context.getString(R.string.ctrl_edit)).performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.OnClick) compose.runOnIdle { assertEquals(1, opened); mode.value = SessionService.MODE_DESKTOP } - compose.onNodeWithText(context.getString(R.string.ctrl_edit)).performClick() + compose.onNodeWithText(context.getString(R.string.ctrl_edit)).performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.OnClick) compose.runOnIdle { assertEquals(2, opened) } } - @Test fun quickMenuCombinesPartsWithoutChangingTheSavedProfile() { - val original = InputLibraries.read(context) - compose.setContent { DroidDeckTheme { - androidx.compose.foundation.layout.Column { InputQuickSettings(rememberMenuHost(), desktop = true) } - } } - compose.onNodeWithTag("setting-input-profile").assertExists() - compose.onNodeWithTag("setting-input-part-PHYSICAL").assertDoesNotExist() - compose.onNodeWithTag("input-profile-expand").performClick() - compose.onNodeWithTag("setting-input-part-PHYSICAL").assertExists() - compose.onNodeWithTag("setting-input-part-PRIMARY").assertExists() - compose.onNodeWithTag("setting-input-part-SECONDARY").performClick() - compose.onNodeWithText("Deck grips + trackpads").performScrollTo().performClick() - compose.runOnIdle { - val changed = InputLibraries.read(context) - assertEquals(InputStockLayouts.DECK, changed.activePart(true, InputRole.SECONDARY).bindings) - assertEquals(original.profiles, changed.profiles) - assertEquals(original.compileActive(false), changed.compileActive(false)) - } - compose.onNodeWithText(context.getString(R.string.input_save_combination)).performClick() - compose.onNode(hasSetTextAction()).performTextInput("Reading") - compose.onNodeWithText(context.getString(R.string.gesture_save_changes)).performClick() - compose.runOnIdle { - val saved = InputLibraries.read(context) - assertEquals("Reading", saved.profile(saved.activeId(true)).name) - assertTrue(saved.selection(true).parts.isEmpty()) - assertEquals(original.profile("desktop"), saved.profile("desktop")) - } - } - @Test fun actionDraftSurvivesRouteAndTypeChanges() { var saved: InputAction? = null compose.setContent { DroidDeckTheme { InputActionEditor(InputControl.RS, InputAction.Scroll(27f, true), "Right stick", {}, { saved = it }) } } @@ -134,12 +104,9 @@ class InputSettingsTest { val layout = library.layout(InputProfile.GAME, InputRole.SECONDARY)!! compose.setContent { DroidDeckTheme { InputSurfaceDialog(InputProfile.GAME, {}, { changed = true }, role = InputRole.PRIMARY, layoutId = layout.id, bindingsId = library.profile(InputProfile.GAME).binding(InputRole.SECONDARY)) } } - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_editor_add)).performClick() - compose.onNodeWithText(context.getString(R.string.input_element_button), substring = false).performClick() - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_properties)).assertExists() - compose.onNodeWithText(context.getString(R.string.input_editor_done)).performClick() + addButton(layout) + compose.onNodeWithText(context.getString(R.string.input_options)).assertExists() + compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() compose.runOnIdle { assertTrue(changed) val updated = InputLibraries.read(context) @@ -189,24 +156,15 @@ class InputSettingsTest { } } - @Test fun hidingEditorToolsPreservesPlacedElements() { - val library = InputLibraries.read(context) - val layout = library.layout("game", InputRole.SECONDARY)!! - compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, - layoutId = layout.id, bindingsId = library.profile("game").binding(InputRole.SECONDARY)) } } - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_editor_add)).performClick() - compose.onNodeWithText(context.getString(R.string.input_element_button)).performClick() - compose.onNodeWithTag("input-layout-canvas").performTouchInput { click(center) } - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_hide_tools)).performClick() - compose.onNodeWithText(context.getString(R.string.input_editor_add)).assertDoesNotExist() - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_editor_done)).performClick() - compose.runOnIdle { assertEquals(layout.elements.size + 1, InputLibraries.read(context).layout("game", InputRole.SECONDARY)!!.elements.size) } + private val add get() = context.getString(R.string.input_editor_add) + + private fun addButton(layout: SavedInputLayout) { + compose.onNodeWithText(add).performScrollTo().performClick() + val clicks = listOf("legacy:l3", "legacy:r3").count { id -> layout.elements.none { it.id == id } } + compose.onAllNodesWithText(add)[1 + clicks + InputElementKind.entries.indexOf(InputElementKind.BUTTON)].performScrollTo().performClick() } - @Test fun localToolsCanMoveAndExpandWithoutMovingTheCanvas() { + @Test fun theEditorToolbarStaysAboveTheCanvasAndAddOpensAndClosesItsList() { val library = InputLibraries.read(context) compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, layoutId = library.layout("game", InputRole.SECONDARY)!!.id, bindingsId = library.profile("game").binding(InputRole.SECONDARY)) } } @@ -216,15 +174,49 @@ class InputSettingsTest { assertEquals(android.view.WindowManager.LayoutParams.MATCH_PARENT, window.attributes.height) } val canvas = compose.onNodeWithTag("input-layout-canvas").fetchSemanticsNode().boundsInRoot - val before = compose.onNodeWithTag("input-editor-tools").fetchSemanticsNode().boundsInRoot - compose.onNodeWithTag("input-editor-tools").performTouchInput { swipe(center, center + androidx.compose.ui.geometry.Offset(250f, 150f), 500) } - val after = compose.onNodeWithTag("input-editor-tools").fetchSemanticsNode().boundsInRoot - assertTrue(after.left > before.left + 100f) - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_editor_add)).assertIsDisplayed() + val tools = compose.onNodeWithTag("input-editor-tools").fetchSemanticsNode().boundsInRoot + assertTrue(tools.top >= canvas.top && tools.bottom < canvas.center.y) + val button = context.getString(R.string.input_element_button) + compose.onNodeWithText(button).assertDoesNotExist() + compose.onNodeWithText(add).performScrollTo().performClick() + compose.onNodeWithText(button).assertIsDisplayed() + compose.onAllNodesWithText(add).onFirst().performScrollTo().performClick() + compose.onNodeWithText(button).assertDoesNotExist() assertEquals(canvas, compose.onNodeWithTag("input-layout-canvas").fetchSemanticsNode().boundsInRoot) - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_editor_add)).assertDoesNotExist() + } + + @Test @Config(qualifiers = "w833dp-h468dp-land-369dpi") + fun removedKitControlsWaitUnderHiddenAndRestoringThemKeepsTheGamepadGenerated() { + val library = InputLibraries.read(context) + val layout = library.layout("game", InputRole.PRIMARY)!! + val a = InputLibraries.defaultPositions(context, library, layout)!!.first.single { it.id == "legacy:a" } + compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, + layoutId = layout.id, bindingsId = library.profile("game").binding(InputRole.PRIMARY)) } } + compose.onNodeWithText(context.getString(R.string.input_hidden_count, 0)).performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.input_nothing_hidden)).assertExists() + compose.onNodeWithText(context.getString(R.string.input_hidden_count, 0)).performScrollTo().performClick() + compose.onNodeWithTag("input-layout-canvas").performTouchInput { click(percentOffset(a.x + a.width / 2, a.y + a.height / 2)) } + compose.onNodeWithText(context.getString(R.string.input_remove_element)).performClick() + compose.onNodeWithText(context.getString(R.string.input_hidden_count, 1)).performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.input_restore)).performClick() + compose.onNodeWithText(context.getString(R.string.input_hidden_count, 0)).assertExists() + compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() + compose.runOnIdle { assertTrue(OnScreenLayout.generated(InputLibraries.read(context).layouts.first { it.id == layout.id })) } + } + + @Test fun resetAfterResizingMakesTheGamepadFollowTheKitAgain() { + val library = InputLibraries.read(context) + val layout = library.layout("game", InputRole.PRIMARY)!! + compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, + layoutId = layout.id, bindingsId = library.profile("game").binding(InputRole.PRIMARY)) } } + val reset = compose.onNodeWithText(context.getString(R.string.hud_reset_button)) + reset.performScrollTo().assertIsNotEnabled() + pressPlus(2) + reset.performScrollTo().assertIsEnabled().performClick() + compose.onNodeWithTag("input-editor-scale").assertTextEquals("100%") + reset.performScrollTo().assertIsNotEnabled() + compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() + compose.runOnIdle { assertTrue(OnScreenLayout.generated(InputLibraries.read(context).layouts.first { it.id == layout.id })) } } @Test fun deckPresetOffersItsRealElementsAndTheCommonEditor() { @@ -253,7 +245,6 @@ class InputSettingsTest { compose.onNodeWithTag("input-element-legacy:a").performScrollTo().assertIsDisplayed() compose.onNodeWithTag("input-binding-a").assertDoesNotExist() compose.onNodeWithTag("input-surface-primary").performScrollTo().performClick() - compose.onNodeWithTag("input-editor-tools").performClick() compose.onNodeWithText(context.getString(R.string.input_editor_add)).assertIsDisplayed() compose.onNodeWithTag("input-layout-canvas").assertExists() } @@ -420,15 +411,14 @@ class InputSettingsTest { val round = mutableStateOf(0) compose.setContent { DroidDeckTheme { androidx.compose.runtime.key(round.value) { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, layoutId = layout.id, bindingsId = library.profile("game").binding(InputRole.SECONDARY)) } } } - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_reset_positions)).performScrollTo().assertIsNotEnabled() - compose.onNodeWithTag("input-editor-scale").performScrollTo().performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.SetProgress) { it(80f) } + compose.onNodeWithText(context.getString(R.string.hud_reset_button)).performScrollTo().assertIsNotEnabled() + repeat(4) { compose.onNodeWithText("\u2212").performScrollTo().performClick() } + compose.onNodeWithTag("input-editor-scale").assertTextEquals("80%") compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() val scaled = InputLibraries.read(context).layouts.first { it.id == layout.id } assertEquals(layout.elements.scaled(.8f), scaled.elements) compose.runOnIdle { round.value = 1 } - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithText(context.getString(R.string.input_reset_positions)).performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.hud_reset_button)).performScrollTo().performClick() compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() compose.runOnIdle { assertEquals(layout.elements, InputLibraries.read(context).layouts.first { it.id == layout.id }.elements) } } @@ -450,21 +440,6 @@ class InputSettingsTest { com.droiddeck.launcher.input.ControllerPrefs.setSnap(context, true) } - @Test fun quickButtonTogglesHideBuiltInButtonsWithoutDeletingThem() { - compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithTag("input-profile-game").performScrollTo().performClick() - compose.onNodeWithTag("input-part-primary").performScrollTo().performClick() - val before = InputLibraries.read(context).layout("game", InputRole.PRIMARY)!! - compose.onNodeWithTag("setting-quick-keyboard").performScrollTo().performClick() - compose.runOnIdle { - val after = InputLibraries.read(context).layout("game", InputRole.PRIMARY)!! - assertEquals(before.elements, after.elements) - assertEquals(setOf(InputCommand.KEYBOARD), after.style.hidden) - } - compose.onNodeWithTag("setting-quick-keyboard").performScrollTo().performClick() - compose.runOnIdle { assertTrue(InputLibraries.read(context).layout("game", InputRole.PRIMARY)!!.style.hidden.isEmpty()) } - } - @Test fun layoutsCanBeImportedAndExported() { val source = java.io.File(context.cacheDir, "jump.icp").apply { writeText("""{"name":"Jump keys","elements":[{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_SPACE"],"scale":1.0,"x":0.8,"y":0.7,"text":"Jump"}]}""") @@ -499,55 +474,54 @@ class InputSettingsTest { assertEquals("KEY_SPACE", org.json.JSONObject(target.readText()).getJSONArray("elements").getJSONObject(0).getJSONArray("bindings").getString(0)) } - @Test fun buttonSizeRegeneratesTheGamepadAndUndoesAsOneStep() { + private fun pressPlus(times: Int) = repeat(times) { compose.onNodeWithText("+").performScrollTo().performClick() } + + @Test fun sizeButtonsScaleTheWholeGamepadAndUndoAsOneStep() { val library = InputLibraries.read(context) val layout = library.layout("game", InputRole.PRIMARY)!! - val (_, metrics) = InputLibraries.primaryDisplay(context) - assertNotNull(OnScreenLayout.generatedSize(context, layout, metrics.widthPixels, metrics.heightPixels)) + assertTrue(OnScreenLayout.generated(layout)) + val defaults = InputLibraries.defaultPositions(context, library, layout)!!.first compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, layoutId = layout.id, bindingsId = library.profile("game").binding(InputRole.PRIMARY)) } } - compose.onNodeWithTag("input-editor-tools").performClick() - val slider = compose.onNodeWithTag("input-editor-scale").performScrollTo() - slider.assert(SemanticsMatcher.expectValue(androidx.compose.ui.semantics.SemanticsProperties.StateDescription, "100%")) - for (value in listOf(110f, 125f)) slider.performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.SetProgress) { it(value) } + val scale = compose.onNodeWithTag("input-editor-scale") + scale.assertTextEquals("100%") + pressPlus(2) + scale.assertTextEquals("110%") compose.onNodeWithText(context.getString(R.string.input_editor_undo)).performScrollTo().performClick() - slider.assert(SemanticsMatcher.expectValue(androidx.compose.ui.semantics.SemanticsProperties.StateDescription, "100%")) - slider.performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.SetProgress) { it(125f) } + scale.assertTextEquals("100%") + pressPlus(5) + scale.assertTextEquals("125%") compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() compose.runOnIdle { val saved = InputLibraries.read(context).layouts.first { it.id == layout.id } - assertEquals(1.25f, saved.scale) - assertNotNull(OnScreenLayout.generatedSize(context, saved, metrics.widthPixels, metrics.heightPixels)) - assertNotEquals(layout.elements.first { it.id == "legacy:a" }.y, saved.elements.first { it.id == "legacy:a" }.y) + assertFalse(OnScreenLayout.generated(saved)) + assertEquals(defaults.map { it.id }, saved.elements.map { it.id }) + assertTrue(saved.elements.first { it.id == "legacy:a" }.width > defaults.first { it.id == "legacy:a" }.width * 1.2f) } } @Test @Config(qualifiers = "w833dp-h468dp-land-369dpi") - fun buttonSizeKeepsMovedGamepadGroupsInShape() { + fun sizeButtonsKeepAMovedFaceClusterInShape() { val face = setOf("legacy:a", "legacy:b", "legacy:x", "legacy:y") val original = InputLibraries.read(context) val gamepad = original.layout("game", InputRole.PRIMARY)!! - val moved = gamepad.copy(elements = gamepad.elements.map { if (it.id in face) it.copy(x = it.x + .012f, y = it.y + .017f) else it }) + val (defaults, aspect) = InputLibraries.defaultPositions(context, original, gamepad)!! + val moved = gamepad.copy(elements = defaults.map { if (it.id in face) it.copy(x = it.x + .012f, y = it.y + .017f) else it }, aspect = aspect) InputLibraries.update(context) { it.withLayout(moved) } - val (_, metrics) = InputLibraries.primaryDisplay(context) - assertNull(OnScreenLayout.generatedSize(context, moved, metrics.widthPixels, metrics.heightPixels)) val library = InputLibraries.read(context) compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, layoutId = moved.id, bindingsId = library.profile("game").binding(InputRole.PRIMARY)) } } - compose.onNodeWithTag("input-editor-tools").performClick() - compose.onNodeWithTag("input-editor-scale").performScrollTo().performSemanticsAction(androidx.compose.ui.semantics.SemanticsActions.SetProgress) { it(125f) } + pressPlus(5) compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() compose.runOnIdle { val saved = InputLibraries.read(context).layouts.first { it.id == moved.id } - assertEquals(1.25f, saved.scale) - val w = metrics.widthPixels; val h = metrics.heightPixels + val w = saved.aspect * 1000; val h = 1000f fun centre(id: String) = saved.elements.first { it.id == id }.let { (it.x + it.width / 2) * w to (it.y + it.height / 2) * h } + val cross = face.associateWith(::centre) assertEquals(centre("legacy:y").first, centre("legacy:a").first, 1f) assertEquals(centre("legacy:x").second, centre("legacy:b").second, 1f) - assertTrue(centre("legacy:y").second < centre("legacy:x").second && centre("legacy:x").second < centre("legacy:a").second) - assertEquals(centre("legacy:a").second - centre("legacy:y").second, centre("legacy:b").first - centre("legacy:x").first, 1f) - assertEquals(centre("legacy:up").first, centre("legacy:down").first, 1f) - assertEquals(centre("legacy:left").second, centre("legacy:right").second, 1f) + assertTrue("$cross", centre("legacy:y").second < centre("legacy:x").second && centre("legacy:x").second < centre("legacy:a").second) + assertTrue("$cross", centre("legacy:x").first < centre("legacy:a").first && centre("legacy:a").first < centre("legacy:b").first) val before = moved.elements.first { it.id == "legacy:a" } assertTrue(saved.elements.first { it.id == "legacy:a" }.width > before.width * 1.2f) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceTouchTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceTouchTest.kt index 3df8d65e0..eaf9d6528 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceTouchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceTouchTest.kt @@ -134,26 +134,23 @@ class InputSurfaceTouchTest { touch(MotionEvent.ACTION_UP, 1 to (600f to 510f)) assertTrue(events.isEmpty()) show(a, b, stick) - view.setQuickHidden(true) + view.setHidden(OnScreenControls.Hidden.BY_TAP) measure(view) assertFalse(view.takesTouchAt(450f, 510f)) assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (450f to 510f))) assertTrue(events.isEmpty()) } - @Test fun keyboardShortcutWorksWithHiddenPadAndButtonsOnly() { - view.setQuickHidden(true) + @Test fun hiddenControlsHideTheKeyboardShortcutUntilShownAgain() { + view.setHidden(OnScreenControls.Hidden.BY_CONTROLLER) measure(view) assertFalse(view.takesTouchAt(800f, 240f)) + assertFalse(view.takesTouchAt(450f, 510f)) + view.setHidden(null) + measure(view) touch(MotionEvent.ACTION_DOWN, 1 to (450f to 510f)) touch(MotionEvent.ACTION_UP, 1 to (450f to 510f)) - view.setButtonsOnly(true) - measure(view) - val (x, y) = centre(element(view, "builtin:keyboard")) - assertFalse(view.takesTouchAt(800f, 240f)) - touch(MotionEvent.ACTION_DOWN, 1 to (x to y)) - touch(MotionEvent.ACTION_UP, 1 to (x to y)) - assertEquals(listOf("KEYBOARD:PRIMARY", "KEYBOARD:PRIMARY"), events) + assertEquals(listOf("KEYBOARD:PRIMARY"), events) } @Test fun hidingTheViewReleasesLatchedKeys() { @@ -181,11 +178,14 @@ class InputSurfaceTouchTest { touch(MotionEvent.ACTION_CANCEL, 1 to (800f to 240f), target = panel) } - @Test fun classicSticksTravelTheirFullRadius() { + @Test fun fixedSticksReachFullTiltInsideTheirRing() { show(stick.copy(buttonShape = InputButtonShape.CIRCLE)) + val reach = (100f - 3 * context.resources.displayMetrics.density) * .62f touch(MotionEvent.ACTION_DOWN, 1 to (200f to 300f)) - touch(MotionEvent.ACTION_MOVE, 1 to (250f to 300f)) + touch(MotionEvent.ACTION_MOVE, 1 to (200f + reach / 2 to 300f)) assertEquals(.5f, state().leftX, .01f) + touch(MotionEvent.ACTION_MOVE, 1 to (200f + reach to 300f)) + assertEquals(1f, state().leftX, .01f) touch(MotionEvent.ACTION_MOVE, 1 to (300f to 300f)) assertEquals(1f, state().leftX, .01f) touch(MotionEvent.ACTION_UP, 1 to (300f to 300f)) @@ -209,14 +209,15 @@ class InputSurfaceTouchTest { } @Test fun adaptiveSticksCaptureAroundThemAndTheLeftOneToTheEdge() { - val left = InputSurfaceElement(InputControl.LS, .3f, .3f, .2f, .4f, hideWhenIdle = true) - val right = InputSurfaceElement(InputControl.RS, .6f, .3f, .2f, .4f, hideWhenIdle = true) + val left = InputSurfaceElement(InputControl.LS, .3f, .3f, .2f, .4f, floating = true) + val right = InputSurfaceElement(InputControl.RS, .6f, .3f, .2f, .4f, floating = true) show(left, right) + val limit = (100f - 3 * context.resources.displayMetrics.density) * 1.71f assertTrue(view.takesTouchAt(10f, 300f)) - assertTrue(view.takesTouchAt(10f, 390f)) - assertFalse(view.takesTouchAt(10f, 420f)) - assertTrue(view.takesTouchAt(795f, 300f)) - assertFalse(view.takesTouchAt(815f, 300f)) + assertTrue(view.takesTouchAt(10f, 300f + limit - 4f)) + assertFalse(view.takesTouchAt(10f, 300f + limit + 4f)) + assertTrue(view.takesTouchAt(990f, 300f)) + assertFalse(view.takesTouchAt(990f, 300f + limit + 4f)) val missed = mutableListOf() view.onTouchMiss = { missed += it.getPointerId(0) } touch(MotionEvent.ACTION_DOWN, 1 to (50f to 300f)) @@ -224,9 +225,9 @@ class InputSurfaceTouchTest { assertEquals(listOf(2), missed) touch(MotionEvent.ACTION_MOVE, 1 to (150f to 300f), 2 to (60f to 310f)) assertTrue(state().leftX > .9f) - show(left.copy(hideWhenIdle = false), right.copy(hideWhenIdle = false)) + show(left.copy(floating = false), right.copy(floating = false)) assertFalse(view.takesTouchAt(10f, 300f)) - assertFalse(view.takesTouchAt(815f, 300f)) + assertFalse(view.takesTouchAt(990f, 300f)) } private fun element(root: View, id: String): View = descendants(root).first { (it.tag as? InputSurfaceElement)?.id == id } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt index 864eb0ef6..6857cf7a7 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.ui.Modifier import com.droiddeck.launcher.R import com.droiddeck.launcher.input.ControllerPrefs +import com.droiddeck.launcher.input.LegacyControllerPrefs import com.droiddeck.launcher.input.PadBridgeRoutingTest import com.droiddeck.launcher.input.PhysicalShortcuts import org.junit.Assert.* @@ -127,7 +128,7 @@ class PhysicalShortcutsDialogTest { } @Test fun removalRestoresDefaultAndPreservesOtherAssignmentsAndControllerSettings() { - ControllerPrefs.setSelectSteam(context, true) + LegacyControllerPrefs.setSelectSteam(context, true) PhysicalShortcuts.assign(context, requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F1, KeyEvent.ACTION_DOWN))), PhysicalShortcuts.Action.STEAM) PhysicalShortcuts.assign(context, requireNotNull(PhysicalShortcuts.button(event(KeyEvent.KEYCODE_F2, KeyEvent.ACTION_DOWN))), 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..f88a8d008 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -71,11 +71,8 @@ class SessionSecondScreenTest { @Test fun steamMenuKeepsTheExistingTrackpadAndTerminal() = checkModes(steam = true) - @Test fun desktopQuickMenuChangesTheRunningDesktopLayout() = checkQuickSelection(steam = false, desktop = true, direct = true) - @Test fun steamQuickMenuLeavesTheDesktopSelectionAlone() = checkQuickSelection(steam = true, desktop = false, direct = false) - @Test fun directGameQuickMenuLeavesTheDesktopSelectionAlone() = checkQuickSelection(steam = false, desktop = false, direct = true) @Test fun closingTheDockedDrawerKeepsTheSelectedControlsPanel() { SessionState.mode = SessionService.MODE_STEAM @@ -308,43 +305,6 @@ class SessionSecondScreenTest { compose.onNodeWithText(context.getString(R.string.mode_mic)).assertDoesNotExist() } - private fun checkQuickSelection(steam: Boolean, desktop: Boolean, direct: Boolean) { - SessionState.mode = if (desktop) SessionService.MODE_DESKTOP else if (steam) SessionService.MODE_STEAM else SessionService.MODE_RUN - val original = InputLibraries.update(context) { it.chooseLayout("desktop", InputRole.SECONDARY, InputLibraries.DECK) } - val activity = Robolectric.buildActivity(SessionActivity::class.java).get() - val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) - val panel = SecondScreenPresentation(activity, display, {}, {}, {}) - val open = androidx.compose.runtime.mutableStateOf(true) - try { - panel.show() - panel.showMode(SecondScreenMode.CUSTOM_CONTROLS) - compose.setContent { - DroidDeckTheme { - SessionDrawer(open.value, SessionDrawerPage.CONTROLLER, false, {}, - actions(steam, emptyList(), desktop = desktop, direct = direct, - onInputSelection = { panel.refreshControls() }, onClose = { open.value = false })) - } - } - compose.onNodeWithTag("setting-input-profile").performScrollTo().performClick() - compose.onNodeWithText("Desktop").performScrollTo().performClick() - compose.onNodeWithTag("input-profile-expand").performScrollTo().performClick() - compose.onNodeWithTag("setting-input-part-SECONDARY").performScrollTo().performClick() - compose.onNodeWithText("Trackpad + keyboard").performScrollTo().performClick() - compose.onNode(hasContentDescription(context.getString(R.string.common_close)) and - SemanticsMatcher.expectValue(androidx.compose.ui.semantics.SemanticsProperties.Role, androidx.compose.ui.semantics.Role.Button)).performClick() - compose.runOnIdle { - val updated = InputLibraries.read(context) - assertEquals("desktop", updated.selection(desktop).profile) - assertEquals(InputLibraries.TRACKPAD, updated.activeLayout(desktop, InputRole.SECONDARY)?.id) - assertEquals(original.selection(!desktop), updated.selection(!desktop)) - assertEquals(original.profiles, updated.profiles) - val controls = descendants(panel.window!!.decorView).filterIsInstance().single() - val pads = descendants(controls).mapNotNull { it.tag as? InputSurfaceElement }.filter { it.kind == InputElementKind.TRACKPAD }.toList() - assertEquals(1, pads.size) - } - } finally { panel.closeControls() } - } - private fun checkModes(steam: Boolean) { SessionState.mode = if (steam) SessionService.MODE_STEAM else SessionService.MODE_DESKTOP val selected = mutableListOf() From ceb0360cd8087fda87114f06453bfc16a9002361 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 19:17:43 -0500 Subject: [PATCH 03/25] feat(input): drop the Deck panel tabs from the controls under the game --- .../com/droiddeck/launcher/SessionActivity.kt | 35 ++----------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f202e3025..767291e2d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -188,9 +188,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private var unfoldedPanel by mutableStateOf(null) private var unfoldedColumn: android.widget.LinearLayout? = null - private var unfoldedDeckSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null private var swappedInputSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null - private var unfoldedDeckPanel by mutableStateOf(null) private var deckPanelLayouts: Map = emptyMap() private lateinit var sessionRoot: FrameLayout private var inputRouter: InputRouter? = null @@ -3618,7 +3616,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde return onScreenControls?.let { takes(it, it::takesTouchAt) } == true || steamTouchControls?.let { takes(it, it::takesTouchAt) } == true || unfoldedPanel?.let { takes(it, it::takesTouchAt) } == true || - unfoldedDeckSurface?.let { takes(it, it::takesTouchAt) } == true || unfoldedColumn?.getChildAt(0)?.let { takes(it) { _, _ -> true } } == true } @@ -4446,7 +4443,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde bottomInputControls?.updateLayout(primaryInputLayout) unfoldedPanel?.updateLayout(primaryInputLayout) if (unfoldedPanel != null) applyUnfoldedControls() - showUnfoldedDeckPanel() updateOnScreenPad() secondScreenPresentation?.refreshControls() } @@ -4509,8 +4505,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (panel != null && (!wanted || panel.dock != dock)) { sessionRoot.removeView(unfoldedColumn) unfoldedColumn = null - unfoldedDeckSurface = null - unfoldedDeckPanel = null unfoldedPanel = null panel = null if (!wanted) updateOnScreenControls() @@ -4531,37 +4525,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde sessionRoot.addView(column, sessionRoot.indexOfChild(surfaceView) + 1) unfoldedColumn = column unfoldedPanel = panel - showUnfoldedDeckPanel() updateOnScreenControls() } unfoldedColumn?.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, height - gameHeight, Gravity.BOTTOM) } private fun unfoldedBar(): View = com.droiddeck.launcher.ui.bottomScreenBarView(this) { - val deck = unfoldedDeckPanel - com.droiddeck.launcher.ui.sessionBarModel(getString(if (deck != null) R.string.second_mode_deck_controls else R.string.deck_tab_gamepad), - { chooseUnfoldedControls(false) }, { drawerOpen = true }, ::tapSteamButton, ::tapQam, - tabs = deck?.let { com.droiddeck.launcher.ui.deckPanelTabs(this, it, ::selectDeckPanel) }) - } - - private fun showUnfoldedDeckPanel() { - val column = unfoldedColumn - val panel = unfoldedPanel - val selected = SessionPrefs.deckPanel(this).takeIf { column != null && panel?.dock?.grips == true } - unfoldedDeckPanel = selected - val layout = selected?.takeIf { it != com.droiddeck.launcher.input.DeckPanel.GAMEPAD }?.let { deckPanelLayouts[it] } - if (layout != null && unfoldedDeckSurface?.tag == layout) return - unfoldedDeckSurface?.let { it.releaseInputs(); column?.removeView(it) } - unfoldedDeckSurface = null - if (column == null || panel == null) return - if (layout == null) { panel.visibility = View.VISIBLE; return } - panel.releaseAll() - panel.visibility = View.GONE - unfoldedDeckSurface = com.droiddeck.launcher.ui.InputSurfaceView(this, padBridge, inputRole = InputRole.PRIMARY, haptics = true).also { - it.showLayout(layout) - it.tag = layout - column.addView(it, android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT, 0, 1f)) - } + com.droiddeck.launcher.ui.sessionBarModel(getString(R.string.deck_tab_gamepad), + { chooseUnfoldedControls(false) }, { drawerOpen = true }, ::tapSteamButton, ::tapQam) } private fun bottomKeyboardPresentation(): SecondScreenPresentation? { @@ -4915,7 +4886,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var screenTapsClick = true private fun onScreenMouseButtonShown(): Boolean = listOfNotNull( - onScreenControls?.inputSurface, bottomInputControls?.inputSurface, unfoldedPanel?.inputSurface, unfoldedDeckSurface, + onScreenControls?.inputSurface, bottomInputControls?.inputSurface, unfoldedPanel?.inputSurface, secondScreenPresentation?.controlsView, swappedInputSurface, ).any { it.isShown && inputProfile.showsMouseButton(it.inputRole, it.shownElements, stockInputProfile) } From 695ae21f93b7be56da66c701d7a2f3152d8d4308 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 19:40:27 -0500 Subject: [PATCH 04/25] feat(input): full-size portrait pad, one top row and sticks for every non-Steam kit --- .../launcher/input/GamepadGeometry.kt | 60 +++++++++--------- .../com/droiddeck/launcher/input/KitLayout.kt | 61 ++++++++++++++++--- .../droiddeck/launcher/input/KitLayoutTest.kt | 36 +++++++---- .../launcher/ui/GamepadGeometryTest.kt | 29 +++++++-- 4 files changed, 127 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt index 988ab5f76..e8e16d712 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt @@ -26,10 +26,10 @@ object GamepadGeometry { fun tall(w: Float, h: Float): Boolean = h >= w * 0.45f - fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false): Map { + fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false, grips: Boolean = true): Map { if (w <= 0f || h <= 0f) return emptyMap() - if (portraitDock && h >= w * 0.9f && w >= 300 * density && h >= 360 * density) { - return portraitLayout(w, h, density) + if (portraitDock && h >= w * 0.6f && w >= 300 * density && h >= 300 * density) { + return portraitLayout(w, h, density, grips) } val pad = 8 * density val buttonH = 40 * density @@ -92,38 +92,36 @@ object GamepadGeometry { return boxes } - private fun portraitLayout(w: Float, h: Float, density: Float): Map { + /** + * The panel under a portrait game: shoulders with View and Menu across the top, the back grips under them when the kit has + * them, then the d-pad and face buttons and, along the bottom edge, the sticks or trackpads, each as large as the panel allows. + */ + private fun portraitLayout(w: Float, h: Float, density: Float, grips: Boolean): Map { val pad = 8 * density val gap = 8 * density val buttonH = 44 * density - val scale = min(1f, (h - 2 * pad - 4 * gap - 3 * buttonH) / (w * 0.7f)) - val main = w * 0.4f * scale - val second = w * 0.3f * scale + val boxes = LinkedHashMap() + val topGap = 4 * density + val topW = (w - 2 * pad - 5 * topGap) / 6f + val top = listOf(Slot.LEFT_OUTER_SHOULDER, Slot.LEFT_INNER_SHOULDER, Slot.VIEW, Slot.MENU, Slot.RIGHT_INNER_SHOULDER, Slot.RIGHT_OUTER_SHOULDER) + for ((i, slot) in top.withIndex()) boxes[slot] = Box(pad + topW / 2f + i * (topW + topGap), pad + buttonH / 2f, topW, buttonH) + var areaTop = pad + buttonH + gap + if (grips) { + val gripW = (w - 2 * pad - 3 * gap) / 4f + val gripH = min(56 * density, (h - areaTop) * 0.12f).coerceAtLeast(buttonH) + for ((i, slot) in listOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4).withIndex()) + boxes[slot] = Box(pad + gripW / 2f + i * (gripW + gap), areaTop + gripH / 2f, gripW, gripH) + areaTop += gripH + gap + } + val area = h - pad - areaTop - gap + val main = min(w * 0.46f, area * 0.53f) + val second = min(w * 0.42f, area - main) + val secondY = areaTop + second / 2f val mainY = h - pad - main / 2f - val secondY = mainY - main / 2f - gap - second / 2f - val shoulderY = secondY - second / 2f - gap - buttonH / 2f - val boxes = linkedMapOf( - Slot.LEFT_MAIN to Box(w * 0.25f, mainY, main, main), - Slot.RIGHT_MAIN to Box(w * 0.75f, mainY, main, main), - Slot.LEFT_SECOND to Box(w * 0.25f, secondY, second, second), - Slot.RIGHT_SECOND to Box(w * 0.75f, secondY, second, second), - ) - val utilityW = (w - 2 * pad - 3 * gap) / 4f - for ((i, slot) in middle.withIndex()) { - boxes[slot] = Box(pad + utilityW / 2f + i * (utilityW + gap), pad + buttonH / 2f, utilityW, buttonH) - } - val gripTop = pad + buttonH + gap - val gripH = min(64 * density, shoulderY - buttonH / 2f - gap - gripTop) - for ((i, slot) in listOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4).withIndex()) { - boxes[slot] = Box(pad + utilityW / 2f + i * (utilityW + gap), gripTop + gripH / 2f, utilityW, gripH) - } - val panelsW = min(112 * density, w * 0.22f) - val shoulderW = (w - 2 * pad - 4 * gap - panelsW) / 4f - boxes[Slot.PANELS] = Box(w / 2f, shoulderY, panelsW, buttonH) - boxes[Slot.LEFT_OUTER_SHOULDER] = Box(pad + shoulderW / 2f, shoulderY, shoulderW, buttonH) - boxes[Slot.LEFT_INNER_SHOULDER] = Box(pad + shoulderW * 1.5f + gap, shoulderY, shoulderW, buttonH) - boxes[Slot.RIGHT_INNER_SHOULDER] = Box(w - pad - shoulderW * 1.5f - gap, shoulderY, shoulderW, buttonH) - boxes[Slot.RIGHT_OUTER_SHOULDER] = Box(w - pad - shoulderW / 2f, shoulderY, shoulderW, buttonH) + boxes[Slot.LEFT_SECOND] = Box(w * 0.25f, secondY, second, second) + boxes[Slot.RIGHT_SECOND] = Box(w * 0.75f, secondY, second, second) + boxes[Slot.LEFT_MAIN] = Box(w * 0.25f, mainY, main, main) + boxes[Slot.RIGHT_MAIN] = Box(w * 0.75f, mainY, main, main) return boxes } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index 14e9d45af..e4d436a7b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -8,8 +8,8 @@ import kotlin.math.min /** * Places a virtual controller's default on-screen controls. Each kit is drawn on a 1600 × 900 reference screen; controls keep * their distance from the nearest edge, so wider screens spread them apart instead of stretching them. Clusters such as the face - * buttons are placed by their centre so they move as one. In portrait the whole pad sits along the bottom edge, and the row left of - * the bottom edge always starts after DroidDeck's corner button. + * buttons are placed by their centre so they move as one, and the row along the bottom-left edge always starts after DroidDeck's + * corner button. */ object KitLayout { const val DPAD_ID = "kit:dpad" @@ -19,11 +19,12 @@ object KitLayout { fun isKit(id: String) = id.startsWith("legacy:") || id == DPAD_ID || id == KEYBOARD_ID private const val REF_W = 1600f private const val REF_H = 900f - private const val PORTRAIT_W = 1200f /** The widest pair of side controls on any kit: a larger size never pushes the two halves, or the rows, into each other. */ private const val MIN_SPAN = 1200f private const val MAX_HEIGHT_MM = 80f private const val CORNER_DP = 52f + private const val ROW_DP = 60f + private const val BUTTON_DP = 44f private const val GAP_DP = 8f private class Spec(val control: InputControl, val cx: Float, val cy: Float, val hw: Float, val hh: Float = hw, val id: String = "legacy:${control.id}", @@ -47,7 +48,7 @@ object KitLayout { kit.steam -> shoulders() + listOf( Spec(InputControl.L4, 30f, 470f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.L5, 30f, 590f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.R4, 1570f, 470f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.R5, 1570f, 590f, 30f, 58f, shape = InputButtonShape.ROUNDED), - dpad(215f, 330f, 100f)) + face(1385f, 330f, 50f, 82f) + listOf( + dpad(215f, 330f, 112f)) + face(1385f, 330f, 56f, 92f) + listOf( Spec(InputControl.LS, 290f, 610f, 96f), Spec(InputControl.RS, 1310f, 610f, 96f), Spec(InputControl.LEFT_PAD, 480f, 345f, 95f, shape = InputButtonShape.ROUNDED), Spec(InputControl.RIGHT_PAD, 1120f, 345f, 95f, shape = InputButtonShape.ROUNDED), Spec(InputControl.SELECT, 660f, 150f, 46f, 26f, shape = InputButtonShape.PILL), Spec(InputControl.START, 940f, 150f, 46f, 26f, shape = InputButtonShape.PILL), @@ -67,16 +68,15 @@ object KitLayout { /** The default controls for [kit] on a [width] × [height] screen. */ fun elements(context: Context, kit: PadKit, width: Int, height: Int, safe: Rect = Rect(), scale: Float = 1f): List { if (width <= 0 || height <= 0) return emptyList() + if (height > width) return portrait(context, kit, width, height, safe, scale) val w = width.toFloat(); val h = height.toFloat() - val portrait = height > width - val unit = (min(w / if (portrait) PORTRAIT_W else REF_W, h / REF_H) * cap(context, min(width, height)) * scale).coerceAtMost(min(w / MIN_SPAN, h / REF_H)) + val unit = (min(w / REF_W, h / REF_H) * cap(context, min(width, height)) * scale).coerceAtMost(min(w / MIN_SPAN, h / REF_H)) fun x(ref: Float) = when { ref < REF_W / 3f -> safe.left + ref * unit ref > REF_W * 2f / 3f -> w - safe.right - (REF_W - ref) * unit else -> w / 2f + (ref - REF_W / 2f) * unit } fun y(ref: Float) = when { - portrait -> h - safe.bottom - (REF_H - ref) * unit ref < REF_H / 3f -> safe.top + ref * unit ref > REF_H * 2f / 3f -> h - safe.bottom - (REF_H - ref) * unit else -> h / 2f + (ref - REF_H / 2f) * unit @@ -95,10 +95,49 @@ object KitLayout { } } + /** + * A portrait surface gets the same pad as the panel under the game, in the lower part of the screen, with the keyboard, + * Steam, Quick Access and stick-click buttons in a row along the bottom edge that starts after DroidDeck's corner button. + */ + private fun portrait(context: Context, kit: PadKit, width: Int, height: Int, safe: Rect, scale: Float): List { + val w = width.toFloat(); val h = height.toFloat() + val density = context.resources.displayMetrics.density + val row = ROW_DP * density + val inner = (w - safe.left - safe.right).coerceAtLeast(1f) + val area = (min(h * .6f, inner * 1.15f) * scale).coerceAtMost(h - safe.top - safe.bottom - row).coerceAtLeast(1f) + val top = h - safe.bottom - row - area + val pad = dock(context, kit, inner.toInt(), area.toInt(), true, InputControl.LS, if (kit.steam) InputControl.RIGHT_PAD else InputControl.RS).map { e -> + e.copy(x = (safe.left + e.x * inner) / w, y = (top + e.y * area) / h, width = e.width * inner / w, height = e.height * area / h, + floating = e.kind == InputElementKind.STICK) + } + val specs = specs(kit) + fun spec(control: InputControl, id: String = "legacy:${control.id}") = specs.firstOrNull { it.control == control && it.id == id } + val size = BUTTON_DP * density + val cy = h - safe.bottom - row / 2f + val placed = mutableListOf() + fun put(s: Spec, cx: Float) { + val bw = size * s.hw / s.hh + placed += InputSurfaceElement(s.control, (cx - bw / 2) / w, (cy - size / 2) / h, bw / w, size / h, s.id, s.kind, + if (s.name == s.control.label) kit.name(s.control) else s.name, buttonShape = s.shape, icon = s.icon) + } + val gap = GAP_DP * density + var left = safe.left + CORNER_DP * density + for (s in listOfNotNull(spec(InputControl.A, KEYBOARD_ID), spec(InputControl.GUIDE).takeIf { kit.steam }, spec(InputControl.L3))) { + val bw = size * s.hw / s.hh + put(s, left + bw / 2); left += bw + gap + } + var right = w - safe.right - gap + for (s in listOfNotNull(spec(InputControl.QAM), spec(InputControl.GUIDE).takeIf { !kit.steam }, spec(InputControl.R3))) { + val bw = size * s.hw / s.hh + put(s, right - bw / 2); right -= bw + gap + } + return pad + placed + } + /** Controls for the panel below the game, in [GamepadGeometry]'s slots. */ fun dock(context: Context, kit: PadKit, width: Int, height: Int, portrait: Boolean, left: InputControl, right: InputControl): List { val w = width.toFloat(); val h = height.toFloat() - val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait) + val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait, grips = kit.steam) val placed = mutableListOf() fun put(control: InputControl, box: GamepadGeometry.Box?, shape: InputButtonShape, id: String = "legacy:${control.id}", kind: InputElementKind = InputElementKind.from(control), name: String = kit.name(control)) { @@ -106,9 +145,11 @@ object KitLayout { placed += InputSurfaceElement(control, b.left / w, b.top / h, b.width / w, b.height / h, id, kind, name, floating = false, buttonShape = shape).bounded() } fun square(box: GamepadGeometry.Box?) = box?.let { val side = min(it.width, it.height); GamepadGeometry.Box(it.cx, it.cy, side, side) } - put(left, square(boxes[GamepadGeometry.Slot.LEFT_MAIN]), InputButtonShape.CIRCLE) + val leftMain = if (kit.steam || left != InputControl.LEFT_PAD) left else InputControl.LS + val rightMain = if (kit.steam || right != InputControl.RIGHT_PAD) right else InputControl.RS + put(leftMain, square(boxes[GamepadGeometry.Slot.LEFT_MAIN]), InputButtonShape.CIRCLE) put(InputControl.LS, square(boxes[GamepadGeometry.Slot.LEFT_SECOND]), InputButtonShape.ROUNDED, DPAD_ID, InputElementKind.DPAD, "D-pad") - put(right, square(boxes[GamepadGeometry.Slot.RIGHT_MAIN]), InputButtonShape.CIRCLE) + put(rightMain, square(boxes[GamepadGeometry.Slot.RIGHT_MAIN]), InputButtonShape.CIRCLE) square(boxes[GamepadGeometry.Slot.RIGHT_SECOND])?.let { b -> val r = b.width * .17f; val off = b.width * .3f listOf(InputControl.Y to (0f to -1f), InputControl.B to (1f to 0f), InputControl.A to (0f to 1f), InputControl.X to (-1f to 0f)).forEach { (c, d) -> diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index 373eea937..35bf1f28b 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -176,8 +176,9 @@ class KitLayoutTest { val face = listOf("legacy:y", "legacy:x", "legacy:b", "legacy:a").map { centre(e.getValue(it), w, h) } val cx = face.map { it.first }.average().toFloat(); val cy = face.map { it.second }.average().toFloat() val radius = e.getValue("legacy:a").height * h / 2 - for ((x, y) in face) assertEquals("$kit $w x $h", radius * ratio.getValue(kit), hypot(x - cx, y - cy), 1f) - if (kit == PadKit.XBOX) { + val spread = if (h > w) .3f / .17f else ratio.getValue(kit) + for ((x, y) in face) assertEquals("$kit $w x $h", radius * spread, hypot(x - cx, y - cy), 1f) + if (kit == PadKit.XBOX && h <= w) { val (lx, ly) = centre(e.getValue("legacy:ls"), w, h); val (cx3, cy3) = centre(e.getValue("legacy:l3"), w, h) val unit = e.getValue("legacy:ls").height * h / 208f assertEquals("$w x $h", hypot(150f, 110f) * unit, hypot(cx3 - lx, cy3 - ly), 1f) @@ -207,18 +208,19 @@ class KitLayoutTest { } } - @Test fun portraitSurfacesKeepEveryControlInTheBottomBlock() { - for (kit in PadKit.entries) for ((w, h) in listOf(1080 to 1920, 1200 to 2000)) { + @Test fun portraitSurfacesPutTheWholePadInTheLowerPartAboveABottomRow() { + val density = context.resources.displayMetrics.density + for (kit in PadKit.entries) for ((w, h) in listOf(1080 to 1920, 1200 to 2000, 1080 to 2400)) { val elements = KitLayout.elements(context, kit, w, h) - val unit = w / 1200f - val top = elements.minOf { it.y } * h - assertTrue("$kit $w x $h top $top", top >= h - 900 * unit - .5f) - assertEquals("$kit $w x $h", h.toFloat(), elements.maxOf { (it.y + it.height) * h }, 900 * unit * .1f) - val tall = KitLayout.elements(context, kit, w, h + 100).associateBy { it.id } - for (e in elements.filter { it.height > .031f && tall.getValue(it.id).height > .031f }) { - val t = tall.getValue(e.id) - assertEquals("$kit ${e.id}", (1 - e.y - e.height / 2) * h, (1 - t.y - t.height / 2) * (h + 100), 1f) - } + val row = 60 * density + val area = minOf(h * .6f, w * 1.15f) + assertTrue("$kit $w x $h", elements.minOf { it.y } * h >= h - row - area - .5f) + assertTrue("$kit $w x $h", elements.maxOf { (it.y + it.height) * h } <= h + .5f) + val bottomRow = elements.filter { (it.y + it.height / 2) * h > h - row } + assertTrue("$kit $w x $h", bottomRow.any { it.id == KitLayout.KEYBOARD_ID } && bottomRow.any { it.control == InputControl.QAM }) + assertTrue("$kit $w x $h", bottomRow.minOf { it.x } * w >= 52 * density - .5f) + val stick = elements.first { it.id == "legacy:ls" } + assertTrue("$kit $w x $h", stick.width * w >= w * .3f) } } @@ -238,4 +240,12 @@ class KitLayoutTest { assertTrue(placed.none { it.floating }) } } + + @Test fun onlySteamKitsPutTrackpadsInTheDockedStrip() { + for (kit in PadKit.entries) { + val placed = KitLayout.dock(context, kit, 1080, 1300, true, InputControl.LS, InputControl.RIGHT_PAD).map { it.control } + assertEquals(kit.toString(), kit.steam, InputControl.RIGHT_PAD in placed) + assertEquals(kit.toString(), !kit.steam, InputControl.RS in placed) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt index dbb153bce..360af6f63 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt @@ -94,7 +94,7 @@ class GamepadGeometryTest { @Test fun portraitDockPlacesAllControlsWithinThePanel() { for (panel in portraitPanels) { val b = portraitBoxes(panel) - assertEquals(panel.name, Slot.values().toSet(), b.keys) + assertEquals(panel.name, Slot.values().toSet() - setOf(Slot.STEAM, Slot.QAM, Slot.PANELS), b.keys) for ((slot, box) in b) { val where = "${panel.name}: $slot $box" assertTrue(where, box.left >= 0f && box.top >= 0f) @@ -126,16 +126,35 @@ class GamepadGeometryTest { } } - @Test fun portraitDockMovesUtilitiesAndGripsAboveTheGamepad() { + @Test fun portraitDockPutsShouldersAndMenusInOneRowAboveTheGripsAndTheGamepad() { for (panel in portraitPanels) { val b = portraitBoxes(panel) - assertEquals(panel.name, 8 * panel.density, b.getValue(Slot.VIEW).top, 0.5f) + val row = listOf(Slot.LEFT_OUTER_SHOULDER, Slot.LEFT_INNER_SHOULDER, Slot.VIEW, Slot.MENU, Slot.RIGHT_INNER_SHOULDER, Slot.RIGHT_OUTER_SHOULDER) + for (slot in row) assertEquals("${panel.name}: $slot", 8 * panel.density, b.getValue(slot).top, 0.5f) + assertEquals(panel.name, row, row.sortedBy { b.getValue(it).cx }) assertTrue(panel.name, b.getValue(Slot.MENU).bottom < b.getValue(Slot.L4).top) - assertTrue(panel.name, b.getValue(Slot.L4).bottom < b.getValue(Slot.LEFT_OUTER_SHOULDER).top) - assertTrue(panel.name, b.getValue(Slot.LEFT_OUTER_SHOULDER).bottom < b.getValue(Slot.LEFT_SECOND).top) + assertTrue(panel.name, b.getValue(Slot.L4).bottom < b.getValue(Slot.LEFT_SECOND).top) + assertTrue(panel.name, b.getValue(Slot.LEFT_SECOND).bottom < b.getValue(Slot.LEFT_MAIN).top) } } + @Test fun aPortraitDockWithoutGripsGivesTheirRowToTheGamepad() { + for (panel in portraitPanels) { + val with = portraitBoxes(panel) + val without = GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density, portraitDock = true, grips = false) + assertTrue(panel.name, grips.none { it in without }) + assertTrue(panel.name, without.getValue(Slot.LEFT_SECOND).top < with.getValue(Slot.LEFT_SECOND).top) + assertTrue(panel.name, without.getValue(Slot.LEFT_SECOND).width >= with.getValue(Slot.LEFT_SECOND).width) + } + } + + @Test fun aShorterPortraitDockStillGetsTheUprightLayout() { + val (w, h, density) = Triple(1080f, 1010f, 369 / 160f) + val b = GamepadGeometry.layout(w, h, density, portraitDock = true, grips = false) + assertEquals(8 * density, b.getValue(Slot.VIEW).top, 0.5f) + assertTrue(b.getValue(Slot.RIGHT_SECOND).width >= w * 0.3f) + } + @Test fun shortPanelsKeepTheExistingLayoutEvenWhenPortraitDockIsRequested() { for ((width, height, density) in listOf(Triple(1920f, 1080f, 2f), Triple(720f, 600f, 2.3f))) { assertEquals(GamepadGeometry.layout(width, height, density), From 6f564caba656843cf8c986fa0e1ae1ce9fddc5c5 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:02:37 -0500 Subject: [PATCH 05/25] fix(input): keep kit bindings, D-pad directions and Steam touch tint through the redesign --- .../com/droiddeck/launcher/SessionActivity.kt | 5 +++- .../launcher/input/InputLibraries.kt | 14 +++++------ .../droiddeck/launcher/input/InputLibrary.kt | 8 +++++-- .../launcher/input/InputSurfaceSource.kt | 15 ++++++++++-- .../com/droiddeck/launcher/input/KitLayout.kt | 12 ++++++++++ .../launcher/input/SteamTouchControls.kt | 14 +++++++---- .../launcher/session/SessionPrefs.kt | 4 +++- .../launcher/ui/InputSettingsPage.kt | 5 +++- .../launcher/ui/InputSurfaceDialog.kt | 14 +++++++++++ .../droiddeck/launcher/ui/InputSurfaceView.kt | 6 +++-- .../launcher/input/InputLayoutToolsTest.kt | 4 +++- .../launcher/input/InputSurfaceSourceTest.kt | 16 +++++++++++++ .../input/OnScreenControlPrefsTest.kt | 23 +++++++++++++++++++ 13 files changed, 118 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 767291e2d..2b9199047 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2036,7 +2036,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun loadFrameGenFor(appId: Long?) { - if (appId != controlsGame) { controlsGame = appId; uiHandler.post { refreshInputProfile(); updateOnScreenControls() } } + val layoutGame = controlsGameId() + if (layoutGame != controlsGame) { controlsGame = layoutGame; uiHandler.post { refreshInputProfile(); updateOnScreenControls() } } val profileId = appId?.toString() frameGen = FrameGen.mode(this, profileId) frameGenHasGameOverride = appId?.let { @@ -5892,6 +5893,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (!screenOff) { gestureSettingsOpen = false inputSettingsOpen = false + layoutEditor = null } releasePads() heldKeys.clear() @@ -6269,6 +6271,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (event.actionMasked == MotionEvent.ACTION_DOWN) { drawerControllerActive = false gestureTouchStreamGate.reset() + if (controllerInUse && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { controllerInUse = false; updateOnScreenControls() } } if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) return false return onTouchEvent(event) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index e9817887d..9f1a012b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -130,9 +130,9 @@ object InputLibraries { InputStockLayouts.layouts().firstOrNull { it.id == origin }?.let { return it.elements to it.aspect } if (origin == OVERLAY) { val (surfaceContext, metrics) = primaryDisplay(context) - val w = maxOf(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) - val h = minOf(metrics.widthPixels, metrics.heightPixels).coerceAtLeast(1) - return KitLayout.elements(surfaceContext, PadKit.current(context), w, h) to w.toFloat() / h + val w = metrics.widthPixels.coerceAtLeast(1) + val h = metrics.heightPixels.coerceAtLeast(1) + return KitLayout.elements(surfaceContext, PadKit.current(context), w, h, scale = layout.scale) to w.toFloat() / h } return library.layouts.firstOrNull { it.id == origin && it.id != layout.id }?.let { it.elements to it.aspect } } @@ -147,10 +147,9 @@ object InputLibraries { private fun upgradeOverlay(context: Context, library: InputLibrary): InputLibrary { if (library.layouts.none { it.template == InputLayoutTemplate.OVERLAY }) return library val settings = ControllerPrefs.read(context) - val elements = emptyList() val style = InputSurfaceStyle(opacity = settings.opacity) val replacements = library.layouts.filter { it.template == InputLayoutTemplate.OVERLAY }.associate { old -> - old.id to old.copy(name = "Gamepad", elements = elements, template = InputLayoutTemplate.CUSTOM, style = style) + old.id to old.copy(name = "Gamepad", elements = emptyList(), template = InputLayoutTemplate.CUSTOM, style = style) } var result = library.copy(layouts = library.layouts.map { replacements[it.id] ?: it }) val migrated = mutableMapOf, String>() @@ -161,9 +160,8 @@ object InputLibraries { val id = migrated.getOrPut(key) { val old = library.preset(part.bindings) val newId = migrationBindingId(result, old.id, layout.id) - val keyboard = elements.filter { it.id == "builtin:keyboard" }.associate { it.id to InputAction.Command(InputCommand.KEYBOARD) } - val clicks = if (settings.stickClick) old.clicks else old.clicks + elements.filter { it.hasClick }.associate { it.id to InputAction.Disabled } - result = result.withPreset(old.copy(id = newId, layoutId = layout.id, elements = old.elements + keyboard, clicks = clicks)) + val clicks = if (settings.stickClick) old.clicks else old.clicks + KitLayout.clickIds.associateWith { InputAction.Disabled } + result = result.withPreset(old.copy(id = newId, layoutId = layout.id, clicks = clicks)) newId } part.copy(bindings = id) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index d1a4c8335..7f62a89ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -271,8 +271,8 @@ data class InputLibrary( require(preset.physical || preset.keys.isEmpty()) val layout = preset.layoutId?.let { id -> layouts.first { it.id == id } } require(!preset.physical || layout == null && preset.elements.isEmpty() && preset.clicks.isEmpty()) - require(preset.elements.all { (id, action) -> layout?.elements?.firstOrNull { it.id == id }?.let { action.validFor(it) } == true }) - require(preset.clicks.all { (id, action) -> layout?.elements?.any { it.id == id && it.hasClick } == true && action.validForClick() }) + require(preset.elements.all { (id, action) -> layout?.element(id)?.let { action.validFor(it) } == true }) + require(preset.clicks.all { (id, action) -> layout?.element(id)?.hasClick == true && action.validForClick() }) require(preset.keys.all { it.key.device.isNotBlank() && it.key.keyCode >= 0 && it.key.scanCode >= 0 && it.action.validFor(InputControl.A) && (it.action !is InputAction.Native || it.action.target == null) }) } @@ -312,3 +312,7 @@ internal fun InputAction.validFor(element: InputSurfaceElement): Boolean = when element.kind == InputElementKind.TRIGGER -> target == InputControl.LT || target == InputControl.RT else -> target.dimensions == 1 && target != InputControl.LT && target != InputControl.RT } + +/** A saved element, or, in a gamepad that keeps no kit positions, the kit control that [id] names. */ +internal fun SavedInputLayout.element(id: String): InputSurfaceElement? = + elements.firstOrNull { it.id == id } ?: KitLayout.element(id)?.takeIf { OnScreenLayout.generated(this) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt index 7012731ae..58e150d44 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt @@ -3,6 +3,9 @@ package com.droiddeck.launcher.input class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole, val element: InputSurfaceElement) { private val router = pad.inputRouter private val route = router?.channel(role, element.control, element = element) + /** The kit's D-pad keeps each direction's own binding, as the separate direction buttons it replaced did. */ + private val arms = if (element.id == KitLayout.DPAD_ID && router != null) + listOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT).map { router.channel(role, it) } else emptyList() private val deck = DeckControls.source(role, routed = true) private val clickDeck = DeckControls.source(role, routed = true) private val clickOwner = Any() @@ -55,6 +58,14 @@ class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole fingerDown = down if (latched) 1f else 0f } else value + if (arms.isNotEmpty() && route?.action is InputAction.Native) { + val values = listOf(y < -.5f, x > .5f, y > .5f, x < -.5f).map { if (it) 1f else 0f } + val toPad = arms.mapIndexed { i, arm -> arm.update(values[i])?.takeIf { it.isPad }?.let { it to values[i] } }.filterNotNull() + if (toPad.isNotEmpty() || nativePad) writePad(this, null) { state -> state.clear(); for ((t, v) in toPad) state.add(t, v) } + nativePad = toPad.isNotEmpty() + InputTiming.end(timing) + return + } val target = if (router == null) element.control else route?.update(x, y, touching) val toPad = target?.isPad == true val toDeck = target != null && !target.isPad @@ -112,13 +123,13 @@ class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole closed = true router?.removeSnapshot(snapshot) releaseNative(); resetLatch() - route?.close(); clickRoute?.close(); gestureWheel?.close(); gestureRight?.close(); gestureMiddle?.close(); deck.close(); clickDeck.close() + route?.close(); arms.forEach { it.close() }; clickRoute?.close(); gestureWheel?.close(); gestureRight?.close(); gestureMiddle?.close(); deck.close(); clickDeck.close() } fun release() { if (closed) return releaseNative(); resetLatch() - route?.release(); clickRoute?.release(); gestureWheel?.release(); gestureRight?.release(); gestureMiddle?.release() + route?.release(); arms.forEach { it.release() }; clickRoute?.release(); gestureWheel?.release(); gestureRight?.release(); gestureMiddle?.release() } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index e4d436a7b..560b22010 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -17,6 +17,18 @@ object KitLayout { /** Whether [id] names one of a kit's own controls rather than a key or control the player added. */ fun isKit(id: String) = id.startsWith("legacy:") || id == DPAD_ID || id == KEYBOARD_ID + + /** The control a kit id stands for in a layout that keeps no kit positions, so bindings saved for it stay valid. */ + fun element(id: String): InputSurfaceElement? = when { + id == DPAD_ID -> InputSurfaceElement(InputControl.LS, 0f, 0f, .1f, .1f, id, InputElementKind.DPAD) + id == KEYBOARD_ID -> InputSurfaceElement(InputControl.A, 0f, 0f, .1f, .1f, id) + id.startsWith("legacy:") -> InputControl.entries.firstOrNull { "legacy:${it.id}" == id } + ?.let { InputSurfaceElement(it, 0f, 0f, .1f, .1f, id, InputElementKind.from(it)) } + else -> null + } + + /** Every kit control that has a click, across all virtual controllers. */ + val clickIds = listOf(InputControl.LS, InputControl.RS, InputControl.LEFT_PAD, InputControl.RIGHT_PAD).map { "legacy:${it.id}" } private const val REF_W = 1600f private const val REF_H = 900f /** The widest pair of side controls on any kit: a larger size never pushes the two halves, or the rows, into each other. */ diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 6932f46c9..6e1361c5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -241,7 +241,10 @@ class SteamTouchControls( private fun cx(e: Element) = e.x * width private fun cy(e: Element) = e.y * height - private fun reach(e: Element, x: Float, y: Float) = hypot((x - cx(e)) / radius(e), (y - cy(e)) / radiusY(e)) + private fun reach(e: Element, x: Float, y: Float): Float { + val dx = (x - cx(e)) / radius(e); val dy = (y - cy(e)) / radiusY(e) + return if (e.type in TRACKPADS) max(abs(dx), abs(dy)) else hypot(dx, dy) + } private fun hit(list: List, x: Float, y: Float): Element? = list.filter { reach(it, x, y) <= 1.15f }.minByOrNull { reach(it, x, y) } @@ -282,6 +285,8 @@ class SteamTouchControls( val r = radius(e) val pressed = !editing && e.type in pressedTypes() val alpha = (255 * alphaScale * if (faded) FADED else 1f).toInt().coerceIn(30, 255) + stroke.color = Color.rgb(Color.red(tint), Color.green(tint), Color.blue(tint)); stroke.strokeWidth = lineWidth() + fill.color = Color.argb(217, 230, 233, 236) if (alpha < 255) canvas.saveLayerAlpha(x - r * 1.5f, y - r * 1.5f, x + r * 1.5f, y + r * 1.5f, alpha) when (e.type) { SteamTouchConfig.DPAD -> if (visuals[SteamTouchConfig.DPAD].orEmpty().any { it.binding?.hasIcon == true }) drawDpad(canvas, e, x, y, r) else { @@ -304,8 +309,8 @@ class SteamTouchControls( } SteamTouchConfig.TRACKPAD_LEFT, SteamTouchConfig.TRACKPAD_RIGHT, SteamTouchConfig.TRACKPAD_CENTER -> { val f = fingers.values.firstOrNull { it.element?.type == e.type }.takeIf { !editing } - canvas.save(); canvas.translate(x - r * 1.3f, y - r * .85f) - art.trackpad(canvas, r * 2.6f, r * 1.7f, f != null, (f?.x ?: x) - x + r * 1.3f, (f?.y ?: y) - y + r * .85f) + canvas.save(); canvas.translate(x - r, y - r) + art.trackpad(canvas, r * 2f, r * 2f, f != null, (f?.x ?: x) - x + r, (f?.y ?: y) - y + r) canvas.restore() if (editing) art.text(canvas, context.getString(R.string.deck_surface_trackpad), x, y, r * .3f, Color.argb(128, 255, 255, 255)) } @@ -354,7 +359,7 @@ class SteamTouchControls( val icon = binding?.icon?.takeIf { it.isNotEmpty() }?.let(::iconOrLoad) val custom = binding != null && binding.background.isNotEmpty() && !binding.background.equals(SteamTouchBindings.DEFAULT_BACKGROUND, true) art.glass(canvas, shape, pressed && !custom, if (custom) parseColor(binding!!.background, SteamTouchBindings.DEFAULT_BACKGROUND) else 0x850E1014.toInt()) - val ink = if (pressed && !custom) com.droiddeck.launcher.ui.PadArt.ON_ACCENT else com.droiddeck.launcher.ui.PadArt.INK + val ink = if (pressed && !custom) com.droiddeck.launcher.ui.PadArt.ON_ACCENT else if (tint != Color.WHITE) tint else com.droiddeck.launcher.ui.PadArt.INK if (icon != null) { val s = r * 0.62f if (custom) canvas.drawBitmap(tinted(binding!!.icon, icon, binding.foreground), null, RectF(x - s, y - s, x + s, y + s), Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG)) @@ -1444,6 +1449,7 @@ class SteamTouchControls( var onSaved: () -> Unit = {} companion object { + private val TRACKPADS = setOf(SteamTouchConfig.TRACKPAD_LEFT, SteamTouchConfig.TRACKPAD_RIGHT, SteamTouchConfig.TRACKPAD_CENTER) private const val TAG = "SteamTouch" private const val POLL_MS = 150L private const val MOVE_REDRAW_MS = 33L diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 6bdaf910a..0b91e9e8b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -647,7 +647,9 @@ object SessionPrefs { } fun setOscMode(context: Context, mode: String) { - prefs(context).edit().putString("osc", mode).apply() + val editor = prefs(context).edit() + if (!prefs(context).contains("steamTouchLayout")) editor.putBoolean("steamTouchLayout", steamTouchLayout(context)) + editor.putString("osc", mode).apply() } /** Draw Steam's touch layout for the game instead of DroidDeck's own. */ diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt index a0549bcb1..7addb75f1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt @@ -169,7 +169,10 @@ private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embe ?: b.controls[editing.control] ?: InputAction.Native() InputActionEditor(editing.control, current, if (editing.click) stringResource(R.string.input_click_name, editing.element!!.name) else editing.element?.name ?: editing.key?.label ?: editing.control.label, - properties = { action -> if (!editing.click) elementProperties?.let { e -> InputElementProperties(e, action) { elementProperties = it } } }, + properties = { action -> + if (!editing.click && layout?.elements?.any { it.id == editing.element?.id } == true) + elementProperties?.let { e -> InputElementProperties(e, action) { elementProperties = it } } + }, onBack = { edit = null }, element = editing.element, nativeTargets = editing.key == null, click = editing.click, detail = if (library.usersOfBindings(b.id).size > 1) stringResource(R.string.input_shared_detail, b.name, library.usersOfBindings(b.id).size) else "${profile.name} · ${roleLabel(role)}", onSave = { action -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 03ccba9a4..492f8afae 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -233,6 +233,11 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> (remote || target == null) && draft.properties && element != null -> propertiesEditor(element) target == null -> SettingsPage(rememberMenuHost(), savedLayout.name, ::leave) { Text(stringResource(R.string.input_display_unavailable)) + if (draft.confirmDiscard) { + Text(stringResource(R.string.input_editor_discard), style = MaterialTheme.typography.titleSmall) + SecondaryButton(stringResource(R.string.input_keep_editing)) { draft.confirmDiscard = false } + SecondaryButton(stringResource(R.string.input_discard), onClick = onDismiss) + } PrimaryButton(stringResource(R.string.input_editor_done)) { save() } } remote -> SettingsPage(rememberMenuHost(), stringResource(R.string.input_editor_remote), ::leave, @@ -362,9 +367,17 @@ private fun EditorRow(title: String, action: String, onClick: () -> Unit) { } } +@Composable +private fun CloseRow(draft: SurfaceDraft) { + Row(Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 4.dp), horizontalArrangement = Arrangement.End) { + SecondaryButton(stringResource(R.string.common_close), compact = true) { draft.popover = null } + } +} + @Composable private fun AddRows(draft: SurfaceDraft) { val context = LocalContext.current + CloseRow(draft) for (control in listOf(InputControl.L3, InputControl.R3).filter { c -> draft.elements.none { it.id == "legacy:${c.id}" } }) EditorRow(control.label, stringResource(R.string.input_editor_add)) { draft.add(InputSurfaceElement(control, .47f, .45f, .06f, .1f, buttonShape = InputButtonShape.CIRCLE)) } for (kind in InputElementKind.entries) EditorRow(stringResource(kind.label()), stringResource(R.string.input_editor_add)) { @@ -378,6 +391,7 @@ private fun AddRows(draft: SurfaceDraft) { @Composable private fun HiddenRows(draft: SurfaceDraft) { val hidden = draft.hiddenDefaults() + CloseRow(draft) if (hidden.isEmpty()) Text(stringResource(R.string.input_nothing_hidden), Modifier.padding(12.dp), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) for (e in hidden) EditorRow(e.name, stringResource(R.string.input_restore)) { draft.add(e) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt index 2af54e178..c3efc3394 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt @@ -155,6 +155,7 @@ class InputSurfaceView( /** Shows [layout]; a layout that has no elements of its own gets the virtual controller's defaults at this view's size. */ fun showLayout(layout: SavedInputLayout?) { generated = layout?.takeIf(OnScreenLayout::generated) + kit = PadKit.current(context) updateStyle(layout?.style ?: InputSurfaceStyle()) updateCustomLayout(generated?.let { OnScreenLayout.elements(context, it, width, height, android.graphics.Rect(), null) } ?: layout?.elements.orEmpty()) } @@ -313,7 +314,8 @@ class InputSurfaceView( val lit = if (element.toggle) source?.latched == true else down val w = width.toFloat(); val h = height.toFloat() val c = element.control - val native = element.id == "legacy:${c.id}" && element.showLabel && element.icon == 0 && bitmap == null + val native = element.id == "legacy:${c.id}" && element.showLabel && element.icon == 0 && bitmap == null && + (element.name == c.label || element.name == kit.name(c)) && (c !in FACE || element.buttonShape == InputButtonShape.CIRCLE) when { element.id == KitLayout.KEYBOARD_ID && element.icon == InputButtonIcons.KEYBOARD -> art.system(canvas, w, h, PadArt.Shape.ROUND, PadArt.Icon.KEYBOARD, lit) native && c in FACE -> art.face(canvas, w / 2f, h / 2f, min(w, h) / 2f - art.dp(2f), c, kit, lit) @@ -476,7 +478,7 @@ class InputSurfaceView( private var knobY = 0f val adaptive get() = adaptive(element) - private fun radius() = min(width, height) / 2f - 3 * density + private fun radius() = (min(width, height) / 2f - 3 * density).coerceAtLeast(1f) fun reach() = radius() * STICK_REACH diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt index 70013a34d..96565c8a8 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt @@ -61,11 +61,13 @@ class InputLayoutToolsTest { val (defaults, aspect) = InputLibraries.defaultPositions(context, library, gamepad)!! assertTrue(gamepad.elements.isEmpty()) val (display, metrics) = InputLibraries.primaryDisplay(context) - val w = maxOf(metrics.widthPixels, metrics.heightPixels); val h = minOf(metrics.widthPixels, metrics.heightPixels) + val w = metrics.widthPixels; val h = metrics.heightPixels assertEquals(KitLayout.elements(display, PadKit.current(context), w, h), defaults) assertEquals(w.toFloat() / h, aspect, .0001f) val copy = SavedInputLayout("mine", "Mine", origin = InputLibraries.OVERLAY) assertEquals(defaults, InputLibraries.defaultPositions(context, library, copy)!!.first) + assertEquals(KitLayout.elements(display, PadKit.current(context), w, h, scale = 1.2f), + InputLibraries.defaultPositions(context, library, gamepad.copy(scale = 1.2f))!!.first) assertNull(InputLibraries.defaultPositions(context, library, SavedInputLayout("new", "New"))) } diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt index 9ccbafe5b..29c3708f4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt @@ -171,4 +171,20 @@ class InputSurfaceSourceTest { surface.click(true); surface.click(false) assertEquals(listOf("button:272:true", "button:272:false"), events) } + + @Test fun theKitDpadPressesOnlyTheHeldDirectionAndKeepsEachDirectionsBinding() { + val dpad = InputSurfaceElement(InputControl.LS, .1f, .1f, .3f, .3f, KitLayout.DPAD_ID, InputElementKind.DPAD) + bridge.setInputProfile(InputProfile("test", bindings = mapOf(InputRole.SECONDARY to mapOf(InputControl.LEFT to InputAction.Keys(listOf(30)))))) + val pad = source(dpad) + pad.update(1f, 0f) + assertTrue(state().right) + assertFalse(state().up || state().down || state().left) + pad.update(0f, 0f) + assertFalse(state().right) + pad.update(-1f, 0f) + assertEquals("key:30:true", events.last()) + assertFalse(state().left) + pad.update(0f, 0f) + assertEquals("key:30:false", events.last()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt index ba8e31590..3934517b3 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt @@ -126,4 +126,27 @@ class OnScreenControlPrefsTest { assertEquals(listOf(key.id), upgraded.layouts.single { it.id == InputLibraries.OVERLAY }.elements.map { it.id }.filter { it.startsWith("imported:") }) assertEquals(InputAction.Keys(listOf(29, 33)), upgraded.compileActive(false).elementAction(InputRole.PRIMARY, key.id, InputControl.A)) } + + @Test fun bindingsSavedForKitControlsSurviveTheKitUpgrade() { + storeAt(14) { lib -> + val overlay = lib.layouts.single { it.id == InputLibraries.OVERLAY } + val bindings = lib.preset(lib.activePart(false, InputRole.PRIMARY).bindings) + lib.withLayout(overlay.copy(elements = KitLayout.elements(context, PadKit.STEAM_DECK, 1920, 1080), aspect = 16f / 9)) + .withPreset(bindings.copy(elements = bindings.elements + ("legacy:a" to InputAction.Keys(listOf(57))), + clicks = bindings.clicks + ("legacy:ls" to InputAction.Disabled))) + } + val upgraded = InputLibraries.read(context) + assertTrue(OnScreenLayout.generated(upgraded.layouts.single { it.id == InputLibraries.OVERLAY })) + val profile = upgraded.compileActive(false) + assertEquals(InputAction.Keys(listOf(57)), profile.elementAction(InputRole.PRIMARY, "legacy:a", InputControl.A)) + assertEquals(InputAction.Disabled, profile.clicks[InputRole.PRIMARY]?.get("legacy:ls")) + } + + @Test fun changingShowKeepsTheSteamLayoutAnOlderBuildStoredThere() { + val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) + prefs.edit().clear().putString("osc", SessionPrefs.OSC_STEAM_TOUCH).commit() + SessionPrefs.setOscMode(context, SessionPrefs.OSC_ALWAYS) + assertEquals(SessionPrefs.OSC_ALWAYS, SessionPrefs.oscMode(context)) + assertTrue(SessionPrefs.steamTouchLayout(context)) + } } From 318d64f3d6bcfec2550e0b9f91b096bdcd2a279a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:04:00 -0500 Subject: [PATCH 06/25] fix(input): keep Steam grips on a small portrait pad and fit the bottom row --- .../launcher/input/GamepadGeometry.kt | 4 ++-- .../com/droiddeck/launcher/input/KitLayout.kt | 21 ++++++++++++------- .../droiddeck/launcher/input/KitLayoutTest.kt | 13 ++++++++++++ 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt index e8e16d712..428995efe 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt @@ -26,9 +26,9 @@ object GamepadGeometry { fun tall(w: Float, h: Float): Boolean = h >= w * 0.45f - fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false, grips: Boolean = true): Map { + fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false, grips: Boolean = true, upright: Boolean = false): Map { if (w <= 0f || h <= 0f) return emptyMap() - if (portraitDock && h >= w * 0.6f && w >= 300 * density && h >= 300 * density) { + if (upright || portraitDock && h >= w * 0.6f && w >= 300 * density && h >= 300 * density) { return portraitLayout(w, h, density, grips) } val pad = 8 * density diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index 560b22010..3d7e5f915 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -118,13 +118,18 @@ object KitLayout { val inner = (w - safe.left - safe.right).coerceAtLeast(1f) val area = (min(h * .6f, inner * 1.15f) * scale).coerceAtMost(h - safe.top - safe.bottom - row).coerceAtLeast(1f) val top = h - safe.bottom - row - area - val pad = dock(context, kit, inner.toInt(), area.toInt(), true, InputControl.LS, if (kit.steam) InputControl.RIGHT_PAD else InputControl.RS).map { e -> + val pad = dock(context, kit, inner.toInt(), area.toInt(), true, InputControl.LS, if (kit.steam) InputControl.RIGHT_PAD else InputControl.RS, upright = true).map { e -> e.copy(x = (safe.left + e.x * inner) / w, y = (top + e.y * area) / h, width = e.width * inner / w, height = e.height * area / h, floating = e.kind == InputElementKind.STICK) } val specs = specs(kit) fun spec(control: InputControl, id: String = "legacy:${control.id}") = specs.firstOrNull { it.control == control && it.id == id } - val size = BUTTON_DP * density + val gap = GAP_DP * density + val leftRow = listOfNotNull(spec(InputControl.A, KEYBOARD_ID), spec(InputControl.GUIDE).takeIf { kit.steam }, spec(InputControl.L3)) + val rightRow = listOfNotNull(spec(InputControl.QAM), spec(InputControl.GUIDE).takeIf { !kit.steam }, spec(InputControl.R3)) + val start = safe.left + CORNER_DP * density + val span = (w - safe.right - gap - start - gap * (leftRow.size + rightRow.size - 1)).coerceAtLeast(1f) + val size = min(BUTTON_DP * density, span / (leftRow + rightRow).sumOf { (it.hw / it.hh).toDouble() }.toFloat()) val cy = h - safe.bottom - row / 2f val placed = mutableListOf() fun put(s: Spec, cx: Float) { @@ -132,14 +137,13 @@ object KitLayout { placed += InputSurfaceElement(s.control, (cx - bw / 2) / w, (cy - size / 2) / h, bw / w, size / h, s.id, s.kind, if (s.name == s.control.label) kit.name(s.control) else s.name, buttonShape = s.shape, icon = s.icon) } - val gap = GAP_DP * density - var left = safe.left + CORNER_DP * density - for (s in listOfNotNull(spec(InputControl.A, KEYBOARD_ID), spec(InputControl.GUIDE).takeIf { kit.steam }, spec(InputControl.L3))) { + var left = start + for (s in leftRow) { val bw = size * s.hw / s.hh put(s, left + bw / 2); left += bw + gap } var right = w - safe.right - gap - for (s in listOfNotNull(spec(InputControl.QAM), spec(InputControl.GUIDE).takeIf { !kit.steam }, spec(InputControl.R3))) { + for (s in rightRow) { val bw = size * s.hw / s.hh put(s, right - bw / 2); right -= bw + gap } @@ -147,9 +151,10 @@ object KitLayout { } /** Controls for the panel below the game, in [GamepadGeometry]'s slots. */ - fun dock(context: Context, kit: PadKit, width: Int, height: Int, portrait: Boolean, left: InputControl, right: InputControl): List { + fun dock(context: Context, kit: PadKit, width: Int, height: Int, portrait: Boolean, left: InputControl, right: InputControl, + upright: Boolean = false): List { val w = width.toFloat(); val h = height.toFloat() - val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait, grips = kit.steam) + val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait, grips = kit.steam, upright = upright) val placed = mutableListOf() fun put(control: InputControl, box: GamepadGeometry.Box?, shape: InputButtonShape, id: String = "legacy:${control.id}", kind: InputElementKind = InputElementKind.from(control), name: String = kit.name(control)) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index 35bf1f28b..f64aec385 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -248,4 +248,17 @@ class KitLayoutTest { assertEquals(kit.toString(), !kit.steam, InputControl.RS in placed) } } + + @Test fun aSmallerPortraitPadKeepsTheGripsAndANarrowBottomRowNeverOverlaps() { + val grips = setOf("legacy:l4", "legacy:l5", "legacy:r4", "legacy:r5") + for (scale in listOf(.8f, 1f)) { + val ids = KitLayout.elements(context, PadKit.STEAM_DECK, 720, 1280, scale = scale).map { it.id } + assertTrue("$scale", ids.containsAll(grips)) + } + for (kit in PadKit.entries) { + val (w, h) = 720 to 1280 + val elements = KitLayout.elements(context, kit, w, h, Rect(120, 0, 0, 0)) + assertEquals(kit.toString(), emptyList>(), overlapping(elements, w, h)) + } + } } From e67c185f132850c924e8d683f153c325868a2ee6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:09:36 -0500 Subject: [PATCH 07/25] fix(input): hide on physical controller use only and refresh the kit when the virtual controller changes --- .../com/droiddeck/launcher/SessionActivity.kt | 3 ++- .../droiddeck/launcher/input/PadBridge.java | 21 +++++++++++++++++-- .../launcher/input/InputSurfaceSourceTest.kt | 11 ++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2b9199047..8784efa71 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -878,6 +878,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionState.deckPadListener = deckPadListener openDeckRing("activity created") bridge.setOnPlayerInput(::onPadInput) + bridge.setOnPhysicalInput(::noteControllerUse) controllerInUse = PadBridge.anyControllerConnected() || SteamControllerBle.connected onScreenControls = OnScreenControls(this, bridge).also { controls -> controls.updateLayout(primaryInputLayout) @@ -1675,6 +1676,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde com.droiddeck.launcher.input.FakeInputWriter.setPadType(SessionPrefs.padType(id)) com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id)) padType = id + refreshInputProfile() }, backHold = backHold, onBackHold = { on -> @@ -3999,7 +4001,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun onPadInput() { - noteControllerUse() if (inputUsesPointer && !pointerLocked) return lastPadInputMs = android.os.SystemClock.uptimeMillis() uiHandler.removeCallbacks(cursorHide) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 666a9d1ce..55d81ca2c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -107,6 +107,8 @@ public final class PadBridge { private volatile Runnable onPlayerInput; private Runnable onChordInput; private final java.util.concurrent.atomic.AtomicBoolean playerInputPosted = new java.util.concurrent.atomic.AtomicBoolean(); + private volatile Runnable onPhysicalInput; + private final java.util.concurrent.atomic.AtomicBoolean physicalInputPosted = new java.util.concurrent.atomic.AtomicBoolean(); private static final long STATS_WINDOW_MS = 10_000; private int statButtons, statAxes, statOnScreen, statDropped; @@ -368,6 +370,20 @@ public final class PadBridge { onPlayerInput = listener; } + /** Input from a controller the player holds, never from the on-screen controls. */ + public void setOnPhysicalInput(Runnable listener) { + onPhysicalInput = listener; + } + + private void notePhysicalInput() { + Runnable listener = onPhysicalInput; + if (listener == null || !physicalInputPosted.compareAndSet(false, true)) return; + mainHandler.post(() -> { + physicalInputPosted.set(false); + listener.run(); + }); + } + public synchronized void setOnChordInput(Runnable listener) { onChordInput = listener; } @@ -433,7 +449,7 @@ public final class PadBridge { } noteDevice(device, slot); if (pressed && event.getRepeatCount() == 0 && !event.isCanceled()) noteChordInput(slot); - if (pressed) notePlayerInput(); + if (pressed) { notePlayerInput(); notePhysicalInput(); } statButtons++; scheduleStats(); publish(slot); @@ -521,7 +537,7 @@ public final class PadBridge { retainStick(slot, side, x, y); projectSticks(slot); if (chordStickInput) noteChordInput(slot); - if (Math.max(Math.abs(x), Math.abs(y)) > 0.5f) notePlayerInput(); + if (Math.max(Math.abs(x), Math.abs(y)) > 0.5f) { notePlayerInput(); notePhysicalInput(); } publish(slot); InputTiming.end(timing); return true; @@ -563,6 +579,7 @@ public final class PadBridge { if (Math.max(Math.max(Math.abs(pad.leftX), Math.abs(pad.leftY)), Math.max(Math.abs(pad.rightX), Math.abs(pad.rightY))) > 0.5f || lt > 0.5f || rt > 0.5f || pad.up || pad.right || pad.down || pad.left) { notePlayerInput(); + notePhysicalInput(); } publish(slot); InputTiming.end(timing); diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt index 29c3708f4..8afe3dbf5 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt @@ -187,4 +187,15 @@ class InputSurfaceSourceTest { pad.update(0f, 0f) assertEquals("key:30:false", events.last()) } + + @Test fun onScreenInputNeverCountsAsAControllerInHand() { + var physical = 0; var player = 0 + bridge.setOnPhysicalInput { physical++ } + bridge.setOnPlayerInput { player++ } + val stick = source(InputSurfaceElement(InputControl.LS, .1f, .1f, .3f, .3f, "legacy:ls", InputElementKind.STICK)) + stick.update(1f, 0f); stick.update(0f, 0f) + org.robolectric.Shadows.shadowOf(android.os.Looper.getMainLooper()).idle() + assertEquals(0, physical) + assertTrue(player > 0) + } } From 0364792111d64ce5fd555dfd780a7ba6ce73d72f Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:11:39 -0500 Subject: [PATCH 08/25] fix(input): Steam touch tint colors the D-pad and system buttons again --- .../com/droiddeck/launcher/input/SteamTouchControls.kt | 9 ++++++--- app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 6e1361c5b..1a4765fc1 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -294,7 +294,7 @@ class SteamTouchControls( val held = (if (bits and DPAD_UP != 0L) 1 else 0) or (if (bits and DPAD_RIGHT != 0L) 2 else 0) or (if (bits and DPAD_DOWN != 0L) 4 else 0) or (if (bits and DPAD_LEFT != 0L) 8 else 0) canvas.save(); canvas.translate(x - r, y - r) - art.dpad(canvas, 2 * r, 2 * r, PadKit.STEAM_DECK, held) + art.dpad(canvas, 2 * r, 2 * r, PadKit.STEAM_DECK, held, ink = glyphInk()) canvas.restore() } SteamTouchConfig.JOYSTICK_LEFT, SteamTouchConfig.JOYSTICK_RIGHT -> { @@ -333,10 +333,13 @@ class SteamTouchControls( private fun systemButton(canvas: Canvas, x: Float, y: Float, r: Float, shape: com.droiddeck.launcher.ui.PadArt.Shape, icon: com.droiddeck.launcher.ui.PadArt.Icon, pressed: Boolean) { canvas.save(); canvas.translate(x - r * 1.4f, y - r * 1.4f) - art.system(canvas, r * 2.8f, r * 2.8f, shape, icon, pressed) + art.system(canvas, r * 2.8f, r * 2.8f, shape, icon, pressed, glyphInk()) canvas.restore() } + /** Glyphs follow the colour picked for Steam touch controls; white keeps the shared artwork's own ink. */ + private fun glyphInk() = if (tint != Color.WHITE) tint else com.droiddeck.launcher.ui.PadArt.INK + private fun isSquare(type: Int) = type in setOf(SteamTouchConfig.BUMPER_LEFT, SteamTouchConfig.BUMPER_RIGHT, SteamTouchConfig.TRIGGER_LEFT, SteamTouchConfig.TRIGGER_RIGHT, SteamTouchConfig.THUMB, SteamTouchConfig.KEYBOARD, SteamTouchConfig.PASTE, SteamTouchConfig.MACRO_1_FINGER, SteamTouchConfig.MACRO_2_FINGER) || @@ -359,7 +362,7 @@ class SteamTouchControls( val icon = binding?.icon?.takeIf { it.isNotEmpty() }?.let(::iconOrLoad) val custom = binding != null && binding.background.isNotEmpty() && !binding.background.equals(SteamTouchBindings.DEFAULT_BACKGROUND, true) art.glass(canvas, shape, pressed && !custom, if (custom) parseColor(binding!!.background, SteamTouchBindings.DEFAULT_BACKGROUND) else 0x850E1014.toInt()) - val ink = if (pressed && !custom) com.droiddeck.launcher.ui.PadArt.ON_ACCENT else if (tint != Color.WHITE) tint else com.droiddeck.launcher.ui.PadArt.INK + val ink = if (pressed && !custom) com.droiddeck.launcher.ui.PadArt.ON_ACCENT else glyphInk() if (icon != null) { val s = r * 0.62f if (custom) canvas.drawBitmap(tinted(binding!!.icon, icon, binding.foreground), null, RectF(x - s, y - s, x + s, y + s), Paint(Paint.ANTI_ALIAS_FLAG or Paint.FILTER_BITMAP_FLAG)) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt b/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt index 23afe6055..ce3512110 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt @@ -124,7 +124,7 @@ internal class PadArt(context: Context) { enum class Shape { ROUND, PILL, CHIP } enum class Icon { VIEW, MENU, QAM, KEYBOARD, BACK, START, CREATE, HOME, STEAM, SHARE, OPTIONS, MARK } - fun system(canvas: Canvas, w: Float, h: Float, shape: Shape, icon: Icon, pressed: Boolean) { + fun system(canvas: Canvas, w: Float, h: Float, shape: Shape, icon: Icon, pressed: Boolean, ink: Int = INK) { val cx = w / 2f; val cy = h / 2f val size = when (shape) { Shape.ROUND -> { val r = min(w, h) / 2f * VISUAL; glass(canvas, circle(cx, cy, r), pressed); r * 1.2f } @@ -133,7 +133,7 @@ internal class PadArt(context: Context) { Shape.CHIP -> { val vh = min(h * VISUAL, w * VISUAL / 1.9f); val vw = vh * 1.9f glass(canvas, roundRect(cx - vw / 2, cy - vh / 2, cx + vw / 2, cy + vh / 2, vh * .32f), pressed); vh * 1.05f } } - icon(canvas, cx, cy, size, icon, if (pressed) ON_ACCENT else INK) + icon(canvas, cx, cy, size, icon, if (pressed) ON_ACCENT else ink) } fun icon(canvas: Canvas, cx: Float, cy: Float, size: Float, icon: Icon, color: Int) { @@ -208,7 +208,7 @@ internal class PadArt(context: Context) { } /** [held] bits: up 1, right 2, down 4, left 8. */ - fun dpad(canvas: Canvas, w: Float, h: Float, kit: PadKit, held: Int, chevrons: Boolean = true) { + fun dpad(canvas: Canvas, w: Float, h: Float, kit: PadKit, held: Int, chevrons: Boolean = true, ink: Int = INK) { val cx = w / 2f; val cy = h / 2f val s = min(w, h) / 2f - dp(3f) val dirs = arrayOf(floatArrayOf(0f, -1f), floatArrayOf(1f, 0f), floatArrayOf(0f, 1f), floatArrayOf(-1f, 0f)) @@ -235,7 +235,7 @@ internal class PadArt(context: Context) { canvas.drawRoundRect(rect, half * .4f, half * .4f, fill) } val m = (arms + half) / 2f - if (chevrons) chevron(canvas, cx + dx * m, cy + dy * m, dx, dy, half * .32f, if (on) ON_ACCENT else INK, half * .17f) + if (chevrons) chevron(canvas, cx + dx * m, cy + dy * m, dx, dy, half * .32f, if (on) ON_ACCENT else ink, half * .17f) } if (!disc) { fill.shader = null; fill.color = Color.argb(18, 255, 255, 255); canvas.drawCircle(cx, cy, half * .36f, fill) } } From b29a5ef8aa1207c9c4f306d6e9c6a166fc0aef31 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:19:02 -0500 Subject: [PATCH 09/25] feat(input): both sticks and both trackpads for Steam kits in portrait --- .../launcher/input/GamepadGeometry.kt | 23 ++++++++++++++++--- .../com/droiddeck/launcher/input/KitLayout.kt | 14 +++++++---- .../droiddeck/launcher/input/KitLayoutTest.kt | 7 +++--- .../launcher/input/OnScreenLayoutTest.kt | 3 ++- .../launcher/ui/GamepadGeometryTest.kt | 16 +++++++++++-- 5 files changed, 50 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt index 428995efe..d29064b78 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt @@ -9,6 +9,7 @@ object GamepadGeometry { VIEW, STEAM, QAM, MENU, PANELS, L4, L5, R5, R4, + LEFT_TOUCH, RIGHT_TOUCH, } data class Box(val cx: Float, val cy: Float, val width: Float, val height: Float) { @@ -26,10 +27,11 @@ object GamepadGeometry { fun tall(w: Float, h: Float): Boolean = h >= w * 0.45f - fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false, grips: Boolean = true, upright: Boolean = false): Map { + fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false, grips: Boolean = true, upright: Boolean = false, + trackpads: Boolean = false): Map { if (w <= 0f || h <= 0f) return emptyMap() if (upright || portraitDock && h >= w * 0.6f && w >= 300 * density && h >= 300 * density) { - return portraitLayout(w, h, density, grips) + return portraitLayout(w, h, density, grips, trackpads) } val pad = 8 * density val buttonH = 40 * density @@ -96,7 +98,7 @@ object GamepadGeometry { * The panel under a portrait game: shoulders with View and Menu across the top, the back grips under them when the kit has * them, then the d-pad and face buttons and, along the bottom edge, the sticks or trackpads, each as large as the panel allows. */ - private fun portraitLayout(w: Float, h: Float, density: Float, grips: Boolean): Map { + private fun portraitLayout(w: Float, h: Float, density: Float, grips: Boolean, trackpads: Boolean): Map { val pad = 8 * density val gap = 8 * density val buttonH = 44 * density @@ -114,6 +116,21 @@ object GamepadGeometry { areaTop += gripH + gap } val area = h - pad - areaTop - gap + if (trackpads) { + val second = min(w * 0.42f, area * 0.5f) + val rowH = area - second + val col = (w - 2 * pad - 3 * gap) / 4f + val stick = min(col, rowH) + val rowY = h - pad - rowH / 2f + val secondY = areaTop + second / 2f + boxes[Slot.LEFT_SECOND] = Box(w * 0.25f, secondY, second, second) + boxes[Slot.RIGHT_SECOND] = Box(w * 0.75f, secondY, second, second) + boxes[Slot.LEFT_TOUCH] = Box(pad + col / 2f, rowY, col, rowH) + boxes[Slot.LEFT_MAIN] = Box(pad + col * 1.5f + gap, rowY, stick, stick) + boxes[Slot.RIGHT_MAIN] = Box(w - pad - col * 1.5f - gap, rowY, stick, stick) + boxes[Slot.RIGHT_TOUCH] = Box(w - pad - col / 2f, rowY, col, rowH) + return boxes + } val main = min(w * 0.46f, area * 0.53f) val second = min(w * 0.42f, area - main) val secondY = areaTop + second / 2f diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index 3d7e5f915..d8dcf7fb9 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -118,7 +118,7 @@ object KitLayout { val inner = (w - safe.left - safe.right).coerceAtLeast(1f) val area = (min(h * .6f, inner * 1.15f) * scale).coerceAtMost(h - safe.top - safe.bottom - row).coerceAtLeast(1f) val top = h - safe.bottom - row - area - val pad = dock(context, kit, inner.toInt(), area.toInt(), true, InputControl.LS, if (kit.steam) InputControl.RIGHT_PAD else InputControl.RS, upright = true).map { e -> + val pad = dock(context, kit, inner.toInt(), area.toInt(), true, InputControl.LS, InputControl.RS, upright = true).map { e -> e.copy(x = (safe.left + e.x * inner) / w, y = (top + e.y * area) / h, width = e.width * inner / w, height = e.height * area / h, floating = e.kind == InputElementKind.STICK) } @@ -154,7 +154,8 @@ object KitLayout { fun dock(context: Context, kit: PadKit, width: Int, height: Int, portrait: Boolean, left: InputControl, right: InputControl, upright: Boolean = false): List { val w = width.toFloat(); val h = height.toFloat() - val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait, grips = kit.steam, upright = upright) + val boxes = GamepadGeometry.layout(w, h, context.resources.displayMetrics.density, portrait, grips = kit.steam, upright = upright, + trackpads = kit.steam) val placed = mutableListOf() fun put(control: InputControl, box: GamepadGeometry.Box?, shape: InputButtonShape, id: String = "legacy:${control.id}", kind: InputElementKind = InputElementKind.from(control), name: String = kit.name(control)) { @@ -162,8 +163,13 @@ object KitLayout { placed += InputSurfaceElement(control, b.left / w, b.top / h, b.width / w, b.height / h, id, kind, name, floating = false, buttonShape = shape).bounded() } fun square(box: GamepadGeometry.Box?) = box?.let { val side = min(it.width, it.height); GamepadGeometry.Box(it.cx, it.cy, side, side) } - val leftMain = if (kit.steam || left != InputControl.LEFT_PAD) left else InputControl.LS - val rightMain = if (kit.steam || right != InputControl.RIGHT_PAD) right else InputControl.RS + val four = GamepadGeometry.Slot.LEFT_TOUCH in boxes + val leftMain = if (four || !kit.steam && left == InputControl.LEFT_PAD) InputControl.LS else left + val rightMain = if (four || !kit.steam && right == InputControl.RIGHT_PAD) InputControl.RS else right + if (four) { + put(InputControl.LEFT_PAD, boxes[GamepadGeometry.Slot.LEFT_TOUCH], InputButtonShape.ROUNDED) + put(InputControl.RIGHT_PAD, boxes[GamepadGeometry.Slot.RIGHT_TOUCH], InputButtonShape.ROUNDED) + } put(leftMain, square(boxes[GamepadGeometry.Slot.LEFT_MAIN]), InputButtonShape.CIRCLE) put(InputControl.LS, square(boxes[GamepadGeometry.Slot.LEFT_SECOND]), InputButtonShape.ROUNDED, DPAD_ID, InputElementKind.DPAD, "D-pad") put(rightMain, square(boxes[GamepadGeometry.Slot.RIGHT_MAIN]), InputButtonShape.CIRCLE) diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index f64aec385..b39dd6321 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -220,7 +220,8 @@ class KitLayoutTest { assertTrue("$kit $w x $h", bottomRow.any { it.id == KitLayout.KEYBOARD_ID } && bottomRow.any { it.control == InputControl.QAM }) assertTrue("$kit $w x $h", bottomRow.minOf { it.x } * w >= 52 * density - .5f) val stick = elements.first { it.id == "legacy:ls" } - assertTrue("$kit $w x $h", stick.width * w >= w * .3f) + assertTrue("$kit $w x $h", stick.width * w >= w * if (kit.steam) .2f else .3f) + assertTrue("$kit $w x $h", elements.any { it.id == "legacy:rs" }) } } @@ -244,8 +245,8 @@ class KitLayoutTest { @Test fun onlySteamKitsPutTrackpadsInTheDockedStrip() { for (kit in PadKit.entries) { val placed = KitLayout.dock(context, kit, 1080, 1300, true, InputControl.LS, InputControl.RIGHT_PAD).map { it.control } - assertEquals(kit.toString(), kit.steam, InputControl.RIGHT_PAD in placed) - assertEquals(kit.toString(), !kit.steam, InputControl.RS in placed) + assertEquals(kit.toString(), kit.steam, InputControl.RIGHT_PAD in placed && InputControl.LEFT_PAD in placed) + assertTrue(kit.toString(), InputControl.RS in placed && InputControl.LS in placed) } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt index e07362e25..31bd54aa0 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt @@ -141,7 +141,8 @@ class OnScreenLayoutTest { for ((size, portrait) in listOf((2208 to 800) to false, (1080 to 1300) to true)) { val (w, h) = size val placed = OnScreenLayout.elements(context, gamepad(), w, h, Rect(), dock = OnScreenLayout.Dock(portrait, grips = true)) - val boxes = GamepadGeometry.layout(w.toFloat(), h.toFloat(), density, portrait) + val steam = PadKit.current(context).steam + val boxes = GamepadGeometry.layout(w.toFloat(), h.toFloat(), density, portrait, grips = steam, trackpads = steam) val ls = placed.first { it.id == "legacy:ls" } val box = boxes.getValue(GamepadGeometry.Slot.LEFT_MAIN) assertEquals(box.left, ls.x * w, 1f) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt index 360af6f63..72e566cd3 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt @@ -38,7 +38,7 @@ class GamepadGeometryTest { @Test fun everyControlIsPlacedAndPanelsOnlyWhenUpright() { for (panel in panels) { val upright = panel.height > panel.width - val expected = Slot.values().toSet() - grips - if (upright) emptySet() else setOf(Slot.PANELS) + val expected = Slot.values().toSet() - grips - setOf(Slot.LEFT_TOUCH, Slot.RIGHT_TOUCH) - if (upright) emptySet() else setOf(Slot.PANELS) assertEquals(panel.name, expected, boxes(panel).keys) } } @@ -94,7 +94,7 @@ class GamepadGeometryTest { @Test fun portraitDockPlacesAllControlsWithinThePanel() { for (panel in portraitPanels) { val b = portraitBoxes(panel) - assertEquals(panel.name, Slot.values().toSet() - setOf(Slot.STEAM, Slot.QAM, Slot.PANELS), b.keys) + assertEquals(panel.name, Slot.values().toSet() - setOf(Slot.STEAM, Slot.QAM, Slot.PANELS, Slot.LEFT_TOUCH, Slot.RIGHT_TOUCH), b.keys) for ((slot, box) in b) { val where = "${panel.name}: $slot $box" assertTrue(where, box.left >= 0f && box.top >= 0f) @@ -161,4 +161,16 @@ class GamepadGeometryTest { GamepadGeometry.layout(width, height, density, portraitDock = true)) } } + + @Test fun aPortraitDockWithTrackpadsPutsThemOutsideBothSticksWithoutOverlap() { + for (panel in portraitPanels) { + val b = GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density, portraitDock = true, trackpads = true) + val row = listOf(Slot.LEFT_TOUCH, Slot.LEFT_MAIN, Slot.RIGHT_MAIN, Slot.RIGHT_TOUCH) + assertEquals(panel.name, row, row.sortedBy { b.getValue(it).cx }) + val placed = b.entries.toList() + for (i in placed.indices) for (j in i + 1 until placed.size) + assertFalse("${panel.name}: ${placed[i].key} overlaps ${placed[j].key}", placed[i].value.overlaps(placed[j].value)) + for ((slot, box) in b) assertTrue("${panel.name}: $slot", box.bottom <= panel.controlsHeight + .5f && box.right <= panel.width + .5f) + } + } } From fdcb7eb3c40267be3c3be9cc3f171790609e6329 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:37:00 -0500 Subject: [PATCH 10/25] fix(input): back grips fill their box as a capsule along its long side --- app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt b/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt index ce3512110..bf7436848 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PadArt.kt @@ -19,6 +19,7 @@ import com.droiddeck.launcher.input.PadKit import com.droiddeck.launcher.input.StickCap import kotlin.math.atan2 import kotlin.math.cos +import kotlin.math.max import kotlin.math.min import kotlin.math.sin @@ -108,11 +109,15 @@ internal class PadArt(context: Context) { text(canvas, kit.label(control), w / 2f, h / 2f, (b - t) * .46f, if (pressed) ON_ACCENT else INK, (r - l) * .8f) } + /** A back grip: a capsule along the long side of its box, at most 2.2 times as long as it is thick. */ fun grip(canvas: Canvas, w: Float, h: Float, label: String, pressed: Boolean) { - val vw = min(w * .8f, h * .4f); val vh = vw * 2.5f + val inset = dp(3f) + val thick = (min(w, h) - 2 * inset).coerceAtLeast(1f) + val long = (max(w, h) - 2 * inset).coerceAtMost(thick * 2.2f) + val bw = if (w >= h) long else thick; val bh = if (w >= h) thick else long val cx = w / 2f; val cy = h / 2f - glass(canvas, roundRect(cx - vw / 2, cy - vh / 2, cx + vw / 2, cy + vh / 2, vw / 2), pressed) - text(canvas, label, cx, cy, vw * .4f, if (pressed) ON_ACCENT else INK_SOFT) + glass(canvas, roundRect(cx - bw / 2, cy - bh / 2, cx + bw / 2, cy + bh / 2, thick / 2), pressed) + text(canvas, label, cx, cy, thick * .42f, if (pressed) ON_ACCENT else INK_SOFT) } fun small(canvas: Canvas, w: Float, h: Float, label: String, pressed: Boolean) { From 952f363b4588a18584bbda6186da44a6cd022d46 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:41:54 -0500 Subject: [PATCH 11/25] fix(input): D-pad keeps direction overrides, kit bindings survive layout edits and an emptied gamepad stays empty --- .../com/droiddeck/launcher/SessionActivity.kt | 1 + .../launcher/input/ControlsPresenter.kt | 2 +- .../droiddeck/launcher/input/InputLibraries.kt | 4 ++-- .../droiddeck/launcher/input/InputLibrary.kt | 6 ++++-- .../launcher/input/InputSurfaceSource.kt | 5 ++++- .../droiddeck/launcher/input/OnScreenLayout.kt | 2 +- .../droiddeck/launcher/ui/InputSurfaceDialog.kt | 4 ++-- .../droiddeck/launcher/ui/InputSurfaceView.kt | 1 + .../launcher/input/ControlsPresenterTest.kt | 4 ++-- .../launcher/input/InputSurfaceSourceTest.kt | 15 +++++++++++++++ .../launcher/input/OnScreenControlPrefsTest.kt | 17 +++++++++++++++++ 11 files changed, 50 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8784efa71..423696603 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -4479,6 +4479,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun controlsBelowWanted(): Boolean { if (!::sessionRoot.isInitialized || glassesScreen != null || bottomGame != null || cardboard.enabled) return false + if (SessionPrefs.oscMode(this) == SessionPrefs.OSC_NEVER) return false return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, pipUi || isInPictureInPictureMode) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt b/app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt index fffc75e80..0ab1d3371 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControlsPresenter.kt @@ -26,8 +26,8 @@ object ControlsPresenter { state.mode == SessionPrefs.OSC_AUTO && state.desktop -> Plan(Place.NONE) else -> Plan( when { - state.steamLayout -> Place.STEAM state.bottomScreen -> Place.BOTTOM + state.steamLayout -> Place.STEAM else -> Place.MAIN }, when { diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index 9f1a012b1..97f3d0ba4 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -277,7 +277,7 @@ object InputLibraries { .put("elementOpacity", e.opacity.toDouble()).put("buttonShape", e.buttonShape.name).put("showLabel", e.showLabel).put("alwaysShown", e.alwaysShown)) layouts.put(JSONObject().put("id", layout.id).put("name", layout.name).put("template", layout.template.name).put("elements", elements) .put("tint", layout.style.tint ?: JSONObject.NULL).put("opacity", layout.style.opacity).put("screen", layout.screen.name).put("aspect", layout.aspect.toDouble()).put("scale", layout.scale.toDouble()) - .put("hidden", JSONArray(layout.style.hidden.map { it.name }.sorted())).put("origin", layout.origin ?: JSONObject.NULL)) + .put("hidden", JSONArray(layout.style.hidden.map { it.name }.sorted())).put("origin", layout.origin ?: JSONObject.NULL).put("kitless", layout.kitless)) } val bindings = JSONArray() for (b in library.bindings) { @@ -321,7 +321,7 @@ object InputLibraries { InputSurfaceStyle(if (!layout.has("tint")) ControllerPrefs.STEAM_BLUE else if (layout.isNull("tint")) null else layout.getInt("tint"), layout.optInt("opacity", 100), layout.optJSONArray("hidden")?.let { hidden -> (0 until hidden.length()).map { InputCommand.valueOf(hidden.getString(it)) }.toSet() }.orEmpty()), InputLayoutScreen.valueOf(layout.optString("screen", InputLayoutScreen.BOTH.name)), layout.optDouble("aspect", 0.0).toFloat(), layout.optionalString("origin"), - layout.optDouble("scale", 1.0).toFloat()) + layout.optDouble("scale", 1.0).toFloat(), layout.optBoolean("kitless", false)) } val bindings = doc.getJSONArray("bindings").objects(512).map { b -> val controls = b.getJSONObject("controls").actions(28).mapKeys { requireNotNull(InputControl.fromId(it.key)) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index 7f62a89ed..b2bf7014b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -22,6 +22,8 @@ data class SavedInputLayout( val aspect: Float = 0f, val origin: String? = null, val scale: Float = 1f, + /** The player removed every kit control from this gamepad, so it must not follow the virtual controller again. */ + val kitless: Boolean = false, ) { val editable get() = template == InputLayoutTemplate.CUSTOM val quickButtons get() = QUICK_BUTTONS.filter { button -> elements.any { it.quickButton == button } } @@ -136,8 +138,8 @@ data class InputLibrary( fun withPreset(value: SavedInputBindings) = copy(bindings = bindings.filterNot { it.id == value.id } + value) fun withLayout(value: SavedInputLayout) = copy(layouts = layouts.filterNot { it.id == value.id } + value, bindings = bindings.map { preset -> if (preset.layoutId != value.id) preset else preset.copy( - elements = preset.elements.filter { (id, action) -> value.elements.any { it.id == id && action.validFor(it) } }, - clicks = preset.clicks.filter { (id, action) -> value.elements.any { it.id == id && it.hasClick && action.validForClick() } }) }) + elements = preset.elements.filter { (id, action) -> value.element(id)?.let { action.validFor(it) } == true }, + clicks = preset.clicks.filter { (id, action) -> value.element(id)?.hasClick == true && action.validForClick() }) }) fun duplicateProfile(id: String, name: String, newId: String = newInputId(), sharePhysical: Boolean = false): InputLibrary { require(profiles.size < 64) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt index 58e150d44..de8d10f69 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt @@ -5,7 +5,8 @@ class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole private val route = router?.channel(role, element.control, element = element) /** The kit's D-pad keeps each direction's own binding, as the separate direction buttons it replaced did. */ private val arms = if (element.id == KitLayout.DPAD_ID && router != null) - listOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT).map { router.channel(role, it) } else emptyList() + listOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT).map { router.channel(role, it, element = KitLayout.element("legacy:${it.id}")) } + else emptyList() private val deck = DeckControls.source(role, routed = true) private val clickDeck = DeckControls.source(role, routed = true) private val clickOwner = Any() @@ -59,6 +60,7 @@ class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole if (latched) 1f else 0f } else value if (arms.isNotEmpty() && route?.action is InputAction.Native) { + route.update(x, y, touching) val values = listOf(y < -.5f, x > .5f, y > .5f, x < -.5f).map { if (it) 1f else 0f } val toPad = arms.mapIndexed { i, arm -> arm.update(values[i])?.takeIf { it.isPad }?.let { it to values[i] } }.filterNotNull() if (toPad.isNotEmpty() || nativePad) writePad(this, null) { state -> state.clear(); for ((t, v) in toPad) state.add(t, v) } @@ -86,6 +88,7 @@ class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole fun cancel() { if (closed) return route?.takeIf { it.action is InputAction.Command }?.release() + arms.filter { it.action is InputAction.Command }.forEach { it.release() } update(0f) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt index 8f15a33b6..39235de58 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt @@ -24,7 +24,7 @@ object OnScreenLayout { * the layout stores only the keys and controls the player added on top. */ fun generated(layout: SavedInputLayout) = (layout.id == InputLibraries.OVERLAY || layout.origin == InputLibraries.OVERLAY) && - layout.elements.none { KitLayout.isKit(it.id) } + !layout.kitless && layout.elements.none { KitLayout.isKit(it.id) } fun elements(context: Context, layout: SavedInputLayout?, width: Int, height: Int, safe: Rect, dock: Dock? = null): List { layout ?: return emptyList() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 492f8afae..0f524c3e6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -165,8 +165,8 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> val p = latest.preset(savedBindings.id) val generated = draft.kitAtDefaults && OnScreenLayout.generated(l.copy(elements = emptyList())) val extras = draft.elements.filterNot { KitLayout.isKit(it.id) } - latest.withLayout(if (generated) l.copy(elements = extras, aspect = if (extras.isEmpty()) 0f else draft.aspect, scale = draft.layoutScale) - else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale)).withPreset(p.copy(elements = draft.actions.filterKeys { id -> draft.elements.any { it.id == id } }, + latest.withLayout(if (generated) l.copy(elements = extras, aspect = if (extras.isEmpty()) 0f else draft.aspect, scale = draft.layoutScale, kitless = false) + else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale, kitless = draft.elements.none { KitLayout.isKit(it.id) })).withPreset(p.copy(elements = draft.actions.filterKeys { id -> draft.elements.any { it.id == id } }, clicks = draft.clicks.filterKeys { id -> draft.elements.any { it.id == id && it.hasClick } })) } }.onSuccess { onChanged(); onDismiss() }.onFailure { failure = it.message ?: context.getString(R.string.input_save_failed) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt index c3efc3394..0c297e0d5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt @@ -576,6 +576,7 @@ class InputSurfaceView( @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_CANCEL) { source?.cancel(); held = 0; invalidate(); return true } val bits = when (event.actionMasked) { MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> { val dx = event.getX(0) - width / 2f diff --git a/app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt index 056b387aa..053768577 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/ControlsPresenterTest.kt @@ -27,7 +27,7 @@ class ControlsPresenterTest { assertFalse(plan.shown) continue } - val place = if (state.steamLayout) Place.STEAM else if (state.bottomScreen) Place.BOTTOM else Place.MAIN + val place = if (state.bottomScreen) Place.BOTTOM else if (state.steamLayout) Place.STEAM else Place.MAIN val hidden = if (state.hiddenByTap) Hidden.BY_TAP else if (state.mode == SessionPrefs.OSC_AUTO && state.controllerInUse) Hidden.BY_CONTROLLER else null assertEquals(state.toString(), ControlsPresenter.Plan(place, hidden), plan) assertEquals(state.toString(), hidden == null, plan.shown) @@ -49,7 +49,7 @@ class ControlsPresenterTest { } @Test fun theSteamLayoutWinsOverTheBottomScreen() { - assertEquals(Place.STEAM, ControlsPresenter.plan(playing.copy(steamLayout = true, bottomScreen = true)).place) + assertEquals(Place.BOTTOM, ControlsPresenter.plan(playing.copy(steamLayout = true, bottomScreen = true)).place) assertEquals(Place.BOTTOM, ControlsPresenter.plan(playing.copy(bottomScreen = true)).place) } diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt index 8afe3dbf5..21f23ba8c 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt @@ -198,4 +198,19 @@ class InputSurfaceSourceTest { assertEquals(0, physical) assertTrue(player > 0) } + + @Test fun theKitDpadUsesSavedDirectionButtonsAndCancellingNeverRunsADirectionCommand() { + val dpad = InputSurfaceElement(InputControl.LS, .1f, .1f, .3f, .3f, KitLayout.DPAD_ID, InputElementKind.DPAD) + bridge.setInputProfile(InputProfile("test", elements = mapOf(InputRole.SECONDARY to mapOf("legacy:up" to InputAction.Keys(listOf(103)), + "legacy:down" to InputAction.Command(InputCommand.KEYBOARD))))) + val pad = source(dpad) + pad.update(0f, -1f) + assertEquals("key:103:true", events.last()) + pad.update(0f, 0f) + assertEquals("key:103:false", events.last()) + events.clear() + pad.update(0f, 1f) + pad.cancel() + assertTrue(events.none { it.startsWith("KEYBOARD") }) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt index 3934517b3..476af9585 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt @@ -149,4 +149,21 @@ class OnScreenControlPrefsTest { assertEquals(SessionPrefs.OSC_ALWAYS, SessionPrefs.oscMode(context)) assertTrue(SessionPrefs.steamTouchLayout(context)) } + + @Test fun aGamepadWithEveryKitControlRemovedStaysEmptyAndKeepsKitBindingsOnOtherEdits() { + val library = InputLibraries.read(context) + val overlay = library.layouts.single { it.id == InputLibraries.OVERLAY } + val key = InputSurfaceElement(InputControl.A, .4f, .4f, .1f, .1f, "imported:9", name = "Key") + val emptied = overlay.copy(elements = listOf(key), aspect = 16f / 9, kitless = true) + InputLibraries.update(context) { it.withLayout(emptied) } + val stored = InputLibraries.read(context).layouts.single { it.id == InputLibraries.OVERLAY } + assertFalse(OnScreenLayout.generated(stored)) + assertEquals(listOf("imported:9"), OnScreenLayout.elements(context, stored, 1920, 1080, android.graphics.Rect()).map { it.id }) + val bindings = library.preset(library.activePart(false, InputRole.PRIMARY).bindings) + val withKey = InputLibraries.update(context) { lib -> + lib.withLayout(overlay).withPreset(bindings.copy(elements = bindings.elements + ("legacy:a" to InputAction.Keys(listOf(30))))) + } + val dimmed = withKey.withLayout(overlay.copy(style = overlay.style.copy(opacity = 50))) + assertEquals(InputAction.Keys(listOf(30)), dimmed.preset(bindings.id).elements["legacy:a"]) + } } From bf75dfb9c0d5eeb47d0dcde93bbf5181f8ea1c75 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 21:00:31 -0500 Subject: [PATCH 12/25] fix(input): saved D-pad keeps direction overrides, held directions wait for neutral and Reset regenerates an emptied gamepad --- .../java/com/droiddeck/launcher/SessionActivity.kt | 1 + .../com/droiddeck/launcher/input/InputLibrary.kt | 2 +- .../droiddeck/launcher/input/InputSurfaceSource.kt | 4 ++-- .../java/com/droiddeck/launcher/input/KitLayout.kt | 7 +++++++ .../droiddeck/launcher/ui/InputSurfaceDialog.kt | 4 ++-- .../launcher/input/InputSurfaceSourceTest.kt | 14 ++++++++++++++ .../launcher/input/OnScreenControlPrefsTest.kt | 12 ++++++++++++ 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 423696603..169969dcd 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1715,6 +1715,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionPrefs.setOscMode(this@SessionActivity, v) controlsHiddenByTap = false readPrefs() + applyUnfoldedControls() updateOnScreenControls() }, layoutGame = controlsGameName(), diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index b2bf7014b..0f5169007 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -317,4 +317,4 @@ internal fun InputAction.validFor(element: InputSurfaceElement): Boolean = when /** A saved element, or, in a gamepad that keeps no kit positions, the kit control that [id] names. */ internal fun SavedInputLayout.element(id: String): InputSurfaceElement? = - elements.firstOrNull { it.id == id } ?: KitLayout.element(id)?.takeIf { OnScreenLayout.generated(this) } + elements.firstOrNull { it.id == id } ?: KitLayout.element(id)?.takeIf { OnScreenLayout.generated(this) || KitLayout.bindsTo(id, elements) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt index de8d10f69..60ffc5497 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt @@ -60,8 +60,8 @@ class InputSurfaceSource(private val pad: PadBridge, private val role: InputRole if (latched) 1f else 0f } else value if (arms.isNotEmpty() && route?.action is InputAction.Native) { - route.update(x, y, touching) - val values = listOf(y < -.5f, x > .5f, y > .5f, x < -.5f).map { if (it) 1f else 0f } + val ready = route.update(x, y, touching) != null + val values = listOf(y < -.5f, x > .5f, y > .5f, x < -.5f).map { if (it && ready) 1f else 0f } val toPad = arms.mapIndexed { i, arm -> arm.update(values[i])?.takeIf { it.isPad }?.let { it to values[i] } }.filterNotNull() if (toPad.isNotEmpty() || nativePad) writePad(this, null) { state -> state.clear(); for ((t, v) in toPad) state.add(t, v) } nativePad = toPad.isNotEmpty() diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index d8dcf7fb9..4c8c46b71 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -27,6 +27,13 @@ object KitLayout { else -> null } + /** The direction buttons the kit's D-pad stands in for; their saved overrides stay with the D-pad. */ + val dpadDirectionIds = listOf(InputControl.UP, InputControl.RIGHT, InputControl.DOWN, InputControl.LEFT).map { "legacy:${it.id}" } + + /** Whether a binding for [id] belongs to a layout made of [elements]. */ + fun bindsTo(id: String, elements: List) = + elements.any { it.id == id } || id in dpadDirectionIds && elements.any { it.id == DPAD_ID } + /** Every kit control that has a click, across all virtual controllers. */ val clickIds = listOf(InputControl.LS, InputControl.RS, InputControl.LEFT_PAD, InputControl.RIGHT_PAD).map { "legacy:${it.id}" } private const val REF_W = 1600f diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 0f524c3e6..1ee38578d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -163,10 +163,10 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> InputLibraries.update(context) { latest -> val l = latest.layouts.first { it.id == savedLayout.id } val p = latest.preset(savedBindings.id) - val generated = draft.kitAtDefaults && OnScreenLayout.generated(l.copy(elements = emptyList())) + val generated = draft.kitAtDefaults && OnScreenLayout.generated(l.copy(elements = emptyList(), kitless = false)) val extras = draft.elements.filterNot { KitLayout.isKit(it.id) } latest.withLayout(if (generated) l.copy(elements = extras, aspect = if (extras.isEmpty()) 0f else draft.aspect, scale = draft.layoutScale, kitless = false) - else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale, kitless = draft.elements.none { KitLayout.isKit(it.id) })).withPreset(p.copy(elements = draft.actions.filterKeys { id -> draft.elements.any { it.id == id } }, + else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale, kitless = draft.elements.none { KitLayout.isKit(it.id) })).withPreset(p.copy(elements = draft.actions.filterKeys { id -> KitLayout.bindsTo(id, draft.elements) }, clicks = draft.clicks.filterKeys { id -> draft.elements.any { it.id == id && it.hasClick } })) } }.onSuccess { onChanged(); onDismiss() }.onFailure { failure = it.message ?: context.getString(R.string.input_save_failed) } diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt index 21f23ba8c..4b3ddec3e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt @@ -213,4 +213,18 @@ class InputSurfaceSourceTest { pad.cancel() assertTrue(events.none { it.startsWith("KEYBOARD") }) } + + @Test fun aDirectionHeldAcrossAProfileChangeWaitsForNeutral() { + val dpad = InputSurfaceElement(InputControl.LS, .1f, .1f, .3f, .3f, KitLayout.DPAD_ID, InputElementKind.DPAD) + bridge.setInputProfile(InputProfile("first", elements = mapOf(InputRole.SECONDARY to mapOf(KitLayout.DPAD_ID to InputAction.Directions(17, 32, 31, 30))))) + val pad = source(dpad) + pad.update(0f, -1f) + bridge.setInputProfile(InputProfile("second", elements = mapOf(InputRole.SECONDARY to mapOf("legacy:up" to InputAction.Keys(listOf(103)))))) + events.clear() + pad.update(0f, -1f) + assertTrue(events.none { it == "key:103:true" }) + pad.update(0f, 0f) + pad.update(0f, -1f) + assertEquals("key:103:true", events.last()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt index 476af9585..4bdc4143e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt @@ -166,4 +166,16 @@ class OnScreenControlPrefsTest { val dimmed = withKey.withLayout(overlay.copy(style = overlay.style.copy(opacity = 50))) assertEquals(InputAction.Keys(listOf(30)), dimmed.preset(bindings.id).elements["legacy:a"]) } + + @Test fun aSavedKitDpadKeepsItsDirectionOverrides() { + val library = InputLibraries.read(context) + val overlay = library.layouts.single { it.id == InputLibraries.OVERLAY } + val saved = overlay.copy(elements = KitLayout.elements(context, PadKit.XBOX, 1920, 1080), aspect = 16f / 9) + val bindings = library.preset(library.activePart(false, InputRole.PRIMARY).bindings) + val withUp = library.withLayout(saved).withPreset(bindings.copy(elements = bindings.elements + ("legacy:up" to InputAction.Keys(listOf(103))))) + val edited = withUp.withLayout(saved.copy(style = saved.style.copy(opacity = 60))).validate() + assertEquals(InputAction.Keys(listOf(103)), edited.preset(bindings.id).elements["legacy:up"]) + val noDpad = edited.withLayout(saved.copy(elements = saved.elements.filterNot { it.id == KitLayout.DPAD_ID })) + assertNull(noDpad.preset(bindings.id).elements["legacy:up"]) + } } From 732c97831d8c10e126d8b4363ca685df90a43e35 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 21:04:52 -0500 Subject: [PATCH 13/25] fix(input): editor Reset keeps the D-pad direction overrides --- .../com/droiddeck/launcher/ui/InputSurfaceDialog.kt | 2 +- .../com/droiddeck/launcher/ui/InputSettingsTest.kt | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 1ee38578d..0c55b68a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -112,7 +112,7 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB fun reset() { val d = restored?.takeIf { !atDefaults } ?: return checkpoint(); elements = d; selected = null - actions = actions.filterKeys { id -> d.any { it.id == id } }; clicks = clicks.filterKeys { id -> d.any { it.id == id } } + actions = actions.filterKeys { id -> KitLayout.bindsTo(id, d) }; clicks = clicks.filterKeys { id -> d.any { it.id == id } } } fun hiddenDefaults(): List = defaults?.let { refit(it, defaultsFrame) }?.filter { d -> elements.none { it.id == d.id } }.orEmpty() fun add(element: InputSurfaceElement) { checkpoint(); elements = elements + element; selected = element.id; popover = null } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt index 83023dbca..ecbd28226 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt @@ -219,6 +219,18 @@ class InputSettingsTest { compose.runOnIdle { assertTrue(OnScreenLayout.generated(InputLibraries.read(context).layouts.first { it.id == layout.id })) } } + @Test fun resetAndSaveKeepTheDpadDirectionOverrides() { + val library = InputLibraries.read(context) + val layout = library.layout("game", InputRole.PRIMARY)!! + val bindingsId = library.profile("game").binding(InputRole.PRIMARY) + InputLibraries.update(context) { lib -> lib.preset(bindingsId).let { b -> lib.withPreset(b.copy(elements = b.elements + ("legacy:up" to InputAction.Keys(listOf(103))))) } } + compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, layoutId = layout.id, bindingsId = bindingsId) } } + pressPlus(2) + compose.onNodeWithText(context.getString(R.string.hud_reset_button)).performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() + compose.runOnIdle { assertEquals(InputAction.Keys(listOf(103)), InputLibraries.read(context).preset(bindingsId).elements["legacy:up"]) } + } + @Test fun deckPresetOffersItsRealElementsAndTheCommonEditor() { InputLibraries.update(context) { it.useLayout("game", InputRole.SECONDARY, InputLibraries.DECK, shared = true) } compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } From b87da99d21cb83fdb802e0702b39dfc2745da3f6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 23:05:03 -0500 Subject: [PATCH 14/25] fix(input): keep Steam's touch controller plugged while its layout is hidden --- .../com/droiddeck/launcher/SessionActivity.kt | 3 ++- .../launcher/input/SessionKeyboardPadTest.kt | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 169969dcd..8b55d1d7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -5389,7 +5389,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde controls.releaseAll(); controls.visibility = View.GONE if (!plan.shown) { steam.cancelEditing(); steam.releaseAll() } steam.visibility = if (plan.shown) View.VISIBLE else View.GONE - com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = plan.shown + // Steam takes seconds to configure a newly plugged touch controller, so hiding the layout keeps it plugged. + com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = true applyTouchRouting() return } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt index 16a466005..b3868afb1 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionKeyboardPadTest.kt @@ -96,6 +96,22 @@ class SessionKeyboardPadTest { assertEquals(SessionPrefs.TOUCH_OFF, routedTouchMode()) } + @Test fun hidingTheSteamLayoutForAControllerKeepsSteamsTouchControllerPlugged() { + SteamTouchDevice.prepare(directory) + val steam = SteamTouchControls(activity, SteamTouchDevice.current!!, {}, {}) + ReflectionHelpers.setField(activity, "steamTouchControls", steam) + SessionPrefs.setOscMode(activity, SessionPrefs.OSC_AUTO) + SessionPrefs.setSteamTouchLayout(activity, true) + ReflectionHelpers.setField(activity, "controlsHiddenByTap", true) + update() + assertEquals(View.GONE, steam.visibility) + assertTrue(SteamTouchDevice.current!!.plugged) + ReflectionHelpers.setField(activity, "controlsHiddenByTap", false) + update() + assertEquals(View.VISIBLE, steam.visibility) + assertTrue(SteamTouchDevice.current!!.plugged) + } + @Test fun endingTheAgentForgetsSteamsKeyboard() { steamKeyboard(true) AgentGuest.stop() From afa696cef267470c6f092808672f1461f4d78461 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 23:11:52 -0500 Subject: [PATCH 15/25] fix(input): Steam kits and PlayStation face buttons no smaller than the old gamepad; Steam layout menu opens the Controller page --- .../java/com/droiddeck/launcher/SessionActivity.kt | 2 +- .../java/com/droiddeck/launcher/input/KitLayout.kt | 12 ++++++------ .../com/droiddeck/launcher/input/KitLayoutTest.kt | 14 ++++++++++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8b55d1d7c..8fbd97ebb 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -5314,7 +5314,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } val root = onScreenControls?.parent as? android.view.ViewGroup ?: return null val view = com.droiddeck.launcher.input.SteamTouchControls(this, device, - onMenu = { drawerOpen = true }, onKeyboard = ::togglePcKeyboard) + onMenu = ::openControllerMenu, onKeyboard = ::togglePcKeyboard) view.visibility = View.GONE view.onEditingChanged = { touchEditorChanged() } view.onOptions = { options -> diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index 4c8c46b71..4df24d56a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -51,8 +51,8 @@ object KitLayout { val ax: Float = cx, val ay: Float = cy) private fun shoulders() = listOf( - Spec(InputControl.LT, 140f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.LB, 140f, 148f, 88f, 28f, shape = InputButtonShape.PILL), - Spec(InputControl.RT, 1460f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.RB, 1460f, 148f, 88f, 28f, shape = InputButtonShape.PILL)) + Spec(InputControl.LT, 140f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.LB, 140f, 148f, 88f, 30f, shape = InputButtonShape.PILL), + Spec(InputControl.RT, 1460f, 66f, 88f, 34f, shape = InputButtonShape.PILL), Spec(InputControl.RB, 1460f, 148f, 88f, 30f, shape = InputButtonShape.PILL)) private fun face(cx: Float, cy: Float, r: Float, off: Float) = listOf( Spec(InputControl.Y, cx, cy - off, r, ax = cx, ay = cy), Spec(InputControl.X, cx - off, cy, r, ax = cx, ay = cy), @@ -67,13 +67,13 @@ object KitLayout { kit.steam -> shoulders() + listOf( Spec(InputControl.L4, 30f, 470f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.L5, 30f, 590f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.R4, 1570f, 470f, 30f, 58f, shape = InputButtonShape.ROUNDED), Spec(InputControl.R5, 1570f, 590f, 30f, 58f, shape = InputButtonShape.ROUNDED), - dpad(215f, 330f, 112f)) + face(1385f, 330f, 56f, 92f) + listOf( - Spec(InputControl.LS, 290f, 610f, 96f), Spec(InputControl.RS, 1310f, 610f, 96f), - Spec(InputControl.LEFT_PAD, 480f, 345f, 95f, shape = InputButtonShape.ROUNDED), Spec(InputControl.RIGHT_PAD, 1120f, 345f, 95f, shape = InputButtonShape.ROUNDED), + dpad(220f, 345f, 150f)) + face(1375f, 345f, 58f, 96f) + listOf( + Spec(InputControl.LS, 290f, 640f, 96f), Spec(InputControl.RS, 1310f, 640f, 96f), + Spec(InputControl.LEFT_PAD, 470f, 360f, 88f, shape = InputButtonShape.ROUNDED), Spec(InputControl.RIGHT_PAD, 1130f, 360f, 88f, shape = InputButtonShape.ROUNDED), Spec(InputControl.SELECT, 660f, 150f, 46f, 26f, shape = InputButtonShape.PILL), Spec(InputControl.START, 940f, 150f, 46f, 26f, shape = InputButtonShape.PILL), Spec(InputControl.GUIDE, 370f, 852f, 66f, 30f, shape = InputButtonShape.PILL), Spec(InputControl.QAM, 1230f, 852f, 66f, 30f, shape = InputButtonShape.PILL), keyboard(136f)) - kit.playStation -> shoulders() + listOf(dpad(250f, 395f, 125f)) + face(1350f, 395f, 56f, 92f) + listOf( + kit.playStation -> shoulders() + listOf(dpad(250f, 395f, 125f)) + face(1350f, 395f, 58f, 96f) + listOf( Spec(InputControl.LS, 565f, 690f, 100f), Spec(InputControl.RS, 1035f, 690f, 100f), Spec(InputControl.L3, 430f, 590f, 42f, ax = 565f, ay = 690f), Spec(InputControl.R3, 1170f, 590f, 42f, ax = 1035f, ay = 690f), Spec(InputControl.SELECT, 640f, 150f, 50f, 30f, shape = InputButtonShape.PILL), Spec(InputControl.START, 960f, 150f, 50f, 30f, shape = InputButtonShape.PILL), diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index b39dd6321..ea5d49aac 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -169,8 +169,8 @@ class KitLayoutTest { } @Test fun clustersStayTogetherOnTallAndSquareScreens() { - val ratio = mapOf(PadKit.STEAM_DECK to 82f / 50f, PadKit.STEAM_CONTROLLER to 82f / 50f, PadKit.XBOX to 94f / 58f, - PadKit.DUALSHOCK to 92f / 56f, PadKit.DUALSENSE to 92f / 56f) + val ratio = mapOf(PadKit.STEAM_DECK to 96f / 58f, PadKit.STEAM_CONTROLLER to 96f / 58f, PadKit.XBOX to 94f / 58f, + PadKit.DUALSHOCK to 96f / 58f, PadKit.DUALSENSE to 96f / 58f) for (kit in PadKit.entries) for ((w, h) in listOf(1080 to 1920, 1240 to 1080, 2400 to 1080)) { val e = KitLayout.elements(context, kit, w, h).associateBy { it.id } val face = listOf("legacy:y", "legacy:x", "legacy:b", "legacy:a").map { centre(e.getValue(it), w, h) } @@ -262,4 +262,14 @@ class KitLayoutTest { assertEquals(kit.toString(), emptyList>(), overlapping(elements, w, h)) } } + + @Test fun noKitControlIsSmallerThanTheOldGamepadOnAHandheld() { + val dp = context.resources.displayMetrics.density + for (kit in PadKit.entries) { + val e = KitLayout.elements(context, kit, 1920, 1080).associateBy { it.id } + assertTrue("$kit face", e.getValue("legacy:a").width * 1920 / 2 >= 30 * dp - 1) + assertTrue("$kit d-pad", e.getValue(KitLayout.DPAD_ID).width * 1920 / 2 >= 60 * dp) + assertTrue("$kit stick", e.getValue("legacy:ls").width * 1920 / 2 >= 40 * dp) + } + } } From 446480aa1960ee09a244ff4f9c2783090c79f72c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 23:45:46 -0500 Subject: [PATCH 16/25] feat(input): Settings Controller is the in-game page for the default, with per-game layouts, Just this game and a direct remap page --- .../com/droiddeck/launcher/SessionActivity.kt | 75 ++- .../launcher/input/ControlsChoice.kt | 115 +++++ .../droiddeck/launcher/input/GameControls.kt | 14 +- .../launcher/input/GamepadGeometry.kt | 22 +- .../com/droiddeck/launcher/input/KitLayout.kt | 7 +- .../launcher/ui/InputLayoutWidgets.kt | 36 -- .../launcher/ui/InputSettingsPage.kt | 445 ++++-------------- .../launcher/ui/InputSurfaceDialog.kt | 38 +- app/src/main/res/values/strings.xml | 7 + .../launcher/input/ControlsChoiceTest.kt | 125 +++++ .../droiddeck/launcher/input/KitLayoutTest.kt | 12 +- .../launcher/input/OnScreenLayoutTest.kt | 2 +- .../launcher/ui/GamepadGeometryTest.kt | 13 +- .../launcher/ui/InputSettingsTest.kt | 200 ++++---- .../launcher/ui/InputUiLayoutTest.kt | 20 +- 15 files changed, 561 insertions(+), 570 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/input/ControlsChoiceTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8fbd97ebb..f52cce011 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -645,6 +645,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var layoutOptions by mutableStateOf>>(emptyList()) private var layoutChoice by mutableStateOf("") private var layoutEditor by mutableStateOf?>(null) + private var layoutEditorScope: String? = null + private var layoutEditorSplit: com.droiddeck.launcher.ui.InputEditorSplit? = null private var controlsGame: Long? = null private var controllerInUse = false private var controlsHiddenByTap = false @@ -1258,9 +1260,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde layoutEditor = null; inputSettingsOpen = false refreshInputProfile(); updateOnScreenControls() }, onChanged = { refreshInputProfile() }, role = InputRole.PRIMARY, layoutId = layout, bindingsId = bindings, - scope = primaryInputLayout?.name?.let { name -> controlsGameName()?.let { getString(R.string.osc_scope_game, name, it) } ?: getString(R.string.osc_scope_default, name) }) + scope = layoutEditorScope, split = layoutEditorSplit) } if (inputSettingsOpen && layoutEditor == null) com.droiddeck.launcher.ui.InputSettingsDialog( + desktop = loadingMode() == SessionService.MODE_DESKTOP, onBack = { inputSettingsOpen = false; secondScreenPresentation?.refreshControls() }, onChanged = { controllerSettings = ControllerPrefs.read(this@SessionActivity) @@ -1723,10 +1726,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde layoutChoice = layoutChoice, onLayout = ::chooseLayout, onEditLayout = when { - layoutChoice == com.droiddeck.launcher.input.GameControls.STEAM -> if (steamTouchAvailable && onScreenButtonsVisible) ({ + layoutChoice == com.droiddeck.launcher.input.GameControls.STEAM -> steamTouchControls?.takeIf { steamTouchAvailable && onScreenButtonsVisible && it.visibility == View.VISIBLE }?.let { view -> { drawerOpen = false - steamTouchControls?.startEditing() - }) else null + view.startEditing() + } } primaryInputLayout?.editable == true -> ({ openLayoutEditor() }) else -> null }, @@ -4370,56 +4373,50 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun controlsGameName(): String? = controlsGameId()?.let { frameGenTargetGameName() } - /** The input library with the current game's main-screen layout selected, without saving it. */ - private fun gameLibrary(): com.droiddeck.launcher.input.InputLibrary { - val library = com.droiddeck.launcher.input.InputLibraries.read(this) - val desktop = loadingMode() == SessionService.MODE_DESKTOP - val chosen = com.droiddeck.launcher.input.GameControls.bindings(this, controlsGameId()) - ?.takeIf { id -> library.bindings.any { it.id == id && !it.physical && it.layoutId?.let { l -> library.layouts.any { x -> x.id == l && x.supports(InputRole.PRIMARY) } } == true } } - return if (chosen == null) library else library.selectPart(desktop, InputRole.PRIMARY, chosen) - } + private fun gameLibrary(): com.droiddeck.launcher.input.InputLibrary = + com.droiddeck.launcher.input.ControlsChoice.library(this, controlsGameId(), loadingMode() == SessionService.MODE_DESKTOP) - private fun refreshLayoutOptions(library: com.droiddeck.launcher.input.InputLibrary) { + private fun refreshLayoutOptions() { val steam = SessionState.mode == SessionService.MODE_STEAM - layoutOptions = listOf(com.droiddeck.launcher.input.InputLibraries.OVERLAY to getString(R.string.osc_layout_gamepad)) + - (if (steam) listOf(com.droiddeck.launcher.input.GameControls.STEAM to getString(R.string.osc_layout_steam)) else emptyList()) + - library.layouts.filter { it.editable && it.supports(InputRole.PRIMARY) && it.id != com.droiddeck.launcher.input.InputLibraries.OVERLAY }.map { it.id to it.name } - layoutChoice = if (steam && com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId())) com.droiddeck.launcher.input.GameControls.STEAM - else primaryInputLayout?.id ?: com.droiddeck.launcher.input.InputLibraries.OVERLAY + val game = controlsGameId() + layoutOptions = com.droiddeck.launcher.input.ControlsChoice.options(this, game, steam, controlsGameName()) + layoutChoice = com.droiddeck.launcher.input.ControlsChoice.current(this, game, steam, loadingMode() == SessionService.MODE_DESKTOP) } private fun chooseLayout(id: String) { val game = controlsGameId() + val name = controlsGameName() val desktop = loadingMode() == SessionService.MODE_DESKTOP - val steam = id == com.droiddeck.launcher.input.GameControls.STEAM - runCatching { - val bindings = if (steam) null else { - var library = com.droiddeck.launcher.input.InputLibraries.read(this) - val layout = library.layouts.first { it.id == id } - library.bindings.firstOrNull { !it.physical && it.compatible(layout) }?.id ?: com.droiddeck.launcher.input.newInputId().also { newId -> - library = com.droiddeck.launcher.input.InputLibraries.update(this) { - it.withPreset(com.droiddeck.launcher.input.SavedInputBindings(newId, layout.name, false, layout.id)) - } - } - } - if (game != null) com.droiddeck.launcher.input.GameControls.choose(this, game, bindings, steam) - else { - SessionPrefs.setSteamTouchLayout(this, steam) - if (bindings != null) com.droiddeck.launcher.input.InputLibraries.update(this) { it.selectPart(desktop, InputRole.PRIMARY, bindings) } - } - }.onFailure { Log.w(TAG, "could not choose layout $id", it) } + val created = runCatching { + if (id == com.droiddeck.launcher.input.ControlsChoice.NEW) { + if (game != null && name != null) com.droiddeck.launcher.input.ControlsChoice.newForGame(this, game, name, desktop) else null + } else { com.droiddeck.launcher.input.ControlsChoice.choose(this, game, id, desktop, name); null } + }.onFailure { Log.w(TAG, "could not choose layout $id", it) }.getOrNull() releasePads() refreshInputProfile() updateOnScreenControls() + if (created != null) openLayoutEditor() } private fun openLayoutEditor() { - val library = gameLibrary() + val game = controlsGameId() + val name = controlsGameName() val desktop = loadingMode() == SessionService.MODE_DESKTOP - val layout = primaryInputLayout ?: return + val target = com.droiddeck.launcher.input.ControlsChoice.editTarget(this, game, desktop) ?: return + val layoutName = com.droiddeck.launcher.input.InputLibraries.read(this).layouts.firstOrNull { it.id == target.second }?.name ?: return + val own = com.droiddeck.launcher.input.ControlsChoice.hasOwn(this, game) + val shared = com.droiddeck.launcher.input.ControlsChoice.shared(this, game) + layoutEditorScope = when { + game == null || name == null || !own -> getString(R.string.osc_scope_default, layoutName) + shared -> getString(R.string.osc_scope_shared, layoutName) + layoutName == name -> getString(R.string.osc_scope_own, name) + else -> getString(R.string.osc_scope_game, layoutName, name) + } + layoutEditorSplit = if (game != null && name != null && shared) com.droiddeck.launcher.ui.InputEditorSplit(getString(R.string.osc_just_this_game), + getString(R.string.osc_scope_game, layoutName, name)) { com.droiddeck.launcher.input.ControlsChoice.newForGame(this, game, name, desktop) } else null releasePads() drawerOpen = false - layoutEditor = Triple(library.activeId(desktop), layout.id, library.activePart(desktop, InputRole.PRIMARY).bindings) + layoutEditor = target inputSettingsOpen = true } @@ -4429,7 +4426,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde inputProfile = library.compileActive(desktop, secondScreenMode.panel(this)) stockInputProfile = library.compileStock(desktop, secondScreenMode.panel(this)) primaryInputLayout = library.activeLayout(desktop, InputRole.PRIMARY) - refreshLayoutOptions(library) + refreshLayoutOptions() secondaryInputLayout = library.panelLayout(desktop, secondScreenMode.panel(this)) deckPanelLayouts = com.droiddeck.launcher.input.DeckPanel.entries.associateWith { library.panelLayout(desktop, it.bindings) } inputUsesLocalActions = InputControl.padControls.any { inputProfile.action(InputRole.PHYSICAL, it) !is InputAction.Native } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt b/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt new file mode 100644 index 000000000..48c712eb8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt @@ -0,0 +1,115 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionPrefs + +/** The on-screen layout each game draws, shared by the in-game Controller page and Settings › Controller. A null game is the default. */ +object ControlsChoice { + const val NEW = "new" + const val DEFAULT = "default" + + data class Game(val id: Long, val name: String, val layout: String) + + private fun own(library: InputLibrary, id: String?): String? = id?.takeIf { bindings -> + library.bindings.any { it.id == bindings && !it.physical && it.layoutId?.let { l -> library.layouts.any { x -> x.id == l && x.supports(InputRole.PRIMARY) } } == true } + } + + private fun own(context: Context, library: InputLibrary, game: Long?) = own(library, GameControls.bindings(context, game)) + + /** The input library with [game]'s main-screen layout selected, without saving it. */ + fun library(context: Context, game: Long?, desktop: Boolean): InputLibrary { + val library = InputLibraries.read(context) + val chosen = own(context, library, game) + return if (chosen == null) library else library.selectPart(desktop, InputRole.PRIMARY, chosen) + } + + fun options(context: Context, game: Long?, steamMode: Boolean, gameName: String? = null): List> { + val library = InputLibraries.read(context) + val own = game != null && game in GameControls.games(context) + return (if (own) listOf(DEFAULT to context.getString(R.string.osc_default)) else emptyList()) + + listOf(InputLibraries.OVERLAY to context.getString(R.string.osc_layout_gamepad)) + + (if (steamMode) listOf(GameControls.STEAM to context.getString(R.string.osc_layout_steam)) else emptyList()) + + library.layouts.filter { it.editable && it.supports(InputRole.PRIMARY) && it.id != InputLibraries.OVERLAY }.map { it.id to it.name } + + (if (game != null && !gameName.isNullOrBlank()) listOf(NEW to context.getString(R.string.osc_layout_new_for, gameName)) else emptyList()) + } + + fun current(context: Context, game: Long?, steamMode: Boolean, desktop: Boolean = false): String = + if (steamMode && GameControls.steamLayout(context, game)) GameControls.STEAM + else library(context, game, desktop).activeLayout(desktop, InputRole.PRIMARY)?.id ?: InputLibraries.OVERLAY + + fun choose(context: Context, game: Long?, id: String, desktop: Boolean, gameName: String? = null) { + require(id != NEW) + if (id == DEFAULT) { if (game != null) useDefault(context, game); return } + val steam = id == GameControls.STEAM + val bindings = if (steam) null else { + val library = InputLibraries.read(context) + val layout = library.layouts.first { it.id == id } + library.bindings.firstOrNull { !it.physical && it.compatible(layout) }?.id ?: newInputId().also { newId -> + InputLibraries.update(context) { it.withPreset(SavedInputBindings(newId, layout.name, false, layout.id)) } + } + } + if (game != null) GameControls.choose(context, game, bindings, steam, gameName) + else { + SessionPrefs.setSteamTouchLayout(context, steam) + if (bindings != null) InputLibraries.update(context) { it.selectPart(desktop, InputRole.PRIMARY, bindings) } + } + } + + /** Copies the layout [game] draws now, actions included, into a layout of its own and chooses it for that game only. */ + fun newForGame(context: Context, game: Long, name: String, desktop: Boolean): Pair { + val layoutId = newInputId() + val bindingsId = newInputId() + InputLibraries.update(context) { latest -> + val chosen = own(context, latest, game) + val part = (if (chosen == null) latest else latest.selectPart(desktop, InputRole.PRIMARY, chosen)).activePart(desktop, InputRole.PRIMARY) + val source = latest.layouts.firstOrNull { it.id == part.layout && it.editable } ?: latest.layouts.first { it.id == InputLibraries.OVERLAY } + val actions = latest.bindings.firstOrNull { it.id == part.bindings && it.compatible(source) } + ?: latest.bindings.firstOrNull { !it.physical && it.compatible(source) } + ?: SavedInputBindings(bindingsId, source.name, false, source.id) + val title = name.trim().take(80).ifEmpty { source.name } + latest.withLayout(source.derived(layoutId, title)).withPreset(actions.copy(id = bindingsId, name = title, layoutId = layoutId)) + } + GameControls.choose(context, game, bindingsId, steam = false, name = name) + return layoutId to bindingsId + } + + /** The profile, layout and actions the editor opens for [game], or null when its layout can't be edited here. */ + fun editTarget(context: Context, game: Long?, desktop: Boolean): Triple? { + val library = library(context, game, desktop) + val layout = library.activeLayout(desktop, InputRole.PRIMARY)?.takeIf { it.editable } ?: return null + return Triple(library.activeId(desktop), layout.id, library.activePart(desktop, InputRole.PRIMARY).bindings) + } + + /** Whether [game] has a layout of its own, rather than the default. */ + fun hasOwn(context: Context, game: Long?): Boolean = own(context, InputLibraries.read(context), game) != null + + /** Whether saving an edit of [game]'s layout would also change the default or another game. */ + fun shared(context: Context, game: Long?): Boolean { + game ?: return false + val library = InputLibraries.read(context) + val bindings = own(context, library, game) ?: return true + val layout = library.preset(bindings).layoutId + fun drawsLayout(id: String) = library.bindings.firstOrNull { it.id == id }?.layoutId == layout + return library.usersOfLayout(layout ?: return true).isNotEmpty() || + library.selections.values.any { s -> s.parts[InputRole.PRIMARY]?.let(::drawsLayout) == true } || + GameControls.games(context).any { it != game && own(context, library, it)?.let(::drawsLayout) == true } + } + + fun useDefault(context: Context, game: Long) = GameControls.clear(context, game) + + /** Games with a layout of their own, by name. */ + fun games(context: Context): List { + val library = InputLibraries.read(context) + return GameControls.games(context).mapNotNull { id -> + val layout = when { + GameControls.steamLayout(context, id) -> context.getString(R.string.osc_layout_steam) + else -> own(context, library, id)?.let { b -> library.layouts.firstOrNull { it.id == library.preset(b).layoutId }?.name } ?: return@mapNotNull null + } + val name = GameControls.name(context, id) + ?: id.takeIf { it in Int.MIN_VALUE..Int.MAX_VALUE }?.let { runCatching { SteamTouchConfig.gameName(context, it.toInt()) }.getOrNull() } + ?: id.toString() + Game(id, name, layout) + }.sortedBy { it.name.lowercase() } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/GameControls.kt b/app/src/main/java/com/droiddeck/launcher/input/GameControls.kt index 4d76af54e..8faead159 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GameControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GameControls.kt @@ -17,8 +17,20 @@ object GameControls { return if (game != null && p.contains("$game.steam")) p.getBoolean("$game.steam", false) else SessionPrefs.steamTouchLayout(context) } - fun choose(context: Context, game: Long, bindings: String?, steam: Boolean) { + fun choose(context: Context, game: Long, bindings: String?, steam: Boolean, name: String? = null) { prefs(context).edit().apply { if (bindings == null) remove("$game.bindings") else putString("$game.bindings", bindings) } + .apply { if (!name.isNullOrBlank()) putString("$game.name", name) } .putBoolean("$game.steam", steam).apply() } + + /** Games with their own choice, in the order of their ids. */ + fun games(context: Context): List = prefs(context).all.keys + .filter { it.endsWith(".steam") || it.endsWith(".bindings") } + .mapNotNull { it.substringBeforeLast('.').toLongOrNull() }.distinct().sorted() + + fun name(context: Context, game: Long): String? = prefs(context).getString("$game.name", null) + + fun clear(context: Context, game: Long) { + prefs(context).edit().remove("$game.bindings").remove("$game.steam").apply() + } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt index d29064b78..e733fca3a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt @@ -27,7 +27,7 @@ object GamepadGeometry { fun tall(w: Float, h: Float): Boolean = h >= w * 0.45f - fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false, grips: Boolean = true, upright: Boolean = false, + fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false, grips: Boolean = false, upright: Boolean = false, trackpads: Boolean = false): Map { if (w <= 0f || h <= 0f) return emptyMap() if (upright || portraitDock && h >= w * 0.6f && w >= 300 * density && h >= 300 * density) { @@ -72,6 +72,7 @@ object GamepadGeometry { else -> 1 } middleGrid(columns, gap - 2 * gutter, shoulderY - buttonH / 2f) + if (grips) gripsBetween(boxes, w, gap - 2 * gutter, boxes.values.maxOf { if (it.cx in (w - gap) / 2f..(w + gap) / 2f) it.bottom else 0f } + gutter, h - pad, density) } else { val side = min(min(w * 0.5f, h * 0.70f), (w - 2 * gridButton - 2 * gutter) / 1.42f) val main = side * 0.62f @@ -87,13 +88,30 @@ object GamepadGeometry { val gap = w - 2 * (side * 0.40f + main / 2f) val columns = if (gap >= 2 * gridButton) 2 else 1 val rows = (middle.size + columns - 1) / columns - middleGrid(columns, gap - 2 * gutter, h - pad - rows * buttonH - (rows - 1) * 10 * density) + val gridTop = h - pad - rows * buttonH - (rows - 1) * 10 * density + middleGrid(columns, gap - 2 * gutter, gridTop) + if (grips) gripsBetween(boxes, w, gap - 2 * gutter, shoulderY + buttonH / 2f + gutter, gridTop - gutter, density) val panelsW = min(112 * density, w - 2 * (side * 0.57f + shoulderW / 2f) - 2 * gutter) if (panelsW >= buttonH) boxes[Slot.PANELS] = Box(w / 2f, shoulderY, panelsW, buttonH) } return boxes } + /** The back grips in the gap between a landscape panel's two clusters: one row of four, or two rows of two. */ + private fun gripsBetween(boxes: MutableMap, w: Float, span: Float, top: Float, bottom: Float, density: Float) { + val gap = 8 * density + val minimum = 44 * density + val rows = if ((span - 3 * gap) / 4f >= minimum) 1 else if ((span - gap) / 2f >= minimum) 2 else return + val perRow = 4 / rows + val cellW = ((span - (perRow - 1) * gap) / perRow).coerceAtMost(96 * density) + val cellH = ((bottom - top - (rows - 1) * gap) / rows).coerceAtMost(64 * density) + if (cellH < minimum) return + for ((i, slot) in listOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4).withIndex()) { + val col = i % perRow; val row = i / perRow + boxes[slot] = Box(w / 2f + (col - (perRow - 1) / 2f) * (cellW + gap), bottom - (rows - 1 - row) * (cellH + gap) - cellH / 2f, cellW, cellH) + } + } + /** * The panel under a portrait game: shoulders with View and Menu across the top, the back grips under them when the kit has * them, then the d-pad and face buttons and, along the bottom edge, the sticks or trackpads, each as large as the panel allows. diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index 4df24d56a..faf9fec0f 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -93,12 +93,12 @@ object KitLayout { fun x(ref: Float) = when { ref < REF_W / 3f -> safe.left + ref * unit ref > REF_W * 2f / 3f -> w - safe.right - (REF_W - ref) * unit - else -> w / 2f + (ref - REF_W / 2f) * unit + else -> (w / 2f + (ref - REF_W / 2f) * unit).between(safe.left + ref * unit, w - safe.right - (REF_W - ref) * unit) } fun y(ref: Float) = when { ref < REF_H / 3f -> safe.top + ref * unit ref > REF_H * 2f / 3f -> h - safe.bottom - (REF_H - ref) * unit - else -> h / 2f + (ref - REF_H / 2f) * unit + else -> (h / 2f + (ref - REF_H / 2f) * unit).between(safe.top + ref * unit, h - safe.bottom - (REF_H - ref) * unit) } val density = context.resources.displayMetrics.density var edge = safe.left + CORNER_DP * density @@ -204,4 +204,7 @@ object KitLayout { val mm = shortSide / dpi * 25.4f return min(1f, MAX_HEIGHT_MM / max(mm, 1f)) } + + /** The middle band never comes closer to an edge than the edge rows' own reference spacing allows. */ + private fun Float.between(low: Float, high: Float) = coerceIn(low, max(low, high)) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt index 5687670bf..414105ee6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt @@ -3,44 +3,8 @@ package com.droiddeck.launcher.ui import android.content.Context import android.graphics.Canvas import android.view.View -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import androidx.compose.ui.viewinterop.AndroidView -import com.droiddeck.launcher.R import com.droiddeck.launcher.input.* -@Composable -internal fun InputLayoutRow(layout: SavedInputLayout, role: InputRole, detail: String?, onManage: () -> Unit, onPick: () -> Unit) { - Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { - Row(Modifier.weight(1f).focusRow(onClick = onPick).padding(12.dp), - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - InputLayoutThumbnail(layout, role) - Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text(layout.name, style = MaterialTheme.typography.titleMedium) - Text(detail ?: stringResource(R.string.input_layout_count, layout.elements.size), - style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) - } - } - PadTextButton(onClick = onManage, modifier = Modifier.testTag("layout-manage-${layout.id}")) { Text("⋮", style = MaterialTheme.typography.titleLarge) } - } -} - -@Composable -internal fun InputLayoutThumbnail(layout: SavedInputLayout, role: InputRole) { - AndroidView(factory = { InputLayoutPreviewView(it) }, modifier = Modifier.width(112.dp).height(76.dp).testTag("layout-preview-${layout.id}"), - update = { it.update(layout, role) }) -} - internal class InputLayoutPreviewView(context: Context) : View(context) { private val renderer = InputSurfaceView(context) private var sourceHeight = 563 diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt index 7addb75f1..c6e43f692 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt @@ -1,18 +1,10 @@ package com.droiddeck.launcher.ui -import android.content.Context -import android.net.Uri -import android.provider.OpenableColumns -import android.util.DisplayMetrics import androidx.activity.compose.BackHandler -import androidx.activity.compose.rememberLauncherForActivityResult -import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.focusGroup import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.ui.focus.focusRequester import androidx.compose.foundation.layout.* -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.verticalScroll import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -20,142 +12,85 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import com.droiddeck.launcher.R import com.droiddeck.launcher.input.* import com.droiddeck.launcher.session.SessionPrefs -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +/** The in-game Remap buttons page. */ @Composable -fun InputSettingsDialog(onBack: () -> Unit, onChanged: () -> Unit) { +fun InputSettingsDialog(onBack: () -> Unit, onChanged: () -> Unit, desktop: Boolean = false) { val context = LocalContext.current val activity = context.findActivity() as? com.droiddeck.launcher.SessionActivity val target = activity?.inputEditorDisplay(InputRole.SECONDARY) if (activity != null && target != null && target.displayId != activity.window.decorView.display?.displayId) { - InputDisplayContent(activity, target, onBack) { InputSettingsPane(onBack, onChanged) } - } else InputSettingsWindow(onBack, onChanged) -} - -@Composable -private fun InputSettingsWindow(onBack: () -> Unit, onChanged: () -> Unit) { - Dialog(onDismissRequest = onBack, properties = DialogProperties(usePlatformDefaultWidth = false)) { - InputSettingsPane(onBack, onChanged) + InputDisplayContent(activity, target, onBack) { InputSettingsPane(onBack, onChanged, desktop) } + } else Dialog(onDismissRequest = onBack, properties = DialogProperties(usePlatformDefaultWidth = false)) { + InputSettingsPane(onBack, onChanged, desktop) } } @Composable -private fun InputSettingsPane(onBack: () -> Unit, onChanged: () -> Unit) { - var editingSurface by remember { mutableStateOf(false) } - val window = (androidx.compose.ui.platform.LocalView.current.parent as? androidx.compose.ui.window.DialogWindowProvider)?.window - DisposableEffect(window, editingSurface) { - window?.setDimAmount(if (editingSurface) 0f else .32f) - onDispose { } - } +private fun InputSettingsPane(onBack: () -> Unit, onChanged: () -> Unit, desktop: Boolean) { BoxWithConstraints(Modifier.fillMaxSize().systemBarsPadding().padding(8.dp)) { CompositionLocalProvider(LocalNarrowPane provides (maxWidth < NarrowPaneWidth)) { - Surface(Modifier.fillMaxSize(), color = if (editingSurface) androidx.compose.ui.graphics.Color.Transparent else MaterialTheme.colorScheme.surface) { - InputSettingsPage(onBack, onChanged, onSurfaceEditing = { editingSurface = it }) + Surface(Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.surface) { + InputSettingsPage(onBack, onChanged, remapOnly = true, desktop = desktop) } } } } -private enum class InputPage { HOME, PROFILE, SOURCE, LAYOUTS, REUSE } -private data class InputBindingEdit(val preset: String, val control: InputControl, val element: InputSurfaceElement? = null, val key: PhysicalInputKey? = null, val click: Boolean = false) -private data class InputNameRequest(val title: Int, val initial: String, val sources: List> = emptyList(), - val source: String = "", val offerSharing: Boolean = false, val save: (String, String, Boolean) -> Unit) -private data class InputConfirmation(val title: String, val detail: String, val action: () -> Unit) -private data class InputReuseRequest(val name: String, val layoutOnly: Boolean, val apply: (Boolean) -> Unit) +private enum class InputPage { HOME, REMAP } +private data class InputBindingEdit(val preset: String, val control: InputControl, val key: PhysicalInputKey? = null) +/** Settings › Controller: the in-game Controller page for the default, or with [remapOnly] just the physical controller's buttons. */ @Composable -fun InputSettingsPage(onBack: () -> Unit, onChanged: () -> Unit = {}, embedded: Boolean = false, onSurfaceEditing: (Boolean) -> Unit = {}) { +fun InputSettingsPage(onBack: () -> Unit, onChanged: () -> Unit = {}, embedded: Boolean = false, onSurfaceEditing: (Boolean) -> Unit = {}, + remapOnly: Boolean = false, desktop: Boolean = false) { CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) { - InputSettingsContent(onBack, onChanged, embedded, onSurfaceEditing) + InputSettingsContent(onBack, onChanged, embedded, onSurfaceEditing, remapOnly, desktop) } } @Composable -private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embedded: Boolean, onSurfaceEditing: (Boolean) -> Unit) { +private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embedded: Boolean, onSurfaceEditing: (Boolean) -> Unit, + remapOnly: Boolean, desktop: Boolean) { val context = LocalContext.current val host = rememberMenuHost() var library by remember { mutableStateOf(InputLibraries.read(context)) } - var page by remember { mutableStateOf(InputPage.HOME) } + var page by remember { mutableStateOf(if (remapOnly) InputPage.REMAP else InputPage.HOME) } var bindingsTab by remember { mutableIntStateOf(0) } - var profileId by remember { mutableStateOf(InputProfile.GAME) } - var role by remember { mutableStateOf(InputRole.PHYSICAL) } var edit by remember { mutableStateOf(null) } - var naming by remember { mutableStateOf(null) } - var confirmation by remember { mutableStateOf(null) } - var reuse by remember { mutableStateOf(null) } var capture by remember { mutableStateOf(false) } - var surface by remember { mutableStateOf(false) } - LaunchedEffect(surface) { onSurfaceEditing(surface) } + var surface by remember { mutableStateOf?>(null) } + var revision by remember { mutableIntStateOf(0) } + LaunchedEffect(surface) { onSurfaceEditing(surface != null) } DisposableEffect(Unit) { onDispose { onSurfaceEditing(false) } } - var managingLayout by remember { mutableStateOf(null) } - var exporting by remember { mutableStateOf(null) } var error by remember { mutableStateOf(null) } - val scope = rememberCoroutineScope() val controller = rememberControllerSettings() - var oscMode by remember { mutableStateOf(SessionPrefs.oscMode(context)) } + fun changed() { library = InputLibraries.read(context); revision++; onChanged() } fun update(change: (InputLibrary) -> InputLibrary): Boolean = runCatching { InputLibraries.update(context, change) } .onSuccess { library = it; onChanged() }.onFailure { error = it.message ?: context.getString(R.string.input_save_failed) }.isSuccess fun go(next: InputPage) { page = next; host.open = null } fun back() { when { edit != null -> edit = null - page == InputPage.HOME -> onBack() - page == InputPage.PROFILE -> go(InputPage.HOME) - page == InputPage.SOURCE -> go(InputPage.PROFILE) - else -> go(InputPage.SOURCE) + page == InputPage.REMAP && !remapOnly -> go(InputPage.HOME) + else -> onBack() } } BackHandler(enabled = !embedded || page != InputPage.HOME || edit != null, onBack = ::back) - val profile = library.profile(profileId) - val preset = library.preset(profile.binding(role)) - val layout = library.layout(profileId, role) - val importer = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> - if (uri == null) return@rememberLauncherForActivityResult - val target = role - scope.launch { - val raw = withContext(Dispatchers.IO) { readLayoutFile(context, uri) } - val metrics = inputDisplayMetrics(context, target) - val imported = raw?.let { InputLayoutFile.import(context, it, layoutFileName(context, uri) ?: context.getString(R.string.ctrl_layout), - if (target == InputRole.PRIMARY) InputLayoutScreen.MAIN else InputLayoutScreen.SECONDARY, layout?.style ?: InputSurfaceStyle(), - metrics.widthPixels, metrics.heightPixels, metrics.density) } - if (imported == null) error = context.getString(R.string.input_layout_import_failed) - else if (update { it.withLayout(imported.first).withPreset(imported.second).chooseLayout(profileId, target, imported.first.id) }) go(InputPage.SOURCE) - } - } - val exporter = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/json")) { uri -> - val text = exporting - exporting = null - if (uri != null && text != null) scope.launch { - val saved = withContext(Dispatchers.IO) { runCatching { context.contentResolver.openOutputStream(uri, "wt")?.use { it.write(text.toByteArray()) } != null }.getOrDefault(false) } - if (!saved) error = context.getString(R.string.input_save_failed) - } - } - fun rename(title: Int, name: String, save: (String) -> Unit) { - naming = InputNameRequest(title, name) { value, _, _ -> save(value) } - } - fun newProfile(copy: Boolean) { - naming = InputNameRequest(if (copy) R.string.input_copy_profile else R.string.input_new_profile, - if (copy) profile.name else "", library.profiles.map { it.id to it.name }, profileId, offerSharing = true) { name, source, shared -> - val id = newInputId() - if (update { it.duplicateProfile(source, name, id, sharePhysical = shared) }) { profileId = id; go(InputPage.PROFILE) } - } - } - fun editPart(nextRole: InputRole) { role = nextRole; bindingsTab = 0; go(InputPage.SOURCE) } + val profile = library.profile(library.activeId(desktop)) + val preset = library.preset(library.activePart(desktop, InputRole.PHYSICAL).bindings) val pageFocus = remember { androidx.compose.ui.focus.FocusRequester() } val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current var settled by remember { mutableStateOf(false) } - LaunchedEffect(page, role, profileId, edit != null, surface) { + LaunchedEffect(page, edit != null, surface) { if (!settled) { settled = true; return@LaunchedEffect } - if (surface || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect + if (surface != null || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect repeat(2) { withFrameNanos { } } runCatching { pageFocus.requestFocus() } } @@ -163,73 +98,45 @@ private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embe Box(Modifier.focusRequester(pageFocus).focusGroup()) { if (editing != null) { val b = library.preset(editing.preset) - var elementProperties by remember(editing) { mutableStateOf(editing.element) } - val current = editing.element?.let { if (editing.click) b.clickAction(it) else b.action(it) } - ?: editing.key?.let { k -> b.keys.firstOrNull { it.key == k }?.action ?: InputAction.Disabled } + val current = editing.key?.let { k -> b.keys.firstOrNull { it.key == k }?.action ?: InputAction.Disabled } ?: b.controls[editing.control] ?: InputAction.Native() - InputActionEditor(editing.control, current, if (editing.click) stringResource(R.string.input_click_name, editing.element!!.name) - else editing.element?.name ?: editing.key?.label ?: editing.control.label, - properties = { action -> - if (!editing.click && layout?.elements?.any { it.id == editing.element?.id } == true) - elementProperties?.let { e -> InputElementProperties(e, action) { elementProperties = it } } - }, - onBack = { edit = null }, element = editing.element, nativeTargets = editing.key == null, click = editing.click, - detail = if (library.usersOfBindings(b.id).size > 1) stringResource(R.string.input_shared_detail, b.name, library.usersOfBindings(b.id).size) - else "${profile.name} · ${roleLabel(role)}", onSave = { action -> - if (update { l -> - val geometry = if (!editing.click && elementProperties != null && layout != null) l.withLayout(layout.copy(elements = layout.elements.map { - if (it.id == elementProperties!!.id) elementProperties!!.copy(name = elementProperties!!.name.trim().ifBlank { it.name }) else it - })) else l - geometry.withPreset(when { - editing.element != null && editing.click -> b.copy(clicks = b.clicks + (editing.element.id to action)) - editing.element != null -> b.copy(elements = b.elements + (editing.element.id to action)) + InputActionEditor(editing.control, current, editing.key?.label ?: editing.control.label, + onBack = { edit = null }, nativeTargets = editing.key == null, detail = stringResource(R.string.input_remap_buttons), onSave = { action -> + if (update { l -> l.withPreset(when { editing.key != null -> b.copy(keys = b.keys.filterNot { it.key == editing.key } + PhysicalInputBinding(editing.key, action)) else -> b.copy(controls = b.controls + (editing.control to action)) }) }) edit = null }) - } else if (!surface) key(page, profileId, role) { + } else if (surface == null) key(page) { SettingsPage(host, title = when (page) { InputPage.HOME -> if (embedded) null else stringResource(R.string.setup_controller) - InputPage.PROFILE -> profile.name - InputPage.SOURCE -> roleLabel(role) - InputPage.LAYOUTS -> stringResource(R.string.input_saved_layouts) - InputPage.REUSE -> stringResource(R.string.input_use_settings_from) - }, eyebrow = when (page) { - InputPage.SOURCE -> profile.name - InputPage.LAYOUTS, InputPage.REUSE -> "${profile.name} · ${roleLabel(role)}" - else -> null - }, - onBack = ::back, showBack = !(embedded && page == InputPage.HOME), compactLayout = true) { + InputPage.REMAP -> stringResource(R.string.input_remap_buttons) + }, onBack = ::back, showBack = !(embedded && page == InputPage.HOME), compactLayout = true) { when (page) { InputPage.HOME -> { - SettingsGroup(stringResource(R.string.input_default_profiles)) { - ChoiceRow(host, "auto-desktop", stringResource(R.string.input_desktop_mode), null, - library.profiles.map { it.id to it.name }, library.desktop) { id -> update { it.copy(desktop = id) } } - ChoiceRow(host, "auto-game", stringResource(R.string.input_game_mode), null, - library.profiles.map { it.id to it.name }, library.steam) { id -> update { it.copy(steam = id) } } - for (desktop in listOf(true, false)) { - val selection = library.selection(desktop) - if (selection.profile != InputProfiles.AUTO || selection.parts.isNotEmpty()) InputHint(stringResource(R.string.input_quick_override_hint, - stringResource(if (desktop) R.string.input_desktop_mode else R.string.input_game_mode))) - } - } if (InputLibraries.hasPendingScreenKeyMigration(context)) InputHint(stringResource(R.string.input_import_failed)) if (InputLibraries.hasLibraryRecovery(context)) InputHint(stringResource(R.string.input_library_recovered)) - if (library.profiles.any { it.id.startsWith("migrated.screenkeys.") }) Text(stringResource(R.string.input_imported_keys_hint), - Modifier.padding(16.dp), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) - SettingsGroup(stringResource(R.string.input_profiles)) { - for (p in library.profiles) InputNavigationRow(p.name, when { - p.id == library.steam && p.id == library.desktop -> stringResource(R.string.input_default_both) - p.id == library.steam -> stringResource(R.string.input_default_game) - p.id == library.desktop -> stringResource(R.string.input_default_desktop) - else -> null - }, Modifier.testTag("input-profile-${p.id}")) { profileId = p.id; go(InputPage.PROFILE) } - PadTextButton(onClick = { newProfile(false) }, modifier = Modifier.padding(8.dp)) { Text(stringResource(R.string.input_new_profile)) } - } - SettingsGroup(stringResource(R.string.input_device_settings)) { + DefaultControlsGroup(host, revision, onEdit = { surface = it }, onChanged = ::changed) + SettingsGroup(stringResource(R.string.drawer_page_controller)) { + var padType by remember { mutableStateOf(SessionPrefs.steamController(context)) } + ChoiceRow(host, "pad-type", stringResource(R.string.input_virtual_controller), null, + listOf(SessionPrefs.CONTROLLER_DECK to stringResource(R.string.mode_controller_deck), + SessionPrefs.CONTROLLER_STEAM to stringResource(R.string.mode_controller_steam), + SessionPrefs.CONTROLLER_DS4 to stringResource(R.string.mode_controller_ds4), + SessionPrefs.CONTROLLER_DUALSENSE to stringResource(R.string.mode_controller_dualsense), + SessionPrefs.CONTROLLER_XBOX360 to stringResource(R.string.mode_controller_x360)), + padType) { SessionPrefs.setSteamController(context, it); padType = it; onChanged() } ToggleRow(host, "controller-rumble", stringResource(R.string.ctrl_rumble), null, controller.rumble) { ControllerPrefs.setRumble(context, it); onChanged() } ChoiceRow(host, "controller-dead-zone", stringResource(R.string.ctrl_dead_zone), null, ControllerPrefs.deadZones.map { it to stringResource(R.string.ctrl_percent, it) }, controller.deadZone) { ControllerPrefs.setDeadZone(context, it); onChanged() } - ToggleRow(host, "controller-joycon-vr", stringResource(R.string.ctrl_joycon_vr), stringResource(R.string.ctrl_joycon_vr_hint), controller.joyConVr) { ControllerPrefs.setJoyConVr(context, it); onChanged() } + ToggleRow(host, "controller-joycon-vr", stringResource(R.string.ctrl_joycon_vr), null, controller.joyConVr) { ControllerPrefs.setJoyConVr(context, it); onChanged() } + ActionRow(stringResource(R.string.input_remap_buttons), null, stringResource(R.string.ctrl_edit), { go(InputPage.REMAP) }, + modifier = Modifier.testTag("input-remap")) + } + val games = remember(revision) { ControlsChoice.games(context) } + if (games.isNotEmpty()) SettingsGroup(stringResource(R.string.osc_games_own)) { + for (game in games) ActionRow(game.name, game.layout, stringResource(R.string.osc_use_default), { + ControlsChoice.useDefault(context, game.id); changed() + }, modifier = Modifier.testTag("osc-use-default-${game.id}")) } SettingsGroup(stringResource(R.string.shortcuts_title)) { PhysicalShortcutRows() } SettingsGroup(stringResource(R.string.input_latency)) { @@ -247,188 +154,70 @@ private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embe } }, confirmButton = { PadTextButton(onClick = { reading = false }) { Text(stringResource(R.string.common_close)) } }) } } - InputPage.PROFILE -> { - SettingsGroup(stringResource(R.string.input_profile_controls)) { - for (r in InputRole.entries) InputNavigationRow(roleLabel(r), - if (r == InputRole.PHYSICAL) stringResource(R.string.input_physical_hint) else library.layout(profileId, r)?.name, - Modifier.testTag("input-part-${r.name.lowercase()}"), leading = { - library.layout(profileId, r)?.let { InputLayoutThumbnail(it, r) } - }) { editPart(r) } - } - Spacer(Modifier.height(16.dp)) - Actions { - SecondaryButton(stringResource(R.string.input_rename)) { rename(R.string.input_rename, profile.name) { name -> update { it.withProfile(profile.copy(name = name)) } } } - SecondaryButton(stringResource(R.string.input_copy_profile)) { newProfile(true) } - SecondaryButton(stringResource(R.string.input_reset_actions)) { - confirmation = InputConfirmation(context.getString(R.string.input_reset_actions), context.getString(R.string.input_reset_profile_detail, profile.name)) { update { it.resetProfile(profileId) } } + InputPage.REMAP -> { + SettingsGroup(stringResource(R.string.input_physical)) { + Box(Modifier.padding(horizontal = 12.dp, vertical = 12.dp)) { + SheetChips(listOf(stringResource(R.string.input_buttons), stringResource(R.string.input_axes), stringResource(R.string.input_extra_keys)), bindingsTab) { bindingsTab = it } } - if (profileId !in listOf(InputProfile.GAME, InputProfile.DESKTOP)) SecondaryButton(stringResource(R.string.input_delete)) { - confirmation = InputConfirmation(context.getString(R.string.input_delete), context.getString(R.string.input_delete_profile_detail, profile.name)) { - if (update { it.removeProfile(profileId) }) { profileId = InputProfile.GAME; go(InputPage.HOME) } + if (bindingsTab != 2) InputControlGrid(preset, InputControl.padControls.asList(), bindingsTab == 1) { edit = InputBindingEdit(preset.id, it) } + else { + for (b in preset.keys) { + InputNavigationRow(b.key.label, actionLabel(b.action)) { edit = InputBindingEdit(preset.id, InputControl.A, key = b.key) } + PadTextButton(onClick = { update { it.withPreset(preset.copy(keys = preset.keys - b)) } }) { Text(stringResource(R.string.input_remove_binding)) } } + InputNavigationRow(stringResource(R.string.input_capture), null) { capture = true } } + val defaults = InputProfile.defaults(profile.base).bindings[InputRole.PHYSICAL].orEmpty() + if (preset.controls != defaults || preset.keys.isNotEmpty()) ActionRow(stringResource(R.string.input_reset_actions), null, + stringResource(R.string.hud_reset_button), { update { it.withPreset(preset.copy(controls = defaults, keys = emptyList())) } }, + modifier = Modifier.testTag("input-remap-reset")) } } - InputPage.SOURCE -> { - if (role == InputRole.PRIMARY) SettingsGroup(stringResource(R.string.input_screen_visibility)) { - ChoiceRow(host, "controller-osc", stringResource(R.string.mode_osc), stringResource(R.string.input_visibility_shared), - listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), - SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), - oscMode) { SessionPrefs.setOscMode(context, it); oscMode = it; onChanged() } - } - if (layout != null) SettingsGroup(stringResource(R.string.ctrl_layout)) { - if (layout.editable) InputNavigationRow(stringResource(R.string.input_edit_layout), layout.name, Modifier.testTag("input-surface-${role.name.lowercase()}")) { surface = true } - else InputHint(layout.name) - InputNavigationRow(stringResource(R.string.input_saved_layouts), stringResource(R.string.input_saved_layouts_hint)) { go(InputPage.LAYOUTS) } - if (layout.editable) { - SliderRow(stringResource(R.string.ctrl_opacity), null, layout.style.opacity, 1..100, step = 1, - format = { "$it%" }) { opacity -> update { it.withLayout(layout.copy(style = layout.style.copy(opacity = opacity))) } } - } - if (role == InputRole.SECONDARY) InputHint(stringResource(R.string.input_second_screen_enable)) - } - SettingsGroup(stringResource(R.string.input_assign_actions)) { - val users = library.usersOfBindings(preset.id) - if (users.size > 1) InputHint(stringResource(R.string.input_shared_with, users.filterNot { it.id == profileId }.joinToString { it.name })) - val elements = layout?.takeIf { it.editable }?.let { l -> - if (OnScreenLayout.generated(l)) InputLibraries.defaultPositions(context, library, l)?.first.orEmpty() + l.elements else l.elements - } - if (elements != null) { - if (elements.isEmpty()) InputHint(stringResource(R.string.input_empty_elements)) - for (e in elements) { - InputNavigationRow(e.name, actionLabel(preset.action(e)), Modifier.testTag("input-element-${e.id}")) { edit = InputBindingEdit(preset.id, e.control, e) } - if (e.hasClick) InputNavigationRow(stringResource(R.string.input_click_name, e.name), actionLabel(preset.clickAction(e)), Modifier.testTag("input-click-${e.id}")) { edit = InputBindingEdit(preset.id, InputControl.A, e, click = true) } - } - } else { - Box(Modifier.padding(horizontal = 12.dp, vertical = 12.dp)) { - SheetChips(listOf(stringResource(R.string.input_buttons), stringResource(R.string.input_axes)) + - if (preset.physical) listOf(stringResource(R.string.input_extra_keys)) else emptyList(), bindingsTab) { bindingsTab = it } - } - val controls = InputControl.padControls.asList() - if (bindingsTab != 2) InputControlGrid(preset, controls, bindingsTab == 1) { edit = InputBindingEdit(preset.id, it) } - else { - for (b in preset.keys) { - InputNavigationRow(b.key.label, actionLabel(b.action)) { edit = InputBindingEdit(preset.id, InputControl.A, key = b.key) } - PadTextButton(onClick = { update { it.withPreset(preset.copy(keys = preset.keys - b)) } }) { Text(stringResource(R.string.input_remove_binding)) } - } - InputNavigationRow(stringResource(R.string.input_capture), stringResource(R.string.input_capture_hint)) { capture = true } - } - } - } - SettingsGroup(stringResource(R.string.input_reuse)) { - InputNavigationRow(stringResource(R.string.input_use_settings_from), stringResource(R.string.input_reuse_hint)) { go(InputPage.REUSE) } - if (library.usersOfBindings(preset.id).size > 1 || layout?.let { it.editable && library.usersOfLayout(it.id).size > 1 } == true) - InputNavigationRow(stringResource(R.string.input_make_independent), stringResource(R.string.input_independent_hint), Modifier.testTag("input-make-independent")) { - update { it.usePart(profileId, role, profileId, shared = false) } - } - } - } - InputPage.LAYOUTS -> { - InputHint(stringResource(R.string.input_layout_geometry_hint)) - SettingsGroup(stringResource(R.string.input_saved_layouts)) { - var showOther by remember { mutableStateOf(false) } - val available = library.layouts.filter { it.supports(role) } - val other = available.filter { saved -> !saved.id.startsWith("builtin.") && saved.id != layout?.id && - library.usersOfLayout(saved.id).isEmpty() && library.bindings.none { it.layoutId == saved.id && library.selectedBindings(it.id) } } - for (saved in available.filter { showOther || it !in other }) { - InputLayoutRow(saved, role, if (saved.id == layout?.id) stringResource(R.string.input_current_layout) else null, - onManage = { managingLayout = saved }) { - reuse = InputReuseRequest(saved.name, layoutOnly = true) { shared -> if (update { it.useLayout(profileId, role, saved.id, shared) }) go(InputPage.SOURCE) } - } - } - if (other.isNotEmpty()) PadTextButton(onClick = { showOther = !showOther }, modifier = Modifier.padding(8.dp)) { - Text(stringResource(if (showOther) R.string.input_hide_other_layouts else R.string.input_other_layouts, other.size)) - } - Row { - PadTextButton(onClick = { naming = InputNameRequest(R.string.input_new_layout, "") { name, _, _ -> - val created = SavedInputLayout(newInputId(), name, screen = if (role == InputRole.PRIMARY) InputLayoutScreen.MAIN else InputLayoutScreen.SECONDARY) - if (update { it.withLayout(created).useLayout(profileId, role, created.id, shared = true) }) { go(InputPage.SOURCE); surface = true } - } }, modifier = Modifier.padding(8.dp)) { Text(stringResource(R.string.input_new_layout)) } - PadTextButton(onClick = { importer.launch(arrayOf("application/json", "text/plain", "application/octet-stream", "*/*")) }, - modifier = Modifier.padding(8.dp).testTag("input-layout-import")) { Text(stringResource(R.string.boot_movie_import)) } - } - } - - } - InputPage.REUSE -> { - InputHint(stringResource(R.string.input_reuse_explanation, roleLabel(role))) - SettingsGroup(stringResource(R.string.input_profiles)) { - for (p in library.profiles.filterNot { it.id == profileId }) InputNavigationRow(p.name, library.layout(p.id, role)?.name) { - reuse = InputReuseRequest(p.name, layoutOnly = false) { shared -> if (update { it.usePart(profileId, role, p.id, shared) }) go(InputPage.SOURCE) } - } - } - } - } } } } - managingLayout?.let { saved -> AlertDialog(onDismissRequest = { managingLayout = null }, title = { Text(saved.name) }, - text = { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { - Text(stringResource(R.string.input_layout_count, saved.elements.size)) - SecondaryButton(stringResource(R.string.input_rename)) { - managingLayout = null - rename(R.string.input_rename_layout, saved.name) { name -> update { it.withLayout(saved.copy(name = name)) } } - } - val exported = remember(saved, library) { - val metrics = inputDisplayMetrics(context, if (saved.screen == InputLayoutScreen.SECONDARY) InputRole.SECONDARY else InputRole.PRIMARY) - InputLayoutFile.export(saved, library.bindings.firstOrNull { it.id == preset.id && it.layoutId == saved.id } - ?: library.bindings.firstOrNull { it.layoutId == saved.id }, metrics.widthPixels, metrics.heightPixels) - } - if (exported != null) SecondaryButton(stringResource(R.string.screen_key_layout_export)) { - managingLayout = null - exporting = exported - exporter.launch(InputLayoutFile.fileName(saved)) - } - val used = library.usersOfLayout(saved.id).isNotEmpty() || library.bindings.any { it.layoutId == saved.id && library.selectedBindings(it.id) } - if (!used && saved.editable) SecondaryButton(stringResource(R.string.input_delete)) { - managingLayout = null - confirmation = InputConfirmation(context.getString(R.string.input_delete), context.getString(R.string.input_delete_layout_detail, saved.name)) { update { it.removeLayout(saved.id) } } - } - } }, confirmButton = { PadTextButton(onClick = { managingLayout = null }) { Text(stringResource(R.string.common_close)) } }) } if (capture) InputCaptureDialog(onDismiss = { capture = false }) { capture = false; edit = InputBindingEdit(preset.id, InputControl.A, key = it) } - if (surface) InputSurfaceDialog(profileId, onDismiss = { surface = false; library = InputLibraries.read(context) }, onChanged = { - library = InputLibraries.read(context); onChanged() - }, role = role, layoutId = layout?.id, bindingsId = preset.id) - naming?.let { request -> key(request) { InputNameDialog(request) { naming = null } } } - reuse?.let { request -> key(request) { InputReuseDialog(request) { reuse = null } } } - confirmation?.let { request -> AlertDialog(onDismissRequest = { confirmation = null }, title = { Text(request.title) }, - text = { Text(request.detail) }, confirmButton = { PadTextButton(onClick = { confirmation = null; request.action() }) { Text(stringResource(R.string.common_ok)) } }, - dismissButton = { PadTextButton(onClick = { confirmation = null }) { Text(stringResource(R.string.common_cancel)) } }) } + surface?.let { (profileId, layoutId, bindingsId) -> + val name = library.layouts.firstOrNull { it.id == layoutId }?.name.orEmpty() + InputSurfaceDialog(profileId, onDismiss = { surface = null; changed() }, onChanged = ::changed, role = InputRole.PRIMARY, + layoutId = layoutId, bindingsId = bindingsId, scope = stringResource(R.string.osc_scope_default, name)) + } error?.let { message -> AlertDialog(onDismissRequest = { error = null }, title = { Text(stringResource(R.string.input_save_failed)) }, text = { Text(message) }, confirmButton = { PadTextButton(onClick = { error = null }) { Text(stringResource(R.string.common_ok)) } }) } } +/** The in-game "On-screen controls" group, for games without a layout of their own. */ @Composable -private fun InputNameDialog(request: InputNameRequest, onDismiss: () -> Unit) { - var name by remember { mutableStateOf(request.initial) } - var source by remember { mutableStateOf(request.source) } - var shared by remember { mutableStateOf(false) } - val host = rememberMenuHost() - AlertDialog(onDismissRequest = onDismiss, title = { Text(stringResource(request.title)) }, text = { Column(Modifier.verticalScroll(rememberScrollState())) { - OutlinedTextField(name, { name = it.take(80) }, label = { Text(stringResource(R.string.input_name)) }, singleLine = true, modifier = Modifier.testTag("input-name")) - if (request.sources.isNotEmpty()) ChoiceRow(host, "input-copy-source", stringResource(R.string.input_start_from), null, request.sources, source) { source = it } - if (request.offerSharing) { - Row(Modifier.fillMaxWidth().focusRow(role = Role.Checkbox, checked = shared) { shared = !shared }.testTag("input-share-physical"), verticalAlignment = Alignment.CenterVertically) { - Checkbox(shared, null) - Text(stringResource(R.string.input_share_physical)) - } - Text(stringResource(R.string.input_new_independent_hint), style = MaterialTheme.typography.bodySmall) +private fun DefaultControlsGroup(host: MenuHost, revision: Int, onEdit: (Triple) -> Unit, onChanged: () -> Unit) { + val context = LocalContext.current + val options = remember(revision) { ControlsChoice.options(context, null, steamMode = true) } + val choice = remember(revision) { ControlsChoice.current(context, null, steamMode = true) } + var oscMode by remember { mutableStateOf(SessionPrefs.oscMode(context)) } + var touch by remember { mutableStateOf(SessionPrefs.touchMode(context)) } + var below by remember { mutableStateOf(SessionPrefs.unfoldedControls(context)) } + SettingsGroup(stringResource(R.string.osc_group_for, stringResource(R.string.osc_default))) { + ChoiceRow(host, "osc-layout", stringResource(R.string.osc_layout), null, options, choice) { id -> + runCatching { ControlsChoice.choose(context, null, id, desktop = false) } + onChanged() } - } }, confirmButton = { PadTextButton(enabled = name.isNotBlank(), onClick = { request.save(name.trim(), source, shared); onDismiss() }) { Text(stringResource(R.string.gesture_save_changes)) } }, - dismissButton = { PadTextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }) -} - -@Composable -private fun InputReuseDialog(request: InputReuseRequest, onDismiss: () -> Unit) { - var shared by remember { mutableStateOf(false) } - AlertDialog(onDismissRequest = onDismiss, title = { Text(request.name) }, text = { Column(Modifier.verticalScroll(rememberScrollState())) { - Text(stringResource(if (request.layoutOnly) R.string.input_reuse_layout_detail else R.string.input_reuse_part_detail)) - for (link in listOf(false, true)) Row(Modifier.fillMaxWidth().focusRow(role = Role.RadioButton, checked = shared == link) { shared = link }, verticalAlignment = Alignment.CenterVertically) { - RadioButton(shared == link, null) - Text(stringResource(if (link) R.string.input_keep_shared else R.string.input_independent_copy)) + if (choice != GameControls.STEAM) ActionRow(stringResource(R.string.osc_edit_layout), null, stringResource(R.string.ctrl_edit), { + host.open = null + ControlsChoice.editTarget(context, null, desktop = false)?.let(onEdit) + }, modifier = Modifier.testTag("osc-edit")) + SettingsRow(stringResource(R.string.osc_show), null) { + SegmentedTabs(listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), + SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), oscMode, + tabModifier = { Modifier.testTag("osc-$it") }) { SessionPrefs.setOscMode(context, it); oscMode = it; onChanged() } } - } }, confirmButton = { PadTextButton(onClick = { request.apply(shared); onDismiss() }) { Text(stringResource(R.string.common_ok)) } }, - dismissButton = { PadTextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }) + ChoiceRow(host, "touch", stringResource(R.string.input_touches), null, + listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.common_auto), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_mouse), + SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), + SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), touch) { SessionPrefs.setTouchMode(context, it); touch = it; onChanged() } + ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), null, below) { + SessionPrefs.setUnfoldedControls(context, it); below = it; onChanged() + } + } } @Composable @@ -451,10 +240,9 @@ private fun InputControlGrid(preset: SavedInputBindings, available: List Unit)? = null, onClick: () -> Unit) { +private fun InputNavigationRow(title: String, detail: String?, modifier: Modifier = Modifier, onClick: () -> Unit) { Row(modifier.fillMaxWidth().focusRow(RoundedCornerShape(0.dp), onClick = onClick).heightIn(min = 64.dp).padding(14.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - leading?.invoke() Column(Modifier.weight(1f)) { Text(title, style = MaterialTheme.typography.titleMedium) if (detail != null) Text(detail, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) @@ -463,37 +251,6 @@ private fun InputNavigationRow(title: String, detail: String?, modifier: Modifie } } -@Suppress("DEPRECATION") -internal fun inputDisplayMetrics(context: Context, role: InputRole): DisplayMetrics = DisplayMetrics().also { metrics -> - (context.findActivity() as? com.droiddeck.launcher.SessionActivity)?.inputEditorDisplay(role)?.getRealMetrics(metrics) - ?: metrics.setTo(context.resources.displayMetrics) -} - -private fun readLayoutFile(context: Context, uri: Uri): String? = runCatching { - context.contentResolver.openInputStream(uri)?.use { input -> - val out = java.io.ByteArrayOutputStream() - val buffer = ByteArray(8192) - while (true) { - val read = input.read(buffer) - if (read < 0) break - out.write(buffer, 0, read) - if (out.size() > 1_000_000) return@use null - } - out.toString(Charsets.UTF_8.name()) - } -}.getOrNull() - -private fun layoutFileName(context: Context, uri: Uri): String? = runCatching { - context.contentResolver.query(uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)?.use { cursor -> - if (cursor.moveToFirst()) cursor.getString(0)?.substringBeforeLast('.')?.trim()?.takeIf { it.isNotEmpty() } else null - } -}.getOrNull() - -@Composable -internal fun roleLabel(role: InputRole) = stringResource(when (role) { - InputRole.PHYSICAL -> R.string.input_physical; InputRole.PRIMARY -> R.string.input_primary; InputRole.SECONDARY -> R.string.input_secondary -}) - @Composable private fun InputHint(text: String) { Text(text, Modifier.padding(14.dp), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 0c55b68a2..4cad7d8fb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -128,16 +128,20 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB fun clickAction(e: InputSurfaceElement) = preset.copy(elements = actions, clicks = clicks).clickAction(e) } +/** Offered when the layout being edited is shared: [create] makes the copy that Done then saves into, and [scope] describes it. */ +class InputEditorSplit(val label: String, val scope: String, val create: () -> Pair) + @Composable fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> Unit, - role: InputRole = InputRole.SECONDARY, layoutId: String? = null, bindingsId: String? = null, scope: String? = null) { + role: InputRole = InputRole.SECONDARY, layoutId: String? = null, bindingsId: String? = null, scope: String? = null, + split: InputEditorSplit? = null) { val context = LocalContext.current val host = LocalInputActivity.current ?: context.findActivity() as? ComponentActivity val library = remember { InputLibraries.read(context) } val savedLayout = remember { library.layouts.first { it.id == (layoutId ?: library.profile(profile).parts.getValue(role).layout) } } val savedBindings = remember { library.preset(bindingsId ?: library.profile(profile).binding(role)) } val layoutUsers = library.usersOfLayout(savedLayout.id).size - val bindingUsers = library.usersOfBindings(savedBindings.id).size + var splitting by remember { mutableStateOf(false) } val draft = remember { val defaults = InputLibraries.defaultPositions(context, library, savedLayout) val start = if (OnScreenLayout.generated(savedLayout) && defaults != null) savedLayout.copy(elements = defaults.first + @@ -160,9 +164,10 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> fun leave() { if (draft.dirty) draft.confirmDiscard = true else onDismiss() } fun save() { runCatching { + val (layoutTarget, bindingsTarget) = split?.takeIf { splitting }?.create?.invoke() ?: (savedLayout.id to savedBindings.id) InputLibraries.update(context) { latest -> - val l = latest.layouts.first { it.id == savedLayout.id } - val p = latest.preset(savedBindings.id) + val l = latest.layouts.first { it.id == layoutTarget } + val p = latest.preset(bindingsTarget) val generated = draft.kitAtDefaults && OnScreenLayout.generated(l.copy(elements = emptyList(), kitless = false)) val extras = draft.elements.filterNot { KitLayout.isKit(it.id) } latest.withLayout(if (generated) l.copy(elements = extras, aspect = if (extras.isEmpty()) 0f else draft.aspect, scale = draft.layoutScale, kitless = false) @@ -209,7 +214,8 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> androidx.compose.ui.graphics.Color.Transparent else MaterialTheme.colorScheme.surface) { val element = draft.element BackHandler { if (draft.properties) draft.properties = false else leave() } - val editorScope = scope ?: if (layoutUsers > 1) stringResource(R.string.input_editor_shared, layoutUsers) else savedLayout.name + val editorScope = split?.scope?.takeIf { splitting } ?: scope ?: if (layoutUsers > 1) stringResource(R.string.input_editor_shared, layoutUsers) else savedLayout.name + val splitLabel = split?.label?.takeIf { !splitting } val propertiesEditor: @Composable (InputSurfaceElement) -> Unit = { element -> var properties by remember(element.id) { mutableStateOf(element) } InputActionEditor(if (draft.clickProperties) InputControl.A else element.control, @@ -218,11 +224,7 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> onBack = { draft.properties = false }, element = element, click = draft.clickProperties, properties = { action -> if (!draft.clickProperties) InputElementProperties(properties, action) { properties = it } - if (layoutUsers > 1) Text(stringResource(R.string.input_editor_shared, layoutUsers), - style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(bottom = 12.dp)) - }, detail = if (bindingUsers > 1) stringResource(R.string.input_shared_detail, savedBindings.name, bindingUsers) - else "${library.profile(profile).name} · ${roleLabel(role)}", onSave = { action -> + }, detail = editorScope, onSave = { action -> draft.checkpoint() if (draft.clickProperties) draft.clicks = draft.clicks + (element.id to action) else draft.actions = draft.actions + (element.id to action) draft.elements = draft.elements.map { if (it.id == element.id) properties.copy(name = properties.name.trim().ifBlank { element.name }) else it } @@ -240,15 +242,15 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> } PrimaryButton(stringResource(R.string.input_editor_done)) { save() } } - remote -> SettingsPage(rememberMenuHost(), stringResource(R.string.input_editor_remote), ::leave, - lede = if (layoutUsers > 1) stringResource(R.string.input_editor_shared, layoutUsers) else savedLayout.name) { + remote -> SettingsPage(rememberMenuHost(), stringResource(R.string.input_editor_remote), ::leave, lede = editorScope) { + splitLabel?.let { SecondaryButton(it, compact = true, modifier = Modifier.padding(horizontal = 8.dp).testTag("input-editor-split")) { splitting = true } } SurfaceToolbar(draft, ::save, ::leave, onDismiss) SurfaceSelection(draft) when (draft.popover) { EditorPopover.ADD -> AddRows(draft); EditorPopover.HIDDEN -> HiddenRows(draft); null -> Unit } } else -> Box(Modifier.fillMaxSize()) { SurfaceCanvas(draft, transparent = host is SessionActivity && role == InputRole.PRIMARY) - EditorChrome(draft, editorScope, failure, ::save, ::leave, onDismiss) + EditorChrome(draft, editorScope, splitLabel, { splitting = true }, failure, ::save, ::leave, onDismiss) if (draft.properties && element != null) Surface(Modifier.align(Alignment.CenterEnd).fillMaxHeight().fillMaxWidth(.44f), color = MaterialTheme.colorScheme.surface, shadowElevation = 12.dp) { propertiesEditor(element) @@ -286,7 +288,8 @@ private fun EditorBar(modifier: Modifier = Modifier, content: @Composable RowSco /** The editor's tools over the canvas: one toolbar, a bar on the selected control, and the Add and Hidden lists. */ @Composable -private fun EditorChrome(draft: SurfaceDraft, scope: String, failure: String?, onSave: () -> Unit, onLeave: () -> Unit, onDiscard: () -> Unit) { +private fun EditorChrome(draft: SurfaceDraft, scope: String, splitLabel: String?, onSplit: () -> Unit, failure: String?, + onSave: () -> Unit, onLeave: () -> Unit, onDiscard: () -> Unit) { val context = LocalContext.current BoxWithConstraints(Modifier.fillMaxSize()) { Column(Modifier.align(Alignment.TopCenter).padding(top = 10.dp).widthIn(max = maxWidth - 16.dp), @@ -319,8 +322,11 @@ private fun EditorChrome(draft: SurfaceDraft, scope: String, failure: String?, o PrimaryButton(stringResource(R.string.input_editor_done), compact = true, onClick = onSave) } } - Text(scope, Modifier.background(MaterialTheme.colorScheme.background.copy(alpha = .7f), RoundedCornerShape(50)).padding(horizontal = 12.dp, vertical = 4.dp), - style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Row(Modifier.background(MaterialTheme.colorScheme.background.copy(alpha = .7f), RoundedCornerShape(50)).padding(horizontal = 12.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(scope, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + splitLabel?.let { SecondaryButton(it, compact = true, modifier = Modifier.testTag("input-editor-split"), onClick = onSplit) } + } failure?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error) } when (draft.popover) { EditorPopover.ADD -> EditorList { AddRows(draft) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8f4b5dacc..1249173b3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -345,6 +345,13 @@ Click %1$s · saved for %2$s %1$s · default for games without their own + Saved for %1$s + %1$s · shared with other games + Just this game + + New for %1$s + Default + Games with their own layout + Use default Controller in use. Touch the screen to show the controls. Steam touch layout Image diff --git a/app/src/test/java/com/droiddeck/launcher/input/ControlsChoiceTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ControlsChoiceTest.kt new file mode 100644 index 000000000..d38ce2892 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/ControlsChoiceTest.kt @@ -0,0 +1,125 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import androidx.compose.runtime.MutableState +import com.droiddeck.launcher.R +import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], shadows = [JoyConPadTest.RecordingWriter::class]) +class ControlsChoiceTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + + @Before fun reset() { + for (name in listOf("session", "game-controls", "input-profiles", "input-surfaces", "controller")) context.getSharedPreferences(name, Context.MODE_PRIVATE).edit().clear().commit() + } + + @After fun mode() { SessionState.mode = SessionService.MODE_STEAM } + + private fun bigSticks(): String { + val id = "big-sticks" + InputLibraries.update(context) { library -> + val stick = InputSurfaceElement(InputControl.A, .4f, .4f, .1f, .1f, "jump", InputElementKind.BUTTON, "Jump") + library.withLayout(SavedInputLayout(id, "Big sticks", listOf(stick), screen = InputLayoutScreen.MAIN)) + .withPreset(SavedInputBindings("big-sticks.actions", "Big sticks", false, id, elements = mapOf("jump" to InputAction.Keys(listOf(57))))) + } + return id + } + + @Test fun aNewLayoutForOneGameCopiesTheLayoutAndItsActionsForThatGameOnly() { + val source = bigSticks() + ControlsChoice.choose(context, null, source, desktop = false) + val (layoutId, bindingsId) = ControlsChoice.newForGame(context, 7, "Castle Crashers", desktop = false) + val library = InputLibraries.read(context) + val copy = library.layouts.first { it.id == layoutId } + assertEquals("Castle Crashers", copy.name) + assertEquals(library.layouts.first { it.id == source }.elements, copy.elements) + assertEquals(InputAction.Keys(listOf(57)), library.preset(bindingsId).elements["jump"]) + assertEquals(layoutId, library.preset(bindingsId).layoutId) + assertEquals(bindingsId, GameControls.bindings(context, 7)) + assertEquals(layoutId, ControlsChoice.current(context, 7, steamMode = true)) + assertEquals(source, ControlsChoice.current(context, 8, steamMode = true)) + assertEquals(source, ControlsChoice.current(context, null, steamMode = true)) + assertEquals(Triple(InputProfile.GAME, layoutId, bindingsId), ControlsChoice.editTarget(context, 7, desktop = false)) + } + + @Test fun aCopyOfTheBuiltInGamepadKeepsFollowingTheKit() { + val extra = InputSurfaceElement(InputControl.A, .45f, .1f, .08f, .1f, "extra", InputElementKind.BUTTON, "Extra") + InputLibraries.update(context) { it.withLayout(it.layouts.first { l -> l.id == InputLibraries.OVERLAY }.copy(elements = listOf(extra), aspect = 2f)) } + val (layoutId, _) = ControlsChoice.newForGame(context, 7, "Castle Crashers", desktop = false) + val copy = InputLibraries.read(context).layouts.first { it.id == layoutId } + assertEquals(InputLibraries.OVERLAY, copy.origin) + assertTrue(OnScreenLayout.generated(copy)) + assertEquals(listOf(extra), copy.elements) + assertEquals(InputLibraries.OVERLAY, ControlsChoice.current(context, null, steamMode = false)) + } + + @Test fun onlyAGameWithItsOwnUnsharedLayoutEditsWithoutChangingOthers() { + assertFalse(ControlsChoice.shared(context, null)) + assertTrue(ControlsChoice.shared(context, 7)) + ControlsChoice.choose(context, 7, InputLibraries.OVERLAY, desktop = false) + assertTrue(ControlsChoice.shared(context, 7)) + ControlsChoice.newForGame(context, 7, "Castle Crashers", desktop = false) + assertFalse(ControlsChoice.shared(context, 7)) + ControlsChoice.choose(context, 8, ControlsChoice.current(context, 7, steamMode = false), desktop = false) + assertTrue(ControlsChoice.shared(context, 7)) + } + + @Test fun useDefaultForgetsTheGamesChoice() { + ControlsChoice.newForGame(context, 7, "Castle Crashers", desktop = false) + ControlsChoice.choose(context, 9, GameControls.STEAM, desktop = false, gameName = "Portal") + assertEquals(listOf("Castle Crashers" to "Castle Crashers", "Portal" to context.getString(R.string.osc_layout_steam)), + ControlsChoice.games(context).map { it.name to it.layout }) + ControlsChoice.useDefault(context, 7) + assertNull(GameControls.bindings(context, 7)) + assertEquals(InputLibraries.OVERLAY, ControlsChoice.current(context, 7, steamMode = true)) + assertEquals(listOf(9L), ControlsChoice.games(context).map { it.id }) + } + + @Test fun newIsOfferedOnlyForAGame() { + assertTrue(ControlsChoice.options(context, null, steamMode = true).none { it.first == ControlsChoice.NEW }) + assertEquals(ControlsChoice.NEW to context.getString(R.string.osc_layout_new_for, "Castle Crashers"), + ControlsChoice.options(context, 7, steamMode = true, gameName = "Castle Crashers").last()) + assertEquals(listOf(InputLibraries.OVERLAY, GameControls.STEAM), ControlsChoice.options(context, null, steamMode = true).map { it.first }.take(2)) + } + + @Test fun newForTheGameInTheControllerPageCopiesTheLayoutAndOpensTheEditorOnIt() { + SessionState.mode = SessionService.MODE_STEAM + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + ReflectionHelpers.getField>(activity, "frameGenActiveGameId\$delegate").value = 77L + ReflectionHelpers.getField>(activity, "frameGenActiveGameName\$delegate").value = "Castle Crashers" + ReflectionHelpers.callInstanceMethod(activity, "refreshInputProfile") + val options = ReflectionHelpers.getField>>>(activity, "layoutOptions\$delegate").value + assertEquals(ControlsChoice.NEW to "+ New for Castle Crashers", options.last()) + ReflectionHelpers.callInstanceMethod(activity, "chooseLayout", ReflectionHelpers.ClassParameter.from(String::class.java, ControlsChoice.NEW)) + val editor = ReflectionHelpers.getField?>>(activity, "layoutEditor\$delegate").value!! + assertEquals(GameControls.bindings(activity, 77), editor.third) + assertEquals("Castle Crashers", InputLibraries.read(activity).layouts.first { it.id == editor.second }.name) + assertEquals(editor.second, ReflectionHelpers.getField>(activity, "layoutChoice\$delegate").value) + assertEquals("Saved for Castle Crashers", ReflectionHelpers.getField(activity, "layoutEditorScope")) + assertNull(ReflectionHelpers.getField(activity, "layoutEditorSplit")) + assertNull(GameControls.bindings(activity, 78)) + assertEquals(InputLibraries.OVERLAY, ControlsChoice.current(activity, null, steamMode = true)) + } + + @Test fun aGameWithItsOwnLayoutCanGoBackToTheDefault() { + assertTrue(ControlsChoice.options(context, 42L, steamMode = true, gameName = "Game").none { it.first == ControlsChoice.DEFAULT }) + ControlsChoice.newForGame(context, 42L, "Game", desktop = false) + assertTrue(ControlsChoice.options(context, 42L, steamMode = true, gameName = "Game").first().first == ControlsChoice.DEFAULT) + ControlsChoice.choose(context, 42L, ControlsChoice.DEFAULT, desktop = false) + assertFalse(ControlsChoice.hasOwn(context, 42L)) + assertTrue(ControlsChoice.options(context, 42L, steamMode = true, gameName = "Game").none { it.first == ControlsChoice.DEFAULT }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index ea5d49aac..0616c2f2c 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -234,8 +234,9 @@ class KitLayoutTest { val density = context.resources.displayMetrics.density for (kit in PadKit.entries) { val placed = KitLayout.dock(context, kit, 1080, 1300, true, InputControl.LS, InputControl.RS) - val boxes = GamepadGeometry.layout(1080f, 1300f, density, true) + val boxes = GamepadGeometry.layout(1080f, 1300f, density, true, grips = kit.steam, trackpads = kit.steam) assertEquals(kit.name, kit.steam && boxes.containsKey(GamepadGeometry.Slot.L4), placed.any { it.control == InputControl.L4 }) + assertEquals(kit.name, kit.steam, placed.any { it.control == InputControl.L4 }) assertNull(placed.firstOrNull { it.control == InputControl.GUIDE || it.control == InputControl.QAM }) assertEquals(1, placed.count { it.id == KitLayout.DPAD_ID }) assertTrue(placed.none { it.floating }) @@ -272,4 +273,13 @@ class KitLayoutTest { assertTrue("$kit stick", e.getValue("legacy:ls").width * 1920 / 2 >= 40 * dp) } } + + @Test fun aTopCutoutNeverPushesTheShoulderRowIntoTheMiddleControls() { + for (kit in PadKit.entries) for (top in listOf(0, 20, 60, 120)) { + val elements = KitLayout.elements(context, kit, 1600, 900, Rect(0, top, 0, 0)) + val lb = elements.single { it.id == "legacy:lb" } + val middle = elements.filter { it.id == KitLayout.DPAD_ID || it.id == "legacy:y" } + for (m in middle) assertTrue("$kit $top ${m.id}", m.y * 900 >= (lb.y + lb.height) * 900 - .5f || m.x * 1600 >= (lb.x + lb.width) * 1600) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt index 31bd54aa0..50b60fa05 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt @@ -150,7 +150,7 @@ class OnScreenLayoutTest { assertEquals(box.height, ls.height * h, 1f) assertSquare(placed.first { it.id == "legacy:a" }, w, h) assertNull(placed.firstOrNull { it.control == InputControl.GUIDE || it.control == InputControl.QAM }) - assertEquals(portrait, placed.any { it.control == InputControl.L4 }) + assertEquals(steam && GamepadGeometry.Slot.L4 in boxes, placed.any { it.control == InputControl.L4 }) assertInside(placed, w, h) val solid = placed.filter { it.kind != InputElementKind.STICK } for (a in solid) for (b in solid) if (a !== b) { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt index 72e566cd3..14a268330 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt @@ -33,7 +33,7 @@ class GamepadGeometryTest { private val grips = setOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4) private val portraitPanels get() = panels.take(3) + Panel("312dp phone portrait", 720, 1280, 369 / 160f) private fun portraitBoxes(panel: Panel) = - GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density, portraitDock = true) + GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density, portraitDock = true, grips = true) @Test fun everyControlIsPlacedAndPanelsOnlyWhenUpright() { for (panel in panels) { @@ -173,4 +173,15 @@ class GamepadGeometryTest { for ((slot, box) in b) assertTrue("${panel.name}: $slot", box.bottom <= panel.controlsHeight + .5f && box.right <= panel.width + .5f) } } + + @Test fun landscapePanelsGiveTheGripsSlotsWithoutOverlap() { + for (panel in panels.filter { it.width > it.height }) { + val b = GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density, grips = true) + assertTrue(panel.name, grips.all { it in b }) + val placed = b.entries.toList() + for (i in placed.indices) for (j in i + 1 until placed.size) + assertFalse("${panel.name}: ${placed[i].key} overlaps ${placed[j].key}", placed[i].value.overlaps(placed[j].value)) + for ((slot, box) in b) assertTrue("${panel.name}: $slot", box.top >= -.5f && box.bottom <= panel.controlsHeight + .5f) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt index ecbd28226..3330dd334 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.ui.test.* import com.droiddeck.launcher.input.* import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.SessionService import org.junit.Assert.* @@ -35,6 +36,8 @@ class InputSettingsTest { context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE).edit().clear().commit() context.getSharedPreferences("input-surfaces", Context.MODE_PRIVATE).edit().clear().commit() context.getSharedPreferences("controller", Context.MODE_PRIVATE).edit().clear().commit() + context.getSharedPreferences("game-controls", Context.MODE_PRIVATE).edit().clear().commit() + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } @Test fun commandSymbolsAreSelectableForAnyCustomButton() { @@ -84,8 +87,7 @@ class InputSettingsTest { @Test fun bindingEditorPersistsDisabledWithoutChangingTouchControls() { var changed = false compose.setContent { DroidDeckTheme { InputSettingsPage({}, { changed = true }) } } - compose.onNodeWithTag("input-profile-game").performScrollTo().performClick() - compose.onNodeWithTag("input-part-physical").performScrollTo().performClick() + compose.onNodeWithTag("input-remap").performScrollTo().performClick() compose.onNodeWithTag("input-binding-a").performScrollTo().performClick() compose.onNodeWithText("Disabled", substring = false).performScrollTo().performClick() compose.runOnIdle { assertFalse(changed) } @@ -116,43 +118,94 @@ class InputSettingsTest { } } - @Test fun aNewProfileIsIndependentAndDoesNotBecomeActive() { + @Test fun remapButtonsOpensThePhysicalControllerAndBackReturnsToTheControllerPage() { compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithText(context.getString(R.string.input_new_profile)).performScrollTo().performClick() - compose.onNodeWithTag("input-name").performTextInput("Minecraft") - compose.onNodeWithText(context.getString(R.string.gesture_save_changes)).performClick() + compose.onNodeWithTag("input-remap").performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.input_physical).uppercase()).assertExists() + compose.onNodeWithTag("input-binding-a").performScrollTo().performClick() + compose.onNodeWithText("Disabled", substring = false).performScrollTo().performClick() + compose.onNodeWithTag("input-action-save").performClick() + compose.onNodeWithTag("input-remap-reset").performScrollTo().assertExists() + compose.onNodeWithText(context.getString(R.string.mode_back)).performClick() + compose.onNodeWithTag("osc-edit").assertExists() compose.runOnIdle { - val library = InputLibraries.read(context) - val created = library.profiles.single { it.name == "Minecraft" } - for (role in InputRole.entries) assertNotEquals(library.profile(InputProfile.GAME).binding(role), created.binding(role)) - assertNotEquals(library.layout(InputProfile.GAME, InputRole.SECONDARY)!!.id, library.layout(created.id, InputRole.SECONDARY)!!.id) - assertEquals(InputProfiles.AUTO, library.selected) + assertEquals(InputProfiles.AUTO, InputLibraries.read(context).selected) + assertEquals(InputAction.Disabled, InputProfiles.read(context, InputProfile.GAME).action(InputRole.PHYSICAL, InputControl.A)) } } - @Test fun openingAProfileDoesNotActivateItAndBackKeepsItsContext() { - compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithTag("input-profile-desktop").performScrollTo().performClick() - compose.onNodeWithTag("input-part-physical").performScrollTo().performClick() - compose.onNodeWithTag("input-binding-a").performScrollTo().performClick() - compose.onNodeWithTag("input-action-save").performClick() + @Test fun inGameRemapOpensStraightOnThePhysicalController() { + var closed = false + compose.setContent { DroidDeckTheme { InputSettingsPage({ closed = true }, remapOnly = true) } } compose.onNodeWithTag("input-binding-a").assertExists() + compose.onNodeWithTag("osc-edit").assertDoesNotExist() compose.onNodeWithText(context.getString(R.string.mode_back)).performClick() - compose.onNodeWithTag("input-part-secondary").assertExists() - compose.runOnIdle { assertEquals(InputProfiles.AUTO, InputLibraries.read(context).selected) } + compose.runOnIdle { assertTrue(closed) } } - @Test fun profileCreationCanExplicitlyShareOnlyPhysicalControls() { + @Test fun settingsShowTheInGameControllerPageForTheDefault() { compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithText(context.getString(R.string.input_new_profile)).performScrollTo().performClick() - compose.onNodeWithTag("input-name").performTextInput("Shared controls") - compose.onNodeWithTag("input-share-physical").performClick() - compose.onNodeWithText(context.getString(R.string.gesture_save_changes)).performClick() + compose.onNodeWithText(context.getString(R.string.osc_group_for, context.getString(R.string.osc_default)).uppercase()).assertExists() + for (label in listOf(R.string.osc_layout, R.string.osc_edit_layout, R.string.osc_show, R.string.input_touches, R.string.unfolded_controls, + R.string.input_virtual_controller, R.string.ctrl_rumble, R.string.ctrl_dead_zone, R.string.input_remap_buttons)) + compose.onNodeWithText(context.getString(label)).performScrollTo().assertExists() + for (removed in listOf(R.string.input_default_profiles, R.string.input_profiles, R.string.input_new_profile)) + compose.onNodeWithText(context.getString(removed)).assertDoesNotExist() + compose.onNodeWithTag("input-profile-game").assertDoesNotExist() + compose.onNodeWithTag("osc-${SessionPrefs.OSC_NEVER}").performScrollTo().performClick() + compose.runOnIdle { assertEquals(SessionPrefs.OSC_NEVER, SessionPrefs.oscMode(context)) } + } + + @Test fun choosingTheDefaultLayoutAppliesToGamesWithoutTheirOwn() { + InputLibraries.update(context) { it.copyLayout(InputLibraries.OVERLAY, "Big sticks", "big-sticks") } + ControlsChoice.newForGame(context, 7, "Castle Crashers", desktop = false) + compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } + compose.onNodeWithTag("setting-osc-layout").performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.osc_layout_steam)).assertExists() + compose.onNodeWithText("Big sticks").performClick() compose.runOnIdle { - val library = InputLibraries.read(context) - val created = library.profiles.single { it.name == "Shared controls" } - assertEquals(library.profile("game").binding(InputRole.PHYSICAL), created.binding(InputRole.PHYSICAL)) - assertNotEquals(library.profile("game").binding(InputRole.SECONDARY), created.binding(InputRole.SECONDARY)) + assertEquals("big-sticks", ControlsChoice.current(context, null, steamMode = true)) + assertEquals("big-sticks", ControlsChoice.current(context, 8, steamMode = true)) + assertNotEquals("big-sticks", ControlsChoice.current(context, 7, steamMode = true)) + assertEquals("big-sticks", InputLibraries.read(context).activeLayout(false, InputRole.PRIMARY)!!.id) + } + compose.onNodeWithTag("osc-edit").performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.osc_scope_default, "Big sticks")).assertExists() + compose.onNodeWithTag("input-editor-split").assertDoesNotExist() + } + + @Test fun useDefaultReturnsAGameToTheDefaultLayout() { + ControlsChoice.newForGame(context, 42, "Castle Crashers", desktop = false) + compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } + compose.onNodeWithText(context.getString(R.string.osc_games_own).uppercase()).performScrollTo().assertExists() + compose.onNodeWithTag("osc-use-default-42").performScrollTo().performClick() + compose.runOnIdle { assertNull(GameControls.bindings(context, 42)) } + compose.onNodeWithText(context.getString(R.string.osc_games_own).uppercase()).assertDoesNotExist() + } + + @Test fun justThisGameSavesTheEditIntoTheGamesOwnCopy() { + val library = InputLibraries.read(context) + val layout = library.layout("game", InputRole.PRIMARY)!! + var closed = false + compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", { closed = true }, {}, role = InputRole.PRIMARY, + layoutId = layout.id, bindingsId = library.profile("game").binding(InputRole.PRIMARY), + scope = context.getString(R.string.osc_scope_default, layout.name), + split = InputEditorSplit(context.getString(R.string.osc_just_this_game), "Gamepad · saved for Castle Crashers") { + ControlsChoice.newForGame(context, 7, "Castle Crashers", desktop = false) + }) } } + compose.onNodeWithTag("input-editor-split").performClick() + compose.onNodeWithText("Gamepad · saved for Castle Crashers").assertExists() + compose.onNodeWithTag("input-editor-split").assertDoesNotExist() + pressPlus(2) + compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() + compose.runOnIdle { + assertTrue(closed) + val saved = InputLibraries.read(context) + assertTrue(OnScreenLayout.generated(saved.layouts.first { it.id == layout.id })) + val own = saved.layouts.first { it.id == ControlsChoice.current(context, 7, steamMode = false) } + assertNotEquals(layout.id, own.id) + assertFalse(OnScreenLayout.generated(own)) + assertEquals(layout.id, ControlsChoice.current(context, 8, steamMode = false)) } } @@ -231,59 +284,6 @@ class InputSettingsTest { compose.runOnIdle { assertEquals(InputAction.Keys(listOf(103)), InputLibraries.read(context).preset(bindingsId).elements["legacy:up"]) } } - @Test fun deckPresetOffersItsRealElementsAndTheCommonEditor() { - InputLibraries.update(context) { it.useLayout("game", InputRole.SECONDARY, InputLibraries.DECK, shared = true) } - compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithTag("input-profile-game").performScrollTo().performClick() - compose.onNodeWithTag("input-part-secondary").performScrollTo().performClick() - compose.onNodeWithTag("input-element-legacy:l4").performScrollTo().assertIsDisplayed() - compose.onNodeWithTag("input-binding-a").assertDoesNotExist() - } - - @Test fun mouseTrackpadPresetIsEditableLikeAnyOtherLayout() { - InputLibraries.update(context) { it.useLayout("game", InputRole.SECONDARY, InputLibraries.TRACKPAD, shared = true) } - compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithTag("input-profile-game").performScrollTo().performClick() - compose.onNodeWithTag("input-part-secondary").performScrollTo().performClick() - compose.onNodeWithTag("input-element-legacy:right-pad").performScrollTo().assertIsDisplayed() - compose.onNodeWithTag("input-surface-secondary").performScrollTo().assertIsDisplayed() - compose.onNodeWithTag("input-binding-a").assertDoesNotExist() - } - - @Test fun primaryScreenOffersItsActualElementsAndTheCommonEditor() { - compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithTag("input-profile-game").performScrollTo().performClick() - compose.onNodeWithTag("input-part-primary").performScrollTo().performClick() - compose.onNodeWithTag("input-element-legacy:a").performScrollTo().assertIsDisplayed() - compose.onNodeWithTag("input-binding-a").assertDoesNotExist() - compose.onNodeWithTag("input-surface-primary").performScrollTo().performClick() - compose.onNodeWithText(context.getString(R.string.input_editor_add)).assertIsDisplayed() - compose.onNodeWithTag("input-layout-canvas").assertExists() - } - - @Test fun deviceSettingsAreInlineBelowProfiles() { - compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithTag("input-more").assertDoesNotExist() - compose.onNodeWithText(context.getString(R.string.ctrl_dead_zone)).performScrollTo().assertIsDisplayed() - compose.onNodeWithTag("input-profile-game").performScrollTo().assertIsDisplayed() - } - - @Test fun migratedPadClicksRemainEditableWithoutChangingMovement() { - compose.setContent { DroidDeckTheme { InputSettingsPage({}) } } - compose.onNodeWithTag("input-profile-desktop").performScrollTo().performClick() - compose.onNodeWithTag("input-part-secondary").performScrollTo().performClick() - compose.onNodeWithTag("input-click-legacy:right-pad").performScrollTo().performClick() - compose.onNodeWithText("Disabled", substring = false).performScrollTo().performClick() - compose.onNodeWithTag("input-action-save").performClick() - compose.runOnIdle { - val library = InputLibraries.read(context) - val pad = library.layout("desktop", InputRole.SECONDARY)!!.elements.first { it.control == InputControl.RIGHT_PAD } - val profile = library.compile("desktop") - assertEquals(InputAction.Disabled, profile.elementClickAction(InputRole.SECONDARY, pad)) - assertEquals(InputAction.Pointer(), profile.elementAction(InputRole.SECONDARY, pad.id, pad.control)) - } - } - @Test @Config(sdk = [34]) fun secondarySettingsCanOpenAnActivityDialogAndCloseCleanly() { val displayId = ShadowDisplayManager.addDisplay("w640dp-h480dp", ReflectionHelpers.getStaticField(Display::class.java, "TYPE_EXTERNAL")) val display = context.getSystemService(DisplayManager::class.java).getDisplay(displayId) @@ -294,8 +294,8 @@ class InputSettingsTest { val host = androidx.compose.ui.platform.LocalContext.current.findActivity() as androidx.activity.ComponentActivity if (open.value) InputDisplayContent(host, display, { open.value = false }) { InputSettingsPage({ open.value = false }) } } } - compose.onNodeWithText(context.getString(R.string.input_new_profile)).performScrollTo().performClick() - compose.onNodeWithTag("input-name").assertExists() + compose.onNodeWithText(context.getString(R.string.input_read_timing)).performScrollTo().performClick() + compose.onNodeWithText(context.getString(R.string.common_close)).assertExists() compose.runOnIdle { assertTrue(ShadowDialog.getShownDialogs().filterIsInstance().any { it.isShowing && it.display.displayId == displayId }) val dialog = ShadowDialog.getShownDialogs().last { it !is Presentation && it.isShowing } @@ -452,40 +452,6 @@ class InputSettingsTest { com.droiddeck.launcher.input.ControllerPrefs.setSnap(context, true) } - @Test fun layoutsCanBeImportedAndExported() { - val source = java.io.File(context.cacheDir, "jump.icp").apply { - writeText("""{"name":"Jump keys","elements":[{"type":"BUTTON","shape":"CIRCLE","bindings":["KEY_SPACE"],"scale":1.0,"x":0.8,"y":0.7,"text":"Jump"}]}""") - } - val target = java.io.File(context.cacheDir, "out.icp").apply { delete() } - val registry = object : androidx.activity.result.ActivityResultRegistry() { - override fun onLaunch(requestCode: Int, contract: androidx.activity.result.contract.ActivityResultContract, input: I, - options: androidx.core.app.ActivityOptionsCompat?) { - dispatchResult(requestCode, android.net.Uri.fromFile(if (input is String) target else source)) - } - } - val owner = object : androidx.activity.result.ActivityResultRegistryOwner { override val activityResultRegistry = registry } - compose.setContent { androidx.compose.runtime.CompositionLocalProvider(androidx.activity.compose.LocalActivityResultRegistryOwner provides owner) { - DroidDeckTheme { InputSettingsPage({}) } - } } - compose.onNodeWithTag("input-profile-game").performScrollTo().performClick() - compose.onNodeWithTag("input-part-primary").performScrollTo().performClick() - compose.onNodeWithText(context.getString(R.string.input_saved_layouts)).performScrollTo().performClick() - compose.onNodeWithTag("layout-manage-${InputLibraries.OVERLAY}").performScrollTo().performClick() - compose.onNodeWithText(context.getString(R.string.screen_key_layout_export)).assertDoesNotExist() - compose.onNodeWithText(context.getString(R.string.common_close)).performClick() - compose.onNodeWithTag("input-layout-import").performScrollTo().performClick() - compose.waitUntil(5_000) { InputLibraries.read(context).layout("game", InputRole.PRIMARY)!!.name == "Jump keys" } - val imported = InputLibraries.read(context).layout("game", InputRole.PRIMARY)!! - assertEquals(InputLayoutScreen.MAIN, imported.screen) - assertEquals(InputAction.Keys(listOf(57)), InputLibraries.read(context).compile("game").elementAction(InputRole.PRIMARY, imported.elements.single().id, InputControl.A)) - compose.onNodeWithText(context.getString(R.string.input_saved_layouts)).performScrollTo().performClick() - compose.onNodeWithTag("layout-manage-${imported.id}").performScrollTo().performClick() - compose.onNodeWithText(context.getString(R.string.screen_key_layout_export)).performClick() - compose.waitUntil(5_000) { target.isFile && target.length() > 0 } - assertEquals(source.readText().let { org.json.JSONObject(it).getString("name") }, org.json.JSONObject(target.readText()).getString("name")) - assertEquals("KEY_SPACE", org.json.JSONObject(target.readText()).getJSONArray("elements").getJSONObject(0).getJSONArray("bindings").getString(0)) - } - private fun pressPlus(times: Int) = repeat(times) { compose.onNodeWithText("+").performScrollTo().performClick() } @Test fun sizeButtonsScaleTheWholeGamepadAndUndoAsOneStep() { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputUiLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputUiLayoutTest.kt index 9f28c9ccc..51df2679c 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputUiLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputUiLayoutTest.kt @@ -55,12 +55,12 @@ class InputUiLayoutTest { } @Test @Config(qualifiers = "w360dp-h800dp") - fun phoneKeepsLibraryNavigationAndProfileEditingReachable() { + fun phoneKeepsTheControllerPageAndRemappingReachable() { compose.setContent { root = LocalView.current; DroidDeckTheme { Surface { BoxWithConstraints { CompositionLocalProvider(LocalNarrowPane provides (maxWidth < 600.dp)) { InputSettingsPage({}) } } } } } - compose.onNodeWithTag("input-profile-desktop").performScrollTo().assertIsDisplayed().performClick() - compose.onNodeWithTag("input-part-physical").performScrollTo().assertIsDisplayed().performClick() + compose.onNodeWithTag("osc-edit").performScrollTo().assertIsDisplayed() + compose.onNodeWithTag("input-remap").performScrollTo().assertIsDisplayed().performClick() compose.onNodeWithTag("input-binding-a").performScrollTo().assertIsDisplayed().performClick() compose.onNodeWithTag("input-action-save").assertIsDisplayed() screenshot("phone-properties") @@ -75,10 +75,10 @@ class InputUiLayoutTest { } @Test @Config(qualifiers = "w960dp-h600dp") - fun largeScreenShowsTheProfileLibraryInTheExistingTheme() { + fun largeScreenShowsTheControllerPageInTheExistingTheme() { compose.setContent { root = LocalView.current; DroidDeckTheme { Surface { InputSettingsPage({}) } } } - compose.onNodeWithTag("input-profile-game").assertIsDisplayed() - screenshot("profiles") + compose.onNodeWithTag("osc-edit").assertIsDisplayed() + screenshot("controller") } @Test @Config(qualifiers = "w960dp-h600dp") @@ -108,11 +108,11 @@ class InputUiLayoutTest { } } compose.onNodeWithText(context.getString(R.string.setup_tab_controller)).performClick() - compose.onNodeWithTag("input-profile-game").assertIsDisplayed() - compose.onNodeWithText(context.getString(R.string.ctrl_layout)).assertDoesNotExist() + compose.onNodeWithTag("osc-edit").assertIsDisplayed() + compose.onAllNodesWithText(context.getString(R.string.osc_edit_layout)).assertCountEquals(1) screenshot("controller-tab") - compose.onNodeWithTag("input-profile-game").performClick() - compose.onNodeWithTag("input-part-physical").performScrollTo().performClick() + compose.onNodeWithTag("input-remap").performScrollTo().performClick() + compose.onNodeWithTag("input-binding-a").assertExists() compose.onNodeWithText(context.getString(R.string.setup_tab_launcher)).assertIsDisplayed() screenshot("controller-physical") compose.runOnIdle { assertEquals(InputProfiles.AUTO, InputLibraries.read(context).selected) } From c664b6cfbf9cd832c3b22882549399d95143afe9 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 23:49:53 -0500 Subject: [PATCH 17/25] fix(input): Back shortcut label fits its button --- app/src/main/res/values/input_library.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/input_library.xml b/app/src/main/res/values/input_library.xml index fa082e4d7..3217d0b9b 100644 --- a/app/src/main/res/values/input_library.xml +++ b/app/src/main/res/values/input_library.xml @@ -95,7 +95,7 @@ Home / Guide Back · single tap Back · double tap - Back · twice in Steam, once in Desktop + Back · 2× Steam, 1× Desktop In Steam mode. Holding Back also opens quick access. Restore to default Virtual controller From 968828afbd732a24d38ed3e5fc6be94c8db474a4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 23:52:00 -0500 Subject: [PATCH 18/25] fix(input): kit scale fits the safe area and oversized insets are capped --- .../com/droiddeck/launcher/input/KitLayout.kt | 8 ++++++-- .../com/droiddeck/launcher/input/KitLayoutTest.kt | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index faf9fec0f..e6d32b418 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -41,6 +41,8 @@ object KitLayout { /** The widest pair of side controls on any kit: a larger size never pushes the two halves, or the rows, into each other. */ private const val MIN_SPAN = 1200f private const val MAX_HEIGHT_MM = 80f + /** A cutout never takes more than this fraction of a side; larger insets would leave no room for a usable pad. */ + private const val MAX_INSET = 6 private const val CORNER_DP = 52f private const val ROW_DP = 60f private const val BUTTON_DP = 44f @@ -85,11 +87,13 @@ object KitLayout { } /** The default controls for [kit] on a [width] × [height] screen. */ - fun elements(context: Context, kit: PadKit, width: Int, height: Int, safe: Rect = Rect(), scale: Float = 1f): List { + fun elements(context: Context, kit: PadKit, width: Int, height: Int, inset: Rect = Rect(), scale: Float = 1f): List { if (width <= 0 || height <= 0) return emptyList() + val safe = Rect(inset.left.coerceIn(0, width / MAX_INSET), inset.top.coerceIn(0, height / MAX_INSET), + inset.right.coerceIn(0, width / MAX_INSET), inset.bottom.coerceIn(0, height / MAX_INSET)) if (height > width) return portrait(context, kit, width, height, safe, scale) val w = width.toFloat(); val h = height.toFloat() - val unit = (min(w / REF_W, h / REF_H) * cap(context, min(width, height)) * scale).coerceAtMost(min(w / MIN_SPAN, h / REF_H)) + val unit = (min(w / REF_W, h / REF_H) * cap(context, min(width, height)) * scale).coerceAtMost(min((w - safe.left - safe.right).coerceAtLeast(1f) / MIN_SPAN, (h - safe.top - safe.bottom).coerceAtLeast(1f) / REF_H)) fun x(ref: Float) = when { ref < REF_W / 3f -> safe.left + ref * unit ref > REF_W * 2f / 3f -> w - safe.right - (REF_W - ref) * unit diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index 0616c2f2c..650d68cdc 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -98,7 +98,7 @@ class KitLayoutTest { } @Test fun safeInsetsMoveEdgeControlsInByTheInsetOnly() { - val safe = Rect(120, 30, 60, 40) + val safe = Rect(120, 0, 60, 0) for (kit in PadKit.entries) { val plain = KitLayout.elements(context, kit, 2400, 1080).associateBy { it.id } val inset = KitLayout.elements(context, kit, 2400, 1080, safe) @@ -108,7 +108,6 @@ class KitLayoutTest { } val a = plain.getValue("legacy:lt"); val b = inset.single { it.id == "legacy:lt" } assertEquals(safe.left.toFloat(), (b.x - a.x) * 2400, .5f) - assertEquals(safe.top.toFloat(), (b.y - a.y) * 1080, .5f) val r = plain.getValue("legacy:rt"); val s = inset.single { it.id == "legacy:rt" } assertEquals(-safe.right.toFloat(), (s.x - r.x) * 2400, .5f) } @@ -282,4 +281,16 @@ class KitLayoutTest { for (m in middle) assertTrue("$kit $top ${m.id}", m.y * 900 >= (lb.y + lb.height) * 900 - .5f || m.x * 1600 >= (lb.x + lb.width) * 1600) } } + + @Test fun insetsThatLeaveLessRoomShrinkTheKitInsteadOfOverlappingIt() { + for (kit in PadKit.entries) for ((w, h, safe) in listOf(Triple(1600, 900, Rect(0, 60, 0, 0)), Triple(1600, 900, Rect(0, 730, 0, 0)), + Triple(1920, 1080, Rect(80, 120, 80, 90)), Triple(2400, 1080, Rect(120, 30, 60, 40)))) { + val elements = KitLayout.elements(context, kit, w, h, safe) + assertEquals("$kit $w x $h $safe", emptyList>(), overlapping(elements, w, h)) + if (safe.top <= h / 6) for (e in elements) { + val (x, y, ew, eh) = px(e, w, h).toList() + assertTrue("$kit $safe ${e.id}", x >= safe.left - .5f && y >= safe.top - .5f && x + ew <= w - safe.right + .5f && y + eh <= h - safe.bottom + .5f) + } + } + } } From 885c4f0a4410aff897ed0512b0e3af858e7d4b5d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 23:58:48 -0500 Subject: [PATCH 19/25] fix(input): keep reported insets unless they crowd out the pad --- .../java/com/droiddeck/launcher/input/KitLayout.kt | 14 ++++++++++---- .../com/droiddeck/launcher/input/KitLayoutTest.kt | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index e6d32b418..2966ec4ca 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -41,8 +41,8 @@ object KitLayout { /** The widest pair of side controls on any kit: a larger size never pushes the two halves, or the rows, into each other. */ private const val MIN_SPAN = 1200f private const val MAX_HEIGHT_MM = 80f - /** A cutout never takes more than this fraction of a side; larger insets would leave no room for a usable pad. */ - private const val MAX_INSET = 6 + /** Insets are kept as reported until together they take more than this share of a side, which would leave no room for a usable pad. */ + private const val MAX_INSETS = .4f private const val CORNER_DP = 52f private const val ROW_DP = 60f private const val BUTTON_DP = 44f @@ -89,8 +89,14 @@ object KitLayout { /** The default controls for [kit] on a [width] × [height] screen. */ fun elements(context: Context, kit: PadKit, width: Int, height: Int, inset: Rect = Rect(), scale: Float = 1f): List { if (width <= 0 || height <= 0) return emptyList() - val safe = Rect(inset.left.coerceIn(0, width / MAX_INSET), inset.top.coerceIn(0, height / MAX_INSET), - inset.right.coerceIn(0, width / MAX_INSET), inset.bottom.coerceIn(0, height / MAX_INSET)) + fun fit(a: Int, b: Int, side: Int): Pair { + val first = a.coerceAtLeast(0); val second = b.coerceAtLeast(0) + val room = (side * MAX_INSETS).toInt() + return if (first + second <= room) first to second else (first * room / (first + second)) to (second * room / (first + second)) + } + val (left, right) = fit(inset.left, inset.right, width) + val (top, bottom) = fit(inset.top, inset.bottom, height) + val safe = Rect(left, top, right, bottom) if (height > width) return portrait(context, kit, width, height, safe, scale) val w = width.toFloat(); val h = height.toFloat() val unit = (min(w / REF_W, h / REF_H) * cap(context, min(width, height)) * scale).coerceAtMost(min((w - safe.left - safe.right).coerceAtLeast(1f) / MIN_SPAN, (h - safe.top - safe.bottom).coerceAtLeast(1f) / REF_H)) diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index 650d68cdc..885245856 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -284,10 +284,11 @@ class KitLayoutTest { @Test fun insetsThatLeaveLessRoomShrinkTheKitInsteadOfOverlappingIt() { for (kit in PadKit.entries) for ((w, h, safe) in listOf(Triple(1600, 900, Rect(0, 60, 0, 0)), Triple(1600, 900, Rect(0, 730, 0, 0)), + Triple(1600, 900, Rect(0, 200, 0, 0)), Triple(1600, 900, Rect(0, 200, 0, 150)), Triple(1920, 1080, Rect(80, 120, 80, 90)), Triple(2400, 1080, Rect(120, 30, 60, 40)))) { val elements = KitLayout.elements(context, kit, w, h, safe) assertEquals("$kit $w x $h $safe", emptyList>(), overlapping(elements, w, h)) - if (safe.top <= h / 6) for (e in elements) { + if (safe.top + safe.bottom <= h * .4f) for (e in elements) { val (x, y, ew, eh) = px(e, w, h).toList() assertTrue("$kit $safe ${e.id}", x >= safe.left - .5f && y >= safe.top - .5f && x + ew <= w - safe.right + .5f && y + eh <= h - safe.bottom + .5f) } From 10b21321b79e5b7c805e1b2aeadbdc39c0a0ee43 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 00:11:01 -0500 Subject: [PATCH 20/25] fix(input): save per-game copies with the edit, keep failed choices visible and grips clear of the d-pad --- .../com/droiddeck/launcher/SessionActivity.kt | 7 +++++-- .../launcher/input/ControlsChoice.kt | 20 +++++++++++++------ .../launcher/input/GamepadGeometry.kt | 2 +- .../launcher/ui/InputSettingsPage.kt | 8 +++++--- .../launcher/ui/InputSurfaceDialog.kt | 12 ++++++++--- .../launcher/ui/GamepadGeometryTest.kt | 8 ++++++++ .../launcher/ui/InputSettingsTest.kt | 6 +++--- 7 files changed, 45 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f52cce011..bbb2e47ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -4413,7 +4413,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde else -> getString(R.string.osc_scope_game, layoutName, name) } layoutEditorSplit = if (game != null && name != null && shared) com.droiddeck.launcher.ui.InputEditorSplit(getString(R.string.osc_just_this_game), - getString(R.string.osc_scope_game, layoutName, name)) { com.droiddeck.launcher.input.ControlsChoice.newForGame(this, game, name, desktop) } else null + getString(R.string.osc_scope_game, layoutName, name), + { library, layoutId, bindingsId -> com.droiddeck.launcher.input.ControlsChoice.copyForGame(this, library, game, name, desktop, layoutId, bindingsId) }, + { bindingsId -> com.droiddeck.launcher.input.ControlsChoice.useForGame(this, game, name, bindingsId) }) else null releasePads() drawerOpen = false layoutEditor = target @@ -5349,12 +5351,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun controlsPlan(): com.droiddeck.launcher.input.ControlsPresenter.Plan { val steam = SessionState.mode == SessionService.MODE_STEAM + if (!PadBridge.anyControllerConnected() && !SteamControllerBle.connected) controllerInUse = false return com.droiddeck.launcher.input.ControlsPresenter.plan(com.droiddeck.launcher.input.ControlsPresenter.State( mode = SessionPrefs.oscMode(this), desktop = SessionState.mode == SessionService.MODE_DESKTOP, virtualPad = !steam || SessionPrefs.builtinPad(this), covered = controlsCovered(), - controllerInUse = controllerInUse && (PadBridge.anyControllerConnected() || SteamControllerBle.connected), + controllerInUse = controllerInUse, hiddenByTap = controlsHiddenByTap, steamLayout = steam && com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()), bottomScreen = bottomGame?.surfaceView?.parent is android.view.ViewGroup, diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt b/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt index 48c712eb8..2e4952b97 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControlsChoice.kt @@ -45,14 +45,14 @@ object ControlsChoice { val bindings = if (steam) null else { val library = InputLibraries.read(context) val layout = library.layouts.first { it.id == id } - library.bindings.firstOrNull { !it.physical && it.compatible(layout) }?.id ?: newInputId().also { newId -> + library.bindings.firstOrNull { !it.physical && it.layoutId == layout.id && it.compatible(layout) }?.id ?: newInputId().also { newId -> InputLibraries.update(context) { it.withPreset(SavedInputBindings(newId, layout.name, false, layout.id)) } } } if (game != null) GameControls.choose(context, game, bindings, steam, gameName) else { - SessionPrefs.setSteamTouchLayout(context, steam) if (bindings != null) InputLibraries.update(context) { it.selectPart(desktop, InputRole.PRIMARY, bindings) } + SessionPrefs.setSteamTouchLayout(context, steam) } } @@ -60,7 +60,14 @@ object ControlsChoice { fun newForGame(context: Context, game: Long, name: String, desktop: Boolean): Pair { val layoutId = newInputId() val bindingsId = newInputId() - InputLibraries.update(context) { latest -> + InputLibraries.update(context) { latest -> copyForGame(context, latest, game, name, desktop, layoutId, bindingsId) } + GameControls.choose(context, game, bindingsId, steam = false, name = name) + return layoutId to bindingsId + } + + /** [latest] with a copy of the layout [game] draws now, actions included, under the given ids. Nothing is chosen for the game. */ + fun copyForGame(context: Context, latest: InputLibrary, game: Long, name: String, desktop: Boolean, layoutId: String, bindingsId: String): InputLibrary { + run { val chosen = own(context, latest, game) val part = (if (chosen == null) latest else latest.selectPart(desktop, InputRole.PRIMARY, chosen)).activePart(desktop, InputRole.PRIMARY) val source = latest.layouts.firstOrNull { it.id == part.layout && it.editable } ?: latest.layouts.first { it.id == InputLibraries.OVERLAY } @@ -68,12 +75,13 @@ object ControlsChoice { ?: latest.bindings.firstOrNull { !it.physical && it.compatible(source) } ?: SavedInputBindings(bindingsId, source.name, false, source.id) val title = name.trim().take(80).ifEmpty { source.name } - latest.withLayout(source.derived(layoutId, title)).withPreset(actions.copy(id = bindingsId, name = title, layoutId = layoutId)) + return latest.withLayout(source.derived(layoutId, title)).withPreset(actions.copy(id = bindingsId, name = title, layoutId = layoutId)) } - GameControls.choose(context, game, bindingsId, steam = false, name = name) - return layoutId to bindingsId } + /** Uses [bindingsId], made by [copyForGame], for [game] only. */ + fun useForGame(context: Context, game: Long, name: String, bindingsId: String) = GameControls.choose(context, game, bindingsId, steam = false, name = name) + /** The profile, layout and actions the editor opens for [game], or null when its layout can't be edited here. */ fun editTarget(context: Context, game: Long?, desktop: Boolean): Triple? { val library = library(context, game, desktop) diff --git a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt index e733fca3a..c448fb357 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt @@ -90,7 +90,7 @@ object GamepadGeometry { val rows = (middle.size + columns - 1) / columns val gridTop = h - pad - rows * buttonH - (rows - 1) * 10 * density middleGrid(columns, gap - 2 * gutter, gridTop) - if (grips) gripsBetween(boxes, w, gap - 2 * gutter, shoulderY + buttonH / 2f + gutter, gridTop - gutter, density) + if (grips) gripsBetween(boxes, w, w - 2 * (side * 0.74f + second / 2f) - 2 * gutter, shoulderY + buttonH / 2f + gutter, gridTop - gutter, density) val panelsW = min(112 * density, w - 2 * (side * 0.57f + shoulderW / 2f) - 2 * gutter) if (panelsW >= buttonH) boxes[Slot.PANELS] = Box(w / 2f, shoulderY, panelsW, buttonH) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt index c6e43f692..7941c24d6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt @@ -116,7 +116,8 @@ private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embe InputPage.HOME -> { if (InputLibraries.hasPendingScreenKeyMigration(context)) InputHint(stringResource(R.string.input_import_failed)) if (InputLibraries.hasLibraryRecovery(context)) InputHint(stringResource(R.string.input_library_recovered)) - DefaultControlsGroup(host, revision, onEdit = { surface = it }, onChanged = ::changed) + DefaultControlsGroup(host, revision, onEdit = { surface = it }, onChanged = ::changed, + onFailure = { error = it.message ?: context.getString(R.string.input_save_failed) }) SettingsGroup(stringResource(R.string.drawer_page_controller)) { var padType by remember { mutableStateOf(SessionPrefs.steamController(context)) } ChoiceRow(host, "pad-type", stringResource(R.string.input_virtual_controller), null, @@ -189,7 +190,8 @@ private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embe /** The in-game "On-screen controls" group, for games without a layout of their own. */ @Composable -private fun DefaultControlsGroup(host: MenuHost, revision: Int, onEdit: (Triple) -> Unit, onChanged: () -> Unit) { +private fun DefaultControlsGroup(host: MenuHost, revision: Int, onEdit: (Triple) -> Unit, onChanged: () -> Unit, + onFailure: (Throwable) -> Unit) { val context = LocalContext.current val options = remember(revision) { ControlsChoice.options(context, null, steamMode = true) } val choice = remember(revision) { ControlsChoice.current(context, null, steamMode = true) } @@ -198,7 +200,7 @@ private fun DefaultControlsGroup(host: MenuHost, revision: Int, onEdit: (Triple< var below by remember { mutableStateOf(SessionPrefs.unfoldedControls(context)) } SettingsGroup(stringResource(R.string.osc_group_for, stringResource(R.string.osc_default))) { ChoiceRow(host, "osc-layout", stringResource(R.string.osc_layout), null, options, choice) { id -> - runCatching { ControlsChoice.choose(context, null, id, desktop = false) } + runCatching { ControlsChoice.choose(context, null, id, desktop = false) }.onFailure(onFailure) onChanged() } if (choice != GameControls.STEAM) ActionRow(stringResource(R.string.osc_edit_layout), null, stringResource(R.string.ctrl_edit), { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 4cad7d8fb..c6a7f13d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -129,7 +129,8 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB } /** Offered when the layout being edited is shared: [create] makes the copy that Done then saves into, and [scope] describes it. */ -class InputEditorSplit(val label: String, val scope: String, val create: () -> Pair) +/** Turns an edit of a shared layout into a copy for one game: [copy] adds it to the library being saved, [use] picks it once that save succeeded. */ +class InputEditorSplit(val label: String, val scope: String, val copy: (InputLibrary, String, String) -> InputLibrary, val use: (String) -> Unit) @Composable fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> Unit, @@ -164,8 +165,10 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> fun leave() { if (draft.dirty) draft.confirmDiscard = true else onDismiss() } fun save() { runCatching { - val (layoutTarget, bindingsTarget) = split?.takeIf { splitting }?.create?.invoke() ?: (savedLayout.id to savedBindings.id) - InputLibraries.update(context) { latest -> + val copy = split?.takeIf { splitting } + val (layoutTarget, bindingsTarget) = if (copy != null) newInputId() to newInputId() else savedLayout.id to savedBindings.id + InputLibraries.update(context) { saved -> + val latest = copy?.copy?.invoke(saved, layoutTarget, bindingsTarget) ?: saved val l = latest.layouts.first { it.id == layoutTarget } val p = latest.preset(bindingsTarget) val generated = draft.kitAtDefaults && OnScreenLayout.generated(l.copy(elements = emptyList(), kitless = false)) @@ -174,6 +177,7 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale, kitless = draft.elements.none { KitLayout.isKit(it.id) })).withPreset(p.copy(elements = draft.actions.filterKeys { id -> KitLayout.bindsTo(id, draft.elements) }, clicks = draft.clicks.filterKeys { id -> draft.elements.any { it.id == id && it.hasClick } })) } + copy?.use?.invoke(bindingsTarget) }.onSuccess { onChanged(); onDismiss() }.onFailure { failure = it.message ?: context.getString(R.string.input_save_failed) } } DisposableEffect(manager) { @@ -235,6 +239,7 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> (remote || target == null) && draft.properties && element != null -> propertiesEditor(element) target == null -> SettingsPage(rememberMenuHost(), savedLayout.name, ::leave) { Text(stringResource(R.string.input_display_unavailable)) + failure?.let { Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error) } if (draft.confirmDiscard) { Text(stringResource(R.string.input_editor_discard), style = MaterialTheme.typography.titleSmall) SecondaryButton(stringResource(R.string.input_keep_editing)) { draft.confirmDiscard = false } @@ -245,6 +250,7 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> remote -> SettingsPage(rememberMenuHost(), stringResource(R.string.input_editor_remote), ::leave, lede = editorScope) { splitLabel?.let { SecondaryButton(it, compact = true, modifier = Modifier.padding(horizontal = 8.dp).testTag("input-editor-split")) { splitting = true } } SurfaceToolbar(draft, ::save, ::leave, onDismiss) + failure?.let { Text(it, Modifier.padding(horizontal = 8.dp), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error) } SurfaceSelection(draft) when (draft.popover) { EditorPopover.ADD -> AddRows(draft); EditorPopover.HIDDEN -> HiddenRows(draft); null -> Unit } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt index 14a268330..8eda0d450 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt @@ -184,4 +184,12 @@ class GamepadGeometryTest { for ((slot, box) in b) assertTrue("${panel.name}: $slot", box.top >= -.5f && box.bottom <= panel.controlsHeight + .5f) } } + + @Test fun gripsNeverOverlapTheClustersOnSmallTallPanels() { + for ((w, h) in listOf(360f to 296f, 480f to 300f, 640f to 420f, 900f to 520f)) { + val b = GamepadGeometry.layout(w, h, 1f, grips = true) + for (g in grips.filter { it in b }) for ((slot, box) in b) if (slot != g) + assertFalse("$w x $h: $g overlaps $slot", b.getValue(g).overlaps(box)) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt index 3330dd334..f923e621b 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt @@ -190,9 +190,9 @@ class InputSettingsTest { compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", { closed = true }, {}, role = InputRole.PRIMARY, layoutId = layout.id, bindingsId = library.profile("game").binding(InputRole.PRIMARY), scope = context.getString(R.string.osc_scope_default, layout.name), - split = InputEditorSplit(context.getString(R.string.osc_just_this_game), "Gamepad · saved for Castle Crashers") { - ControlsChoice.newForGame(context, 7, "Castle Crashers", desktop = false) - }) } } + split = InputEditorSplit(context.getString(R.string.osc_just_this_game), "Gamepad · saved for Castle Crashers", + { lib, layoutId, bindingsId -> ControlsChoice.copyForGame(context, lib, 7, "Castle Crashers", false, layoutId, bindingsId) }, + { bindingsId -> ControlsChoice.useForGame(context, 7, "Castle Crashers", bindingsId) }) ) } } compose.onNodeWithTag("input-editor-split").performClick() compose.onNodeWithText("Gamepad · saved for Castle Crashers").assertExists() compose.onNodeWithTag("input-editor-split").assertDoesNotExist() From cd5e824c1b990c27869d7e529d8b7e2d801ad681 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 00:19:56 -0500 Subject: [PATCH 21/25] fix(input): keep full insets while the kit fits, restore the library after a failed save --- .../launcher/input/InputLibraries.kt | 8 +++++-- .../com/droiddeck/launcher/input/KitLayout.kt | 16 +++++++------ .../launcher/ui/InputSettingsPage.kt | 3 +-- .../droiddeck/launcher/input/KitLayoutTest.kt | 4 ++-- .../input/OnScreenControlPrefsTest.kt | 24 +++++++++++++++++++ 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index 97f3d0ba4..127c525d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -83,8 +83,12 @@ object InputLibraries { if (invalid) { val encoded = encode(updated) require(encoded.length <= 2_000_000) { "The input library is too large to save." } - check(p.edit().putString(RECOVERY + UUID.nameUUIDFromBytes(stored!!.toByteArray(Charsets.UTF_8)), stored) - .putString(KEY, encoded).commit()) { "Could not save the input library and its recovery copy." } + val recovery = RECOVERY + UUID.nameUUIDFromBytes(stored!!.toByteArray(Charsets.UTF_8)) + if (!p.edit().putString(recovery, stored).putString(KEY, encoded).commit()) { + // A failed commit has already changed the in-memory preferences; put the previous library back. + p.edit().putString(KEY, stored).remove(recovery).apply() + error("Could not save the input library and its recovery copy.") + } } else write(context, updated) return updated } diff --git a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt index 2966ec4ca..ef8322e9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KitLayout.kt @@ -41,8 +41,8 @@ object KitLayout { /** The widest pair of side controls on any kit: a larger size never pushes the two halves, or the rows, into each other. */ private const val MIN_SPAN = 1200f private const val MAX_HEIGHT_MM = 80f - /** Insets are kept as reported until together they take more than this share of a side, which would leave no room for a usable pad. */ - private const val MAX_INSETS = .4f + /** The smallest half-size of any kit control in reference units. */ + private const val SMALLEST_HALF = 26f private const val CORNER_DP = 52f private const val ROW_DP = 60f private const val BUTTON_DP = 44f @@ -89,13 +89,15 @@ object KitLayout { /** The default controls for [kit] on a [width] × [height] screen. */ fun elements(context: Context, kit: PadKit, width: Int, height: Int, inset: Rect = Rect(), scale: Float = 1f): List { if (width <= 0 || height <= 0) return emptyList() - fun fit(a: Int, b: Int, side: Int): Pair { + // Insets stay as reported unless what's left is too small to keep every control above the minimum element size. + val smallestUnit = InputSurfaceElement.MIN_SIZE * max(width, height) / (2 * SMALLEST_HALF) + fun fit(a: Int, b: Int, side: Int, reference: Float): Pair { val first = a.coerceAtLeast(0); val second = b.coerceAtLeast(0) - val room = (side * MAX_INSETS).toInt() - return if (first + second <= room) first to second else (first * room / (first + second)) to (second * room / (first + second)) + val room = (side - (smallestUnit * reference).toInt() - 1).coerceAtLeast(0) + return if (first + second <= room) first to second else (first.toLong() * room / (first + second)).toInt() to (second.toLong() * room / (first + second)).toInt() } - val (left, right) = fit(inset.left, inset.right, width) - val (top, bottom) = fit(inset.top, inset.bottom, height) + val (left, right) = fit(inset.left, inset.right, width, MIN_SPAN) + val (top, bottom) = fit(inset.top, inset.bottom, height, REF_H) val safe = Rect(left, top, right, bottom) if (height > width) return portrait(context, kit, width, height, safe, scale) val w = width.toFloat(); val h = height.toFloat() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt index 7941c24d6..317673449 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt @@ -200,8 +200,7 @@ private fun DefaultControlsGroup(host: MenuHost, revision: Int, onEdit: (Triple< var below by remember { mutableStateOf(SessionPrefs.unfoldedControls(context)) } SettingsGroup(stringResource(R.string.osc_group_for, stringResource(R.string.osc_default))) { ChoiceRow(host, "osc-layout", stringResource(R.string.osc_layout), null, options, choice) { id -> - runCatching { ControlsChoice.choose(context, null, id, desktop = false) }.onFailure(onFailure) - onChanged() + runCatching { ControlsChoice.choose(context, null, id, desktop = false) }.onSuccess { onChanged() }.onFailure(onFailure) } if (choice != GameControls.STEAM) ActionRow(stringResource(R.string.osc_edit_layout), null, stringResource(R.string.ctrl_edit), { host.open = null diff --git a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt index 885245856..944c83020 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/KitLayoutTest.kt @@ -284,11 +284,11 @@ class KitLayoutTest { @Test fun insetsThatLeaveLessRoomShrinkTheKitInsteadOfOverlappingIt() { for (kit in PadKit.entries) for ((w, h, safe) in listOf(Triple(1600, 900, Rect(0, 60, 0, 0)), Triple(1600, 900, Rect(0, 730, 0, 0)), - Triple(1600, 900, Rect(0, 200, 0, 0)), Triple(1600, 900, Rect(0, 200, 0, 150)), + Triple(1600, 900, Rect(0, 200, 0, 0)), Triple(1600, 900, Rect(0, 200, 0, 150)), Triple(1600, 900, Rect(0, 390, 0, 0)), Triple(1920, 1080, Rect(80, 120, 80, 90)), Triple(2400, 1080, Rect(120, 30, 60, 40)))) { val elements = KitLayout.elements(context, kit, w, h, safe) assertEquals("$kit $w x $h $safe", emptyList>(), overlapping(elements, w, h)) - if (safe.top + safe.bottom <= h * .4f) for (e in elements) { + if (safe.top + safe.bottom <= 400) for (e in elements) { val (x, y, ew, eh) = px(e, w, h).toList() assertTrue("$kit $safe ${e.id}", x >= safe.left - .5f && y >= safe.top - .5f && x + ew <= w - safe.right + .5f && y + eh <= h - safe.bottom + .5f) } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt index 4bdc4143e..df5a0cd45 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt @@ -178,4 +178,28 @@ class OnScreenControlPrefsTest { val noDpad = edited.withLayout(saved.copy(elements = saved.elements.filterNot { it.id == KitLayout.DPAD_ID })) assertNull(noDpad.preset(bindings.id).elements["legacy:up"]) } + + @Test fun aFailedRecoverySaveLeavesTheStoredLibraryAsItWas() { + val stored = JSONObject().put("version", 1).put("profiles", "broken").toString() + val real = context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE) + real.edit().clear().putString("library", stored).commit() + val failing = object : android.content.ContextWrapper(context) { + override fun getSharedPreferences(name: String, mode: Int): android.content.SharedPreferences { + val prefs = super.getSharedPreferences(name, mode) + return object : android.content.SharedPreferences by prefs { + override fun edit(): android.content.SharedPreferences.Editor { + val editor = prefs.edit() + return object : android.content.SharedPreferences.Editor by editor { + override fun putString(key: String?, value: String?) = apply { editor.putString(key, value) } + override fun remove(key: String?) = apply { editor.remove(key) } + override fun commit(): Boolean { editor.apply(); return false } + } + } + } + } + } + assertTrue(runCatching { InputLibraries.update(failing) { it } }.isFailure) + assertEquals(stored, real.getString("library", null)) + assertTrue(real.all.keys.none { it.startsWith("library-recovery.") }) + } } From dcebdac765a2156f95b10432cd75932ec0a39683 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 00:44:41 -0500 Subject: [PATCH 22/25] fix(input): removed kit controls keep their actions in gamepad layouts --- .../droiddeck/launcher/input/InputLibrary.kt | 9 +++++++-- .../launcher/ui/InputSurfaceDialog.kt | 12 ++++++++---- .../launcher/input/OnScreenControlPrefsTest.kt | 18 +++++++++++++++++- .../droiddeck/launcher/ui/InputSettingsTest.kt | 14 ++++++++++++++ 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index 0f5169007..976b55970 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -315,6 +315,11 @@ internal fun InputAction.validFor(element: InputSurfaceElement): Boolean = when else -> target.dimensions == 1 && target != InputControl.LT && target != InputControl.RT } -/** A saved element, or, in a gamepad that keeps no kit positions, the kit control that [id] names. */ +/** + * A saved element, or the kit control that [id] names: in a layout made from the built-in gamepad every kit control keeps its + * binding while it's removed, so Reset or Restore brings it back with its action. + */ internal fun SavedInputLayout.element(id: String): InputSurfaceElement? = - elements.firstOrNull { it.id == id } ?: KitLayout.element(id)?.takeIf { OnScreenLayout.generated(this) || KitLayout.bindsTo(id, elements) } + elements.firstOrNull { it.id == id } ?: KitLayout.element(id)?.takeIf { + this.id == InputLibraries.OVERLAY || origin == InputLibraries.OVERLAY || KitLayout.bindsTo(id, elements) + } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index c6a7f13d4..49657039b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -116,7 +116,10 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB } fun hiddenDefaults(): List = defaults?.let { refit(it, defaultsFrame) }?.filter { d -> elements.none { it.id == d.id } }.orEmpty() fun add(element: InputSurfaceElement) { checkpoint(); elements = elements + element; selected = element.id; popover = null } - fun remove(id: String) { checkpoint(); elements = elements.filterNot { it.id == id }; actions = actions - id; clicks = clicks - id; selected = null } + fun remove(id: String) { + checkpoint(); elements = elements.filterNot { it.id == id }; selected = null + if (!KitLayout.isKit(id)) { actions = actions - id; clicks = clicks - id } + } fun resizeSelected(factor: Float) { val e = element ?: return checkpoint() @@ -173,9 +176,10 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> val p = latest.preset(bindingsTarget) val generated = draft.kitAtDefaults && OnScreenLayout.generated(l.copy(elements = emptyList(), kitless = false)) val extras = draft.elements.filterNot { KitLayout.isKit(it.id) } - latest.withLayout(if (generated) l.copy(elements = extras, aspect = if (extras.isEmpty()) 0f else draft.aspect, scale = draft.layoutScale, kitless = false) - else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale, kitless = draft.elements.none { KitLayout.isKit(it.id) })).withPreset(p.copy(elements = draft.actions.filterKeys { id -> KitLayout.bindsTo(id, draft.elements) }, - clicks = draft.clicks.filterKeys { id -> draft.elements.any { it.id == id && it.hasClick } })) + val edited = if (generated) l.copy(elements = extras, aspect = if (extras.isEmpty()) 0f else draft.aspect, scale = draft.layoutScale, kitless = false) + else l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale, kitless = draft.elements.none { KitLayout.isKit(it.id) }) + latest.withLayout(edited).withPreset(p.copy(elements = draft.actions.filterKeys { id -> edited.element(id) != null }, + clicks = draft.clicks.filterKeys { id -> edited.element(id)?.hasClick == true })) } copy?.use?.invoke(bindingsTarget) }.onSuccess { onChanged(); onDismiss() }.onFailure { failure = it.message ?: context.getString(R.string.input_save_failed) } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt index df5a0cd45..699ff0816 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt @@ -176,7 +176,23 @@ class OnScreenControlPrefsTest { val edited = withUp.withLayout(saved.copy(style = saved.style.copy(opacity = 60))).validate() assertEquals(InputAction.Keys(listOf(103)), edited.preset(bindings.id).elements["legacy:up"]) val noDpad = edited.withLayout(saved.copy(elements = saved.elements.filterNot { it.id == KitLayout.DPAD_ID })) - assertNull(noDpad.preset(bindings.id).elements["legacy:up"]) + assertEquals(InputAction.Keys(listOf(103)), noDpad.preset(bindings.id).elements["legacy:up"]) + } + + @Test fun removingAKitControlFromAGamepadLayoutKeepsItsActionForReset() { + val library = InputLibraries.read(context) + val overlay = library.layouts.single { it.id == InputLibraries.OVERLAY } + val kit = KitLayout.elements(context, PadKit.XBOX, 1920, 1080) + val bindings = library.preset(library.activePart(false, InputRole.PRIMARY).bindings) + val withA = library.withLayout(overlay.copy(elements = kit, aspect = 16f / 9)) + .withPreset(bindings.copy(elements = bindings.elements + ("legacy:a" to InputAction.Keys(listOf(30))))) + val noA = withA.withLayout(overlay.copy(elements = kit.filterNot { it.id == "legacy:a" }, aspect = 16f / 9)).validate() + assertEquals(InputAction.Keys(listOf(30)), noA.preset(bindings.id).elements["legacy:a"]) + val kitless = noA.withLayout(overlay.copy(elements = emptyList(), kitless = true)).validate() + assertEquals(InputAction.Keys(listOf(30)), kitless.preset(bindings.id).elements["legacy:a"]) + val custom = SavedInputLayout("custom", "Custom", listOf(InputSurfaceElement(InputControl.B, .1f, .1f, .1f, .1f, "legacy:b"))) + assertNull(custom.element("legacy:a")) + assertNull(overlay.element("imported:404")) } @Test fun aFailedRecoverySaveLeavesTheStoredLibraryAsItWas() { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt index f923e621b..0b85a15c6 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt @@ -272,6 +272,20 @@ class InputSettingsTest { compose.runOnIdle { assertTrue(OnScreenLayout.generated(InputLibraries.read(context).layouts.first { it.id == layout.id })) } } + @Test @Config(qualifiers = "w833dp-h468dp-land-369dpi") + fun removingAndRestoringAKitButtonKeepsItsAction() { + val library = InputLibraries.read(context) + val layout = library.layout("game", InputRole.PRIMARY)!! + val bindingsId = library.profile("game").binding(InputRole.PRIMARY) + InputLibraries.update(context) { lib -> lib.preset(bindingsId).let { b -> lib.withPreset(b.copy(elements = b.elements + ("legacy:a" to InputAction.Keys(listOf(30))))) } } + val a = InputLibraries.defaultPositions(context, library, layout)!!.first.single { it.id == "legacy:a" } + compose.setContent { DroidDeckTheme { InputSurfaceDialog("game", {}, {}, role = InputRole.PRIMARY, layoutId = layout.id, bindingsId = bindingsId) } } + compose.onNodeWithTag("input-layout-canvas").performTouchInput { click(percentOffset(a.x + a.width / 2, a.y + a.height / 2)) } + compose.onNodeWithText(context.getString(R.string.input_remove_element)).performClick() + compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick() + compose.runOnIdle { assertEquals(InputAction.Keys(listOf(30)), InputLibraries.read(context).preset(bindingsId).elements["legacy:a"]) } + } + @Test fun resetAndSaveKeepTheDpadDirectionOverrides() { val library = InputLibraries.read(context) val layout = library.layout("game", InputRole.PRIMARY)!! From 7c2955b058ab1417e807cef433d39f7571ede528 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 20 Nov 2026 07:33:23 -0500 Subject: [PATCH 23/25] fix(preview): use the mouse touch label --- app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 21057d1de..04cd21cf7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DevPreview.kt @@ -152,7 +152,7 @@ internal fun SessionDrawerPreview(secondScreens: List) { suspendPolicy = suspend, onSuspendPolicy = { suspend = it }, backActionsInverted = inverted, onBackActionsInverted = { inverted = it }, touchMode = touch, onTouch = { touch = it }, - touchAuto = stringResource(R.string.session_touch_auto_direct), + touchAuto = stringResource(R.string.mode_touch_mouse), fexPreset = fex, onFexPreset = { fex = it }, fpsLimit = fps, onFpsLimit = { fps = it }, secondScreenMode = second, onSecondScreenMode = { second = it }, From 97e0251e6a20f28119dca8b8fe7ff697d9a3e950 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 20 Nov 2026 07:48:12 -0500 Subject: [PATCH 24/25] fix(input): preserve control visibility and routing --- .../com/droiddeck/launcher/SessionActivity.kt | 57 +++++++++++++------ .../launcher/input/PhysicalInputBindings.kt | 10 +++- .../launcher/input/SteamControllerBle.kt | 13 ++++- .../launcher/input/TritonInputRouter.kt | 15 ++++- .../launcher/session/SessionPrefs.kt | 3 +- .../launcher/ui/SessionDrawerPage.kt | 2 +- .../input/OnScreenControlPrefsTest.kt | 5 ++ .../input/PhysicalInputBindingsTest.kt | 4 +- .../launcher/input/SteamControllerBleTest.kt | 20 ++++++- 9 files changed, 103 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f9dac0dc5..42cea423e 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -854,7 +854,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde bridge.setStickDeadZone(ControllerPrefs.deadZone(this)) bridge.setBuiltinPad(SessionState.mode != SessionService.MODE_STEAM || SessionPrefs.builtinPad(this)) padBridge = bridge - inputRouter = InputRouter(inputOutput).also { bridge.setInputRouter(it); DeckControls.setRouter(it); physicalInputBindings = com.droiddeck.launcher.input.PhysicalInputBindings(it) } + inputRouter = InputRouter(inputOutput).also { bridge.setInputRouter(it); DeckControls.setRouter(it); physicalInputBindings = com.droiddeck.launcher.input.PhysicalInputBindings(it, ::noteRemappedControllerUse) } refreshInputProfile() bridge.setOnChordInput(backQamInput::onChordInput) SessionState.padBridge = bridge @@ -868,8 +868,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde bridge.setExcluded(vr::owns) joyConVr = vr } - SteamControllerBle.listener = { uiHandler.post { updatePadMotion(); refreshControls() } } - steamController = SteamControllerBle(this, inputRouter).also { it.start() } + SteamControllerBle.listener = { + uiHandler.post { + if (isDestroyed) return@post + if (SteamControllerBle.connected) controllerInUse = true + updatePadMotion() + refreshControls() + } + } + steamController = SteamControllerBle(this, inputRouter, ::noteSteamControllerUse).also { it.start() } if (Build.VERSION.SDK_INT >= 31 && checkSelfPermission(BLUETOOTH_CONNECT) != android.content.pm.PackageManager.PERMISSION_GRANTED && !SessionPrefs.bluetoothAsked(this)) { SessionPrefs.setBluetoothAsked(this) @@ -1271,7 +1278,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onBack = { inputSettingsOpen = false; secondScreenPresentation?.refreshControls() }, onChanged = { controllerSettings = ControllerPrefs.read(this@SessionActivity) - oscMode = SessionPrefs.oscMode(this@SessionActivity) + oscMode = sessionOscMode() padBridge?.setStickDeadZone(ControllerPrefs.deadZone(this@SessionActivity)) joyConVr?.refresh() onScreenControls?.reload() @@ -1460,7 +1467,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde micAvailable = SessionState.micAvailable && !SessionState.suspended, micEnabled = SessionState.micEnabled, onMicEnabled = { SessionService.setMicEnabled(this@SessionActivity, it) }, - touchAuto = getString(if (usingTouchpad()) R.string.mode_touch_touchpad else R.string.mode_touch_mouse), + touchAuto = getString(if (usingTouchpad(SessionPrefs.TOUCH_AUTO)) R.string.mode_touch_touchpad else R.string.mode_touch_mouse), pen = penSettings.takeIf { penSeen }, onPen = { key, value -> SessionPrefs.setPenSetting(this@SessionActivity, key, value); readPrefs() }, fexPreset = fexPreset, @@ -2548,7 +2555,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde fexPreset = SessionPrefs.fexPreset(this) suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) - oscMode = SessionPrefs.oscMode(this) + oscMode = sessionOscMode() backHold = SessionPrefs.backHold(this) backActionsInverted = SessionPrefs.backActionsInverted(this) physicalShortcuts.bindings = PhysicalShortcuts.read(this) @@ -4471,7 +4478,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onScreenControls?.updateLayout(primaryInputLayout) bottomInputControls?.updateLayout(primaryInputLayout) unfoldedPanel?.updateLayout(primaryInputLayout) - if (unfoldedPanel != null) applyUnfoldedControls() + if (onScreenControls != null) applyUnfoldedControls() updateOnScreenPad() secondScreenPresentation?.refreshControls() } @@ -4506,7 +4513,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun controlsBelowWanted(): Boolean { if (!::sessionRoot.isInitialized || glassesScreen != null || bottomGame != null || cardboard.enabled) return false - if (SessionPrefs.oscMode(this) == SessionPrefs.OSC_NEVER) return false + if (sessionOscMode() == SessionPrefs.OSC_NEVER || usesSteamTouchLayout()) return false return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, pipUi || isInPictureInPictureMode) } @@ -4772,7 +4779,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun deliversTouches(mode: String) = mode == SessionPrefs.TOUCH_DIRECT || mode == SessionPrefs.TOUCH_AUTO - private fun usingTouchpad(): Boolean = when (routedTouchMode) { + private fun usingTouchpad(mode: String = routedTouchMode): Boolean = when (mode) { SessionPrefs.TOUCH_PAD -> true SessionPrefs.TOUCH_DIRECT -> false else -> SessionState.mode != SessionService.MODE_STEAM || SessionState.steamUi == "desktop" @@ -5376,17 +5383,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } + private fun sessionOscMode() = SessionPrefs.oscMode(this, steamSession = SessionState.mode == SessionService.MODE_STEAM) + + private fun usesSteamTouchLayout() = SessionState.mode == SessionService.MODE_STEAM && + com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()) + private fun controlsPlan(): com.droiddeck.launcher.input.ControlsPresenter.Plan { val steam = SessionState.mode == SessionService.MODE_STEAM if (!PadBridge.anyControllerConnected() && !SteamControllerBle.connected) controllerInUse = false return com.droiddeck.launcher.input.ControlsPresenter.plan(com.droiddeck.launcher.input.ControlsPresenter.State( - mode = SessionPrefs.oscMode(this), + mode = sessionOscMode(), desktop = SessionState.mode == SessionService.MODE_DESKTOP, virtualPad = !steam || SessionPrefs.builtinPad(this), covered = controlsCovered(), controllerInUse = controllerInUse, hiddenByTap = controlsHiddenByTap, - steamLayout = steam && com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()), + steamLayout = usesSteamTouchLayout(), bottomScreen = bottomGame?.surfaceView?.parent is android.view.ViewGroup, )) } @@ -5398,8 +5410,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde fun hideBottomControls() { bottomInputControls?.takeIf { it.visibility == View.VISIBLE }?.let { it.releaseAll(); it.visibility = View.GONE } } fun hideSteam() { steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } - val keyboardOver = SessionState.mode == SessionService.MODE_STEAM && controlsCovered() && - com.droiddeck.launcher.input.GameControls.steamLayout(this, controlsGameId()) + val keyboardOver = controlsCovered() && usesSteamTouchLayout() if (!keyboardOver) com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false } val plan = controlsPlan() @@ -5407,8 +5418,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val wantsSteam = plan.place == com.droiddeck.launcher.input.ControlsPresenter.Place.STEAM val steam = if (wantsSteam) steamTouch() else null steamTouchInUse = steam != null + uiHandler.removeCallbacks(steamTouchRetry) if (wantsSteam && steam == null && !isFinishing && !isDestroyed) { - uiHandler.removeCallbacks(steamTouchRetry) uiHandler.postDelayed(steamTouchRetry, 1000) } if (steam != null) { @@ -5442,7 +5453,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde bottom.setHidden(plan.hidden) bottom.visibility = View.VISIBLE } - com.droiddeck.launcher.input.ControlsPresenter.Place.MAIN -> { + com.droiddeck.launcher.input.ControlsPresenter.Place.MAIN, + com.droiddeck.launcher.input.ControlsPresenter.Place.STEAM -> { hideBottomControls() controls.setHidden(plan.hidden) controls.visibility = View.VISIBLE @@ -5466,6 +5478,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde drawerOpen = true } + private fun noteRemappedControllerUse(event: KeyEvent) { + if (PadBridge.isControllerKeyEvent(event) || + (event.isFromSource(InputDevice.SOURCE_GAMEPAD) && PadBridge.isFromController(event.device))) { + noteControllerUse() + } + } + + private fun noteSteamControllerUse() { + uiHandler.post { + if (!isDestroyed && SteamControllerBle.connected) noteControllerUse() + } + } + private fun noteControllerUse() { if (controllerInUse) return controllerInUse = true @@ -6706,7 +6731,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde super.onRequestPermissionsResult(requestCode, permissions, grantResults) if (requestCode != REQUEST_BLUETOOTH || grantResults.firstOrNull() != android.content.pm.PackageManager.PERMISSION_GRANTED) return steamController?.stop() - steamController = SteamControllerBle(this, inputRouter).also { it.start() } + steamController = SteamControllerBle(this, inputRouter, ::noteSteamControllerUse).also { it.start() } } companion object { diff --git a/app/src/main/java/com/droiddeck/launcher/input/PhysicalInputBindings.kt b/app/src/main/java/com/droiddeck/launcher/input/PhysicalInputBindings.kt index fcb883a99..664e06092 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PhysicalInputBindings.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PhysicalInputBindings.kt @@ -25,7 +25,10 @@ data class PhysicalInputKey(val device: String, val name: String, val keyCode: I data class PhysicalInputBinding(val key: PhysicalInputKey, val action: InputAction) -class PhysicalInputBindings(private val router: InputRouter) { +class PhysicalInputBindings( + private val router: InputRouter, + private val onPress: (KeyEvent) -> Unit = {}, +) { private class Entry(val binding: PhysicalInputBinding, val channel: InputRouter.Channel) { var heldDevice = -1 var suppressed = false @@ -66,7 +69,10 @@ class PhysicalInputBindings(private val router: InputRouter) { if (identity != key.device) continue entry.heldDevice = event.deviceId entry.suppressed = event.repeatCount != 0 - if (!entry.suppressed) entry.channel.update(1f) + if (!entry.suppressed) { + entry.channel.update(1f) + onPress(event) + } return true } return false diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt index 8194cea3b..5a567c0bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt @@ -20,7 +20,11 @@ import java.util.ArrayDeque import java.util.UUID @SuppressLint("MissingPermission") -class SteamControllerBle(private val context: Context, router: InputRouter? = null) { +class SteamControllerBle( + private val context: Context, + router: InputRouter? = null, + private val onPhysicalInput: (() -> Unit)? = null, +) { private val inputLock = router ?: Any() private var routedInput = router?.let(::TritonInputRouter) @Volatile private var stopped = false @@ -39,6 +43,7 @@ class SteamControllerBle(private val context: Context, router: InputRouter? = nu private var outputSequence = 0L private var outputWritePending = false private var featureRead = 0L + private var lastPressedControls = 0 fun start(): Unit = synchronized(inputLock) { if (stopped || started) return@synchronized @@ -266,12 +271,18 @@ class SteamControllerBle(private val context: Context, router: InputRouter? = nu val timing = InputTiming.begin() FakeInputWriter.writeTritonState(SLOT, reportId, routedInput?.route(data) ?: data) InputTiming.end(timing) + if (connected && onPhysicalInput != null) { + val pressed = TritonInputRouter.pressedControls(data) + if (pressed and lastPressedControls.inv() != 0) onPhysicalInput() + lastPressedControls = pressed + } } private fun release() = synchronized(inputLock) { if (stopped) return@synchronized routedInput?.release() withSlot { + lastPressedControls = 0 FakeInputWriter.writeTritonState(SLOT, if (reportId == 0x47) 0x47 else 0x45, ByteArray(STATE_BYTES)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/TritonInputRouter.kt b/app/src/main/java/com/droiddeck/launcher/input/TritonInputRouter.kt index c85b4ffa9..cbc3659fc 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TritonInputRouter.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TritonInputRouter.kt @@ -63,16 +63,25 @@ class TritonInputRouter(private val router: InputRouter) { fun release() = synchronized(router) { channels.forEach { it.release() }; last = null } fun close() = synchronized(router) { release(); channels.forEach { it.close() }; router.removeSnapshot(snapshot) } - private fun bits(data: ByteArray): Int = (data[1].toInt() and 255) or ((data[2].toInt() and 255) shl 8) or - ((data[3].toInt() and 255) shl 16) or ((data[4].toInt() and 255) shl 24) private fun putBits(data: ByteArray, value: Int) { for (i in 0..3) data[i + 1] = (value ushr (i * 8)).toByte() } - private fun short(data: ByteArray, offset: Int) = ((data[offset].toInt() and 255) or (data[offset + 1].toInt() shl 8)).toShort().toInt() private fun axis(data: ByteArray, offset: Int): Float = short(data, offset).let { it / if (it < 0) 32768f else 32767f } private fun shortValue(value: Float) = (value * if (value < 0f) 32768f else 32767f).roundToInt().coerceIn(-32768, 32767) private fun putShort(data: ByteArray, offset: Int, value: Int) { data[offset] = value.toByte(); data[offset + 1] = (value shr 8).toByte() } companion object { private const val CONTROL_BITS = 0x0fffffff + + internal fun pressedControls(data: ByteArray): Int { + var active = bits(data) and CONTROL_BITS + if ((5..15 step 2).any { kotlin.math.abs(short(data, it)) > 16384 }) active = active or (1 shl 28) + return active + } + + private fun bits(data: ByteArray): Int = (data[1].toInt() and 255) or ((data[2].toInt() and 255) shl 8) or + ((data[3].toInt() and 255) shl 16) or ((data[4].toInt() and 255) shl 24) + + private fun short(data: ByteArray, offset: Int) = + ((data[offset].toInt() and 255) or (data[offset + 1].toInt() shl 8)).toShort().toInt() private fun bit(c: InputControl): Int = when (c) { InputControl.A -> 0x1; InputControl.B -> 0x2; InputControl.X -> 0x4; InputControl.Y -> 0x8 InputControl.QAM -> 0x10; InputControl.R3 -> 0x20; InputControl.START -> 0x40 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 1eece93b0..5f62fec93 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -665,9 +665,10 @@ object SessionPrefs { ?: if (context.packageManager.hasSystemFeature("android.hardware.sensor.hinge_angle")) SHAPE_WIDE else SHAPE_AUTO /** Auto, Always or Never. Older builds also stored the Steam layout and a buttons-only mode here. */ - fun oscMode(context: Context): String = when (val mode = prefs(context).getString("osc", OSC_AUTO)) { + fun oscMode(context: Context, steamSession: Boolean = false): String = when (val mode = prefs(context).getString("osc", OSC_AUTO)) { OSC_ALWAYS, OSC_NEVER -> mode OSC_STEAM_QAM -> OSC_ALWAYS + OSC_STEAM_TOUCH -> if (steamSession) OSC_ALWAYS else OSC_AUTO else -> OSC_AUTO } 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 375170289..32b70d569 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -1,7 +1,7 @@ package com.droiddeck.launcher.ui internal enum class SessionDrawerPage(val firstControl: String) { - CONTROLLER("input-profile"), + CONTROLLER("touch"), GLASSES("glasses-game"), DISPLAY("fg"), HUD("hud"), diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt index 699ff0816..6b8fd1fad 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlPrefsTest.kt @@ -30,6 +30,11 @@ class OnScreenControlPrefsTest { session.edit().putString("osc", saved).commit() assertEquals(saved, mode, SessionPrefs.oscMode(context)) } + session.edit().putString("osc", SessionPrefs.OSC_STEAM_TOUCH).commit() + assertEquals(SessionPrefs.OSC_ALWAYS, SessionPrefs.oscMode(context, steamSession = true)) + SessionPrefs.setOscMode(context, SessionPrefs.OSC_AUTO) + assertEquals(SessionPrefs.OSC_AUTO, SessionPrefs.oscMode(context, steamSession = true)) + assertTrue(SessionPrefs.steamTouchLayout(context)) } @Test fun theOldSteamTouchModeBecomesTheSteamLayoutUntilChanged() { diff --git a/app/src/test/java/com/droiddeck/launcher/input/PhysicalInputBindingsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PhysicalInputBindingsTest.kt index 71a098578..f70c2ce88 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PhysicalInputBindingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PhysicalInputBindingsTest.kt @@ -24,7 +24,8 @@ class PhysicalInputBindingsTest { override fun command(command: InputCommand) { events += command.name } override fun requestMotion() {} }) - private val bindings = PhysicalInputBindings(router) + private val presses = ArrayList() + private val bindings = PhysicalInputBindings(router) { presses += it.deviceId } private fun device(id: Int): InputDevice { val device = InputDeviceBuilder.newBuilder().setId(id).setName("Thor extra keys").setDescriptor("keys-$id") @@ -55,6 +56,7 @@ class PhysicalInputBindingsTest { assertEquals(listOf("29 true", "30 true", "30 false", "29 false"), events) bindings.onKey(event(device.id, true), true) assertEquals("28 true", events.last()) + assertEquals(listOf(device.id, device.id), presses) } @Test fun releasesRemainConsumedAfterOpeningMenuAndVirtualKeysAreUntouched() { diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt index f97ca1bf8..57572c04b 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamControllerBleTest.kt @@ -25,6 +25,7 @@ import java.util.UUID @Config(sdk = [34], manifest = Config.NONE, shadows = [SteamControllerBleTest.Writer::class]) class SteamControllerBleTest { private val keys = ArrayList>() + private var presses = 0 private val router = InputRouter(object : InputOutput { override fun key(code: Int, down: Boolean) { keys += code to down } override fun button(code: Int, down: Boolean) {} @@ -42,7 +43,7 @@ class SteamControllerBleTest { Writer.features = 0 router.setProfile(InputProfile.defaults(InputProfile.GAME) .withBinding(InputRole.PHYSICAL, InputControl.A, InputAction.Keys(listOf(57)))) - controller = SteamControllerBle(RuntimeEnvironment.getApplication(), router) + controller = SteamControllerBle(RuntimeEnvironment.getApplication(), router) { presses++ } handler = ReflectionHelpers.getField(controller, "handler") shadowOf(handler.looper).pause() controller.start() @@ -60,6 +61,23 @@ class SteamControllerBleTest { drain(handler.looper) } + @Test fun newInputNotifiesOncePerPressOrStickDeflection() { + subscribe(controller) + val held = ByteArray(45).apply { this[1] = 1 } + val stick = held.copyOf().apply { this[10] = 80 } + state(ByteArray(45)) + assertEquals(0, presses) + state(held) + state(held) + assertEquals(1, presses) + state(stick) + state(stick) + assertEquals(2, presses) + state(ByteArray(45)) + state(held) + assertEquals(3, presses) + } + @Test fun stopReleasesAndDetachesInputBeforeQueuedCallbacksCanPublish() { state(ByteArray(45).apply { this[1] = 1 }) assertEquals(listOf(57 to true), keys) From 11fb8f59d4d91dbc852ed9977b216e8c500a5796 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:01:41 -0500 Subject: [PATCH 25/25] test(library): cover Hidden in tab ordering --- .../test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt | 4 ++-- .../java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index 772578ea3..b168587e0 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -96,9 +96,9 @@ class LibraryEntriesTest { } @Test fun placesRoundTripThroughTheirOrder() { - val order = listOf("epic", "steam", "favorites", "gog", "xbox", "added") + val order = listOf("epic", "steam", "favorites", LIBRARY_HIDDEN, "gog", "xbox", "added") assertEquals(order, placeLibraryTabs(listOf("epic", "gog", "xbox"), libraryPlacesOf(order))) - assertEquals(listOf("favorites", "steam", "epic", "gog", "added"), placeLibraryTabs(listOf("epic", "gog"), emptyList())) + assertEquals(listOf("favorites", "steam", "epic", "gog", "added", LIBRARY_HIDDEN), placeLibraryTabs(listOf("epic", "gog"), emptyList())) } @Test fun librarySourcesIgnoreUnknownAndDuplicateOrderEntriesAndAppendNewStores() { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt index c2ce77dbf..8a8cf5973 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryFavoritesTest.kt @@ -53,6 +53,6 @@ class LibraryFavoritesTest { @Test fun aHiddenFavoritesTabStaysHiddenWithHeartedGames() { val entries = listOf(steam(440, "Team Fortress 2"), owned("123", "Witcher")) - assertEquals(listOf("steam", "gog"), librarySources(entries, listOf("gog"), favorites = setOf("gog:123"), offTabs = setOf(LIBRARY_FAVORITES))) + assertEquals(listOf("steam", "gog"), librarySources(entries, listOf("gog"), favorites = setOf("gog:123"), offTabs = setOf(LIBRARY_FAVORITES, LIBRARY_HIDDEN))) } }