diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a187dc15b0..5f010b48d3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -195,7 +195,6 @@
-
-
SessionPrefs.setOscMode(this, o); oscMode = o },
- onTint = { t -> ControllerPrefs.setTint(this, t); refreshController() },
- onOpacity = { o -> ControllerPrefs.setOpacity(this, o); refreshController() },
- onSize = { v -> ControllerPrefs.setSize(this, v); refreshController() },
- onStickClick = { on -> ControllerPrefs.setStickClick(this, on); refreshController() },
- onAdaptiveSticks = { on -> ControllerPrefs.setAdaptiveSticks(this, on); refreshController() },
- onRumble = { on -> ControllerPrefs.setRumble(this, on); refreshController() },
- onDeadZone = { v -> ControllerPrefs.setDeadZone(this, v); refreshController() },
- onSteamButton = { on -> ControllerPrefs.setSteamButton(this, on); refreshController() },
- onQamButton = { on -> ControllerPrefs.setQamButton(this, on); refreshController() },
- onKeyboardButton = { on -> ControllerPrefs.setKeyboardButton(this, on); refreshController() },
- onJoyConVr = { on -> ControllerPrefs.setJoyConVr(this, on); refreshController() },
- onEditLayout = { startActivity(Intent(this, ControllerEditorActivity::class.java)) },
- onResetLayout = { ControllerPrefs.resetAllLayouts(this); refreshController() },
onMapping = { showPerformance = false; showComponents = false; showMapping = true },
- onResetAll = { ControllerPrefs.resetAll(this); com.droiddeck.launcher.input.InputProfiles.resetAll(this); refreshController() },
),
),
page = page,
@@ -2381,6 +2365,7 @@ class FrontEndActivity : ComponentActivity() {
SessionPrefs.setUnfoldedControlsWithController(this, on); unfoldedControlsWithController = on
},
onOsc = { o -> SessionPrefs.setOscMode(this, o); oscMode = o },
+ onInputSettings = { showPerformance = false; showComponents = false; showMapping = true },
onBackHold = { on -> SessionPrefs.setBackHold(this, on); backHold = on },
onBackActionsInverted = { inverted ->
SessionPrefs.setBackActionsInverted(this, inverted)
diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
index a1789aa75c..8fcf4afba2 100644
--- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
+++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt
@@ -91,7 +91,6 @@ import com.droiddeck.launcher.input.PhysicalShortcuts
import com.droiddeck.launcher.input.PhysicalShortcutRouter
import com.droiddeck.launcher.input.PadMouse
import com.droiddeck.launcher.input.PadState
-import com.droiddeck.launcher.input.ScreenKeys
import com.droiddeck.launcher.input.SteamControllerBle
import com.droiddeck.launcher.input.DirectTouchHold
import com.droiddeck.launcher.input.GestureTouchStreamGate
@@ -172,7 +171,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
WaylandCompositor.nativeSetScaleMode(SCALE_FIT, alignment)
}
- private var unfoldedPanel: com.droiddeck.launcher.ui.DeckControlsPanel? = null
+ private var unfoldedPanel: com.droiddeck.launcher.ui.InputSurfaceView? = null
private lateinit var sessionRoot: FrameLayout
private var inputRouter: InputRouter? = null
private var physicalInputBindings: com.droiddeck.launcher.input.PhysicalInputBindings? = null
@@ -194,6 +193,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
}
override fun scroll(steps: Int) { sendSceneWheel(steps) }
+ override fun scrollHorizontal(steps: Int) {
+ val writer = if (evdevMouseActive) mouseWriter else null
+ if (writer != null) writer.writeMouseWheel(0, steps, 120)
+ else WaylandCompositor.nativeSendSceneInput(11, 0, steps * 120)
+ }
override fun requestMotion() { inputMotion.request() }
override fun command(command: InputCommand) {
uiHandler.post {
@@ -238,6 +242,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
private var steamController: SteamControllerBle? = null
private var onScreenControls: OnScreenControls? = null
+ private var bottomInputControls: OnScreenControls? = null
+ private var primaryInputLayout: com.droiddeck.launcher.input.SavedInputLayout? = null
+ private var secondaryInputLayout by mutableStateOf(null)
private var steamTouchControls: com.droiddeck.launcher.input.SteamTouchControls? = null
private var steamTouchAvailable by mutableStateOf(false)
private val steamTouchRetry = Runnable { updateOnScreenControls() }
@@ -272,15 +279,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var directHoldBehavior by mutableStateOf(com.droiddeck.launcher.input.TouchGestureConfig.MOUSE_BEHAVIOR_CLICK)
private var relativeMouseMode by mutableIntStateOf(0)
@Volatile private var appliedRelativeMouseMode: Int? = null
- private var screenKeyPickerOpen by mutableStateOf(false)
- private var screenKeyBind: List? = null
- private var screenKeyDir: Int? = null
- private var screenKeyTextFocus = false
- private var screenKeyEdit by mutableStateOf(null)
- private var screenLayoutsOpen by mutableStateOf(false)
- private var screenKeysShown by mutableStateOf(true)
- private var screenLayoutNames by mutableStateOf(listOf())
- private var screenKeys: ScreenKeys? = null
private var recognizedGesture by mutableStateOf(null)
private var gesturePointerX = 0f
private var gesturePointerY = 0f
@@ -756,7 +754,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
SessionState.deckPadListener = deckPadListener
openDeckRing("activity created")
bridge.setOnPlayerInput(::onPadInput)
- onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { controls ->
+ onScreenControls = OnScreenControls(this, bridge).also { controls ->
+ controls.updateLayout(primaryInputLayout)
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())
@@ -764,20 +763,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
root.addView(controls)
}
- screenKeysShown = com.droiddeck.launcher.input.ControllerPrefs.screenKeysShown(this)
- screenKeys = ScreenKeys(this) { code, down -> if (CompositorHost.isStarted) sendGuestKey(code, down, 64) }.also { keys ->
- keys.onTouchMiss = miss@{ event ->
- if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, event)) return@miss
- event.offsetLocation(keys.left - surfaceView.left.toFloat(), keys.top - surfaceView.top.toFloat())
- onTouchEvent(event)
- }
- keys.onAdd = { screenKeyPickerOpen = true }
- keys.onSelect = { codes -> screenKeyEdit = screenKeys?.stateOf(codes) }
- keys.onEditingChanged = { touchEditorChanged(); if (!it) screenKeyEdit = null }
- keys.steamStyle = { steamTouchControls?.style }
- keys.visibility = if (screenKeysShown) View.VISIBLE else View.GONE
- root.addView(keys)
- }
keyboard = KeyboardHost(this).also { host ->
host.onImeChanged = { updateDesktopKeyboardButton() }
root.addView(host)
@@ -1043,18 +1028,26 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
}
LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, inputSettingsOpen, pipUi, SessionState.suspended, resumed) {
+ updateOnScreenControls()
padBridge?.setInputEnabled(resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !inputSettingsOpen && !pipUi && !SessionState.suspended)
if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || inputSettingsOpen || pipUi || SessionState.suspended) {
backQamInput.cancel()
com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this@SessionActivity)
cancelTouchGestures()
- screenKeys?.stopEditing()
}
}
com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture)
if (inputSettingsOpen) com.droiddeck.launcher.ui.InputSettingsDialog(
onBack = { inputSettingsOpen = false; secondScreenPresentation?.refreshControls() },
- onChanged = ::refreshInputProfile,
+ onChanged = {
+ controllerSettings = ControllerPrefs.read(this@SessionActivity)
+ oscMode = SessionPrefs.oscMode(this@SessionActivity)
+ padBridge?.setStickDeadZone(ControllerPrefs.deadZone(this@SessionActivity))
+ joyConVr?.refresh()
+ onScreenControls?.reload()
+ refreshInputProfile()
+ refreshControls()
+ },
)
LaunchedEffect(Unit) {
val root = LinuxRuntime.rootDir(this@SessionActivity)
@@ -1084,84 +1077,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onDismiss = { gestureSettingsOpen = false },
onSaved = { gestureSettingsOpen = false; refreshGestureConfig() },
)
- if (screenKeyPickerOpen) {
- val dir = screenKeyDir
- com.droiddeck.launcher.ui.ScreenKeyPicker(
- initial = if (dir != null) {
- listOfNotNull((screenKeyEdit?.codes?.getOrNull(dir) ?: 0).takeIf { it != 0 })
- } else {
- screenKeyBind ?: emptyList()
- },
- onDismiss = { screenKeyPickerOpen = false; screenKeyBind = null; screenKeyDir = null },
- onAdd = { codes ->
- val bind = screenKeyBind
- if (dir != null && bind != null) {
- screenKeys?.setDirection(bind, dir, codes.lastOrNull() ?: 0)?.let { screenKeyEdit = it }
- } else if (bind != null) {
- screenKeys?.setCodes(bind, codes)?.let { screenKeyEdit = it }
- } else {
- screenKeys?.add(codes)
- screenKeyEdit = screenKeys?.stateOf(codes)
- }
- screenKeyPickerOpen = false
- screenKeyBind = null
- screenKeyDir = null
- },
- )
- }
- screenKeyEdit?.let { key ->
- com.droiddeck.launcher.ui.ScreenKeyEditor(
- codes = key.codes, keyY = key.y,
- size = key.size, opacity = key.opacity, shape = key.shape, toggle = key.toggle,
- labels = key.labels,
- text = key.text, hasImage = key.image.isNotEmpty(),
- onResize = { screenKeys?.resize(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onOpacity = { screenKeys?.setOpacity(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onShape = { screenKeys?.setShape(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onToggle = { on -> screenKeys?.setToggle(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onLabels = { on -> screenKeys?.setLabels(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onDirection = { index -> screenKeyBind = key.codes; screenKeyDir = index; screenKeyPickerOpen = true },
- onText = { screenKeys?.setText(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onImage = { screenKeys?.setImage(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onClearImage = { screenKeys?.setImage(key.codes, ""); screenKeyEdit = screenKeys?.stateOf(key.codes) },
- onBind = { screenKeyBind = key.codes; screenKeyDir = null; screenKeyPickerOpen = true },
- onTextFocus = { screenKeyTextFocus = true; keyboard?.hide() },
- onTextBlur = { screenKeyTextFocus = false },
- onRemove = { screenKeys?.remove(key.codes); screenKeyEdit = null },
- onDismiss = { screenKeyEdit = null; screenKeyTextFocus = false; screenKeys?.deselect() },
- )
- }
- if (screenLayoutsOpen) com.droiddeck.launcher.ui.ScreenLayoutPanel(
- layouts = screenLayoutNames,
- onSave = { name ->
- screenKeys?.let { keys ->
- com.droiddeck.launcher.input.ControllerPrefs.saveScreenLayout(this@SessionActivity, name, keys.export())
- }
- screenLayoutNames = layoutNames()
- },
- onLoad = { name ->
- com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this@SessionActivity)[name]?.let { screenKeys?.load(it) }
- screenLayoutsOpen = false
- },
- onDelete = { name ->
- com.droiddeck.launcher.input.ControllerPrefs.deleteScreenLayout(this@SessionActivity, name)
- screenLayoutNames = layoutNames()
- },
- onImport = { text ->
- val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels
- val keys = com.droiddeck.launcher.input.importScreenLayout(text, width, resources.displayMetrics.density)
- if (keys != null) {
- screenKeys?.load(com.droiddeck.launcher.input.ControllerPrefs.encodeScreenKeys(keys))
- screenLayoutsOpen = false
- }
- },
- exportText = {
- val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels
- val keys = com.droiddeck.launcher.input.ControllerPrefs.decodeScreenKeys(screenKeys?.export().orEmpty())
- com.droiddeck.launcher.input.exportScreenLayout(keys, width, resources.displayMetrics.density)
- },
- onDismiss = { screenLayoutsOpen = false },
- )
androidx.compose.runtime.LaunchedEffect(drawerOpen) {
if (drawerOpen) {
syncLossless()
@@ -1358,9 +1273,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onHardwareKeyboard = ::togglePcKeyboard,
controller = controllerSettings,
onRumble = { on -> updateControllerPrefs { ControllerPrefs.setRumble(this@SessionActivity, on) } },
- onSteamButton = { on -> updateControllerPrefs { ControllerPrefs.setSteamButton(this@SessionActivity, on) } },
- onQamButton = { on -> updateControllerPrefs { ControllerPrefs.setQamButton(this@SessionActivity, on) } },
- onKeyboardButton = { on -> updateControllerPrefs { ControllerPrefs.setKeyboardButton(this@SessionActivity, on) } },
onSteamMenu = if (SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null,
onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ triggerSteamQam() }) else null,
onAchievements = achievementsInFront?.let { { drawerOpen = false; achievementsOpen = true } },
@@ -1429,6 +1341,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
},
onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() },
onInputSettings = { releasePads(); drawerOpen = false; inputSettingsOpen = true },
+ onInputSelection = { releasePads(); refreshInputProfile() },
onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true },
touchActive = drawerTouchMode(),
directHoldBehavior = directHoldBehavior,
@@ -1444,19 +1357,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
relativeMouseMode = mode
setRelativeMouse(mode)
},
- onScreenKeys = { if (screenKeysShown) { drawerOpen = false; screenKeys?.startEditing() } },
- screenKeysShown = screenKeysShown,
- onScreenKeysShown = { shown ->
- screenKeysShown = shown
- com.droiddeck.launcher.input.ControllerPrefs.setScreenKeysShown(this@SessionActivity, shown)
- screenKeys?.stopEditing()
- screenKeys?.visibility = if (shown) View.VISIBLE else View.GONE
- },
- onScreenLayouts = {
- drawerOpen = false
- screenLayoutNames = layoutNames()
- screenLayoutsOpen = true
- },
onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() },
onSecondScreenMode = { mode ->
if (docked) drawerOpen = false
@@ -1505,7 +1405,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
},
onClose = { drawerOpen = false },
- onDismissScreen = if (docked) ({ selectSecondScreenMode(SecondScreenMode.NONE) }) else null,
components = drawerComponents,
onComponentsRefresh = {
refreshDrawerComponents()
@@ -1624,6 +1523,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
drawerOpen = false
keyboard?.hide()
onScreenControls?.releaseAll()
+ bottomInputControls?.releaseAll()
pcKeyboardOpen = !pcKeyboardOpen
}
@@ -2683,7 +2583,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
SessionState.mode == SessionService.MODE_STEAM && SessionState.running &&
SessionState.firstFrameSeen && !SessionState.suspended && !ended &&
!pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen &&
- !gestureSettingsOpen && !inputSettingsOpen && !screenKeyTextFocus && window.decorView.hasWindowFocus()
+ !gestureSettingsOpen && !inputSettingsOpen && window.decorView.hasWindowFocus()
if (steamVolume) {
val audio = getSystemService(android.media.AudioManager::class.java)
if (com.droiddeck.launcher.input.SteamVolumeKeys.dispatch(event, !audio.isVolumeFixed) { direction ->
@@ -2693,7 +2593,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return super.dispatchKeyEvent(event)
}
}
- if (!pipUi && !screenKeyTextFocus) {
+ if (!pipUi) {
if (physicalInputBindings?.onKey(event, resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen &&
!inputSettingsOpen && !gestureSettingsOpen && !SessionState.suspended && !loading.visible) == true) return true
if (physicalShortcuts.onKey(
@@ -2721,10 +2621,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
Log.i(TAG, String.format(java.util.Locale.ROOT, "back key device=%d (%s) source=0x%x flags=0x%x",
event.deviceId, event.device?.name, event.source, event.flags))
}
- val mouseToGuest = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !inputSettingsOpen &&
+ val mouseToGuest = !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !inputSettingsOpen &&
!SessionState.suspended && !(::loading.isInitialized && (loading.visible || loading.ended))
if (mouseBackInput.onKeyEvent(event, mouseToGuest)) return true
- val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen &&
+ val backToQam = !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen &&
!inputSettingsOpen && !gestureSettingsOpen &&
SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen &&
!SessionState.suspended && padBridge?.canHoldQam() == true
@@ -2734,7 +2634,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
return true
}
if (pipUi) return true
- if (screenKeyTextFocus) return super.dispatchKeyEvent(event)
val pad = com.droiddeck.launcher.input.JoyCon.normalize(event)
if (pad !== event) return dispatchKeyEvent(pad)
val fromController = PadBridge.isControllerKeyEvent(event)
@@ -2889,7 +2788,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
return onScreenControls?.let { takes(it, it::takesTouchAt) } == true ||
steamTouchControls?.let { takes(it, it::takesTouchAt) } == true ||
- screenKeys?.let { takes(it, it::takesTouchAt) } == true ||
unfoldedPanel?.let { takes(it, it::takesTouchAt) } == true
}
@@ -3017,8 +2915,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (secondScreenMode == SecondScreenMode.NONE) closeSecondScreen(reset = false) else updateKeyboardRoute()
}
- private fun layoutNames(): List =
- com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this).keys.sorted()
private val relativeMouseRequests = java.util.concurrent.Executors.newSingleThreadExecutor { runnable ->
Thread(runnable, "relative-mouse").apply { isDaemon = true }
@@ -3404,8 +3300,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
showSecondScreen(mode)
}
- private fun showSecondScreen(mode: SecondScreenMode) {
+ private fun showSecondScreen(requested: SecondScreenMode) {
if (pipUi || !started) return
+ val mode = if (requested == SecondScreenMode.DECK_CONTROLS || requested == SecondScreenMode.KEYBOARD_TRACKPAD) {
+ val desktop = SessionState.mode == SessionService.MODE_DESKTOP
+ val library = com.droiddeck.launcher.input.InputLibraries.read(this)
+ val key = if (desktop) InputProfile.DESKTOP else InputProfile.GAME
+ if (key !in library.selections) {
+ val preset = if (requested == SecondScreenMode.DECK_CONTROLS) com.droiddeck.launcher.input.InputStockLayouts.DECK else com.droiddeck.launcher.input.InputStockLayouts.TRACKPAD
+ runCatching { com.droiddeck.launcher.input.InputLibraries.update(this) { it.selectPart(desktop, InputRole.SECONDARY, preset) } }
+ .onSuccess { refreshInputProfile() }
+ .onFailure { Log.w(TAG, "could not migrate the saved second-screen selection", it) }
+ }
+ SessionPrefs.setSecondScreenPanel(this, SecondScreenMode.CUSTOM_CONTROLS.id)
+ SecondScreenMode.CUSTOM_CONTROLS
+ } else requested
val target = displayManager.getDisplay(selectedSecondScreenDisplay)
if (target == null || !target.isValid || (target.flags and Display.FLAG_PRESENTATION) == 0) {
closeSecondScreen(reset = false)
@@ -3439,14 +3348,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun secondScreenPresentation(target: Display) = SecondScreenPresentation(
this, target,
- sendPointer = ::moveSecondScreenPointer,
- sendButton = { button, pressed -> heldButtons.set(2, button, pressed) },
- sendWheel = ::sendSceneWheel,
onSteamMenu = ::tapSteamButton,
onQam = ::tapQam,
onClose = ::closeBottomPanel,
pad = padBridge,
- pointerPosition = ::secondScreenPointerPosition,
onKeyboardClosed = ::bottomKeyboardClosed,
onMenu = { drawerOpen = true },
onMenuTouched = {
@@ -3559,15 +3464,36 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (SessionState.mode == SessionService.MODE_STEAM) padBridge?.triggerSteamMenu()
}
+ fun inputEditorDisplay(role: InputRole): Display? {
+ val main = window.decorView.display
+ if (role == InputRole.PRIMARY) return bottomGame?.display ?: main
+ if (bottomGame != null) return main
+ return displayManager.getDisplay(selectedSecondScreenDisplay)
+ ?: secondScreenDisplays.firstOrNull()?.let { displayManager.getDisplay(it.id) }
+ }
+
private fun refreshInputProfile() {
- inputProfile = InputProfiles.active(this, loadingMode() == SessionService.MODE_DESKTOP)
+ val library = com.droiddeck.launcher.input.InputLibraries.read(this)
+ val desktop = loadingMode() == SessionService.MODE_DESKTOP
+ inputProfile = library.compileActive(desktop)
+ primaryInputLayout = library.activeLayout(desktop, InputRole.PRIMARY)
+ secondaryInputLayout = library.activeLayout(desktop, InputRole.SECONDARY)
inputUsesLocalActions = InputControl.padControls.any { inputProfile.action(InputRole.PHYSICAL, it) !is InputAction.Native }
inputUsesPointer = inputProfile.bindings.values.any { bindings ->
bindings.values.any { it is InputAction.Pointer || it is InputAction.MouseButton || it is InputAction.Scroll }
- } || inputProfile.keys.any { it.action is InputAction.MouseButton }
+ } || inputProfile.elements.values.any { bindings ->
+ bindings.values.any { it is InputAction.Pointer || it is InputAction.MouseButton || it is InputAction.Scroll }
+ } || inputProfile.clicks.values.any { bindings -> bindings.values.any { it is InputAction.MouseButton } }
+ || inputProfile.keys.any { it.action is InputAction.MouseButton }
physicalInputBindings?.configure(inputProfile.keys)
padBridge?.setInputProfile(inputProfile)
DeckControls.refresh()
+ onScreenControls?.updateLayout(primaryInputLayout)
+ bottomInputControls?.updateLayout(primaryInputLayout)
+ unfoldedPanel?.updateCustomLayout(primaryInputLayout?.elements.orEmpty())
+ unfoldedPanel?.updateStyle(primaryInputLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle())
+ updateOnScreenPad()
+ secondScreenPresentation?.refreshControls()
}
private fun tapQam() {
@@ -3589,7 +3515,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun refreshControls() {
applyUnfoldedControls()
updateOnScreenControls()
- screenKeys?.refreshAppearance()
}
private fun controlsBelowWanted(): Boolean {
@@ -3612,19 +3537,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
else "unfolded controls: game full screen")
}
var panel = unfoldedPanel
- if (panel != null && panel.deckControls != SessionState.deckPad) {
- sessionRoot.removeView(panel)
- unfoldedPanel = null
- panel = null
- }
if (!wanted) {
if (panel != null) { sessionRoot.removeView(panel); unfoldedPanel = null; updateOnScreenControls() }
return
}
if (panel == null) {
- panel = com.droiddeck.launcher.ui.DeckControlsPanel(this, onClose = { chooseUnfoldedControls(false) },
- onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge, inputRole = InputRole.PRIMARY,
- portraitDock = !com.droiddeck.launcher.session.SessionDisplay.foldable(this), onMenu = { drawerOpen = true })
+ panel = com.droiddeck.launcher.ui.InputSurfaceView(this, padBridge, primaryInputLayout?.elements.orEmpty(), InputRole.PRIMARY,
+ primaryInputLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle())
sessionRoot.addView(panel, sessionRoot.indexOfChild(surfaceView) + 1)
unfoldedPanel = panel
updateOnScreenControls()
@@ -3632,22 +3551,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
panel.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, height - gameHeight, Gravity.BOTTOM)
}
- private fun secondScreenPointerPosition(): androidx.compose.ui.geometry.Offset? =
- drawnRect()?.takeIf { cursorPos.x >= 0f && cursorPos.y >= 0f }?.let {
- androidx.compose.ui.geometry.Offset((cursorPos.x - it.left) / it.width(), (cursorPos.y - it.top) / it.height())
- }
-
- private fun moveSecondScreenPointer(x: Float, y: Float, width: Float, height: Float) {
- if (width <= 0f || height <= 0f) return
- val nx = (x / width).coerceIn(0f, 1f)
- val ny = (y / height).coerceIn(0f, 1f)
- val rect = pointerSurfaceRect() ?: return
- val px = rect.left + nx * rect.width()
- val py = rect.top + ny * rect.height()
- WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, outputView().width), InputSpace.y(py, outputView().height))
- showCursor(px, py)
- }
-
private fun openBottomKeyboard() {
if (!started) return
if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) {
@@ -3655,7 +3558,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (drawerOpen || drawerPinned) drawerOpen = false
typingReturnMode = secondScreenMode
selectedSecondScreenDisplay = target.displayId
- selectSecondScreenMode(SecondScreenMode.KEYBOARD_TRACKPAD)
+ selectSecondScreenMode(SecondScreenMode.CUSTOM_CONTROLS)
}
val presentation = secondScreenPresentation ?: return
if (!presentation.showsKeyboard) return
@@ -3668,7 +3571,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
com.droiddeck.launcher.ui.SessionTyping.returnFocus(this, taskId)
val mode = typingReturnMode ?: return
typingReturnMode = null
- uiHandler.post { if (secondScreenMode == SecondScreenMode.KEYBOARD_TRACKPAD) selectSecondScreenMode(mode) }
+ uiHandler.post { if (secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS) selectSecondScreenMode(mode) }
}
private fun updateKeyboardRoute() {
@@ -4078,7 +3981,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private var platformPointerShown: Boolean? = null
private fun touchEditorChanged() {
- touchEditorOpen = screenKeys?.isEditing == true || steamTouchControls?.isEditing == true
+ touchEditorOpen = steamTouchControls?.isEditing == true
updatePointerCapture()
applyPlatformPointer(appUiOwnsPointer())
}
@@ -4158,7 +4061,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
device.plugged = false
uiHandler.postDelayed({ updateOnScreenControls() }, 700)
}
- view.onStyle = { screenKeys?.refreshAppearance() }
view.onTouchMiss = miss@{ event ->
if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss
event.offsetLocation(view.left - surfaceView.left.toFloat(), view.top - surfaceView.top.toFloat())
@@ -4182,19 +4084,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
}
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
- if (pipUi || unfoldedPanel != null || pcKeyboardOpen ||
+ if (pipUi || unfoldedPanel != null || pcKeyboardOpen || inputSettingsOpen ||
(SessionState.mode == SessionService.MODE_STEAM && !SessionPrefs.builtinPad(this))) {
onScreenButtonsVisible = false
+ hideBottomControls()
controls.releaseAll()
controls.visibility = View.GONE
steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE }
com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false
- screenKeys?.followSteam = false
applyTouchRouting()
return
}
@@ -4223,7 +4126,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onScreenButtonsVisible = show
val drawn = show && !keyboardCoversPad()
if (steam != null) {
- screenKeys?.followSteam = drawn
+ hideBottomControls()
if (controls.visibility == View.VISIBLE) { controls.releaseAll(); controls.visibility = View.GONE }
if (!drawn) { steam.cancelEditing(); steam.releaseAll() }
steam.visibility = if (drawn) View.VISIBLE else View.GONE
@@ -4232,7 +4135,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
Log.i(TAG, "on-screen controls: Steam's touch controller " + if (drawn) "shown" else "hidden")
return
}
- screenKeys?.followSteam = false
+ val bottomRoot = bottomGame?.surfaceView?.parent as? android.view.ViewGroup
+ if (drawn && bottomRoot != null) {
+ 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.visibility = View.VISIBLE
+ return
+ }
+ hideBottomControls()
if (drawn == (controls.visibility == View.VISIBLE)) return
if (!drawn) controls.releaseAll()
controls.visibility = if (drawn) View.VISIBLE else View.GONE
@@ -4386,7 +4306,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
pendingBackAction = null
releaseDrawerDirection()
onScreenControls?.releaseAll()
- screenKeys?.releaseAll()
+ bottomInputControls?.releaseAll()
releasePads()
touchpad.cancel()
scrollTouch.cancel()
@@ -4584,6 +4504,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
(getSystemService(INPUT_SERVICE) as? InputManager)?.unregisterInputDeviceListener(deviceListener)
releaseDrawerDirection()
onScreenControls?.releaseAll()
+ bottomInputControls?.releaseAll()
if (::scrollTouch.isInitialized) scrollTouch.cancel()
if (::padMouse.isInitialized) padMouse.reset()
resumed = false
@@ -4807,6 +4728,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (holder !== outputHolder()) return
glassesOutputActive = glassesScreen?.holder === holder
bottomOutputActive = bottomGame?.holder === holder
+ updateOnScreenPad()
updatePointerCapture()
if (bottomOutputActive) bottomRecoveries = 0
if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive || bottomOutputActive)
@@ -4911,6 +4833,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (bottomGame !== screen) return
bottomGame = null
bottomOutputActive = false
+ updateOnScreenPad()
surfaceW = 0
surfaceH = 0
CompositorHost.detach(screen.holder.surface)
@@ -4942,9 +4865,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
title, openMenu, openMenu, if (steam) ({ tapSteamButton() }) else null, if (steam) ({ tapQam() }) else null,
extras + com.droiddeck.launcher.ui.BarExtra(getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, onClick = swapBack),
)
- val keyboardExtra = com.droiddeck.launcher.ui.BarExtra(getString(R.string.second_show_keyboard), icon = R.drawable.ic_bottom_keyboard) {
- keyboard?.toggle()
- }
+ val profileLayout = secondaryInputLayout
androidx.compose.foundation.layout.Box(
Modifier.fillMaxSize().background(androidx.compose.ui.graphics.Color.Black)
.pointerInput(Unit) { awaitPointerEventScope { while (true) awaitPointerEvent() } },
@@ -4958,43 +4879,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
},
modifier = Modifier.fillMaxSize(),
)
- secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS ||
- (secondScreenMode == SecondScreenMode.DECK_CONTROLS && SessionState.deckPad) -> {
- val layout = if (secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS)
- com.droiddeck.launcher.input.InputSurfaceLayout.read(this@SessionActivity, inputProfile.id) else null
- androidx.compose.runtime.key(secondScreenMode, layout) {
+ secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS -> {
+ androidx.compose.runtime.key(profileLayout) {
androidx.compose.ui.viewinterop.AndroidView(
- factory = { context ->
- com.droiddeck.launcher.ui.DeckControlsPanel(context, onClose = openMenu, onSteamMenu = ::tapSteamButton,
- onQam = ::tapQam, pad = padBridge, customLayout = layout,
- onMenu = openMenu, onSwap = swapBack)
- },
+ factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge, profileLayout?.elements.orEmpty(),
+ surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) },
modifier = Modifier.fillMaxSize(),
)
}
}
- secondScreenMode == SecondScreenMode.KEYBOARD_TRACKPAD -> androidx.compose.foundation.layout.Column(Modifier.fillMaxSize()) {
- com.droiddeck.launcher.ui.BottomScreenBar(bar(getString(SecondScreenMode.KEYBOARD_TRACKPAD.label), listOf(keyboardExtra)))
- androidx.compose.ui.viewinterop.AndroidView(
- factory = { context ->
- com.droiddeck.launcher.ui.SessionTrackpadView(context, ::moveSecondScreenPointer,
- { button, pressed -> heldButtons.set(2, button, pressed) },
- ::sendSceneWheel, ::secondScreenPointerPosition)
- },
- modifier = Modifier.fillMaxWidth().weight(1f),
- )
- }
- secondScreenMode == SecondScreenMode.TERMINAL -> androidx.compose.foundation.layout.Column(Modifier.fillMaxSize()) {
- var terminal by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(null) }
- com.droiddeck.launcher.ui.BottomScreenBar(bar(getString(SecondScreenMode.TERMINAL.label), listOf(
- com.droiddeck.launcher.ui.BarExtra(getString(R.string.drawer_keyboard), icon = R.drawable.ic_bottom_keyboard) { terminal?.showKeyboard() },
- )))
- androidx.compose.ui.viewinterop.AndroidView(
- factory = { context -> com.droiddeck.launcher.ui.SessionTerminalPanel(context).also { terminal = it } },
- modifier = Modifier.fillMaxWidth().weight(1f),
- )
- }
- pages.isEmpty() -> com.droiddeck.launcher.ui.BottomScreenBar(bar(null))
+
else -> BottomDashboard(
pages, com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId),
gameStarts = gameStarts,
@@ -5207,6 +5101,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
closeSecondScreen(reset = false)
glassesScope.cancel()
glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } }
+ bottomInputControls?.let { (it.parent as? android.view.ViewGroup)?.removeView(it) }
+ bottomInputControls = null
bottomGame?.let { screen -> bottomGame = null; runCatching { screen.dismiss() } }
headTracker?.stop()
if (::hud.isInitialized) hud.stop()
diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt
deleted file mode 100644
index cb544d5a4d..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.droiddeck.launcher.input
-
-import com.droiddeck.launcher.ui.focusGlide
-import android.os.Build
-import android.os.Bundle
-import android.view.Gravity
-import android.view.View
-import android.view.WindowManager
-import android.widget.FrameLayout
-import androidx.activity.ComponentActivity
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.selection.toggleable
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.ui.Alignment
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.res.stringResource
-import com.droiddeck.launcher.R
-import com.droiddeck.launcher.ui.DroidDeckTheme
-import com.droiddeck.launcher.ui.onSignal
-import com.droiddeck.launcher.ui.LocalPalette
-
-class ControllerEditorActivity : ComponentActivity() {
- override fun attachBaseContext(newBase: android.content.Context) {
- super.attachBaseContext(newBase)
- com.droiddeck.launcher.core.AppLanguage.applyTo(this, newBase)
- }
-
- private lateinit var controls: OnScreenControls
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this)
- immersive()
- val root = FrameLayout(this)
- root.setBackgroundColor(0xFF0B0F14.toInt())
- controls = OnScreenControls(this, null, editing = true)
- root.addView(controls, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT))
- val bar = ComposeView(this).apply {
- setContent {
- DroidDeckTheme {
- var snap by remember { mutableStateOf(ControllerPrefs.read(context).snap) }
- Column(
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.spacedBy(5.dp),
- modifier = Modifier
- .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.9f), RoundedCornerShape(20.dp))
- .padding(start = 5.dp, end = 5.dp, top = 8.dp, bottom = 5.dp),
- ) {
- Text(stringResource(R.string.ctrl_editor_drag), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant)
- Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
- EditorButton(stringResource(R.string.ctrl_editor_snap), false, selected = snap) {
- snap = !snap
- ControllerPrefs.setSnap(context, snap)
- controls.setSnap(snap)
- }
- EditorButton(stringResource(R.string.ctrl_reset), false) { controls.resetLayout() }
- EditorButton(stringResource(R.string.common_cancel), false) { finish() }
- EditorButton(stringResource(R.string.ctrl_editor_save), true) {
- controls.saveLayout()
- finish()
- }
- }
- }
- }
- }
- }
- root.addView(bar, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT, Gravity.CENTER))
- setContentView(root)
- }
-
- @Composable
- private fun EditorButton(label: String, primary: Boolean, selected: Boolean? = null, onClick: () -> Unit) {
- val pal = LocalPalette.current
- Text(
- label, fontSize = 12.sp, fontWeight = FontWeight.SemiBold,
- color = when {
- primary -> pal.onSignal
- selected == true -> pal.signal
- else -> MaterialTheme.colorScheme.onBackground
- },
- modifier = Modifier.clip(RoundedCornerShape(50))
- .background(
- when {
- primary -> pal.signal
- selected == true -> pal.signal.copy(alpha = 0.18f)
- else -> Color.White.copy(alpha = 0.06f)
- },
- )
- .focusGlide(RoundedCornerShape(50))
- .then(
- if (selected == null) Modifier.clickable(onClick = onClick)
- else Modifier.toggleable(value = selected, role = Role.Switch, onValueChange = { onClick() }),
- )
- .padding(horizontal = 12.dp, vertical = 6.dp),
- )
- }
-
- override fun onWindowFocusChanged(hasFocus: Boolean) {
- super.onWindowFocusChanged(hasFocus)
- if (hasFocus) immersive()
- }
-
- private fun immersive() {
- @Suppress("DEPRECATION")
- window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
- or View.SYSTEM_UI_FLAG_FULLSCREEN
- or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
- or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
- or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
- if (Build.VERSION.SDK_INT >= 28) {
- window.attributes = window.attributes.apply {
- layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
- }
- }
- }
-}
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 bb1705ba68..1edc2395ce 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt
@@ -169,56 +169,6 @@ object ControllerPrefs {
prefs(context).edit().remove("layout.${width}x$height").apply()
}
- fun screenKeysShown(context: Context): Boolean = prefs(context).getBoolean("screenKeysShown", true)
-
- fun setScreenKeysShown(context: Context, shown: Boolean) {
- prefs(context).edit().putBoolean("screenKeysShown", shown).apply()
- }
-
- fun screenKeys(context: Context): List = decodeScreenKeys(prefs(context).getString("screenKeys", null).orEmpty())
-
- fun setScreenKeys(context: Context, keys: List) {
- prefs(context).edit().putString("screenKeys", encodeScreenKeys(keys)).apply()
- }
-
- fun encodeScreenKeys(keys: List): String = keys.joinToString(";") {
- "${it.codes.joinToString("+")}:${it.x},${it.y},${it.size}:${escape(it.glyph)}:${escape(it.text)}:${escape(it.image)}:${it.opacity}:${it.shape}:${if (it.toggle) 1 else 0}:${if (it.labels) 1 else 0}"
- }
-
- fun decodeScreenKeys(raw: String): List = raw.split(';').mapNotNull { entry ->
- val parts = entry.split(':')
- if (parts.size < 2) return@mapNotNull null
- val keys = parts[0].split('+').mapNotNull { it.toIntOrNull() }.takeIf { it.isNotEmpty() } ?: return@mapNotNull null
- val nums = parts[1].split(',').mapNotNull { it.toFloatOrNull() }.takeIf { it.size == 3 } ?: return@mapNotNull null
- ScreenKey(
- keys, nums[0], nums[1], nums[2].toInt(),
- parts.getOrNull(2)?.let(::unescape).orEmpty(),
- parts.getOrNull(3)?.let(::unescape).orEmpty(),
- parts.getOrNull(4)?.let(::unescape).orEmpty(),
- parts.getOrNull(5)?.toFloatOrNull()?.coerceIn(0.2f, 1f) ?: 1f,
- parts.getOrNull(6)?.toIntOrNull()?.coerceIn(SCREEN_KEY_PILL, SCREEN_KEY_STICK) ?: SCREEN_KEY_PILL,
- parts.getOrNull(7) == "1",
- parts.getOrNull(8) != "0",
- )
- }
-
- fun screenLayouts(context: Context): Map =
- prefs(context).all.mapNotNull { (key, value) ->
- if (!key.startsWith("screenLayout.") || value !is String) null else key.removePrefix("screenLayout.") to value
- }.toMap()
-
- fun saveScreenLayout(context: Context, name: String, raw: String) {
- prefs(context).edit().putString("screenLayout.$name", raw).apply()
- }
-
- fun deleteScreenLayout(context: Context, name: String) {
- prefs(context).edit().remove("screenLayout.$name").apply()
- }
-
- private fun escape(value: String) = value.replace("%", "%25").replace(";", "%3B").replace(":", "%3A").replace(",", "%2C")
-
- private fun unescape(value: String) = value.replace("%2C", ",").replace("%3A", ":").replace("%3B", ";").replace("%25", "%")
-
fun resetAll(context: Context) {
prefs(context).edit().clear().putBoolean("rumble", true).apply()
}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/DeckControls.kt b/app/src/main/java/com/droiddeck/launcher/input/DeckControls.kt
index 88087d9700..10cdd434c6 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/DeckControls.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/DeckControls.kt
@@ -24,7 +24,8 @@ object DeckControls {
}
@Synchronized
- fun source(role: InputRole) = Source(role)
+ @JvmOverloads
+ fun source(role: InputRole, routed: Boolean = false) = Source(role, routed)
@Synchronized
fun setGrip(bit: Int, down: Boolean) = physical.setGrip(bit, down)
@@ -53,7 +54,7 @@ object DeckControls {
publish()
}
- class Source internal constructor(private val role: InputRole) {
+ class Source internal constructor(private val role: InputRole, private val routed: Boolean = false) {
private val x = FloatArray(8)
private val y = FloatArray(8)
private val touched = BooleanArray(8)
@@ -62,7 +63,7 @@ object DeckControls {
internal val axes = ShortArray(4)
internal fun configure() {
- routes = router?.let { r -> Array(8) { i ->
+ routes = router?.takeUnless { routed }?.let { r -> Array(8) { i ->
r.channel(role, controls[i]).also { it.awaitNeutral(x[i], y[i], touched[i]) }
} }
mask = 0
@@ -95,6 +96,15 @@ object DeckControls {
InputTiming.end(timing)
}
+ internal fun native(control: InputControl?, value: Float, second: Float, contact: Boolean) = synchronized(DeckControls) {
+ require(routed)
+ attach()
+ x.fill(0f); y.fill(0f); touched.fill(false)
+ val at = controls.indexOf(control)
+ if (at >= 0) { x[at] = value; y[at] = second; touched[at] = contact }
+ route(); publish()
+ }
+
internal fun route() {
mask = 0
axes.fill(0)
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt
similarity index 99%
rename from app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt
rename to app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt
index 2b369c20aa..988ab5f764 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/GamepadGeometry.kt
@@ -1,4 +1,4 @@
-package com.droiddeck.launcher.ui
+package com.droiddeck.launcher.input
import kotlin.math.min
diff --git a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt
index 4d69f68c5b..9ba24e3381 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt
@@ -3,7 +3,7 @@ package com.droiddeck.launcher.input
import android.view.MotionEvent
internal class GestureTouchStreamGate {
- enum class Source { SURFACE, SCREEN_KEYS, ON_SCREEN_CONTROLS }
+ enum class Source { SURFACE, ON_SCREEN_CONTROLS }
private var owner: Source? = null
diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt b/app/src/main/java/com/droiddeck/launcher/input/InputButtonIcons.kt
similarity index 97%
rename from app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt
rename to app/src/main/java/com/droiddeck/launcher/input/InputButtonIcons.kt
index b1ea677b99..0f2b184571 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputButtonIcons.kt
@@ -4,10 +4,10 @@ import android.graphics.Canvas
import android.graphics.Paint
import android.graphics.Path
-object ScreenKeyIcons {
- fun has(code: Int): Boolean = code in SET
+object InputButtonIcons {
+ fun has(code: Int): Boolean = code in codes
- private val SET = setOf(28, 14, 15, 57, 42, 54, 29, 97, 125, 103, 108, 105, 106)
+ val codes = listOf(28, 14, 15, 57, 42, 54, 29, 97, 125, 103, 108, 105, 106)
fun draw(canvas: Canvas, code: Int, cx: Float, cy: Float, box: Float, paint: Paint): Boolean {
if (!has(code)) return false
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt
new file mode 100644
index 0000000000..0baf28e18c
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt
@@ -0,0 +1,265 @@
+package com.droiddeck.launcher.input
+
+import android.content.Context
+import android.hardware.display.DisplayManager
+import android.util.DisplayMetrics
+import android.view.Display
+import org.json.JSONArray
+import org.json.JSONObject
+
+object InputLibraries {
+ private const val VERSION = 6
+ private const val KEY = "library"
+ const val OVERLAY = "builtin.overlay"
+ const val DECK = "builtin.deck"
+ const val TRACKPAD = "builtin.trackpad"
+
+ private fun prefs(context: Context) = context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE)
+
+ @Synchronized
+ fun read(context: Context): InputLibrary {
+ val p = prefs(context)
+ val raw = p.getString(KEY, null)
+ val decoded = raw?.let(::decode)
+ if (raw != null && decoded == null) return scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, migrate(context))))
+ var library = decoded ?: scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, migrate(context))))
+ val version = raw?.let { JSONObject(it).getInt("version") } ?: 0
+ if (version < 5) library = scopeLayouts(upgradeStockLayouts(upgradeOverlay(context, library)))
+ if (version < 6 || !p.contains(LegacyScreenKeyMigration.BACKUP)) {
+ val legacy = LegacyScreenKeyMigration.snapshot(context)
+ if (legacy != null) {
+ val upgraded = runCatching { LegacyScreenKeyMigration.migrate(context, library, legacy) }.getOrElse {
+ android.util.Log.e("InputLibraries", "Could not migrate screen keys; keeping the original settings", it)
+ return library
+ }
+ val encoded = encode(upgraded)
+ require(encoded.length <= 2_000_000)
+ if (!p.edit().putString(KEY, encoded).putString(LegacyScreenKeyMigration.BACKUP, legacy).commit()) return library
+ LegacyScreenKeyMigration.clean(context)
+ return upgraded
+ }
+ }
+ if (raw == null || version < VERSION) write(context, library)
+ if (p.contains(LegacyScreenKeyMigration.BACKUP)) LegacyScreenKeyMigration.clean(context)
+ return library
+ }
+
+ fun hasPendingScreenKeyMigration(context: Context) = !prefs(context).contains(LegacyScreenKeyMigration.BACKUP) && LegacyScreenKeyMigration.snapshot(context) != null
+
+ @Synchronized
+ fun update(context: Context, change: (InputLibrary) -> InputLibrary): InputLibrary {
+ val stored = prefs(context).getString(KEY, null)
+ require(stored == null || decode(stored) != null) { "The saved input library cannot be edited by this version." }
+ return change(read(context)).validate().also { write(context, it) }
+ }
+
+ private fun write(context: Context, library: InputLibrary) {
+ val encoded = encode(library.validate())
+ require(encoded.length <= 2_000_000) { "The input library is too large to save." }
+ prefs(context).edit().putString(KEY, encoded).apply()
+ }
+
+ private fun migrate(context: Context): InputLibrary {
+ val profiles = mutableListOf()
+ val layouts = mutableListOf(
+ SavedInputLayout(OVERLAY, "Built-in gamepad", template = InputLayoutTemplate.OVERLAY),
+ SavedInputLayout(DECK, "Deck grips + trackpads", template = InputLayoutTemplate.DECK),
+ SavedInputLayout(TRACKPAD, "Trackpad + keyboard", template = InputLayoutTemplate.TRACKPAD),
+ )
+ val bindings = mutableListOf()
+ for (id in listOf(InputProfile.GAME, InputProfile.DESKTOP)) {
+ val old = InputProfiles.readLegacy(context, id)
+ val name = if (id == InputProfile.GAME) "Game" else "Desktop"
+ val layout = SavedInputLayout("$id.layout", "$name touch", InputSurfaceLayout.readLegacy(context, id))
+ layouts += layout
+ val parts = InputRole.entries.associateWith { role ->
+ val preset = SavedInputBindings("$id.${role.name.lowercase()}", "$name / ${role.name.lowercase()}",
+ role == InputRole.PHYSICAL, if (role == InputRole.SECONDARY) layout.id else null,
+ old.bindings[role].orEmpty(), keys = if (role == InputRole.PHYSICAL) old.keys else emptyList())
+ bindings += preset
+ InputPart(preset.id, when (role) { InputRole.PHYSICAL -> null; InputRole.PRIMARY -> OVERLAY; InputRole.SECONDARY -> layout.id })
+ }
+ profiles += SavedInputProfile(id, name, id, parts)
+ }
+ val selected = prefs(context).getString("selected", InputProfiles.AUTO)
+ ?.takeIf { it == InputProfiles.AUTO || profiles.any { p -> p.id == it } } ?: InputProfiles.AUTO
+ return InputLibrary(profiles, layouts, bindings, selected).validate()
+ }
+
+ @Suppress("DEPRECATION")
+ private fun upgradeOverlay(context: Context, library: InputLibrary): InputLibrary {
+ if (library.layouts.none { it.template == InputLayoutTemplate.OVERLAY }) return library
+ val display = context.getSystemService(DisplayManager::class.java)?.getDisplay(Display.DEFAULT_DISPLAY)
+ val surfaceContext = display?.let(context::createDisplayContext) ?: context
+ val metrics = DisplayMetrics().also { if (display != null) display.getRealMetrics(it) else it.setTo(context.resources.displayMetrics) }
+ 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 replacements = library.layouts.filter { it.template == InputLayoutTemplate.OVERLAY }.associate { old ->
+ 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>()
+ for (profile in library.profiles) {
+ val parts = profile.parts.mapValues { (role, part) ->
+ val layout = replacements[part.layout] ?: return@mapValues part
+ val key = part.bindings to layout.id
+ val id = migrated.getOrPut(key) {
+ val old = library.preset(part.bindings)
+ val newId = newInputId()
+ 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))
+ newId
+ }
+ part.copy(bindings = id)
+ }
+ result = result.withProfile(profile.copy(parts = parts))
+ }
+ 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))
+ }
+ return result.validate()
+ }
+
+ private fun upgradeStockLayouts(library: InputLibrary): InputLibrary {
+ val stock = InputStockLayouts.layouts()
+ val replacements = library.layouts.filter { it.template == InputLayoutTemplate.DECK || it.template == InputLayoutTemplate.TRACKPAD }
+ .associate { old -> old.id to stock.first { it.id == if (old.template == InputLayoutTemplate.DECK) DECK else TRACKPAD }.copy(id = old.id, name = old.name) }
+ var result = library.copy(layouts = library.layouts.map { replacements[it.id] ?: it })
+ val migrated = mutableMapOf, String>()
+ for (profile in library.profiles) {
+ val parts = profile.parts.mapValues { (_, part) ->
+ val layout = replacements[part.layout] ?: return@mapValues part
+ val id = migrated.getOrPut(part.bindings to layout.id) {
+ val old = library.preset(part.bindings)
+ val id = newInputId()
+ val original = library.layouts.first { it.id == layout.id }
+ val stockLayout = layout.copy(id = if (original.template == InputLayoutTemplate.TRACKPAD) TRACKPAD else DECK)
+ result = result.withPreset(old.copy(id = id, layoutId = layout.id,
+ elements = InputStockLayouts.actions(stockLayout) + old.elements, clicks = InputStockLayouts.clicks(stockLayout) + old.clicks))
+ id
+ }
+ part.copy(bindings = id)
+ }
+ result = result.withProfile(profile.copy(parts = parts))
+ }
+ val oldBindings = migrated.keys.map { it.first }.toSet()
+ result = result.copy(bindings = result.bindings.filter { it.id !in oldBindings || result.usersOfBindings(it.id).isNotEmpty() })
+ for (layout in stock) if (result.layouts.none { it.id == layout.id }) result = result.withLayout(layout)
+ for (preset in InputStockLayouts.presets(stock)) if (result.bindings.none { it.id == preset.id }) result = result.withPreset(preset)
+ return result.validate()
+ }
+
+ private fun scopeLayouts(library: InputLibrary): InputLibrary = library.copy(layouts = library.layouts.map { layout ->
+ val roles = library.profiles.flatMap { p -> p.parts.filterValues { it.layout == layout.id }.keys } +
+ library.selections.values.flatMap { s -> s.parts.filterValues { library.preset(it).layoutId == layout.id }.keys }
+ val screen = when {
+ InputRole.PRIMARY in roles && InputRole.SECONDARY in roles -> InputLayoutScreen.BOTH
+ InputRole.PRIMARY in roles -> InputLayoutScreen.MAIN
+ InputRole.SECONDARY in roles -> InputLayoutScreen.SECONDARY
+ layout.id == OVERLAY || layout.id.startsWith("migrated.layout.") -> InputLayoutScreen.MAIN
+ else -> InputLayoutScreen.SECONDARY
+ }
+ layout.copy(screen = screen)
+ })
+
+ internal fun encode(library: InputLibrary): String {
+ val layouts = JSONArray()
+ for (layout in library.layouts) {
+ val elements = JSONArray()
+ for (e in layout.elements) elements.put(JSONObject().put("id", e.id).put("kind", e.kind.name)
+ .put("control", e.control.id).put("name", e.name).put("x", e.x.toDouble()).put("y", e.y.toDouble())
+ .put("width", e.width.toDouble()).put("height", e.height.toDouble()).put("floating", e.floating).put("hideWhenIdle", e.hideWhenIdle).put("mouseGestures", e.mouseGestures).put("toggle", e.toggle).put("icon", e.icon).put("image", e.image)
+ .put("elementOpacity", e.opacity.toDouble()).put("buttonShape", e.buttonShape.name).put("showLabel", e.showLabel))
+ layouts.put(JSONObject().put("id", layout.id).put("name", layout.name).put("template", layout.template.name).put("elements", elements)
+ .put("tint", layout.style.tint).put("opacity", layout.style.opacity).put("screen", layout.screen.name))
+ }
+ val bindings = JSONArray()
+ for (b in library.bindings) {
+ val controls = JSONObject(); b.controls.forEach { (c, a) -> controls.put(c.id, InputProfiles.encode(a)) }
+ val elements = JSONObject(); b.elements.forEach { (id, a) -> elements.put(id, InputProfiles.encode(a)) }
+ val clicks = JSONObject(); b.clicks.forEach { (id, a) -> clicks.put(id, InputProfiles.encode(a)) }
+ val keys = JSONArray()
+ b.keys.forEach { binding -> keys.put(JSONObject().put("device", binding.key.device).put("name", binding.key.name)
+ .put("keyCode", binding.key.keyCode).put("scanCode", binding.key.scanCode).put("action", InputProfiles.encode(binding.action))) }
+ bindings.put(JSONObject().put("id", b.id).put("name", b.name).put("physical", b.physical)
+ .put("layout", b.layoutId).put("controls", controls).put("elements", elements).put("keys", keys).put("clicks", clicks))
+ }
+ val profiles = JSONArray()
+ for (p in library.profiles) {
+ val parts = JSONObject()
+ p.parts.forEach { (role, part) -> parts.put(role.name, JSONObject().put("bindings", part.bindings).put("layout", part.layout)) }
+ profiles.put(JSONObject().put("id", p.id).put("name", p.name).put("base", p.base).put("parts", parts))
+ }
+ val selections = JSONObject()
+ for ((mode, selection) in library.selections) {
+ val parts = JSONObject()
+ selection.parts.forEach { (role, id) -> parts.put(role.name, id) }
+ selections.put(mode, JSONObject().put("profile", selection.profile).put("parts", parts))
+ }
+ return JSONObject().put("selections", selections).put("version", VERSION).put("selected", library.selected).put("steam", library.steam).put("desktop", library.desktop)
+ .put("profiles", profiles).put("layouts", layouts).put("bindings", bindings).toString()
+ }
+
+ internal fun decode(raw: String): InputLibrary? = runCatching {
+ require(raw.length <= 2_000_000)
+ val doc = JSONObject(raw); require(doc.getInt("version") in 2..VERSION)
+ val layouts = doc.getJSONArray("layouts").objects(256).map { layout ->
+ val elements = layout.getJSONArray("elements").objects(64).map { e ->
+ InputSurfaceElement(requireNotNull(InputControl.fromId(e.getString("control"))), e.getDouble("x").toFloat(),
+ e.getDouble("y").toFloat(), e.getDouble("width").toFloat(), e.getDouble("height").toFloat(),
+ e.getString("id"), InputElementKind.valueOf(e.getString("kind")), e.getString("name"),
+ e.optBoolean("floating", true), e.optBoolean("hideWhenIdle", false), e.optBoolean("mouseGestures", false), e.optBoolean("toggle", false), e.optInt("icon", 0), e.optString("image", ""),
+ e.optDouble("elementOpacity", 1.0).toFloat(), InputButtonShape.valueOf(e.optString("buttonShape", InputButtonShape.ROUNDED.name)), e.optBoolean("showLabel", true))
+ }
+ SavedInputLayout(layout.getString("id"), layout.getString("name"), elements, InputLayoutTemplate.valueOf(layout.getString("template")),
+ InputSurfaceStyle(layout.optInt("tint", ControllerPrefs.STEAM_BLUE), layout.optInt("opacity", 100)),
+ InputLayoutScreen.valueOf(layout.optString("screen", InputLayoutScreen.BOTH.name)))
+ }
+ val bindings = doc.getJSONArray("bindings").objects(512).map { b ->
+ val controls = b.getJSONObject("controls").actions(28).mapKeys { requireNotNull(InputControl.fromId(it.key)) }
+ val keys = b.getJSONArray("keys").objects(64).map { k -> PhysicalInputBinding(
+ PhysicalInputKey(k.getString("device"), k.getString("name"), k.getInt("keyCode"), k.getInt("scanCode")),
+ requireNotNull(InputProfiles.decode(k.getJSONObject("action")))) }
+ SavedInputBindings(b.getString("id"), b.getString("name"), b.getBoolean("physical"), b.optionalString("layout"),
+ controls, b.getJSONObject("elements").actions(64), keys, b.optJSONObject("clicks")?.actions(64).orEmpty())
+ }
+ val profiles = doc.getJSONArray("profiles").objects(64).map { p ->
+ val parts = p.getJSONObject("parts")
+ SavedInputProfile(p.getString("id"), p.getString("name"), p.getString("base"), InputRole.entries.associateWith { role ->
+ val part = parts.getJSONObject(role.name); InputPart(part.getString("bindings"), part.optionalString("layout"))
+ })
+ }
+ val selections = doc.optJSONObject("selections")?.let { saved ->
+ require(saved.length() <= 2)
+ saved.keys().asSequence().associateWith { mode ->
+ val value = saved.getJSONObject(mode)
+ val parts = value.getJSONObject("parts")
+ require(parts.length() <= InputRole.entries.size)
+ InputSelection(value.getString("profile"), parts.keys().asSequence().associate { role -> InputRole.valueOf(role) to parts.getString(role) })
+ }
+ }.orEmpty()
+ InputLibrary(profiles, layouts, bindings, doc.getString("selected"), doc.getString("steam"), doc.getString("desktop"), selections).validate()
+ }.getOrNull()
+
+ private fun JSONArray.objects(limit: Int): List {
+ require(length() <= limit)
+ return (0 until length()).map { getJSONObject(it) }
+ }
+
+ private fun JSONObject.actions(limit: Int): Map {
+ require(length() <= limit)
+ return keys().asSequence().associateWith { requireNotNull(InputProfiles.decode(getJSONObject(it))) }
+ }
+
+ private fun JSONObject.optionalString(key: String): String? = if (isNull(key)) null else getString(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
new file mode 100644
index 0000000000..1836004f44
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt
@@ -0,0 +1,284 @@
+package com.droiddeck.launcher.input
+
+import java.util.UUID
+
+enum class InputLayoutTemplate { CUSTOM, OVERLAY, DECK, TRACKPAD }
+
+enum class InputLayoutScreen { MAIN, SECONDARY, BOTH;
+ fun supports(role: InputRole) = role != InputRole.PHYSICAL && (this == BOTH ||
+ if (role == InputRole.PRIMARY) this == MAIN else this == SECONDARY)
+}
+
+data class InputSurfaceStyle(val tint: Int = ControllerPrefs.STEAM_BLUE, val opacity: Int = 100)
+
+data class SavedInputLayout(
+ val id: String, val name: String, val elements: List = emptyList(),
+ val template: InputLayoutTemplate = InputLayoutTemplate.CUSTOM,
+ val style: InputSurfaceStyle = InputSurfaceStyle(),
+ val screen: InputLayoutScreen = InputLayoutScreen.BOTH,
+) {
+ val editable get() = template == InputLayoutTemplate.CUSTOM
+ fun supports(role: InputRole) = screen.supports(role) && when (template) {
+ InputLayoutTemplate.OVERLAY -> role == InputRole.PRIMARY
+ InputLayoutTemplate.DECK, InputLayoutTemplate.TRACKPAD -> role == InputRole.SECONDARY
+ InputLayoutTemplate.CUSTOM -> true
+ }
+}
+
+data class SavedInputBindings(
+ val id: String, val name: String, val physical: Boolean,
+ val layoutId: String? = null,
+ val controls: Map = emptyMap(),
+ val elements: Map = emptyMap(),
+ val keys: List = emptyList(),
+ val clicks: Map = emptyMap(),
+) {
+ fun compatible(layout: SavedInputLayout?) = if (physical) layout == null
+ else layout != null && if (layout.editable) layoutId == layout.id else layoutId == null
+
+ fun action(element: InputSurfaceElement) = elements[element.id]
+ ?: if (element.id == "legacy:${element.control.id}") controls[element.control] ?: InputAction.Native()
+ else InputAction.Disabled
+
+ fun clickAction(element: InputSurfaceElement) = clicks[element.id]
+ ?: defaultElementClick(element, action(element)) { controls[it] ?: InputAction.Native() }
+}
+
+data class InputSelection(val profile: String = InputProfiles.AUTO, val parts: Map = emptyMap())
+
+data class InputPart(val bindings: String, val layout: String? = null)
+
+data class SavedInputProfile(val id: String, val name: String, val base: String, val parts: Map) {
+ fun binding(role: InputRole) = parts.getValue(role).bindings
+}
+
+data class InputLibrary(
+ val profiles: List, val layouts: List, val bindings: List,
+ val selected: String = InputProfiles.AUTO,
+ val steam: String = InputProfile.GAME, val desktop: String = InputProfile.DESKTOP,
+ val selections: Map = emptyMap(),
+) {
+ fun profile(id: String) = profiles.first { it.id == id }
+ fun preset(id: String) = bindings.first { it.id == id }
+ fun layout(profile: String, role: InputRole) = profiles.firstOrNull { it.id == profile }?.parts?.get(role)?.layout
+ ?.let { id -> layouts.firstOrNull { it.id == id } }
+ private fun mode(isDesktop: Boolean) = if (isDesktop) InputProfile.DESKTOP else InputProfile.GAME
+ fun selection(isDesktop: Boolean) = selections[mode(isDesktop)] ?: InputSelection(selected)
+ fun activeId(isDesktop: Boolean): String {
+ val id = selection(isDesktop).profile
+ return if (id == InputProfiles.AUTO) { if (isDesktop) desktop else steam } else id
+ }
+ fun selectProfile(isDesktop: Boolean, id: String) = copy(selections = selections + (mode(isDesktop) to InputSelection(id)))
+ fun selectPart(isDesktop: Boolean, role: InputRole, bindingsId: String): InputLibrary {
+ val previous = selection(isDesktop)
+ return copy(selections = selections + (mode(isDesktop) to previous.copy(parts = previous.parts + (role to bindingsId))))
+ }
+ fun activePart(isDesktop: Boolean, role: InputRole): InputPart {
+ val binding = selection(isDesktop).parts[role]?.let(::preset)
+ return if (binding != null) InputPart(binding.id, binding.layoutId) else profile(activeId(isDesktop)).parts.getValue(role)
+ }
+ fun activeLayout(isDesktop: Boolean, role: InputRole) = activePart(isDesktop, role).layout?.let { id -> layouts.first { it.id == id } }
+ fun compileActive(isDesktop: Boolean): InputProfile = compileParts(activeId(isDesktop), InputRole.entries.associateWith { preset(activePart(isDesktop, it).bindings) })
+
+ fun saveSelection(isDesktop: Boolean, name: String, id: String = newInputId()): InputLibrary {
+ val current = profile(activeId(isDesktop))
+ var result = withProfile(SavedInputProfile(id, inputName(name), current.base, InputRole.entries.associateWith { activePart(isDesktop, it) }))
+ for (role in InputRole.entries) result = result.usePart(id, role, id, shared = false)
+ return result.selectProfile(isDesktop, id)
+ }
+
+
+ fun compile(id: String): InputProfile {
+ val profile = profile(id)
+ val parts = InputRole.entries.associateWith { preset(profile.binding(it)) }
+ return compileParts(id, parts)
+ }
+
+ private fun compileParts(id: String, parts: Map): InputProfile {
+ return InputProfile(id, parts.mapValues { it.value.controls }.filterValues { it.isNotEmpty() },
+ parts.getValue(InputRole.PHYSICAL).keys,
+ parts.mapValues { it.value.elements }.filterValues { it.isNotEmpty() },
+ parts.mapValues { it.value.clicks }.filterValues { it.isNotEmpty() })
+ }
+
+ fun usersOfBindings(id: String) = profiles.filter { p -> p.parts.values.any { it.bindings == id } }
+ fun selectedBindings(id: String) = selections.values.any { id in it.parts.values }
+ fun usersOfLayout(id: String) = profiles.filter { p -> p.parts.values.any { it.layout == id } }
+ fun withProfile(value: SavedInputProfile) = copy(profiles = profiles.filterNot { it.id == value.id } + value)
+ 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() } }) })
+
+ fun duplicateProfile(id: String, name: String, newId: String = newInputId(), sharePhysical: Boolean = false): InputLibrary {
+ require(profiles.size < 64)
+ var result = withProfile(profile(id).copy(id = newId, name = inputName(name)))
+ for (role in InputRole.entries) result = result.usePart(newId, role, id, shared = sharePhysical && role == InputRole.PHYSICAL)
+ return result
+ }
+
+ fun usePart(profileId: String, role: InputRole, sourceId: String, shared: Boolean): InputLibrary {
+ val target = profile(profileId)
+ val source = profile(sourceId).parts.getValue(role)
+ if (shared) return withProfile(target.copy(parts = target.parts + (role to source)))
+ val sourceLayout = layout(sourceId, role)
+ val name = (target.name + " / " + role.name.lowercase()).take(80)
+ val copiedLayout = sourceLayout?.takeIf { it.editable }?.copy(id = newInputId(), name = name)
+ val copiedBindings = preset(source.bindings).copy(id = newInputId(), name = name,
+ layoutId = copiedLayout?.id ?: preset(source.bindings).layoutId)
+ return (if (copiedLayout == null) this else withLayout(copiedLayout)).withPreset(copiedBindings)
+ .withProfile(target.copy(parts = target.parts + (role to InputPart(copiedBindings.id, copiedLayout?.id ?: source.layout))))
+ }
+
+ fun useLayout(profileId: String, role: InputRole, layoutId: String, shared: Boolean): InputLibrary {
+ val source = layouts.first { it.id == layoutId }
+ require(source.supports(role))
+ val target = profile(profileId)
+ val layout = if (shared || !source.editable) source else source.copy(id = newInputId(), name = (target.name + " / " + source.name).take(80))
+ val previous = preset(target.binding(role))
+ val actions = if (previous.compatible(source)) previous else bindings.firstOrNull { it.compatible(source) } ?: SavedInputBindings(newInputId(), target.name, false,
+ controls = if (source.editable) emptyMap() else InputProfile.defaults(target.base).bindings[role].orEmpty(),
+ elements = if (source.editable) source.elements.associate { it.id to InputAction.Disabled } else emptyMap())
+ val copied = actions.copy(id = newInputId(), name = (target.name + " / " + role.name.lowercase()).take(80),
+ layoutId = layout.id.takeIf { layout.editable })
+ return withLayout(layout).withPreset(copied)
+ .withProfile(target.copy(parts = target.parts + (role to InputPart(copied.id, layout.id))))
+ }
+
+ fun copyBindings(id: String, name: String, profileId: String? = null, role: InputRole? = null, newId: String = newInputId()): InputLibrary {
+ require(bindings.size < 512)
+ var result = withPreset(preset(id).copy(id = newId, name = inputName(name)))
+ if (profileId != null && role != null) result = result.chooseBindings(profileId, role, newId)
+ return result
+ }
+
+ fun chooseBindings(profileId: String, role: InputRole, id: String): InputLibrary {
+ val profile = profile(profileId)
+ require(preset(id).compatible(layout(profileId, role)))
+ return withProfile(profile.copy(parts = profile.parts + (role to profile.parts.getValue(role).copy(bindings = id))))
+ }
+
+ fun chooseLayout(profileId: String, role: InputRole, id: String): InputLibrary {
+ val layout = layouts.first { it.id == id }
+ require(layout.supports(role))
+ val profile = profile(profileId)
+ val previous = preset(profile.binding(role))
+ val compatible = bindings.firstOrNull { it.id == previous.id && it.compatible(layout) }
+ ?: bindings.firstOrNull { it.compatible(layout) }
+ ?: SavedInputBindings(newInputId(), layout.name, false, if (layout.editable) layout.id else null)
+ return withPreset(compatible).withProfile(profile.copy(parts = profile.parts + (role to InputPart(compatible.id, id))))
+ }
+
+ fun copyLayout(id: String, name: String, newId: String = newInputId()): InputLibrary {
+ val source = layouts.first { it.id == id }
+ require(source.editable)
+ return withLayout(source.copy(id = newId, name = inputName(name)))
+ }
+
+ fun removeProfile(id: String): InputLibrary {
+ require(id != InputProfile.GAME && id != InputProfile.DESKTOP)
+ return copy(profiles = profiles.filterNot { it.id == id }, selected = selected.takeUnless { it == id } ?: InputProfiles.AUTO,
+ steam = steam.takeUnless { it == id } ?: InputProfile.GAME, desktop = desktop.takeUnless { it == id } ?: InputProfile.DESKTOP,
+ selections = selections.mapValues { (_, selection) -> if (selection.profile == id) selection.copy(profile = InputProfiles.AUTO) else selection })
+ }
+
+ fun removeLayout(id: String): InputLibrary {
+ require(usersOfLayout(id).isEmpty() && bindings.none { it.layoutId == id && selectedBindings(it.id) } && layouts.first { it.id == id }.editable)
+ return copy(layouts = layouts.filterNot { it.id == id }, bindings = bindings.filterNot { it.layoutId == id })
+ }
+
+ fun removeBindings(id: String): InputLibrary {
+ require(usersOfBindings(id).isEmpty() && !selectedBindings(id))
+ return copy(bindings = bindings.filterNot { it.id == id })
+ }
+
+ fun resetProfile(id: String): InputLibrary {
+ val p = profile(id)
+ var result = this
+ val defaults = InputProfile.defaults(p.base)
+ val parts = p.parts.mapValues { (role, part) ->
+ val previous = preset(part.bindings)
+ val isPrivate = usersOfBindings(part.bindings).all { it.id == id }
+ val preset = SavedInputBindings(if (isPrivate) previous.id else newInputId(),
+ if (isPrivate) previous.name else (p.name + " / " + role.name.lowercase()).take(80), role == InputRole.PHYSICAL,
+ part.layout?.takeIf { layout(id, role)?.editable == true }, defaults.bindings[role].orEmpty(),
+ elements = layout(id, role)?.elements.orEmpty().filter { it.id == "builtin:keyboard" }
+ .associate { it.id to InputAction.Command(InputCommand.KEYBOARD) })
+ result = result.withPreset(preset)
+ part.copy(bindings = preset.id)
+ }
+ return result.withProfile(p.copy(parts = parts))
+ }
+
+ fun validate(): InputLibrary {
+ require(profiles.size in 2..64 && layouts.size in 3..256 && bindings.size in 1..512)
+ fun unique(ids: List) { require(ids.all { it.isNotBlank() && it.length <= 128 } && ids.distinct().size == ids.size) }
+ unique(profiles.map { it.id }); unique(layouts.map { it.id }); unique(bindings.map { it.id })
+ require(profiles.any { it.id == InputProfile.GAME } && profiles.any { it.id == InputProfile.DESKTOP })
+ require(selected == InputProfiles.AUTO || profiles.any { it.id == selected })
+ require(profiles.any { it.id == steam } && profiles.any { it.id == desktop })
+ for (layout in layouts) {
+ require(layout.style.opacity in 1..100)
+ inputName(layout.name); require(layout.elements.size <= 64); unique(layout.elements.map { it.id })
+ for (e in layout.elements) {
+ inputName(e.name)
+ require(e.icon == 0 || InputButtonIcons.has(e.icon))
+ require(e.image.isEmpty() || e.image.matches(Regex("[A-Za-z0-9_.-]{1,128}")) && e.image != "." && e.image != "..")
+ require(e.opacity.isFinite() && e.opacity in 0.01f..1f)
+ require(!e.toggle || e.kind == InputElementKind.BUTTON || e.kind == InputElementKind.TRIGGER)
+ require(listOf(e.x, e.y, e.width, e.height).all { it.isFinite() })
+ require(e == e.bounded())
+ require(if (e.id.startsWith("legacy:")) e.id == "legacy:${e.control.id}" && e.kind == InputElementKind.from(e.control)
+ else e.control == e.kind.control)
+ }
+ }
+ for (preset in bindings) {
+ inputName(preset.name)
+ require(preset.controls.all { (c, a) -> a.validFor(c) })
+ require(preset.elements.size <= 64 && preset.keys.size <= 64 && preset.clicks.size <= 64)
+ require(preset.keys.map { Triple(it.key.device, it.key.keyCode, it.key.scanCode) }.distinct().size == preset.keys.size)
+ 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.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) })
+ }
+ require(selections.keys.all { it == InputProfile.GAME || it == InputProfile.DESKTOP })
+ for (selection in selections.values) {
+ require(selection.profile == InputProfiles.AUTO || profiles.any { it.id == selection.profile })
+ for ((role, id) in selection.parts) {
+ val binding = preset(id)
+ require(binding.physical == (role == InputRole.PHYSICAL))
+ val layout = binding.layoutId?.let { lid -> layouts.first { it.id == lid } }
+ require(binding.compatible(layout) && (layout == null || layout.supports(role)))
+ }
+ }
+ for (p in profiles) {
+ inputName(p.name); require(p.base == InputProfile.GAME || p.base == InputProfile.DESKTOP)
+ require(p.parts.keys == InputRole.entries.toSet())
+ for ((role, part) in p.parts) {
+ val layout = part.layout?.let { id -> layouts.first { it.id == id } }
+ require(if (role == InputRole.PHYSICAL) layout == null else layout?.supports(role) == true)
+ require(preset(part.bindings).compatible(layout))
+ }
+ }
+ return this
+ }
+}
+
+internal fun inputName(value: String): String = value.trim().also { require(it.isNotEmpty() && it.length <= 80) }
+fun newInputId(): String = UUID.randomUUID().toString()
+
+internal fun InputAction.validFor(element: InputSurfaceElement): Boolean = when {
+ this !is InputAction.Native -> validFor(element.control)
+ element.id.startsWith("legacy:") -> validFor(element.control)
+ element.kind == InputElementKind.DPAD -> target == null
+ target == null -> false
+ element.kind == InputElementKind.TRACKPAD -> target.isTrackpad
+ element.kind == InputElementKind.STICK -> target == InputControl.LS || target == InputControl.RS
+ element.kind == InputElementKind.TRIGGER -> target == InputControl.LT || target == InputControl.RT
+ else -> target.dimensions == 1 && target != InputControl.LT && target != InputControl.RT
+}
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 9ce1c1e078..2375cf34e8 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt
@@ -29,15 +29,17 @@ sealed interface InputAction {
data class Keys(val codes: List) : InputAction
data class MouseButton(val code: Int) : InputAction
data class Command(val command: InputCommand) : InputAction
- data class Directions(val up: Int, val right: Int, val down: Int, val left: Int) : InputAction
+ data class Directions(val up: Int, val right: Int, val down: Int, val left: Int, val diagonals: List? = null) : InputAction
data class Pointer(val speed: Float = 900f) : InputAction
- data class Scroll(val speed: Float = 10f) : InputAction
+ data class Scroll(val speed: Float = 10f, val horizontal: Boolean = false) : InputAction
}
data class InputProfile(
val id: String,
val bindings: Map> = emptyMap(),
val keys: List = emptyList(),
+ val elements: Map> = emptyMap(),
+ val clicks: Map> = emptyMap(),
) {
fun action(role: InputRole, control: InputControl): InputAction =
bindings[role]?.get(control) ?: InputAction.Native()
@@ -45,6 +47,12 @@ data class InputProfile(
fun withBinding(role: InputRole, control: InputControl, action: InputAction) =
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
+
+ fun elementClickAction(role: InputRole, element: InputSurfaceElement): InputAction = clicks[role]?.get(element.id)
+ ?: defaultElementClick(element, elementAction(role, element.id, element.control)) { action(role, it) }
+
companion object {
const val GAME = "game"
const val DESKTOP = "desktop"
@@ -69,12 +77,30 @@ data class InputProfile(
}
}
+internal fun defaultElementClick(element: InputSurfaceElement, action: InputAction, legacy: (InputControl) -> InputAction): InputAction {
+ fun click(control: InputControl) = when (control) {
+ InputControl.LS -> InputControl.L3; InputControl.RS -> InputControl.R3
+ InputControl.LEFT_PAD -> InputControl.LEFT_CLICK; InputControl.RIGHT_PAD -> InputControl.RIGHT_CLICK
+ else -> null
+ }
+ if (!element.hasClick) return InputAction.Disabled
+ if (element.id == "legacy:${element.control.id}") {
+ val target = click(element.control) ?: return InputAction.Disabled
+ return legacy(target).let { if (it is InputAction.Native && it.target == null) InputAction.Native(target) else it }
+ }
+ return (action as? InputAction.Native)?.let { click(it.target ?: element.control) }?.let { InputAction.Native(it) } ?: InputAction.Disabled
+}
+
+internal fun InputAction.validForClick(): Boolean = if (this is InputAction.Native)
+ target != null && target.dimensions == 1 && target != InputControl.LT && target != InputControl.RT
+else validFor(InputControl.A)
+
internal fun InputAction.validFor(control: InputControl): Boolean = when (this) {
is InputAction.Native -> target == null || (control.isPad == target.isPad && control.dimensions == target.dimensions &&
(!control.isTrackpad && !target.isTrackpad || control.isTrackpad && target.isTrackpad))
is InputAction.Keys -> codes.isNotEmpty() && codes.size <= 8 && codes.distinct().size == codes.size && codes.all { it in 1..255 }
is InputAction.MouseButton -> code in 272..276
- is InputAction.Directions -> control.dimensions == 2 && listOf(up, right, down, left).all { it in 1..255 }
+ is InputAction.Directions -> control.dimensions == 2 && listOf(up, right, down, left).all { it in 0..255 } && (diagonals == null || diagonals.size == 4 && diagonals.all { it in 0..255 })
is InputAction.Pointer -> control.dimensions == 2 && speed.isFinite() && speed in 100f..3000f
is InputAction.Scroll -> control.dimensions == 2 && speed.isFinite() && speed in 1f..60f
else -> true
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputProfiles.kt b/app/src/main/java/com/droiddeck/launcher/input/InputProfiles.kt
index b6e38c6864..abe65da46d 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputProfiles.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputProfiles.kt
@@ -10,20 +10,25 @@ object InputProfiles {
private fun prefs(context: Context) = context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE)
- fun selection(context: Context): String = prefs(context).getString("selected", AUTO)
- ?.takeIf { it in listOf(AUTO, InputProfile.GAME, InputProfile.DESKTOP) } ?: AUTO
+ fun selection(context: Context): String = InputLibraries.read(context).selected
fun select(context: Context, id: String) {
- require(id in listOf(AUTO, InputProfile.GAME, InputProfile.DESKTOP))
- prefs(context).edit().putString("selected", id).apply()
+ InputLibraries.update(context) { library ->
+ require(id == AUTO || library.profiles.any { it.id == id })
+ library.copy(selected = id, selections = emptyMap())
+ }
}
fun active(context: Context, desktop: Boolean): InputProfile {
- val selected = selection(context)
- return read(context, if (selected != AUTO) selected else if (desktop) InputProfile.DESKTOP else InputProfile.GAME)
+ val library = InputLibraries.read(context)
+ return library.compileActive(desktop)
}
fun read(context: Context, id: String): InputProfile {
+ return InputLibraries.read(context).compile(id)
+ }
+
+ internal fun readLegacy(context: Context, id: String): InputProfile {
migrate(context)
var result = InputProfile.defaults(id)
val stored = prefs(context).getString("profile.$id", null) ?: return result
@@ -52,6 +57,20 @@ object InputProfiles {
}
fun save(context: Context, profile: InputProfile) {
+ InputLibraries.update(context) { library ->
+ val definition = library.profile(profile.id)
+ var updated = library
+ for (role in InputRole.entries) {
+ val preset = updated.preset(definition.binding(role))
+ updated = updated.withPreset(preset.copy(controls = profile.bindings[role].orEmpty(),
+ elements = profile.elements[role].orEmpty(), keys = if (role == InputRole.PHYSICAL) profile.keys else emptyList(),
+ clicks = profile.clicks[role].orEmpty()))
+ }
+ updated
+ }
+ }
+
+ private fun saveLegacy(context: Context, profile: InputProfile) {
val bindings = JSONArray()
for ((role, controls) in profile.bindings) for ((control, action) in controls) {
require(action.validFor(control))
@@ -64,7 +83,7 @@ object InputProfiles {
.put("version", VERSION).put("id", profile.id).put("bindings", bindings).put("keys", keys).toString()).apply()
}
- fun reset(context: Context, id: String) { prefs(context).edit().remove("profile.$id").apply() }
+ fun reset(context: Context, id: String) = InputLibraries.update(context) { it.resetProfile(id) }.let { }
fun resetAll(context: Context) {
prefs(context).edit().clear().putBoolean("migrated", true).apply()
@@ -83,33 +102,33 @@ object InputProfiles {
if (target != id) game = game.withBinding(InputRole.PRIMARY, source, action)
}
if (old.selectSteam) game = game.withBinding(InputRole.PHYSICAL, InputControl.SELECT, InputAction.Native(InputControl.GUIDE))
- if (!p.contains("profile.${InputProfile.GAME}")) save(context, game)
+ if (!p.contains("profile.${InputProfile.GAME}")) saveLegacy(context, game)
p.edit().putBoolean("migrated", true).apply()
}
- private fun encode(action: InputAction): JSONObject = JSONObject().apply {
+ internal fun encode(action: InputAction): JSONObject = JSONObject().apply {
when (action) {
is InputAction.Native -> { put("type", "native"); action.target?.let { put("target", it.id) } }
InputAction.Disabled -> put("type", "disabled")
is InputAction.Keys -> { put("type", "keys"); put("codes", JSONArray(action.codes)) }
is InputAction.MouseButton -> { put("type", "button"); put("code", action.code) }
is InputAction.Command -> { put("type", "command"); put("command", action.command.name) }
- is InputAction.Directions -> { put("type", "directions"); put("codes", JSONArray(listOf(action.up, action.right, action.down, action.left))) }
+ is InputAction.Directions -> { put("type", "directions"); put("codes", JSONArray(listOf(action.up, action.right, action.down, action.left))); action.diagonals?.let { put("diagonals", JSONArray(it)) } }
is InputAction.Pointer -> { put("type", "pointer"); put("speed", action.speed.toDouble()) }
- is InputAction.Scroll -> { put("type", "scroll"); put("speed", action.speed.toDouble()) }
+ is InputAction.Scroll -> { put("type", "scroll"); put("speed", action.speed.toDouble()); put("horizontal", action.horizontal) }
}
}
- private fun decode(json: JSONObject): InputAction? = runCatching {
+ internal fun decode(json: JSONObject): InputAction? = runCatching {
when (json.getString("type")) {
"native" -> InputAction.Native(if (json.has("target")) InputControl.fromId(json.getString("target")) ?: return null else null)
"disabled" -> InputAction.Disabled
"keys" -> InputAction.Keys(json.getJSONArray("codes").let { a -> (0 until a.length()).map { a.getInt(it) } })
"button" -> InputAction.MouseButton(json.getInt("code"))
"command" -> InputAction.Command(InputCommand.valueOf(json.getString("command")))
- "directions" -> json.getJSONArray("codes").let { InputAction.Directions(it.getInt(0), it.getInt(1), it.getInt(2), it.getInt(3)) }
+ "directions" -> json.getJSONArray("codes").let { InputAction.Directions(it.getInt(0), it.getInt(1), it.getInt(2), it.getInt(3), json.optJSONArray("diagonals")?.let { d -> (0 until d.length()).map { d.getInt(it) } }) }
"pointer" -> InputAction.Pointer(json.getDouble("speed").toFloat())
- "scroll" -> InputAction.Scroll(json.getDouble("speed").toFloat())
+ "scroll" -> InputAction.Scroll(json.getDouble("speed").toFloat(), json.optBoolean("horizontal", false))
else -> null
}
}.getOrNull()
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputRouter.kt b/app/src/main/java/com/droiddeck/launcher/input/InputRouter.kt
index a556fc6be6..24b45ed1ef 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputRouter.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputRouter.kt
@@ -7,6 +7,7 @@ interface InputOutput {
fun button(code: Int, down: Boolean)
fun pointer(dx: Float, dy: Float)
fun scroll(steps: Int)
+ fun scrollHorizontal(steps: Int) {}
fun command(command: InputCommand)
fun requestMotion()
}
@@ -19,6 +20,7 @@ class InputRouter(private val output: InputOutput) {
private var profile = InputProfile.defaults(InputProfile.GAME)
private var moving = false
private var wheel = 0f
+ private var horizontalWheel = 0f
private var enabled = true
private val snapshots = ArrayList<() -> Unit>()
@@ -43,9 +45,10 @@ class InputRouter(private val output: InputOutput) {
for (snapshot in snapshots) snapshot()
for (pad in pads) pad.snapshot()
profile = next
- for (channel in channels) channel.configure(next.action(channel.role, channel.control))
+ for (channel in channels) channel.configure(channel.actionFrom(next))
for (pad in pads) pad.refreshIdentity()
wheel = 0f
+ horizontalWheel = 0f
moving = false
}
@@ -54,9 +57,9 @@ class InputRouter(private val output: InputOutput) {
fun pad(role: InputRole, retained: PadState? = null): PadSource = PadSource(role, retained).also { pads.add(it) }
@Synchronized
- fun channel(role: InputRole, control: InputControl, fixedAction: InputAction? = null): Channel = Channel(role, control, fixedAction).also {
+ fun channel(role: InputRole, control: InputControl, fixedAction: InputAction? = null, element: InputSurfaceElement? = null, elementClick: Boolean = false): Channel = Channel(role, control, fixedAction, element, elementClick).also {
channels.add(it)
- it.configure(profile.action(role, control))
+ it.configure(it.actionFrom(profile))
}
@Synchronized
@@ -66,6 +69,7 @@ class InputRouter(private val output: InputOutput) {
for (channel in channels) channel.suspend()
for (pad in pads) pad.refreshIdentity()
wheel = 0f
+ horizontalWheel = 0f
moving = false
}
@@ -75,27 +79,31 @@ class InputRouter(private val output: InputOutput) {
var x = 0f
var y = 0f
var scroll = 0f
+ var horizontalScroll = 0f
for (channel in channels) {
if (channel.blocked || channel.control.isTrackpad) continue
val cx = if (abs(channel.x) > 0.12f) channel.x else 0f
val cy = if (abs(channel.y) > 0.12f) channel.y else 0f
when (val action = channel.action) {
is InputAction.Pointer -> { x += cx * action.speed; y += cy * action.speed }
- is InputAction.Scroll -> scroll += cy * action.speed
+ is InputAction.Scroll -> if (action.horizontal) horizontalScroll += cx * action.speed else scroll += cy * action.speed
else -> Unit
}
}
val dt = seconds.coerceIn(0f, 0.05f)
if (x != 0f || y != 0f) output.pointer(x * dt, y * dt)
wheel += scroll * dt
+ horizontalWheel += horizontalScroll * dt
flushWheel()
- moving = x != 0f || y != 0f || scroll != 0f
+ moving = x != 0f || y != 0f || scroll != 0f || horizontalScroll != 0f
return moving
}
private fun flushWheel() {
val steps = wheel.toInt()
if (steps != 0) { wheel -= steps; output.scroll(steps) }
+ val horizontalSteps = horizontalWheel.toInt()
+ if (horizontalSteps != 0) { horizontalWheel -= horizontalSteps; output.scrollHorizontal(horizontalSteps) }
}
private fun key(code: Int, down: Boolean) {
@@ -111,7 +119,7 @@ class InputRouter(private val output: InputOutput) {
if ((was == 0) != (buttons[at] == 0)) output.button(code, down)
}
- inner class Channel internal constructor(val role: InputRole, val control: InputControl, private val fixedAction: InputAction?) {
+ inner class Channel internal constructor(val role: InputRole, val control: InputControl, private val fixedAction: InputAction?, private val element: InputSurfaceElement?, private val elementClick: Boolean) {
var action: InputAction = InputAction.Native()
private set
internal var x = 0f
@@ -120,10 +128,15 @@ class InputRouter(private val output: InputOutput) {
internal var blocked = false
private var held = false
private val directions = BooleanArray(4)
+ private var radialKeys = emptyList()
+
+ internal fun actionFrom(profile: InputProfile) = element?.let { if (elementClick) profile.elementClickAction(role, it) else profile.elementAction(role, it.id, control) }
+ ?: profile.action(role, control)
internal fun configure(next: InputAction) {
suspend()
- action = (fixedAction ?: next).takeIf { it.validFor(control) } ?: InputAction.Native()
+ action = (fixedAction ?: next).takeIf { if (elementClick) it.validForClick() else if (element != null) it.validFor(element) else it.validFor(control) }
+ ?: if (element != null) InputAction.Disabled else InputAction.Native()
}
internal fun observe(value: Float, second: Float = 0f, touching: Boolean = false) {
@@ -152,6 +165,20 @@ class InputRouter(private val output: InputOutput) {
channels.remove(this)
}
+ fun acceptsPointerGesture() = synchronized(this@InputRouter) { enabled && !blocked && contact && action is InputAction.Pointer }
+
+ fun pointerDelta(dx: Float, dy: Float) = synchronized(this@InputRouter) {
+ val pointer = action as? InputAction.Pointer
+ if (enabled && !blocked && contact && pointer != null && dx.isFinite() && dy.isFinite()) output.pointer(dx * pointer.speed, dy * pointer.speed)
+ }
+
+ fun wheelSteps(steps: Int) = synchronized(this@InputRouter) {
+ val scroll = action as? InputAction.Scroll
+ if (enabled && !blocked && scroll != null && steps != 0) {
+ if (scroll.horizontal) output.scrollHorizontal(steps) else output.scroll(steps)
+ }
+ }
+
fun update(value: Float, second: Float = 0f, touching: Boolean = false): InputControl? = synchronized(this@InputRouter) {
val oldX = x
val oldY = y
@@ -177,13 +204,27 @@ class InputRouter(private val output: InputOutput) {
}
is InputAction.Scroll -> {
if (control.isTrackpad) {
- if (contact && oldContact) { wheel += (y - oldY) * a.speed; flushWheel() }
+ if (contact && oldContact) {
+ if (a.horizontal) horizontalWheel -= (x - oldX) * a.speed else wheel += (y - oldY) * a.speed
+ flushWheel()
+ }
} else requestMotion()
}
is InputAction.Directions -> {
val vertical = if (control.isTrackpad) -y else y
- direction(0, -vertical, a.up); direction(1, x, a.right)
- direction(2, vertical, a.down); direction(3, -x, a.left)
+ if (a.diagonals == null) {
+ direction(0, -vertical, a.up); direction(1, x, a.right)
+ direction(2, vertical, a.down); direction(3, -x, a.left)
+ } else {
+ val cardinal = listOf(a.up, a.right, a.down, a.left)
+ val sector = ((kotlin.math.round(Math.toDegrees(kotlin.math.atan2(vertical, x).toDouble()) / 45).toInt() + 2) % 8 + 8) % 8
+ val next = if (kotlin.math.hypot(x, vertical) < .24f) emptyList() else if (sector % 2 == 0) listOf(cardinal[sector / 2])
+ else a.diagonals[sector / 2].let { if (it != 0) listOf(it) else listOf(cardinal[sector / 2], cardinal[(sector / 2 + 1) % 4]) }
+ val codes = next.filter { it != 0 }.distinct()
+ radialKeys.filterNot { it in codes }.forEach { key(it, false) }
+ codes.filterNot { it in radialKeys }.forEach { key(it, true) }
+ radialKeys = codes
+ }
}
else -> {
val down = if (control.isTrackpad) contact else maxOf(abs(x), abs(y)) > if (held) 0.35f else 0.55f
@@ -207,7 +248,7 @@ class InputRouter(private val output: InputOutput) {
private fun direction(at: Int, value: Float, code: Int) {
val down = value > if (directions[at]) 0.35f else 0.55f
- if (directions[at] != down) { directions[at] = down; key(code, down) }
+ if (directions[at] != down) { directions[at] = down; if (code != 0) key(code, down) }
}
private fun releaseOutputs() {
@@ -216,10 +257,11 @@ class InputRouter(private val output: InputOutput) {
is InputAction.MouseButton -> if (held) button(a.code, false)
is InputAction.Directions -> {
val codes = intArrayOf(a.up, a.right, a.down, a.left)
- for (i in directions.indices) if (directions[i]) key(codes[i], false)
+ for (i in directions.indices) if (directions[i] && codes[i] != 0) key(codes[i], false)
}
else -> Unit
}
+ radialKeys.forEach { key(it, false) }; radialKeys = emptyList()
held = false
directions.fill(false)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt b/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt
new file mode 100644
index 0000000000..2387ed0a67
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputStockLayouts.kt
@@ -0,0 +1,84 @@
+package com.droiddeck.launcher.input
+
+internal object InputStockLayouts {
+ const val DECK = "preset.deck"
+ const val TRACKPAD = "preset.trackpad"
+ const val LEFT = "preset.left-pad"
+ const val RIGHT = "preset.right-pad"
+ const val BOTH = "preset.both-pads"
+ const val GRIPS = "preset.grips"
+ const val GAMEPAD = "preset.gamepad"
+
+ private fun commands() = listOf("Menu", "Keyboard", "Steam", "Quick access").mapIndexed { i, name ->
+ InputSurfaceElement(InputControl.A, .02f + i * .245f, .01f, .225f, .11f, "command:$i", name = name)
+ }
+ private fun commandActions(): Map = listOf(InputCommand.MENU, InputCommand.KEYBOARD, InputCommand.STEAM, InputCommand.QUICK_ACCESS)
+ .mapIndexed { i, command -> "command:$i" to InputAction.Command(command) }.toMap()
+ private fun grips() = listOf(InputControl.L4, InputControl.L5, InputControl.R5, InputControl.R4).mapIndexed { i, c ->
+ InputSurfaceElement(c, .02f + i * .245f, .78f, .225f, .20f)
+ }
+ private fun pads() = listOf(InputSurfaceElement(InputControl.LEFT_PAD, .02f, .14f, .47f, .62f),
+ InputSurfaceElement(InputControl.RIGHT_PAD, .51f, .14f, .47f, .62f))
+ private fun single(right: Boolean) = listOf(InputSurfaceElement(if (right) InputControl.RIGHT_PAD else InputControl.LEFT_PAD, .02f, .14f, .96f, .62f),
+ InputSurfaceElement(if (right) InputControl.RIGHT_CLICK else InputControl.LEFT_CLICK, .02f, .78f, .96f, .20f, name = "Click"))
+
+ fun layouts() = listOf(
+ SavedInputLayout(InputLibraries.DECK, "Deck grips + trackpads", commands() + pads() + grips()),
+ SavedInputLayout(InputLibraries.TRACKPAD, "Trackpad + keyboard", commands().take(2).mapIndexed { i, e -> e.copy(x = .02f + i * .49f, width = .47f) } + listOf(
+ InputSurfaceElement(InputControl.RIGHT_PAD, .02f, .14f, .96f, .62f, mouseGestures = true),
+ InputSurfaceElement(InputControl.A, .02f, .78f, .47f, .20f, name = "Left click"),
+ InputSurfaceElement(InputControl.B, .51f, .78f, .47f, .20f, name = "Right click"))),
+ SavedInputLayout("builtin.left-pad", "Left Deck trackpad", commands() + single(false)),
+ SavedInputLayout("builtin.right-pad", "Right Deck trackpad", commands() + single(true)),
+ SavedInputLayout("builtin.both-pads", "Two Deck trackpads", commands() + pads() + listOf(
+ InputSurfaceElement(InputControl.LEFT_CLICK, .02f, .78f, .47f, .20f, name = "Left pad click"),
+ InputSurfaceElement(InputControl.RIGHT_CLICK, .51f, .78f, .47f, .20f, name = "Right pad click"))),
+ SavedInputLayout("builtin.grips", "Deck grips", commands() + listOf(InputControl.L4, InputControl.R4, InputControl.L5, InputControl.R5).mapIndexed { i, c ->
+ InputSurfaceElement(c, .02f + (i % 2) * .49f, .14f + (i / 2) * .43f, .47f, .41f)
+ }),
+ SavedInputLayout("builtin.gamepad", "Compact gamepad", gamepad()),
+ )
+
+ private fun gamepad(): List {
+ val w = 600f; val h = 500f
+ val boxes = GamepadGeometry.layout(w, h, 1f, portraitDock = true)
+ val result = mutableListOf()
+ val controls = mapOf(GamepadGeometry.Slot.LEFT_MAIN to InputControl.LS, GamepadGeometry.Slot.RIGHT_MAIN to InputControl.RS,
+ GamepadGeometry.Slot.LEFT_OUTER_SHOULDER to InputControl.LT, GamepadGeometry.Slot.LEFT_INNER_SHOULDER to InputControl.LB,
+ GamepadGeometry.Slot.RIGHT_INNER_SHOULDER to InputControl.RB, GamepadGeometry.Slot.RIGHT_OUTER_SHOULDER to InputControl.RT,
+ GamepadGeometry.Slot.VIEW to InputControl.SELECT, GamepadGeometry.Slot.MENU to InputControl.START,
+ GamepadGeometry.Slot.STEAM to InputControl.GUIDE, GamepadGeometry.Slot.QAM to InputControl.QAM,
+ GamepadGeometry.Slot.L4 to InputControl.L4, GamepadGeometry.Slot.L5 to InputControl.L5,
+ GamepadGeometry.Slot.R4 to InputControl.R4, GamepadGeometry.Slot.R5 to InputControl.R5)
+ for ((slot, box) in boxes) {
+ fun add(c: InputControl, x: Float = box.left, y: Float = box.top, width: Float = box.width, height: Float = box.height,
+ id: String = "legacy:${c.id}", kind: InputElementKind = InputElementKind.from(c), name: String = c.label) {
+ result += InputSurfaceElement(c, x / w, y / h, width / w, height / h, id, kind, name, floating = false).bounded()
+ }
+ when (slot) {
+ GamepadGeometry.Slot.LEFT_SECOND -> add(InputControl.LS, id = "compact:dpad", kind = InputElementKind.DPAD, name = "D-pad")
+ GamepadGeometry.Slot.RIGHT_SECOND -> {
+ val size = minOf(box.width, box.height) * .32f
+ add(InputControl.Y, box.cx - size / 2, box.top, size, size)
+ add(InputControl.X, box.left, box.cy - size / 2, size, size)
+ add(InputControl.B, box.right - size, box.cy - size / 2, size, size)
+ add(InputControl.A, box.cx - size / 2, box.bottom - size, size, size)
+ }
+ GamepadGeometry.Slot.PANELS -> add(InputControl.A, id = "command:0", name = "Menu")
+ else -> controls[slot]?.let { add(it) }
+ }
+ }
+ return result
+ }
+
+ fun actions(layout: SavedInputLayout): Map = commandActions().filterKeys { id -> layout.elements.any { it.id == id } } + if (layout.id == InputLibraries.TRACKPAD) mapOf(
+ "legacy:right-pad" to InputAction.Pointer(), "legacy:a" to InputAction.MouseButton(272), "legacy:b" to InputAction.MouseButton(273),
+ ) else if (layout.id == "builtin.gamepad") mapOf("compact:dpad" to InputAction.Native()) else emptyMap()
+
+ fun clicks(layout: SavedInputLayout): Map = if (layout.id == InputLibraries.TRACKPAD)
+ mapOf("legacy:right-pad" to InputAction.MouseButton(272)) else emptyMap()
+
+ fun presets(layouts: List) = layouts.zip(listOf(DECK, TRACKPAD, LEFT, RIGHT, BOTH, GRIPS, GAMEPAD)) { layout, id ->
+ SavedInputBindings(id, layout.name, false, layout.id, elements = actions(layout), clicks = clicks(layout))
+ }
+}
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 d6431e1982..456c69f9f7 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceLayout.kt
@@ -4,9 +4,41 @@ import android.content.Context
import org.json.JSONArray
import org.json.JSONObject
-data class InputSurfaceElement(val control: InputControl, val x: Float, val y: Float, val width: Float, val height: Float) {
- fun bounded() = copy(x = x.coerceIn(0f, 0.9f), y = y.coerceIn(0f, 0.9f),
- width = width.coerceIn(0.1f, 1f - x.coerceIn(0f, 0.9f)), height = height.coerceIn(0.1f, 1f - y.coerceIn(0f, 0.9f)))
+enum class InputElementKind(val control: InputControl) {
+ BUTTON(InputControl.A), STICK(InputControl.LS), TRACKPAD(InputControl.LEFT_PAD),
+ DPAD(InputControl.LS), TRIGGER(InputControl.LT);
+
+ companion object {
+ fun from(control: InputControl) = when {
+ control.isTrackpad -> TRACKPAD
+ control.dimensions == 2 -> STICK
+ control == InputControl.LT || control == InputControl.RT -> TRIGGER
+ else -> BUTTON
+ }
+ }
+}
+
+enum class InputButtonShape { ROUNDED, PILL, CIRCLE, RECTANGLE }
+
+data class InputSurfaceElement(
+ val control: InputControl, val x: Float, val y: Float, val width: Float, val height: Float,
+ val id: String = "legacy:${control.id}",
+ val kind: InputElementKind = InputElementKind.from(control),
+ val name: String = control.label,
+ val floating: Boolean = true,
+ val hideWhenIdle: Boolean = false,
+ val mouseGestures: Boolean = false,
+ val toggle: Boolean = false,
+ val icon: Int = 0,
+ val image: String = "",
+ val opacity: Float = 1f,
+ val buttonShape: InputButtonShape = InputButtonShape.ROUNDED,
+ val showLabel: Boolean = true,
+) {
+ 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)), height = height.coerceIn(0.03f, 1f - y.coerceIn(0f, 0.97f)))
}
object InputSurfaceLayout {
@@ -23,7 +55,10 @@ object InputSurfaceLayout {
InputSurfaceElement(InputControl.START, 0.76f, 0.72f, 0.22f, 0.25f),
)
- fun read(context: Context, profile: String): List {
+ fun read(context: Context, profile: String, role: InputRole = InputRole.SECONDARY): List =
+ InputLibraries.read(context).layout(profile, role)?.elements.orEmpty()
+
+ internal fun readLegacy(context: Context, profile: String): List {
val text = prefs(context).getString(profile, null) ?: return defaults()
return runCatching {
val doc = JSONObject(text)
@@ -40,6 +75,13 @@ object InputSurfaceLayout {
}
fun save(context: Context, profile: String, layout: List) {
+ InputLibraries.update(context) { library ->
+ val saved = library.layout(profile, InputRole.SECONDARY) ?: return@update library
+ library.withLayout(saved.copy(elements = layout.map { it.bounded() }))
+ }
+ }
+
+ internal fun saveLegacy(context: Context, profile: String, layout: List) {
val array = JSONArray()
for (element in layout.distinctBy { it.control }.take(28)) {
val e = element.bounded()
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSnap.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSnap.kt
new file mode 100644
index 0000000000..011a478888
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSnap.kt
@@ -0,0 +1,24 @@
+package com.droiddeck.launcher.input
+
+import kotlin.math.abs
+
+internal data class SurfaceSnapResult(val element: InputSurfaceElement, val x: Float? = null, val y: Float? = null)
+
+internal fun snapSurfaceElement(element: InputSurfaceElement, others: List, thresholdX: Float, thresholdY: Float,
+ corner: Int = 0): SurfaceSnapResult {
+ fun axis(start: Float, size: Float, targets: List, threshold: Float, low: Boolean, high: Boolean): Triple {
+ val anchors = when { low -> listOf(0f); high -> listOf(size); else -> listOf(0f, size / 2f, size) }
+ val candidate = anchors.flatMap { anchor -> targets.map { target -> Triple(target - start - anchor, target, anchor) } }
+ .filter { abs(it.first) <= threshold }.minByOrNull { abs(it.first) } ?: return Triple(start, size, null)
+ val offset = candidate.first
+ val nextStart = if (high) start else start + offset
+ val nextSize = when { low -> size - offset; high -> size + offset; else -> size }
+ if (nextStart < 0f || nextSize < .03f || nextStart + nextSize > 1.00001f) return Triple(start, size, null)
+ return Triple(nextStart.coerceAtLeast(0f), nextSize, candidate.second)
+ }
+ val xTargets = listOf(0f, .5f, 1f) + others.flatMap { listOf(it.x, it.x + it.width / 2f, it.x + it.width) }
+ val yTargets = listOf(0f, .5f, 1f) + others.flatMap { listOf(it.y, it.y + it.height / 2f, it.y + it.height) }
+ val x = axis(element.x, element.width, xTargets, thresholdX, corner and 1 != 0, corner and 2 != 0)
+ val y = axis(element.y, element.height, yTargets, thresholdY, corner and 4 != 0, corner and 8 != 0)
+ return SurfaceSnapResult(element.copy(x = x.first, y = y.first, width = x.second, height = y.second).bounded(), x.third, y.third)
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt
new file mode 100644
index 0000000000..80c869a641
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/input/InputSurfaceSource.kt
@@ -0,0 +1,117 @@
+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)
+ private val deck = DeckControls.source(role, routed = true)
+ private val clickDeck = DeckControls.source(role, routed = true)
+ private val clickOwner = Any()
+ private val clickRoute = if (element.hasClick) router?.channel(role, InputControl.A, element = element, elementClick = true) else null
+ private val gestureWheel = if (element.mouseGestures) router?.channel(role, InputControl.RIGHT_PAD, fixedAction = InputAction.Scroll()) else null
+ private val gestureRight = if (element.mouseGestures) router?.channel(role, InputControl.A, fixedAction = InputAction.MouseButton(273)) else null
+ private val gestureMiddle = if (element.mouseGestures) router?.channel(role, InputControl.A, fixedAction = InputAction.MouseButton(274)) else null
+ val mouseGestures get() = element.mouseGestures && route?.action is InputAction.Pointer
+
+ fun gestureContact(touching: Boolean) { if (!closed) route?.update(0f, 0f, touching) }
+ fun pointerDelta(dx: Float, dy: Float) {
+ if (closed) return
+ val timing = InputTiming.begin()
+ route?.pointerDelta(dx, dy)
+ InputTiming.end(timing)
+ }
+ fun gestureWheel(steps: Int) { if (!closed && route?.acceptsPointerGesture() == true) gestureWheel?.wheelSteps(steps) }
+ fun gestureButton(code: Int, down: Boolean) {
+ if (closed || down && route?.acceptsPointerGesture() != true) return
+ when (code) {
+ 272 -> click(down)
+ 273 -> gestureRight?.update(if (down) 1f else 0f)
+ 274 -> gestureMiddle?.update(if (down) 1f else 0f)
+ }
+ }
+
+ private var nativePad = false
+ private var nativeDeck = false
+ private var clickPad = false
+ private var clickDeckActive = false
+ private var closed = false
+ private var fingerDown = false
+ private var latchBlocked = false
+ var latched = false
+ private set
+ var onStateChanged: () -> Unit = {}
+ private fun resetLatch() { latched = false; latchBlocked = fingerDown; onStateChanged() }
+ private val snapshot: () -> Unit = { releaseNative(); resetLatch(); if (element.toggle) route?.release() }
+
+ init { router?.beforeProfileChange(snapshot) }
+
+ fun update(value: Float, y: Float = 0f, touching: Boolean = false) {
+ if (closed) return
+ val timing = InputTiming.begin()
+ val x = if (element.toggle && route?.action !is InputAction.Command && route?.action !is InputAction.Disabled) {
+ val down = value > .5f
+ if (!down) latchBlocked = false
+ if (down && !fingerDown && !latchBlocked) latched = !latched
+ fingerDown = down
+ if (latched) 1f else 0f
+ } else value
+ val target = if (router == null) element.control else route?.update(x, y, touching)
+ val toPad = target?.isPad == true
+ val toDeck = target != null && !target.isPad
+ if (toPad || nativePad) writePad(this, target) { state ->
+ state.clear()
+ if (toPad) {
+ if (element.kind == InputElementKind.DPAD) {
+ state.up = y < -.5f; state.down = y > .5f; state.left = x < -.5f; state.right = x > .5f
+ } else state.add(target, x, y)
+ }
+ }
+ if (toDeck || nativeDeck) deck.native(if (toDeck) target else null, x, y, touching)
+ nativePad = toPad; nativeDeck = toDeck
+ if (element.toggle) onStateChanged()
+ InputTiming.end(timing)
+ }
+
+ fun click(down: Boolean) {
+ if (closed) return
+ val timing = InputTiming.begin()
+ val target = if (router == null) when (element.control) { InputControl.LS -> InputControl.L3; InputControl.RS -> InputControl.R3; else -> null } else clickRoute?.update(if (down) 1f else 0f)
+ val toPad = target?.isPad == true
+ val toDeck = target != null && !target.isPad
+ if (toPad || clickPad) writePad(clickOwner, target) { state ->
+ state.clear()
+ if (toPad && down) state.add(target, 1f)
+ }
+ if (toDeck || clickDeckActive) clickDeck.native(if (toDeck) target else null, if (down) 1f else 0f, 0f, false)
+ clickPad = toPad; clickDeckActive = toDeck
+ InputTiming.end(timing)
+ }
+
+ private fun writePad(owner: Any, target: InputControl?, mutation: (PadState) -> Unit) {
+ if (router != null) pad.applyRoutedTouch(owner, role, mutation)
+ else pad.applyTouch(owner, role, when (target) { InputControl.LS -> PadBridge.LEFT_STICK; InputControl.RS -> PadBridge.RIGHT_STICK; else -> 0 }, mutation)
+ }
+
+ private fun releaseNative() {
+ if (nativePad) pad.releaseTouch(this)
+ if (nativeDeck) deck.release()
+ if (clickPad) pad.releaseTouch(clickOwner)
+ if (clickDeckActive) clickDeck.release()
+ clickPad = false; clickDeckActive = false
+ nativePad = false; nativeDeck = false
+ }
+
+ fun close() {
+ if (closed) return
+ closed = true
+ router?.removeSnapshot(snapshot)
+ releaseNative(); resetLatch()
+ route?.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()
+ }
+
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt
new file mode 100644
index 0000000000..4525fa9d9c
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt
@@ -0,0 +1,207 @@
+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 resources get() = context.resources
+ private val settings = ControllerPrefs.read(context)
+ private val safe = Rect()
+ 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, 26f, 0f, -52f),
+ Control("right", "dpad", -1, 26f, 52f, 0f),
+ Control("down", "dpad", -1, 26f, 0f, 52f),
+ Control("left", "dpad", -1, 26f, -52f, 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 * 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(): 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).bounded()
+ }.toMutableList()
+ if (settings.keyboardButton) result += InputSurfaceElement(InputControl.A, .02f, .9f, .12f, .08f,
+ "builtin:keyboard", name = "Keyboard")
+ return result
+ }
+ 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")
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/LegacyScreenKeyMigration.kt b/app/src/main/java/com/droiddeck/launcher/input/LegacyScreenKeyMigration.kt
new file mode 100644
index 0000000000..fed7b35fe9
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/input/LegacyScreenKeyMigration.kt
@@ -0,0 +1,82 @@
+package com.droiddeck.launcher.input
+
+import android.content.Context
+import android.hardware.display.DisplayManager
+import android.util.DisplayMetrics
+import android.view.Display
+import org.json.JSONObject
+
+internal object LegacyScreenKeyMigration {
+ const val BACKUP = "legacy-screen-keys-backup"
+
+ fun snapshot(context: Context): String? {
+ val values = ControllerPrefs.prefs(context).all.filterKeys { it == "screenKeys" || it == "screenKeysShown" || it.startsWith("screenLayout.") }
+ return values.takeIf { it.isNotEmpty() }?.let { JSONObject(it).toString() }
+ }
+
+ fun clean(context: Context) {
+ val prefs = ControllerPrefs.prefs(context)
+ prefs.edit().apply { prefs.all.keys.filter { it == "screenKeys" || it == "screenKeysShown" || it.startsWith("screenLayout.") }.forEach(::remove) }.apply()
+ }
+
+ @Suppress("DEPRECATION")
+ fun migrate(context: Context, library: InputLibrary, raw: String): InputLibrary {
+ val old = JSONObject(raw)
+ val display = context.getSystemService(DisplayManager::class.java)?.getDisplay(Display.DEFAULT_DISPLAY)
+ val metrics = DisplayMetrics().also { if (display != null) display.getRealMetrics(it) else it.setTo(context.resources.displayMetrics) }
+ val settings = ControllerPrefs.read(context)
+ val style = InputSurfaceStyle(settings.tint, settings.opacity)
+ val sets = buildList {
+ old.optString("screenKeys").takeIf { it.isNotBlank() }?.let { add("Screen keys (imported)" to it) }
+ old.keys().asSequence().filter { it.startsWith("screenLayout.") }.sorted().forEach { key ->
+ add((key.removePrefix("screenLayout.").ifBlank { "Screen keys" } + " (imported)").take(80) to old.getString(key))
+ }
+ }
+ var result = library
+ for ((index, set) in sets.withIndex()) {
+ val id = "migrated.screenkeys.$index"
+ if (result.profiles.any { it.id == id }) continue
+ val converted = convert(context, set.second, metrics.widthPixels, metrics.heightPixels, metrics.density)
+ if (converted.isEmpty()) continue
+ val layout = SavedInputLayout("$id.layout", set.first, converted.map { it.first }, style = style, screen = InputLayoutScreen.MAIN)
+ val bindings = SavedInputBindings("$id.bindings", set.first, false, layout.id, elements = converted.associate { it.first.id to it.second })
+ val base = library.profile(library.steam)
+ val profile = SavedInputProfile(id, set.first, base.base, base.parts + (InputRole.PRIMARY to InputPart(bindings.id, layout.id)))
+ result = result.withLayout(layout).withPreset(bindings).withProfile(profile)
+ }
+ return result.validate()
+ }
+
+ internal fun convert(context: Context, raw: String, width: Int, height: Int, density: Float): List> =
+ raw.split(';').filter { it.isNotBlank() }.mapIndexed { index, entry ->
+ val parts = entry.split(':')
+ require(parts.size >= 2) { "Invalid legacy screen key" }
+ val codes = parts[0].split('+').map { it.toInt() }
+ require(codes.all { it in 0..255 })
+ val position = parts[1].split(',').map { it.toFloat() }
+ require(position.size == 3 && position.all { it.isFinite() })
+ fun text(at: Int) = parts.getOrNull(at).orEmpty().replace("%2C", ",").replace("%3A", ":").replace("%3B", ";").replace("%25", "%")
+ val shape = parts.getOrNull(6)?.toIntOrNull() ?: 0
+ val kind = when (shape) { 5 -> InputElementKind.DPAD; 6 -> InputElementKind.STICK; 4 -> InputElementKind.TRIGGER; else -> InputElementKind.BUTTON }
+ val label = text(3).ifEmpty { text(2) }.ifEmpty { codes.filter { it != 0 }.joinToString("+") { pcKeyLabel(context, it) } }.ifBlank { "Button" }.take(80)
+ val image = text(4)
+ val icon = codes.singleOrNull()?.takeIf { InputButtonIcons.has(it) && text(3).isEmpty() && text(2).isEmpty() } ?: 0
+ val heightPx = position[2].coerceIn(24f, 140f) * density
+ val ratio = when { shape == 2 -> 1f; shape == 4 -> 1.7f; shape == 5 || shape == 6 || image.isNotEmpty() || icon != 0 -> 1.15f; else -> (.55f * label.length + 1.05f).coerceIn(1.7f, 4.6f) }
+ val w = (heightPx * ratio / width.coerceAtLeast(1)).coerceIn(.03f, 1f)
+ val h = (heightPx / height.coerceAtLeast(1)).coerceIn(.03f, 1f)
+ val element = InputSurfaceElement(kind.control, (position[0] - w / 2).coerceIn(0f, 1f - w), (position[1] - h / 2).coerceIn(0f, 1f - h), w, h,
+ id = "imported:$index", kind = kind, name = label, floating = false,
+ toggle = parts.getOrNull(7) == "1" && kind != InputElementKind.DPAD && kind != InputElementKind.STICK,
+ icon = icon, image = image, opacity = (parts.getOrNull(5)?.toFloatOrNull() ?: 1f).coerceIn(.2f, 1f),
+ buttonShape = when (shape) { 0 -> InputButtonShape.PILL; 2 -> InputButtonShape.CIRCLE; 3 -> InputButtonShape.RECTANGLE; else -> InputButtonShape.ROUNDED },
+ showLabel = parts.getOrNull(8) != "0").bounded()
+ val action = when (kind) {
+ InputElementKind.DPAD -> InputAction.Directions(codes.getOrElse(0) { 0 }, codes.getOrElse(1) { 0 }, codes.getOrElse(2) { 0 }, codes.getOrElse(3) { 0 })
+ InputElementKind.STICK -> InputAction.Directions(codes.getOrElse(0) { 0 }, codes.getOrElse(2) { 0 }, codes.getOrElse(4) { 0 }, codes.getOrElse(6) { 0 }, listOf(1, 3, 5, 7).map { codes.getOrElse(it) { 0 } })
+ else -> codes.filter { it != 0 }.distinct().let { if (it.isEmpty()) InputAction.Disabled else InputAction.Keys(it) }
+ }
+ require(action.validFor(element))
+ element to action
+ }
+}
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 4e8ff1af8a..053bc695ed 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt
@@ -1,828 +1,44 @@
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.Path
-import android.graphics.Rect
-import android.graphics.RectF
-import android.os.Build
-import android.view.HapticFeedbackConstants
import android.view.MotionEvent
-import android.view.View
-import android.view.WindowInsets
-import com.droiddeck.launcher.session.SessionPrefs
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.sin
-import kotlin.math.sqrt
+import android.widget.FrameLayout
+import com.droiddeck.launcher.ui.InputSurfaceView
-@SuppressLint("ViewConstructor")
-class OnScreenControls(
- context: Context,
- private val pad: PadBridge?,
- private val editing: Boolean = false,
- private val onKeyboard: (() -> Unit)? = null,
-) : View(context) {
+class OnScreenControls(context: Context, pad: PadBridge?) : FrameLayout(context) {
+ private val surface = InputSurfaceView(context, pad, inputRole = InputRole.PRIMARY)
+ private var layout: SavedInputLayout? = null
+ var isButtonsOnly = false
+ private set
+ var onTouchMiss: ((MotionEvent) -> Unit)?
+ get() = surface.onTouchMiss
+ set(value) { surface.onTouchMiss = value }
- private class Control(
- val id: String,
- val group: String,
- val stick: Int,
- val radiusDp: Float,
- val offsetXDp: Float,
- val offsetYDp: Float,
- ) {
- var target = id
- var radius = 0f
- var cx = 0f
- var cy = 0f
- var pressedBy = -1
- var kx = 0f
- var ky = 0f
- var ax = 0f
- var ay = 0f
- var dirty = false
- var clicked = false
- var lastUp = 0L
- val wide = id in shoulderIds
- val halfW get() = if (wide) radius * SHOULDER_WIDTH else radius
- val halfH get() = if (wide) radius * SHOULDER_HEIGHT else radius
+ init { addView(surface, LayoutParams(-1, -1)) }
- fun contains(x: Float, y: Float, r: Float, padding: Float = 0f): Boolean {
- val dx = x - cx
- val dy = y - cy
- if (wide) return abs(dx) <= halfW + r * 0.25f + padding && abs(dy) <= halfH + r * 0.25f + padding
- val hit = r * 1.25f + padding
- return dx * dx + dy * dy <= hit * hit
- }
-
- fun drag(x: Float, y: Float): Boolean {
- var dx = x - ax
- var dy = y - ay
- val d = sqrt(dx * dx + dy * dy)
- val atLimit = d > radius
- if (atLimit) { dx = dx / d * radius; dy = dy / d * radius }
- if (!atLimit && abs(dx - kx) < MIN_STICK_MOVE_PX && abs(dy - ky) < MIN_STICK_MOVE_PX) return false
- kx = dx; ky = dy; dirty = true
- return true
- }
- }
-
- private val stickRedraw = ThrottledRedraw(this, STICK_REDRAW_MS)
-
- private val controls = listOf(
- Control("up", "dpad", -1, 26f, 0f, -52f),
- Control("right", "dpad", -1, 26f, 52f, 0f),
- Control("down", "dpad", -1, 26f, 0f, 52f),
- Control("left", "dpad", -1, 26f, -52f, 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 var buttonsOnly = false
- val isButtonsOnly: Boolean get() = buttonsOnly
- private var quickHidden = false
- private var quickPressedBy = -1
- private var keyboardPressedBy = -1
- private var forwardedPointerBits = 0
- var onTouchMiss: ((MotionEvent) -> Unit)? = null
- private var settings = ControllerPrefs.read(context)
- private var snap = settings.snap
- private var safe = Rect()
- private var selected: String? = null
- private var snapX: Float? = null
- private var snapY: Float? = null
- private var grabX = 0f
- private var grabY = 0f
- private var ignoreSaved = false
- private var fit = 1f
-
- private var idleFill = 0
- private var heldFill = 0
- private var idleStroke = 0
- private var heldStroke = 0
- private var idleText = 0
- private var stickFill = 0
- private var knobFill = 0
-
- private val fill = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
- private val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE }
- private val arrow = Path()
- private val box = RectF()
- private val text = Paint(Paint.ANTI_ALIAS_FLAG).apply {
- textAlign = Paint.Align.CENTER
- typeface = android.graphics.Typeface.DEFAULT_BOLD
- }
-
- init {
- applySettings()
- }
-
- private fun dp(value: Float) = value * resources.displayMetrics.density
-
- private fun scaled(value: Float) = dp(value) * settings.size / 100f * 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)
- }
-
- fun reload() {
+ fun updateLayout(value: SavedInputLayout?) {
+ if (layout == value) return
releaseAll()
- settings = ControllerPrefs.read(context)
- setSnap(settings.snap)
- applySettings()
- relayout()
- }
-
- private fun clearSnapGuides() {
- if (snapX == null && snapY == null) return
- snapX = null
- snapY = null
- invalidate()
- }
-
- private fun applySettings() {
- for (control in controls) control.target = if (pad?.hasInputRouter() == true) control.id else settings.mapping[control.id] ?: control.id
- val tint = settings.tint
- val alpha = settings.opacity / 100f
- fun shade(a: Int, f: Float) = Color.argb((a * alpha).toInt(), (Color.red(tint) * f).toInt(), (Color.green(tint) * f).toInt(), (Color.blue(tint) * f).toInt())
- fun light(a: Int, f: Float) = Color.argb(
- (a * alpha).toInt(),
- (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(),
- )
- idleFill = shade(80, 0.12f)
- heldFill = shade(160, 1f)
- idleStroke = light(150, 0.25f)
- heldStroke = light(230, 0.7f)
- idleText = light(210, 0.75f)
- stickFill = shade(60, 0.12f)
- knobFill = shade(120, 0.35f)
- stroke.strokeWidth = dp(1.5f)
+ layout = value
+ render()
}
fun setButtonsOnly(enabled: Boolean) {
- if (buttonsOnly == enabled) return
+ if (isButtonsOnly == enabled) return
releaseAll()
- buttonsOnly = enabled
- quickHidden = false
- relayout()
+ isButtonsOnly = enabled
+ render()
}
- fun setQuickHidden(hidden: Boolean) {
- if (buttonsOnly || editing || quickHidden == hidden) return
- if (hidden) releaseAll()
- quickHidden = hidden
- invalidate()
+ private fun render() {
+ val elements = layout?.elements.orEmpty()
+ surface.updateCustomLayout(if (isButtonsOnly) elements.filter { it.control == InputControl.GUIDE || it.control == InputControl.QAM || it.id == "builtin:keyboard" } else elements)
+ surface.updateStyle(layout?.style ?: InputSurfaceStyle())
}
- fun setSnap(on: Boolean) {
- snap = on
- if (!on) clearSnapGuides()
- }
+ fun takesTouchAt(x: Float, y: Float) = surface.takesTouchAt(x, y)
+ fun releaseAll() = surface.releaseInputs()
+ fun reload() { releaseAll(); render() }
- override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
- super.onSizeChanged(w, h, oldw, oldh)
- relayout()
- }
-
- override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets {
- val cutout = if (Build.VERSION.SDK_INT >= 28) insets.displayCutout else null
- val fresh = Rect(cutout?.safeInsetLeft ?: 0, cutout?.safeInsetTop ?: 0, cutout?.safeInsetRight ?: 0, cutout?.safeInsetBottom ?: 0)
- if (fresh != safe) { safe = fresh; relayout() }
- return super.onApplyWindowInsets(insets)
- }
-
- override fun onDetachedFromWindow() {
- stickRedraw.cancel()
- releaseAll()
- pad?.releaseTouch(this)
- super.onDetachedFromWindow()
- }
-
- private fun relayout() {
- if (width <= 0 || height <= 0) return
- fit = if (buttonsOnly && !editing) 1f else fitScale()
- for (control in controls) control.radius = if (buttonsOnly && !editing && (control.id == "guide" || control.id == "qam")) dp(30f) else scaled(control.radiusDp)
- if (buttonsOnly && !editing) {
- val inset = dp(44f)
- put("guide", safe.left + inset, height - safe.bottom - inset)
- put("qam", width - safe.right - inset, height - safe.bottom - inset)
- } else {
- placeAuto(width.toFloat(), height.toFloat())
- if (!ignoreSaved) for ((group, pos) in ControllerPrefs.layout(context, width, height)) {
- if (group in groups) put(group, pos.first * width, pos.second * height)
- }
- }
- groups.forEach { clamp(it) }
- invalidate()
- }
-
- 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 saveLayout() {
- if (width <= 0 || height <= 0) return
- if (ignoreSaved) { ControllerPrefs.resetLayout(context, width, height); return }
- ControllerPrefs.setLayout(context, width, height, groups.associateWith { group ->
- val (x, y) = centre(group)
- x / width to y / height
- })
- }
-
- fun resetLayout() {
- ControllerPrefs.resetLayout(context, width, height)
- ignoreSaved = true
- selected = null
- relayout()
- }
-
- private fun label(control: Control): String = when (control.target) {
- "ls" -> "L"
- "rs" -> "R"
- "select" -> "⧉"
- "start" -> "☰"
- "guide" -> if (buttonsOnly && !editing) "Steam" else "◉"
- "qam" -> "⋯"
- else -> control.target.uppercase()
- }
-
- override fun onDraw(canvas: Canvas) {
- if (!quickHidden) for (control in controls) {
- if (!isVisible(control)) continue
- if (control.stick >= 0 && settings.adaptiveSticks && !editing && control.pressedBy == -1) continue
- val held = control.pressedBy != -1
- val radius = control.radius
- if (control.stick >= 0) {
- val bx = if (held) control.ax else control.cx
- val by = if (held) control.ay else control.cy
- fill.color = if (held) heldFill else stickFill
- canvas.drawCircle(bx, by, radius, fill)
- stroke.color = if (held) heldStroke else idleStroke
- canvas.drawCircle(bx, by, radius, stroke)
- val knob = radius * 0.46f
- fill.color = if (held || control.clicked) heldFill else knobFill
- canvas.drawCircle(bx + control.kx, by + control.ky, knob, fill)
- stroke.color = if (held) heldStroke else idleStroke
- canvas.drawCircle(bx + control.kx, by + control.ky, knob, stroke)
- text.color = if (held) Color.WHITE else idleText
- text.textSize = knob * 0.8f
- canvas.drawText(label(control), bx + control.kx, by + control.ky + text.textSize * 0.35f, text)
- } else if (control.wide) {
- box.set(control.cx - control.halfW, control.cy - control.halfH, control.cx + control.halfW, control.cy + control.halfH)
- val corner = control.halfH * 0.55f
- fill.color = if (held) heldFill else idleFill
- canvas.drawRoundRect(box, corner, corner, fill)
- stroke.color = if (held) heldStroke else idleStroke
- canvas.drawRoundRect(box, corner, corner, stroke)
- text.color = if (held) Color.WHITE else idleText
- text.textSize = control.halfH * 0.8f
- canvas.drawText(label(control), control.cx, control.cy + text.textSize * 0.35f, text)
- } else {
- fill.color = if (held) heldFill else idleFill
- canvas.drawCircle(control.cx, control.cy, radius, fill)
- stroke.color = if (held) heldStroke else idleStroke
- canvas.drawCircle(control.cx, control.cy, radius, stroke)
- text.color = if (held) Color.WHITE else idleText
- val direction = directions.indexOf(control.target)
- if (direction >= 0) {
- drawArrow(canvas, control.cx, control.cy, radius * 0.34f, direction)
- continue
- }
- val name = label(control)
- text.textSize = if (name.length > 2) dp(11f) else radius * if (name.length == 2) 0.62f else 0.85f
- canvas.drawText(name, control.cx, control.cy + text.textSize * 0.35f, text)
- }
- }
- if (editing) {
- stroke.color = heldStroke
- snapX?.let { canvas.drawLine(it, safe.top.toFloat(), it, (height - safe.bottom).toFloat(), stroke) }
- snapY?.let { canvas.drawLine(safe.left.toFloat(), it, (width - safe.right).toFloat(), it, stroke) }
- selected?.let { group ->
- val (x, y) = centre(group)
- val single = members(group).singleOrNull()
- if (single?.wide == true) {
- val pad = dp(6f)
- box.set(x - single.halfW - pad, y - single.halfH - pad, x + single.halfW + pad, y + single.halfH + pad)
- canvas.drawRoundRect(box, single.halfH, single.halfH, stroke)
- } else canvas.drawCircle(x, y, extent(group) + dp(6f), stroke)
- }
- } else if (!buttonsOnly) {
- val (x, y) = quickCenter()
- val radius = dp(18f)
- fill.color = Color.argb(190, Color.red(idleFill), Color.green(idleFill), Color.blue(idleFill))
- canvas.drawCircle(x, y, radius, fill)
- stroke.color = idleStroke
- canvas.drawCircle(x, y, radius, stroke)
- text.color = idleText
- text.textSize = dp(22f)
- canvas.drawText(if (quickHidden) "+" else "−", x, y + text.textSize * 0.35f, text)
- }
- if (!editing && settings.keyboardButton && onKeyboard != null) {
- val (x, y) = keyboardCenter()
- fill.color = Color.argb(190, Color.red(idleFill), Color.green(idleFill), Color.blue(idleFill))
- canvas.drawCircle(x, y, dp(18f), fill)
- stroke.color = if (keyboardPressedBy == -1) idleStroke else heldStroke
- canvas.drawCircle(x, y, dp(18f), stroke)
- box.set(x - dp(10f), y - dp(7f), x + dp(10f), y + dp(7f))
- canvas.drawRoundRect(box, dp(2f), dp(2f), stroke)
- for (row in 0..1) for (col in 0..2) {
- val kx = x + dp(-6f + col * 5f)
- val ky = y + dp(-3f + row * 4f)
- canvas.drawLine(kx, ky, kx + dp(2f), ky, stroke)
- }
- canvas.drawLine(x - dp(5f), y + dp(4f), x + dp(5f), y + dp(4f), stroke)
- }
- }
-
- private fun quickCenter() = (safe.left + dp(34f)) to (height - safe.bottom - dp(34f))
-
- private fun keyboardCenter() = if (buttonsOnly)
- width / 2f to (height - safe.bottom - dp(44f))
- else (safe.left + dp(90f)) to (height - safe.bottom - dp(34f))
-
- private fun keyboardContains(x: Float, y: Float): Boolean {
- if (!settings.keyboardButton || onKeyboard == null) return false
- val (cx, cy) = keyboardCenter()
- val dx = x - cx
- val dy = y - cy
- return dx * dx + dy * dy <= dp(26f) * dp(26f)
- }
-
- private fun quickContains(x: Float, y: Float): Boolean {
- val (cx, cy) = quickCenter()
- val radius = dp(26f)
- val dx = x - cx
- val dy = y - cy
- return dx * dx + dy * dy <= radius * radius
- }
-
- private fun drawArrow(canvas: Canvas, x: Float, y: Float, size: Float, direction: Int) {
- val (fx, fy) = when (direction) {
- 0 -> 0f to -1f
- 1 -> 1f to 0f
- 2 -> 0f to 1f
- else -> -1f to 0f
- }
- arrow.reset()
- arrow.moveTo(x + fx * size, y + fy * size)
- arrow.lineTo(x - fx * size * 0.7f - fy * size, y - fy * size * 0.7f + fx * size)
- arrow.lineTo(x - fx * size * 0.7f + fy * size, y - fy * size * 0.7f - fx * size)
- arrow.close()
- fill.color = text.color
- canvas.drawPath(arrow, fill)
- }
-
- @SuppressLint("ClickableViewAccessibility")
- override fun onTouchEvent(event: MotionEvent): Boolean {
- if (editing) return onEditTouch(event)
- if (event.getToolType(event.actionIndex) == MotionEvent.TOOL_TYPE_MOUSE) return false
- when (event.actionMasked) {
- MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
- val index = event.actionIndex
- val x = event.getX(index)
- val y = event.getY(index)
- if (event.actionMasked == MotionEvent.ACTION_DOWN) forwardedPointerBits = 0
- if (event.actionMasked == MotionEvent.ACTION_POINTER_DOWN && forwardMiss(event, x, y)) return true
- if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits)
- if (event.actionMasked == MotionEvent.ACTION_DOWN && keyboardContains(x, y)) {
- keyboardPressedBy = event.getPointerId(index)
- invalidate()
- return true
- }
- if (keyboardPressedBy != -1) return true
- if (!buttonsOnly && event.actionMasked == MotionEvent.ACTION_DOWN && quickContains(x, y)) {
- quickPressedBy = event.getPointerId(index)
- return true
- }
- if (quickPressedBy != -1) return true
- if (quickHidden) return false
- val control = controlAt(x, y) ?: adaptiveStickAt(x, y) ?: return false
- if (control.pressedBy != -1) return true
- control.pressedBy = event.getPointerId(index)
- if (control.stick >= 0) {
- control.clicked = settings.stickClick && control.lastUp > 0L && event.eventTime - control.lastUp < DOUBLE_TAP_MS
- val adaptive = settings.adaptiveSticks
- control.ax = if (adaptive) event.getX(index) else control.cx
- control.ay = if (adaptive) event.getY(index) else control.cy
- control.drag(event.getX(index), event.getY(index))
- control.dirty = true
- }
- if (SessionPrefs.lowLatency(context)) requestUnbufferedDispatch(event)
- apply()
- return true
- }
- MotionEvent.ACTION_MOVE -> {
- if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits)
- if (keyboardPressedBy != -1) return true
- if (quickPressedBy != -1) return true
- var changed = false
- var stickMoved = false
- for (index in 0 until event.pointerCount) {
- val pointer = event.getPointerId(index)
- if (forwardedPointerBits and (1 shl pointer) != 0) continue
- val x = event.getX(index)
- val y = event.getY(index)
- val stick = controls.firstOrNull { it.stick >= 0 && it.pressedBy == pointer }
- if (stick != null) { stickMoved = stick.drag(x, y) || stickMoved; continue }
- val over = controlAt(x, y)?.takeIf { it.stick < 0 }
- for (control in controls) {
- if (control.stick < 0 && control.pressedBy == pointer && control !== over) {
- control.pressedBy = -1
- changed = true
- }
- }
- if (over != null && over.pressedBy == -1) {
- over.pressedBy = pointer
- changed = true
- }
- }
- if (changed) apply() else if (stickMoved) apply(stickOnly = true)
- return true
- }
- MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> {
- val pointer = event.getPointerId(event.actionIndex)
- if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits)
- if (event.actionMasked == MotionEvent.ACTION_CANCEL) {
- forwardedPointerBits = 0
- releaseAll()
- return true
- }
- if (forwardedPointerBits and (1 shl pointer) != 0) {
- forwardedPointerBits = forwardedPointerBits and (1 shl pointer).inv()
- return true
- }
- if (keyboardPressedBy == pointer) {
- val tapped = event.actionMasked == MotionEvent.ACTION_UP && keyboardContains(event.x, event.y)
- keyboardPressedBy = -1
- invalidate()
- if (tapped) { releaseAll(); onKeyboard?.invoke() }
- return true
- }
- if (quickPressedBy == pointer) {
- val toggled = event.actionMasked == MotionEvent.ACTION_UP && quickContains(event.x, event.y)
- quickPressedBy = -1
- if (toggled) setQuickHidden(!quickHidden)
- return true
- }
- if (quickHidden) return false
- var changed = false
- for (control in controls) {
- if (control.pressedBy == pointer || event.actionMasked == MotionEvent.ACTION_CANCEL) {
- if (control.pressedBy != -1) changed = true
- if (control.stick >= 0 && control.pressedBy != -1) control.lastUp = if (control.clicked || event.actionMasked == MotionEvent.ACTION_CANCEL) 0L else event.eventTime
- control.pressedBy = -1
- control.clicked = false
- if (control.stick >= 0 && (control.kx != 0f || control.ky != 0f)) control.dirty = true
- control.kx = 0f; control.ky = 0f
- }
- }
- if (changed) apply()
- return true
- }
- }
- return false
- }
-
- private fun forwardMiss(event: MotionEvent, x: Float, y: Float): Boolean {
- if (onTouchMiss == null || keyboardPressedBy != -1 || quickPressedBy != -1) return false
- if (!quickHidden && (controlAt(x, y) ?: adaptiveStickAt(x, y)) != null) return false
- forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(event.actionIndex))
- forwardPointers(event, forwardedPointerBits)
- return true
- }
-
- private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) {
- val split = event.pointerSubset(pointerIdBits) ?: return
- try {
- onTouchMiss?.invoke(split)
- } finally {
- split.recycle()
- }
- }
-
- private fun onEditTouch(event: MotionEvent): Boolean {
- when (event.actionMasked) {
- MotionEvent.ACTION_DOWN -> {
- clearSnapGuides()
- val control = controlAt(event.x, event.y)
- selected = control?.group
- val group = selected ?: run { invalidate(); return false }
- val (x, y) = centre(group)
- grabX = x - event.x
- grabY = y - event.y
- invalidate()
- }
- MotionEvent.ACTION_MOVE -> {
- val group = selected ?: return true
- ignoreSaved = false
- val rawX = event.x + grabX
- val rawY = event.y + grabY
- val others = groups.filter { it != group && members(it).any(::isVisible) }.map { centre(it) }
- val nextX = if (snap) closestSnap(rawX, others.map { it.first } + width / 2f) else null
- val nextY = if (snap) closestSnap(rawY, others.map { it.second }) else null
- put(group, nextX ?: rawX, nextY ?: rawY)
- clamp(group)
- val (x, y) = centre(group)
- val visibleX = nextX?.takeIf { abs(x - it) <= SNAP_TOLERANCE_PX }
- val visibleY = nextY?.takeIf { abs(y - it) <= SNAP_TOLERANCE_PX }
- if ((visibleX != null && visibleX != snapX) || (visibleY != null && visibleY != snapY)) performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)
- snapX = visibleX
- snapY = visibleY
- invalidate()
- }
- MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> clearSnapGuides()
- }
- return true
- }
-
- private fun closestSnap(position: Float, targets: List): Float? =
- targets.minByOrNull { abs(position - it) }?.takeIf { abs(position - it) <= dp(SNAP_DP) }
-
- fun takesTouchAt(x: Float, y: Float): Boolean =
- editing || keyboardContains(x, y) || (!buttonsOnly && quickContains(x, y)) ||
- (!quickHidden && (controlAt(x, y) ?: adaptiveStickAt(x, y)) != null)
-
- private fun controlAt(x: Float, y: Float): Control? =
- controls.firstOrNull {
- !quickHidden && isVisible(it) && (editing || !settings.adaptiveSticks || it.stick < 0) && it.contains(x, y, it.radius)
- }
-
- private fun adaptiveStickAt(x: Float, y: Float): Control? {
- if (!settings.adaptiveSticks || editing || buttonsOnly || quickHidden) return null
- if (x < safe.left || x >= width - safe.right || y < safe.top || y >= height - safe.bottom) return null
- if (controls.any { control ->
- control.stick < 0 && isVisible(control) && control.contains(x, y, control.radius, 5f)
- }) return null
- return controls.filter { control ->
- val dx = if (control.stick == 0) max(0f, x - control.cx) else x - control.cx
- val dy = y - control.cy
- val reach = control.radius * 1.4f * sqrt(1.5f)
- control.stick >= 0 && isVisible(control) && control.pressedBy == -1 &&
- dx * dx + dy * dy <= reach * reach
- }.minByOrNull { control ->
- val dx = x - control.cx
- val dy = y - control.cy
- dx * dx + dy * dy
- }
- }
-
- private fun isVisible(control: Control): Boolean = when {
- !editing && control.id == "guide" && !settings.steamButton -> false
- !editing && control.id == "qam" && !settings.qamButton -> false
- buttonsOnly && !editing -> control.id == "guide" || control.id == "qam"
- else -> control.target != ControllerPrefs.OFF
- }
-
- private fun apply(stickOnly: Boolean = false) {
- val bridge = pad
- if (bridge == null || editing) { invalidate(); return }
- if (bridge.hasInputRouter()) {
- bridge.applyTouch(this, InputRole.PRIMARY) { state ->
- state.clear()
- for (control in controls) {
- if (!isVisible(control)) continue
- if (control.stick >= 0) {
- if (control.stick == 0) { state.leftX = control.kx / control.radius; state.leftY = control.ky / control.radius }
- else { state.rightX = control.kx / control.radius; state.rightY = control.ky / control.radius }
- if (settings.stickClick) state.press(if (control.stick == 0) PadState.L3 else PadState.R3, control.clicked)
- } else write(state, control.id, control.pressedBy != -1)
- }
- }
- if (stickOnly) stickRedraw.request() else invalidate()
- return
- }
- val qamHeld = controls.any { it.id == "qam" && it.pressedBy != -1 }
- if (buttonsOnly) {
- bridge.setSystemButtons(controls.any { it.id == "guide" && it.pressedBy != -1 }, qamHeld)
- } else {
- bridge.setSystemButtons(false, qamHeld)
- val stickWrites = controls.filter { it.stick >= 0 && it.dirty }.fold(0) { mask, control ->
- mask or if (control.stick == 0) PadBridge.LEFT_STICK else PadBridge.RIGHT_STICK
- }
- bridge.applyTouch(this, InputRole.PRIMARY, stickWrites) { state ->
- val used = HashSet()
- val held = HashSet()
- for (control in controls) {
- when {
- control.stick >= 0 -> {
- val click = if (control.stick == 0) "l3" else "r3"
- if (settings.stickClick) used.add(click)
- if (control.clicked) held.add(click)
- if (!control.dirty) continue
- if (control.stick == 0) { state.leftX = control.kx / control.radius; state.leftY = control.ky / control.radius }
- else { state.rightX = control.kx / control.radius; state.rightY = control.ky / control.radius }
- control.dirty = false
- }
- control.id == "qam" || control.target == ControllerPrefs.OFF -> {}
- else -> {
- used.add(control.target)
- if (control.pressedBy != -1) held.add(control.target)
- }
- }
- }
- for (target in used) write(state, target, target in held)
- }
- }
- if (stickOnly) stickRedraw.request() else invalidate()
- }
-
- private fun write(state: PadState, target: String, down: Boolean) {
- when (target) {
- "a" -> state.press(PadState.A, down)
- "b" -> state.press(PadState.B, down)
- "x" -> state.press(PadState.X, down)
- "y" -> state.press(PadState.Y, down)
- "lb" -> state.press(PadState.LB, down)
- "rb" -> state.press(PadState.RB, down)
- "select" -> state.press(PadState.SELECT, down)
- "start" -> state.press(PadState.START, down)
- "l3" -> state.press(PadState.L3, down)
- "r3" -> state.press(PadState.R3, down)
- "guide" -> state.press(PadState.GUIDE, down)
- "qam" -> state.press(PadState.QAM, down)
- "lt" -> state.leftTrigger = if (down) 1f else 0f
- "rt" -> state.rightTrigger = if (down) 1f else 0f
- "up" -> state.up = down
- "right" -> state.right = down
- "down" -> state.down = down
- "left" -> state.left = down
- }
- }
-
- fun releaseAll() {
- quickPressedBy = -1
- keyboardPressedBy = -1
- invalidate()
- if (controls.none { it.pressedBy != -1 || it.clicked } && !buttonsOnly) return
- controls.forEach {
- it.pressedBy = -1
- it.clicked = false
- it.lastUp = 0L
- if (it.stick >= 0 && (it.kx != 0f || it.ky != 0f)) it.dirty = true
- it.kx = 0f; it.ky = 0f
- }
- apply()
- }
-
- private companion object {
- const val DOUBLE_TAP_MS = 300L
- const val STICK_REDRAW_MS = 33L
- const val MIN_STICK_MOVE_PX = 1f
- 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
- const val SNAP_DP = 9f
- const val SNAP_TOLERANCE_PX = 1f
- val shoulderIds = setOf("lb", "rb", "lt", "rt")
- val directions = listOf("up", "right", "down", "left")
- }
+ override fun onDetachedFromWindow() { releaseAll(); super.onDetachedFromWindow() }
}
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 37b68e06e9..0d0dbc2f71 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java
+++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java
@@ -69,6 +69,7 @@ public final class PadBridge {
final PadState raw = new PadState();
final PadState passthrough = new PadState();
final InputRole role;
+ boolean routed;
InputRouter.PadSource route;
TouchSource(InputRole role) { this.role = role; }
}
@@ -144,7 +145,7 @@ public final class PadBridge {
for (TouchSource source : touchSources.values()) if (source.route != null) source.route.close();
inputRouter = router;
for (int slot = 0; slot < SLOTS; slot++) physicalRoutes[slot] = router == null ? null : router.pad(InputRole.PHYSICAL, stateFor(slot));
- for (TouchSource source : touchSources.values()) source.route = router == null ? null : router.pad(source.role, source.raw);
+ for (TouchSource source : touchSources.values()) source.route = router == null || source.routed ? null : router.pad(source.role, source.raw);
clearBackQamWrites();
if (open) publish();
for (int slot = 1; slot < SLOTS; slot++) if (playerWriters[slot] != null) publish(slot);
@@ -152,6 +153,8 @@ public final class PadBridge {
public synchronized boolean hasInputRouter() { return inputRouter != null; }
+ public synchronized InputRouter getInputRouter() { return inputRouter; }
+
public synchronized void setInputProfile(InputProfile profile) {
if (inputRouter == null) return;
inputRouter.setProfile(profile);
@@ -611,6 +614,19 @@ public final class PadBridge {
publish();
}
+ public synchronized void applyRoutedTouch(Object owner, InputRole role, java.util.function.Consumer mutation) {
+ if (!builtinPad) return;
+ TouchSource source = touchSources.get(owner);
+ if (source == null) {
+ source = new TouchSource(role);
+ source.routed = true;
+ touchSources.put(owner, source);
+ }
+ mutation.accept(source.raw);
+ notePlayerInput();
+ publish();
+ }
+
public synchronized void applyExternal(java.util.function.Consumer mutation, boolean changed) {
mutateState(mutation);
if (changed) {
diff --git a/app/src/main/java/com/droiddeck/launcher/input/PhysicalShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/input/PhysicalShortcuts.kt
index a79fa8c706..11e76cb4ad 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/PhysicalShortcuts.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/PhysicalShortcuts.kt
@@ -105,6 +105,10 @@ object PhysicalShortcuts {
write(context, read(context).filterNot { it == binding })
}
+ fun restoreDefault(context: Context, action: Action) {
+ write(context, read(context).filterNot { it.action == action })
+ }
+
private fun write(context: Context, bindings: List) {
val array = JSONArray()
bindings.forEach {
diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt
deleted file mode 100644
index 4223754320..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.droiddeck.launcher.input
-
-import android.content.Context
-
-fun screenKeyLabel(context: Context, codes: List): String =
- codes.filter { it != 0 }.joinToString("+") { short(context, it) }
-
-private fun short(context: Context, code: Int): String = when (code) {
- 28 -> "⏎"
- 14 -> "⌫"
- 15 -> "Tab"
- 57 -> "Space"
- 58 -> "Caps"
- 42, 54 -> "Shift"
- 29, 97 -> "Ctrl"
- 56 -> "Alt"
- 100 -> "AltGr"
- 125 -> "Super"
- else -> pcKeyLabel(context, code)
-}
-
-const val SCREEN_KEY_PILL = 0
-const val SCREEN_KEY_ROUND = 1
-const val SCREEN_KEY_CIRCLE = 2
-const val SCREEN_KEY_RECT = 3
-const val SCREEN_KEY_TRIGGER = 4
-const val SCREEN_KEY_DPAD = 5
-const val SCREEN_KEY_STICK = 6
-
-val SCREEN_KEY_DPAD_DIRS = listOf("↑", "→", "↓", "←")
-val SCREEN_KEY_STICK_DIRS = listOf("↑", "↗", "→", "↘", "↓", "↙", "←", "↖")
-
-fun screenKeyDirections(shape: Int): List = when (shape) {
- SCREEN_KEY_DPAD -> SCREEN_KEY_DPAD_DIRS
- SCREEN_KEY_STICK -> SCREEN_KEY_STICK_DIRS
- else -> emptyList()
-}
-
-data class ScreenKey(
- val codes: List,
- val x: Float,
- val y: Float,
- val size: Int,
- val glyph: String = "",
- val text: String = "",
- val image: String = "",
- val opacity: Float = 1f,
- val shape: Int = SCREEN_KEY_PILL,
- val toggle: Boolean = false,
- val labels: Boolean = true,
-) {
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt
deleted file mode 100644
index 2e27eecbe6..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt
+++ /dev/null
@@ -1,1098 +0,0 @@
-package com.droiddeck.launcher.input
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.PointF
-import android.graphics.Rect
-import android.graphics.RectF
-import android.graphics.Typeface
-import android.os.Build
-import android.view.MotionEvent
-import android.view.View
-import android.view.WindowInsets
-import java.io.File
-import kotlin.math.abs
-import kotlin.math.hypot
-import kotlin.math.round
-
-class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) : View(context) {
- private class Entry(val codes: List) {
- var glyph = ""
- var text = ""
- var image = ""
- var bitmap: Bitmap? = null
- var bitmapFor = ""
- var x = 0.5f
- var y = 0.5f
- var size = DEFAULT_SIZE
- var opacity = 1f
- var shape = SCREEN_KEY_PILL
- var toggle = false
- var labels = true
- var armed = -1
- var cx = 0f
- var cy = 0f
- var halfW = 0f
- var halfH = 0f
- }
-
- private val entries = mutableListOf()
- private val down = HashMap()
- private val latched = mutableListOf()
- private val dpadDown = HashMap()
- private val stickEntries = HashMap()
- private val stickCodes = HashMap>()
- private val held = HashMap()
- private var forwardedPointerBits = 0
- private var addX = -1f
- private var addY = -1f
- private var pressX = 0f
- private var pressY = 0f
- private var guideX = -1f
- private var guideY = -1f
- private val addPress = Runnable { addX = pressX; addY = pressY; onAdd?.invoke() }
- private var editing = false
- val isEditing get() = editing
- private var selected: Entry? = null
- private var dragX = 0f
- private var dragY = 0f
- private var dragging = false
- private var moved = false
- private var toolbarDrag = false
- private var safe = Rect()
- private var tint = ControllerPrefs.STEAM_BLUE
-
- init {
- ControllerPrefs.screenKeys(context).forEach { key -> entries += entryOf(key) }
- }
-
- var followSteam = false
- set(value) {
- if (field == value) return
- field = value
- invalidate()
- }
-
- var steamStyle: () -> Pair? = { null }
-
- var onAdd: (() -> Unit)? = null
- var onSelect: ((List) -> Unit)? = null
- var onEditingChanged: ((Boolean) -> Unit)? = null
- var onTouchMiss: ((MotionEvent) -> Unit)? = null
-
- private val fillPaint = Paint(Paint.ANTI_ALIAS_FLAG)
- private val strokePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE }
- private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE }
- private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
- textAlign = Paint.Align.CENTER
- typeface = Typeface.DEFAULT_BOLD
- }
- private val gridPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE }
- private val rect = RectF()
- private val bodyPathRect = RectF()
- private val bodyPath = android.graphics.Path()
- private val clipPath = android.graphics.Path()
- private val imageRect = RectF()
- private val bitmapRect = RectF()
-
- private val capsuleRadius = dp(24f)
- private val capsuleGap = dp(62f)
- private val toolbar = PointF()
- private val addCenter = PointF()
- private val doneCenter = PointF()
-
- fun startEditing() {
- if (editing) return
- editing = true
- releaseAll()
- selected = null
- placeToolbar()
- invalidate()
- onEditingChanged?.invoke(true)
- }
-
- fun stopEditing() {
- if (!editing) return
- releaseAll()
- editing = false
- selected = null
- save()
- invalidate()
- onEditingChanged?.invoke(false)
- }
-
- fun add(codes: List) {
- if (codes.isEmpty()) return
- entries.firstOrNull { it.codes == codes }?.let {
- selected = it
- invalidate()
- return
- }
- val entry = Entry(codes)
- if (addX >= 0f && width > 0) {
- entry.x = (addX / width).coerceIn(0.05f, 0.95f)
- entry.y = (addY / height).coerceIn(0.05f, 0.95f)
- } else {
- entry.x = (0.30f + 0.08f * (entries.size % 5)).coerceAtMost(0.70f)
- entry.y = 0.62f
- }
- addX = -1f
- addY = -1f
- entries += entry
- if (width > 0) measure(entry)
- selected = entry
- save()
- invalidate()
- }
-
- fun remove(codes: List) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- entries.remove(entry)
- if (selected === entry) selected = null
- save()
- invalidate()
- }
-
- fun setCodes(from: List, to: List): ScreenKey? {
- if (to.isEmpty()) return null
- val index = entries.indexOfFirst { it.codes == from }
- if (index < 0) return null
- val old = entries[index]
- if (to != from && entries.any { it !== old && it.codes == to }) return null
- val fresh = Entry(to).also {
- it.glyph = old.glyph
- it.text = old.text
- it.image = old.image
- it.bitmap = old.bitmap
- it.bitmapFor = old.bitmapFor
- it.x = old.x
- it.y = old.y
- it.size = old.size
- it.opacity = old.opacity
- it.shape = old.shape
- it.toggle = old.toggle
- it.labels = old.labels
- }
- entries[index] = fresh
- measure(fresh)
- if (selected === old) selected = fresh
- save()
- invalidate()
- return stateOf(fresh.codes)
- }
-
- fun setText(codes: List, text: String) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- entry.text = text
- measure(entry)
- save()
- invalidate()
- }
-
- fun setImage(codes: List, image: String) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- val previous = entry.image
- entry.image = image
- entry.bitmap = null
- entry.bitmapFor = ""
- if (previous.isNotEmpty() && previous != image) File(File(context.filesDir, IMAGE_DIR), previous).delete()
- measure(entry)
- save()
- invalidate()
- }
-
- fun resize(codes: List, size: Int) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- entry.size = size.coerceIn(MIN_SIZE, MAX_SIZE)
- measure(entry)
- save()
- invalidate()
- }
-
- fun setOpacity(codes: List, opacity: Float) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- entry.opacity = opacity.coerceIn(0.2f, 1f)
- save()
- invalidate()
- }
-
- fun setShape(codes: List, shape: Int) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- entry.shape = shape.coerceIn(SCREEN_KEY_PILL, SCREEN_KEY_STICK)
- measure(entry)
- save()
- invalidate()
- }
-
- fun setToggle(codes: List, toggle: Boolean) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- entry.toggle = toggle
- if (!toggle && latched.remove(entry)) release(entry)
- save()
- invalidate()
- }
-
- fun setLabels(codes: List, labels: Boolean) {
- val entry = entries.firstOrNull { it.codes == codes } ?: return
- entry.labels = labels
- save()
- invalidate()
- }
-
- fun setDirection(codes: List, index: Int, code: Int): ScreenKey? {
- val entry = entries.firstOrNull { it.codes == codes } ?: entries.firstOrNull { it.codes == trimmed(codes) } ?: return null
- val next = entry.codes.toMutableList()
- while (next.size <= index) next += 0
- next[index] = code
- val nextCodes = trimmed(next)
- if (entries.any { it !== entry && it.codes == nextCodes }) return null
- val updated = Entry(nextCodes).also {
- it.glyph = entry.glyph
- it.text = entry.text
- it.image = entry.image
- it.bitmap = entry.bitmap
- it.bitmapFor = entry.bitmapFor
- it.x = entry.x
- it.y = entry.y
- it.size = entry.size
- it.opacity = entry.opacity
- it.shape = entry.shape
- it.toggle = entry.toggle
- it.labels = entry.labels
- }
- entries[entries.indexOf(entry)] = updated
- measure(updated)
- if (selected === entry) selected = updated
- save()
- invalidate()
- return stateOf(updated.codes)
- }
-
- private fun trimmed(codes: List): List = codes.dropLastWhile { it == 0 }.ifEmpty { listOf(0) }
-
- fun stateOf(codes: List): ScreenKey? = entries.firstOrNull { it.codes == codes }?.let {
- ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels)
- }
-
- fun deselect() {
- if (selected == null) return
- selected = null
- invalidate()
- }
-
- override fun onAttachedToWindow() {
- super.onAttachedToWindow()
- refreshAppearance()
- }
-
- fun refreshAppearance() {
- tint = ControllerPrefs.read(context).tint
- invalidate()
- }
-
- override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
- super.onSizeChanged(w, h, oldw, oldh)
- entries.forEach { measure(it) }
- placeToolbar()
- }
-
- override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets {
- val cutout = if (Build.VERSION.SDK_INT >= 28) insets.displayCutout else null
- val fresh = Rect(
- cutout?.safeInsetLeft ?: 0, cutout?.safeInsetTop ?: 0,
- cutout?.safeInsetRight ?: 0, cutout?.safeInsetBottom ?: 0,
- )
- if (fresh != safe) {
- safe = fresh
- placeToolbar()
- invalidate()
- }
- return super.onApplyWindowInsets(insets)
- }
-
- override fun onDetachedFromWindow() {
- releaseAll()
- super.onDetachedFromWindow()
- }
-
- override fun onVisibilityChanged(changedView: View, visibility: Int) {
- super.onVisibilityChanged(changedView, visibility)
- if (visibility != VISIBLE) releaseAll()
- }
-
- override fun setVisibility(visibility: Int) {
- super.setVisibility(visibility)
- if (visibility != VISIBLE) releaseAll()
- }
-
- fun releaseAll() {
- dpadDown.values.forEach { releaseKey(it) }
- dpadDown.clear()
- entries.forEach { it.armed = -1 }
- stickCodes.values.flatten().forEach { if (it != 0) releaseKey(it) }
- stickCodes.clear()
- stickEntries.clear()
- down.values.forEach { release(it) }
- down.clear()
- latched.toList().forEach { release(it) }
- latched.clear()
- invalidate()
- }
-
- private fun snap(value: Float) = if (width > 0) round(value / (width / 100f)) * (width / 100f) else value
-
- private fun placeToolbar() {
- if (width == 0 || height == 0) return
- if (toolbar.x == 0f && toolbar.y == 0f) {
- toolbar.set(width - safe.right - capsuleGap - capsuleRadius, height - safe.bottom - capsuleRadius - dp(20f))
- }
- addCenter.set(toolbar.x - capsuleGap / 2f, toolbar.y)
- doneCenter.set(toolbar.x + capsuleGap / 2f, toolbar.y)
- }
-
- private fun entryOf(key: ScreenKey): Entry = Entry(key.codes).also {
- it.glyph = key.glyph
- it.text = key.text
- it.image = key.image
- it.x = key.x
- it.y = key.y
- it.size = key.size
- it.opacity = key.opacity
- it.shape = key.shape
- it.toggle = key.toggle
- it.labels = key.labels
- }
-
- private fun label(entry: Entry) = when {
- entry.text.isNotEmpty() -> entry.text
- entry.glyph.isNotEmpty() -> entry.glyph
- else -> screenKeyLabel(context, entry.codes)
- }
-
- private fun bitmapFor(entry: Entry): Bitmap? {
- if (entry.image.isEmpty()) return null
- if (entry.bitmapFor == entry.image) return entry.bitmap
- val file = File(File(context.filesDir, IMAGE_DIR), entry.image)
- val bitmap = if (file.isFile) BitmapFactory.decodeFile(file.absolutePath) else null
- entry.bitmap = bitmap
- entry.bitmapFor = entry.image
- return bitmap
- }
-
- private fun measure(entry: Entry) {
- val h = dp(entry.size.toFloat())
- entry.halfH = h / 2f
- entry.halfW = when {
- entry.shape == SCREEN_KEY_CIRCLE -> entry.halfH
- entry.shape == SCREEN_KEY_TRIGGER -> entry.halfH * 1.7f
- entry.shape == SCREEN_KEY_DPAD || entry.shape == SCREEN_KEY_STICK -> entry.halfH * 1.15f
- entry.image.isNotEmpty() -> entry.halfH * 1.15f
- hasIcon(entry) -> entry.halfH * 1.15f
- else -> {
- val chars = label(entry).length
- entry.halfH * (0.55f * chars + 1.05f).coerceIn(1.7f, 4.6f)
- }
- }
- entry.cx = entry.x * width
- entry.cy = entry.y * height
- }
-
- private fun hasIcon(entry: Entry): Boolean =
- entry.text.isEmpty() && entry.glyph.isEmpty() && entry.codes.size == 1 && ScreenKeyIcons.has(entry.codes[0])
-
- private fun unit() = minOf(width / 1280f, height / 720f)
-
- private fun accent(): Pair {
- val style = if (followSteam) steamStyle() else null
- return (style?.first ?: tint) to (style?.second ?: 1f)
- }
-
- private fun tinted(color: Int, alpha: Float): Int {
- val scale = accent().second
- return Color.argb(
- (alpha * scale * 255f).toInt().coerceIn(0, 255),
- Color.red(color), Color.green(color), Color.blue(color),
- )
- }
-
- private fun triggerPath(entry: Entry, path: android.graphics.Path, inset: Float = 0f) {
- val lean = (entry.halfH - inset) * 0.6f
- val left = entry.cx - entry.halfW + inset
- val right = entry.cx + entry.halfW - inset
- val top = entry.cy - entry.halfH + inset
- val bottom = entry.cy + entry.halfH - inset
- path.reset()
- path.moveTo(left + lean, top)
- path.lineTo(right, top)
- path.lineTo(right - lean, bottom)
- path.lineTo(left, bottom)
- path.close()
- }
-
- private fun body(canvas: Canvas, entry: Entry, radius: Float, paint: Paint, inset: Float = 0f) {
- if (entry.shape != SCREEN_KEY_TRIGGER) {
- canvas.drawRoundRect(rect, radius, radius, paint)
- return
- }
- triggerPath(entry, bodyPath, inset)
- canvas.drawPath(bodyPath, paint)
- }
-
- private fun drawDpad(canvas: Canvas, entry: Entry) {
- val color = accent().first
- val alpha = entry.opacity
- val r = minOf(entry.halfW, entry.halfH)
- val t = r * 0.42f
- val hairline = maxOf(dp(1.2f), entry.halfH * 0.032f)
- val engaged = entry.armed >= 0
- crossPath(entry, bodyPath, r, t)
- fillPaint.style = Paint.Style.FILL
- fillPaint.color = tinted(color, if (entry.armed >= 0) 0.26f * alpha else 0.10f * alpha)
- canvas.drawPath(bodyPath, fillPaint)
- if (entry.armed >= 0) {
- armRect(entry, bodyPathRect, entry.armed, r, t)
- fillPaint.color = tinted(color, 0.55f * alpha)
- canvas.drawRoundRect(bodyPathRect, t * 0.6f, t * 0.6f, fillPaint)
- }
- strokePaint.strokeJoin = Paint.Join.ROUND
- strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline
- strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha)
- canvas.drawPath(bodyPath, strokePaint)
- textPaint.setShadowLayer(0f, 0f, 0f, 0)
- fillPaint.color = tinted(color, if (editing) 0.90f else 0.80f)
- DPAD_DIRS.forEachIndexed { index, dir ->
- val on = entry.armed == index
- val code = entry.codes.getOrNull(index) ?: 0
- val name = if (code == 0) "" else screenKeyLabel(context, listOf(code))
- if (entry.labels && name.isNotEmpty()) {
- textPaint.color = if (on) Color.WHITE else tinted(color, alpha)
- textPaint.textSize = dp(48f)
- val fit = 48f * (t * 1.9f) / textPaint.measureText(name).coerceAtLeast(1f)
- textPaint.textSize = minOf(fit, t * 1.7f).coerceIn(dp(8f), dp(60f))
- val tx = entry.cx + dir.first * (r - t * 0.6f)
- val ty = entry.cy + dir.second * (r - t * 0.6f)
- canvas.drawText(name, tx, ty - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint)
- } else {
- fillPaint.color = if (on) Color.WHITE else tinted(color, if (editing) 0.90f else 0.80f)
- arrow(canvas, fillPaint, entry.cx, entry.cy, r - t * 0.55f, dir.first, dir.second, t * 0.8f)
- }
- }
- if (editing && selected === entry) {
- ringPaint.strokeWidth = hairline * 0.8f
- ringPaint.color = tinted(color, 0.9f)
- ringPaint.style = Paint.Style.STROKE
- canvas.drawCircle(entry.cx, entry.cy, r + hairline * 3f, ringPaint)
- }
- }
-
- private fun crossPath(entry: Entry, path: android.graphics.Path, r: Float, t: Float) {
- val cx = entry.cx
- val cy = entry.cy
- path.reset()
- path.moveTo(cx - t, cy - r)
- path.lineTo(cx + t, cy - r)
- path.lineTo(cx + t, cy - t)
- path.lineTo(cx + r, cy - t)
- path.lineTo(cx + r, cy + t)
- path.lineTo(cx + t, cy + t)
- path.lineTo(cx + t, cy + r)
- path.lineTo(cx - t, cy + r)
- path.lineTo(cx - t, cy + t)
- path.lineTo(cx - r, cy + t)
- path.lineTo(cx - r, cy - t)
- path.lineTo(cx - t, cy - t)
- path.close()
- }
-
- private fun armRect(entry: Entry, rect: RectF, index: Int, r: Float, t: Float) {
- when (index) {
- 0 -> rect.set(entry.cx - t, entry.cy - r, entry.cx + t, entry.cy - t)
- 1 -> rect.set(entry.cx + t, entry.cy - t, entry.cx + r, entry.cy + t)
- 2 -> rect.set(entry.cx - t, entry.cy + t, entry.cx + t, entry.cy + r)
- else -> rect.set(entry.cx - r, entry.cy - t, entry.cx - t, entry.cy + t)
- }
- }
-
- private fun arrow(canvas: Canvas, paint: Paint, cx: Float, cy: Float, dist: Float, dx: Float, dy: Float, size: Float) {
- val tipX = cx + dx * dist
- val tipY = cy + dy * dist
- val baseX = cx + dx * (dist - size)
- val baseY = cy + dy * (dist - size)
- val nx = -dy * size * 0.62f
- val ny = dx * size * 0.62f
- bodyPath.reset()
- bodyPath.moveTo(tipX, tipY)
- bodyPath.lineTo(baseX + nx, baseY + ny)
- bodyPath.lineTo(baseX - nx, baseY - ny)
- bodyPath.close()
- canvas.drawPath(bodyPath, paint)
- }
-
- private fun armOf(entry: Entry, x: Float, y: Float): Int {
- val dx = x - entry.cx
- val dy = y - entry.cy
- return if (abs(dx) > abs(dy)) (if (dx > 0f) 1 else 3) else (if (dy > 0f) 2 else 0)
- }
-
- private fun drawStick(canvas: Canvas, entry: Entry) {
- val color = accent().first
- val alpha = entry.opacity
- val engaged = entry.armed >= 0
- val radius = minOf(entry.halfW, entry.halfH)
- val hairline = maxOf(dp(1.2f), entry.halfH * 0.032f)
- fillPaint.style = Paint.Style.FILL
- fillPaint.color = tinted(color, 0.14f * alpha)
- canvas.drawCircle(entry.cx, entry.cy, radius - hairline, fillPaint)
- strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline
- strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha)
- canvas.drawCircle(entry.cx, entry.cy, radius - hairline / 2f, strokePaint)
- val dir = if (engaged) STICK_DIRS[entry.armed.coerceIn(0, 7)] else 0f to 0f
- val knob = radius * 0.36f
- fillPaint.color = tinted(color, if (engaged) 0.55f * alpha else 0.24f * alpha)
- canvas.drawCircle(entry.cx + dir.first * radius * 0.40f, entry.cy + dir.second * radius * 0.40f, knob, fillPaint)
- strokePaint.strokeWidth = hairline
- strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha)
- canvas.drawCircle(entry.cx + dir.first * radius * 0.40f, entry.cy + dir.second * radius * 0.40f, knob, strokePaint)
- textPaint.setShadowLayer(0f, 0f, 0f, 0)
- STICK_DIRS.forEachIndexed { index, unit ->
- val on = entry.armed == index
- val code = entry.codes.getOrNull(index) ?: 0
- val name = if (code == 0) "" else screenKeyLabel(context, listOf(code))
- if (entry.labels && name.isNotEmpty()) {
- textPaint.color = if (on) Color.WHITE else tinted(color, 0.85f * alpha)
- textPaint.textSize = dp(48f)
- val fit = 48f * (radius * 0.34f) / textPaint.measureText(name).coerceAtLeast(1f)
- textPaint.textSize = minOf(fit, radius * 0.22f).coerceAtLeast(dp(6f))
- val tx = entry.cx + unit.first * radius * 0.66f
- val ty = entry.cy + unit.second * radius * 0.66f
- canvas.drawText(name, tx, ty - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint)
- } else {
- fillPaint.color = if (on) Color.WHITE else tinted(color, if (editing) 0.88f else 0.72f)
- arrow(canvas, fillPaint, entry.cx, entry.cy, radius * 0.88f, unit.first, unit.second, radius * 0.16f)
- }
- }
- if (editing && selected === entry) {
- ringPaint.strokeWidth = hairline * 0.8f
- ringPaint.color = tinted(color, 0.9f)
- ringPaint.style = Paint.Style.STROKE
- canvas.drawCircle(entry.cx, entry.cy, radius + hairline * 3f, ringPaint)
- }
- }
-
- private fun directionCodes(entry: Entry, index: Int): List {
- if (index < 0) return emptyList()
- val code = entry.codes.getOrNull(index) ?: 0
- if (code != 0) return listOf(code)
- if (entry.shape != SCREEN_KEY_STICK || index % 2 == 0) return emptyList()
- return listOfNotNull(
- entry.codes.getOrNull((index + 7) % 8)?.takeIf { it != 0 },
- entry.codes.getOrNull((index + 1) % 8)?.takeIf { it != 0 },
- )
- }
-
- private fun stickSector(entry: Entry, x: Float, y: Float): Int {
- val dx = x - entry.cx
- val dy = y - entry.cy
- if (hypot(dx, dy) < minOf(entry.halfW, entry.halfH) * 0.24f) return -1
- val degrees = Math.toDegrees(kotlin.math.atan2(dy, dx).toDouble()).toFloat()
- val index = (round(degrees / 45f).toInt() + 2) % 8
- return (index + 8) % 8
- }
-
- private fun radiusOf(entry: Entry): Float = when (entry.shape) {
- SCREEN_KEY_ROUND -> entry.halfH * 0.30f
- SCREEN_KEY_RECT -> entry.halfH * 0.12f
- SCREEN_KEY_TRIGGER -> entry.halfH * 0.45f
- else -> entry.halfH
- }
-
- fun takesTouchAt(x: Float, y: Float): Boolean = editing || entryAt(x, y) != null
-
- private fun entryAt(x: Float, y: Float): Entry? = entries.lastOrNull { entry ->
- x >= entry.cx - entry.halfW && x <= entry.cx + entry.halfW && y >= entry.cy - entry.halfH && y <= entry.cy + entry.halfH
- }
-
- private fun inCircle(center: PointF, x: Float, y: Float, radius: Float) = hypot(x - center.x, y - center.y) <= radius
-
- private fun inToolbar(x: Float, y: Float): Boolean =
- editing && x >= toolbar.x - capsuleGap / 2f - capsuleRadius && x <= toolbar.x + capsuleGap / 2f + capsuleRadius &&
- y >= toolbar.y - capsuleRadius && y <= toolbar.y + capsuleRadius
-
- override fun onDraw(canvas: Canvas) {
- if (editing) drawGrid(canvas)
- entries.forEach { draw(canvas, it) }
- if (editing) {
- drawGuides(canvas)
- drawToolbar(canvas)
- }
- }
-
- private fun drawGuides(canvas: Canvas) {
- if (guideX < 0f && guideY < 0f) return
- gridPaint.strokeWidth = dp(1f)
- gridPaint.color = tinted(accent().first, 0.9f)
- if (guideX >= 0f) canvas.drawLine(guideX, 0f, guideX, height.toFloat(), gridPaint)
- if (guideY >= 0f) canvas.drawLine(0f, guideY, width.toFloat(), guideY, gridPaint)
- }
-
- private fun drawGrid(canvas: Canvas) {
- if (width == 0 || height == 0) return
- val step = width / 100f
- gridPaint.strokeWidth = dp(1f)
- gridPaint.color = Color.argb(38, 255, 255, 255)
- var x = step
- while (x < width) {
- canvas.drawLine(x, 0f, x, height.toFloat(), gridPaint)
- x += step
- }
- var y = step
- while (y < height) {
- canvas.drawLine(0f, y, width.toFloat(), y, gridPaint)
- y += step
- }
- gridPaint.color = Color.argb(96, 255, 255, 255)
- gridPaint.strokeWidth = dp(1f)
- canvas.drawLine(width / 2f, 0f, width / 2f, height.toFloat(), gridPaint)
- canvas.drawLine(0f, height / 2f, width.toFloat(), height / 2f, gridPaint)
- }
-
- private fun draw(canvas: Canvas, entry: Entry) {
- if (entry.shape == SCREEN_KEY_DPAD) {
- drawDpad(canvas, entry)
- return
- }
- if (entry.shape == SCREEN_KEY_STICK) {
- drawStick(canvas, entry)
- return
- }
- val style = if (followSteam) steamStyle() else null
- val engaged = down.values.any { it === entry } || latched.contains(entry)
- val bitmap = bitmapFor(entry)
- val icon = bitmap == null && hasIcon(entry)
- val frameless = entry.text.isBlank() && (bitmap != null || icon)
- val alpha = entry.opacity
- val h2 = entry.halfH * 2f
- val radius = radiusOf(entry)
- val selectedNow = editing && selected === entry
- val hairline = maxOf(dp(1.2f), h2 * 0.032f)
- rect.set(entry.cx - entry.halfW, entry.cy - entry.halfH, entry.cx + entry.halfW, entry.cy + entry.halfH)
- val inkColor: Int
- if (style != null) {
- val inkAlpha = (255f * style.second * alpha).toInt().coerceIn(30, 255)
- inkColor = Color.argb(inkAlpha, Color.red(style.first), Color.green(style.first), Color.blue(style.first))
- fillPaint.style = Paint.Style.FILL
- if (engaged) {
- fillPaint.color = Color.argb((inkAlpha * 0.85f).toInt(), 230, 233, 236)
- body(canvas, entry, radius, fillPaint)
- }
- if (frameless) {
- if (engaged) {
- fillPaint.color = Color.argb((inkAlpha * 0.45f).toInt(), 230, 233, 236)
- body(canvas, entry, radius, fillPaint)
- }
- } else {
- strokePaint.color = if (selectedNow) Color.rgb(26, 159, 255) else inkColor
- strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline
- body(canvas, entry, radius, strokePaint)
- }
- } else {
- fillPaint.style = Paint.Style.FILL
- if (!frameless) {
- fillPaint.color = tinted(BODY, 0.60f * alpha)
- canvas.drawRoundRect(rect, radius, radius, fillPaint)
- }
- if (engaged) {
- fillPaint.color = tinted(accent().first, if (frameless) 0.32f * alpha else 0.42f * alpha)
- canvas.drawRoundRect(rect, radius, radius, fillPaint)
- }
- if (!frameless) {
- strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline
- strokePaint.color = tinted(
- accent().first,
- (if (engaged) 0.96f else if (editing) 0.80f else 0.68f) * alpha,
- )
- body(canvas, entry, radius, strokePaint)
- }
- inkColor = if (engaged) Color.WHITE else tinted(accent().first, alpha)
- }
- if (editing && selected === entry) {
- ringPaint.strokeWidth = hairline * 0.8f
- ringPaint.color = tinted(accent().first, 0.9f)
- val gap = hairline * 2.4f
- rect.set(
- entry.cx - entry.halfW - gap, entry.cy - entry.halfH - gap,
- entry.cx + entry.halfW + gap, entry.cy + entry.halfH + gap,
- )
- if (entry.shape == SCREEN_KEY_TRIGGER) {
- body(canvas, entry, radius + gap, ringPaint, gap)
- } else {
- canvas.drawRoundRect(rect, radius + gap, radius + gap, ringPaint)
- }
- rect.set(entry.cx - entry.halfW, entry.cy - entry.halfH, entry.cx + entry.halfW, entry.cy + entry.halfH)
- }
-
- if (bitmap != null) {
- imageRect.set(rect)
- canvas.save()
- clipPath.reset()
- when (entry.shape) {
- SCREEN_KEY_CIRCLE -> clipPath.addCircle(
- entry.cx, entry.cy, minOf(entry.halfW, entry.halfH), android.graphics.Path.Direction.CW,
- )
- SCREEN_KEY_TRIGGER -> triggerPath(entry, clipPath, 0f)
- else -> clipPath.addRoundRect(rect, radius, radius, android.graphics.Path.Direction.CW)
- }
- canvas.clipPath(clipPath)
- val scale = maxOf(imageRect.width() / bitmap.width, imageRect.height() / bitmap.height)
- val w = bitmap.width * scale
- val h = bitmap.height * scale
- bitmapRect.set(
- imageRect.centerX() - w / 2f, imageRect.centerY() - h / 2f,
- imageRect.centerX() + w / 2f, imageRect.centerY() + h / 2f,
- )
- canvas.drawBitmap(bitmap, null, bitmapRect, fillPaint)
- canvas.restore()
- }
-
- val name = label(entry)
- textPaint.color = inkColor
- if (bitmap != null && name.isEmpty()) return
- var iconDrawn = false
- if (icon) {
- val box = minOf(entry.halfW, entry.halfH) * 1.35f
- iconDrawn = ScreenKeyIcons.draw(canvas, entry.codes[0], entry.cx, entry.cy, box, textPaint)
- textPaint.color = inkColor
- }
- if (iconDrawn || name.isEmpty()) return
- val overImage = bitmap != null
- if (overImage) textPaint.color = Color.WHITE
- textPaint.setShadowLayer(if (overImage) dp(3f) else 0f, 0f, 0f, Color.argb(200, 0, 0, 0))
- textPaint.textSize = dp(48f)
- val available = rect.width() - hairline * 4f
- val fit = 48f * available / textPaint.measureText(name).coerceAtLeast(1f)
- textPaint.textSize = minOf(fit, entry.halfH * 1.15f).coerceIn(dp(8f), dp(120f))
- canvas.drawText(name, entry.cx, entry.cy - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint)
- textPaint.clearShadowLayer()
- }
-
- private fun drawToolbar(canvas: Canvas) {
- val (color, _) = accent()
- val capsule = RectF(
- toolbar.x - capsuleGap / 2f - capsuleRadius, toolbar.y - capsuleRadius,
- toolbar.x + capsuleGap / 2f + capsuleRadius, toolbar.y + capsuleRadius,
- )
- fillPaint.style = Paint.Style.FILL
- fillPaint.color = tinted(color, 0.30f)
- canvas.drawRoundRect(capsule, capsuleRadius, capsuleRadius, fillPaint)
- strokePaint.strokeWidth = dp(1.5f)
- strokePaint.color = tinted(color, 0.85f)
- canvas.drawRoundRect(capsule, capsuleRadius, capsuleRadius, strokePaint)
-
- textPaint.color = Color.WHITE
- textPaint.setShadowLayer(0f, 0f, 0f, 0)
- textPaint.textSize = capsuleRadius * 1.15f
- val plus = "+"
- canvas.drawText(plus, addCenter.x, addCenter.y - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint)
- val path = android.graphics.Path()
- val check = capsuleRadius * 0.42f
- path.moveTo(doneCenter.x - check, doneCenter.y)
- path.lineTo(doneCenter.x - check * 0.25f, doneCenter.y + check * 0.7f)
- path.lineTo(doneCenter.x + check, doneCenter.y - check * 0.7f)
- ringPaint.strokeWidth = dp(3f)
- ringPaint.strokeCap = Paint.Cap.ROUND
- ringPaint.color = Color.WHITE
- canvas.drawPath(path, ringPaint)
- ringPaint.strokeCap = Paint.Cap.BUTT
- }
-
- override fun onTouchEvent(event: MotionEvent): Boolean = if (editing) editTouch(event) else playTouch(event)
-
- private fun playTouch(event: MotionEvent): Boolean {
- if (event.getToolType(event.actionIndex) == MotionEvent.TOOL_TYPE_MOUSE) return false
- when (event.actionMasked) {
- MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
- val index = event.actionIndex
- val entry = entryAt(event.getX(index), event.getY(index))
- if (entry == null) {
- if (event.actionMasked == MotionEvent.ACTION_DOWN) return false
- forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(index))
- forwardPointers(event, forwardedPointerBits)
- return true
- }
- if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits)
- if (entry.shape == SCREEN_KEY_DPAD) {
- val arm = armOf(entry, event.getX(index), event.getY(index))
- val code = entry.codes.getOrNull(arm) ?: 0
- if (code == 0) return true
- val pid = event.getPointerId(index)
- dpadDown.remove(pid)?.let { releaseKey(it) }
- dpadDown[pid] = code
- entry.armed = arm
- pressKey(code)
- invalidate()
- return true
- }
- if (entry.shape == SCREEN_KEY_STICK) {
- val sector = stickSector(entry, event.getX(index), event.getY(index))
- val pid = event.getPointerId(index)
- stickCodes.remove(pid)?.forEach { if (it != 0) releaseKey(it) }
- val codes = directionCodes(entry, sector)
- stickEntries[pid] = entry
- stickCodes[pid] = codes
- entry.armed = if (codes.isEmpty()) -1 else sector
- codes.forEach { pressKey(it) }
- invalidate()
- return true
- }
- if (entry.toggle) {
- if (latched.remove(entry)) release(entry) else {
- latched += entry
- entry.codes.forEach { pressKey(it) }
- }
- invalidate()
- return true
- }
- if (down.values.any { it === entry }) return true
- down[event.getPointerId(index)] = entry
- entry.codes.forEach { pressKey(it) }
- invalidate()
- return true
- }
-
- MotionEvent.ACTION_MOVE -> {
- if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits)
- if (stickEntries.isEmpty()) return true
- repeat(event.pointerCount) { index ->
- val pid = event.getPointerId(index)
- val entry = stickEntries[pid] ?: return@repeat
- val sector = stickSector(entry, event.getX(index), event.getY(index))
- val codes = directionCodes(entry, sector)
- val previous = stickCodes[pid].orEmpty()
- if (codes != previous) {
- previous.filterNot { it in codes }.forEach { releaseKey(it) }
- codes.filterNot { it in previous }.forEach { pressKey(it) }
- stickCodes[pid] = codes
- entry.armed = if (codes.isEmpty()) -1 else sector
- invalidate()
- }
- }
- return true
- }
-
- MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
- val pid = event.getPointerId(event.actionIndex)
- if (forwardedPointerBits and (1 shl pid) != 0) {
- forwardPointers(event, forwardedPointerBits)
- forwardedPointerBits = forwardedPointerBits and (1 shl pid).inv()
- if (stickCodes.containsKey(pid) || dpadDown.containsKey(pid)) return true
- down.remove(pid)?.let(::release)
- return true
- }
- if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits)
- if (stickCodes.containsKey(pid)) {
- stickCodes.remove(pid)?.forEach { if (it != 0) releaseKey(it) }
- stickEntries.remove(pid)?.armed = -1
- invalidate()
- return true
- }
- val armedCode = dpadDown.remove(pid)
- if (armedCode != null) {
- releaseKey(armedCode)
- entries.firstOrNull { it.armed >= 0 && it.codes.contains(armedCode) }?.armed = -1
- invalidate()
- return true
- }
- val entry = down.remove(pid)
- if (entry != null) release(entry)
- return true
- }
-
- MotionEvent.ACTION_CANCEL -> {
- if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits)
- forwardedPointerBits = 0
- stickCodes.values.flatten().forEach { if (it != 0) releaseKey(it) }
- stickCodes.clear()
- stickEntries.clear()
- entries.forEach { it.armed = -1 }
- dpadDown.values.forEach { releaseKey(it) }
- dpadDown.clear()
- entries.forEach { it.armed = -1 }
- down.values.forEach { release(it) }
- down.clear()
- return true
- }
- }
- return true
- }
-
- private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) {
- val split = event.pointerSubset(pointerIdBits) ?: return
- try {
- onTouchMiss?.invoke(split)
- } finally {
- split.recycle()
- }
- }
-
- private fun editTouch(event: MotionEvent): Boolean {
- when (event.actionMasked) {
- MotionEvent.ACTION_DOWN -> {
- val x = event.x
- val y = event.y
- if (inCircle(addCenter, x, y, capsuleRadius)) {
- onAdd?.invoke()
- return true
- }
- if (inCircle(doneCenter, x, y, capsuleRadius)) {
- stopEditing()
- return true
- }
- if (inToolbar(x, y)) {
- toolbarDrag = true
- dragX = toolbar.x - x
- dragY = toolbar.y - y
- return true
- }
- val entry = entryAt(x, y)
- if (entry == null) {
- pressX = x
- pressY = y
- postDelayed(addPress, 520)
- selected = null
- invalidate()
- return true
- }
- selected = entry
- dragging = true
- moved = false
- dragX = entry.cx - x
- dragY = entry.cy - y
- invalidate()
- return true
- }
-
- MotionEvent.ACTION_MOVE -> {
- if (toolbarDrag) {
- val maxX = width - safe.right - capsuleGap / 2f - capsuleRadius
- val maxY = height - safe.bottom - capsuleRadius
- toolbar.x = (event.x + dragX).coerceIn(safe.left + capsuleGap / 2f + capsuleRadius, maxOf(safe.left + capsuleGap / 2f + capsuleRadius, maxX))
- toolbar.y = (event.y + dragY).coerceIn(safe.top + capsuleRadius, maxOf(safe.top + capsuleRadius, maxY))
- addCenter.set(toolbar.x - capsuleGap / 2f, toolbar.y)
- doneCenter.set(toolbar.x + capsuleGap / 2f, toolbar.y)
- invalidate()
- return true
- }
- val entry = selected
- if (entry == null) {
- if (hypot(event.x - pressX, event.y - pressY) > dp(10f)) removeCallbacks(addPress)
- return true
- }
- if (!dragging) return true
- if (hypot(event.x - (entry.cx - dragX), event.y - (entry.cy - dragY)) > dp(10f)) removeCallbacks(addPress)
- var nextX = snap((event.x + dragX).coerceIn(entry.halfW + safe.left, width - entry.halfW - safe.right))
- var nextY = snap((event.y + dragY).coerceIn(entry.halfH + safe.top, height - entry.halfH - safe.bottom))
- guideX = -1f
- guideY = -1f
- entries.forEach { other ->
- if (other === entry) return@forEach
- if (abs(nextX - other.cx) < dp(8f)) { nextX = other.cx; guideX = other.cx }
- if (abs(nextY - other.cy) < dp(8f)) { nextY = other.cy; guideY = other.cy }
- }
- if (abs(nextX - width / 2f) < dp(8f)) { nextX = width / 2f; guideX = nextX }
- if (abs(nextY - height / 2f) < dp(8f)) { nextY = height / 2f; guideY = nextY }
- if (hypot(nextX - entry.cx, nextY - entry.cy) > dp(4f)) moved = true
- entry.cx = nextX
- entry.cy = nextY
- entry.x = entry.cx / width
- entry.y = entry.cy / height
- invalidate()
- return true
- }
-
- MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
- removeCallbacks(addPress)
- guideX = -1f
- guideY = -1f
- if (toolbarDrag) {
- toolbarDrag = false
- return true
- }
- val entry = selected
- if (entry != null && dragging) {
- dragging = false
- if (moved) {
- save()
- invalidate()
- } else {
- onSelect?.invoke(entry.codes)
- }
- }
- return true
- }
- }
- return true
- }
-
- private fun pressKey(code: Int) {
- val owners = held[code] ?: 0
- held[code] = owners + 1
- if (owners == 0) sendKey(code, true)
- }
-
- private fun releaseKey(code: Int) {
- val owners = held[code] ?: return
- if (owners > 1) {
- held[code] = owners - 1
- return
- }
- held.remove(code)
- sendKey(code, false)
- }
-
- private fun release(entry: Entry) {
- entry.codes.asReversed().forEach { releaseKey(it) }
- invalidate()
- }
-
- fun export(): String = ControllerPrefs.encodeScreenKeys(
- entries.map { ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) },
- )
-
- fun load(raw: String) {
- releaseAll()
- entries.clear()
- ControllerPrefs.decodeScreenKeys(raw).forEach { entries += entryOf(it) }
- entries.forEach { measure(it) }
- selected = null
- save()
- invalidate()
- }
-
- private fun save() {
- ControllerPrefs.setScreenKeys(
- context,
- entries.map { ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) },
- )
- }
-
- private fun dp(value: Float) = value * resources.displayMetrics.density
-
- companion object {
- private val DPAD_DIRS = listOf(
- 0f to -1f, 1f to 0f, 0f to 1f, -1f to 0f,
- )
- private val STICK_DIRS = listOf(
- 0f to -1f, 0.7071f to -0.7071f, 1f to 0f, 0.7071f to 0.7071f,
- 0f to 1f, -0.7071f to 0.7071f, -1f to 0f, -0.7071f to -0.7071f,
- )
- const val DEFAULT_SIZE = 44
- const val MIN_SIZE = 24
- const val MAX_SIZE = 140
- const val IMAGE_DIR = "screenkeys"
- private const val BODY = 0xFF14181F.toInt()
- }
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt
deleted file mode 100644
index fc25940719..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.droiddeck.launcher.input
-
-import org.json.JSONArray
-import org.json.JSONObject
-import kotlin.math.roundToInt
-
-private val ICP_NAMES: Map = mapOf(
- 103 to "KEY_UP", 106 to "KEY_RIGHT", 108 to "KEY_DOWN", 105 to "KEY_LEFT",
- 28 to "KEY_ENTER", 1 to "KEY_ESC", 14 to "KEY_BKSP", 111 to "KEY_DEL", 15 to "KEY_TAB",
- 57 to "KEY_SPACE", 29 to "KEY_CTRL_L", 97 to "KEY_CTRL_R", 110 to "KEY_INSERT",
- 42 to "KEY_SHIFT_L", 54 to "KEY_SHIFT_R", 56 to "KEY_ALT_L", 100 to "KEY_ALT_R",
- 102 to "KEY_HOME", 107 to "KEY_END", 99 to "KEY_PRTSCN", 104 to "KEY_PG_UP", 109 to "KEY_PG_DOWN",
- 58 to "KEY_CAPS_LOCK", 69 to "KEY_NUM_LOCK", 41 to "KEY_GRAVE", 12 to "KEY_MINUS",
- 11 to "KEY_0", 2 to "KEY_1", 3 to "KEY_2", 4 to "KEY_3", 5 to "KEY_4", 6 to "KEY_5",
- 7 to "KEY_6", 8 to "KEY_7", 9 to "KEY_8", 10 to "KEY_9",
- 30 to "KEY_A", 48 to "KEY_B", 46 to "KEY_C", 32 to "KEY_D", 18 to "KEY_E", 33 to "KEY_F",
- 34 to "KEY_G", 35 to "KEY_H", 23 to "KEY_I", 36 to "KEY_J", 37 to "KEY_K", 38 to "KEY_L",
- 50 to "KEY_M", 49 to "KEY_N", 24 to "KEY_O", 25 to "KEY_P", 16 to "KEY_Q", 19 to "KEY_R",
- 31 to "KEY_S", 20 to "KEY_T", 22 to "KEY_U", 47 to "KEY_V", 17 to "KEY_W", 45 to "KEY_X",
- 21 to "KEY_Y", 44 to "KEY_Z",
- 26 to "KEY_BRACKET_LEFT", 27 to "KEY_BRACKET_RIGHT", 43 to "KEY_BACKSLASH", 53 to "KEY_SLASH",
- 39 to "KEY_SEMICOLON", 51 to "KEY_COMMA", 52 to "KEY_PERIOD", 40 to "KEY_APOSTROPHE",
- 59 to "KEY_F1", 60 to "KEY_F2", 61 to "KEY_F3", 62 to "KEY_F4", 63 to "KEY_F5", 64 to "KEY_F6",
- 65 to "KEY_F7", 66 to "KEY_F8", 67 to "KEY_F9", 68 to "KEY_F10", 87 to "KEY_F11", 88 to "KEY_F12",
- 79 to "KEY_KP_1", 80 to "KEY_KP_2", 81 to "KEY_KP_3", 75 to "KEY_KP_4", 76 to "KEY_KP_5",
- 77 to "KEY_KP_6", 71 to "KEY_KP_7", 72 to "KEY_KP_8", 73 to "KEY_KP_9", 82 to "KEY_KP_0",
-)
-
-private val ICP_CODES: Map = ICP_NAMES.entries.associate { (code, name) -> name to code }
-
-private fun icpShape(shape: Int): String = when (shape) {
- SCREEN_KEY_CIRCLE -> "CIRCLE"
- SCREEN_KEY_RECT -> "RECT"
- SCREEN_KEY_ROUND -> "ROUND_RECT"
- SCREEN_KEY_DPAD -> "ROUND_RECT"
- SCREEN_KEY_STICK -> "ROUND_RECT"
- SCREEN_KEY_TRIGGER -> "ROUND_RECT"
- else -> "ROUND_RECT"
-}
-
-private fun screenKeyShape(shape: String): Int = when (shape) {
- "CIRCLE" -> SCREEN_KEY_CIRCLE
- "RECT" -> SCREEN_KEY_RECT
- "SQUARE" -> SCREEN_KEY_ROUND
- else -> SCREEN_KEY_PILL
-}
-
-fun exportScreenLayout(keys: List, widthPx: Int, density: Float): String {
- val snap = widthPx / 100f
- val elements = JSONArray()
- keys.forEach { key ->
- val binds = JSONArray()
- val directional = key.shape == SCREEN_KEY_DPAD || key.shape == SCREEN_KEY_STICK
- key.codes.forEach { code ->
- val name = ICP_NAMES[code]
- if (name != null) binds.put(name) else if (directional) binds.put("")
- }
- if (binds.length() == 0) return@forEach
- val shape = icpShape(key.shape)
- val sizePx = key.size * density
- val scale = when {
- key.shape == SCREEN_KEY_DPAD -> sizePx * 2.3f / (14f * snap)
- key.shape == SCREEN_KEY_STICK -> sizePx * 2.3f / (14f * snap)
- shape == "CIRCLE" -> sizePx / (6f * snap)
- else -> sizePx / (4f * snap)
- }
- elements.put(
- JSONObject()
- .put(
- "type",
- when (key.shape) {
- SCREEN_KEY_DPAD -> "D_PAD"
- SCREEN_KEY_STICK -> "STICK"
- else -> "BUTTON"
- },
- )
- .put("shape", shape)
- .put("customColor", 0)
- .put("bindings", binds)
- .put("scale", scale)
- .put("x", key.x)
- .put("y", key.y)
- .put("toggleSwitch", key.toggle)
- .put("swipeable", false)
- .put("text", key.text)
- .put("iconId", 0)
- .apply { if (key.opacity < 1f) put("opacity", key.opacity) },
- )
- }
- return JSONObject()
- .put("id", 0)
- .put("name", "DroidDeck")
- .put("cursorSpeed", 1.5f)
- .put("elements", elements)
- .toString()
-}
-
-fun importScreenLayout(raw: String, widthPx: Int, density: Float): List? {
- val root = runCatching { JSONObject(raw) }.getOrNull() ?: return null
- val elements = root.optJSONArray("elements") ?: return null
- val snap = widthPx / 100f
- val keys = mutableListOf()
- for (i in 0 until elements.length()) {
- val element = elements.optJSONObject(i) ?: continue
- val type = element.optString("type", "BUTTON")
- if (type != "BUTTON" && type != "D_PAD" && type != "STICK") continue
- val binds = element.optJSONArray("bindings") ?: continue
- val raw = (0 until binds.length()).map { ICP_CODES[binds.optString(it)] ?: 0 }
- val codes = if (type == "D_PAD" || type == "STICK") {
- raw.dropLastWhile { it == 0 }.ifEmpty { listOf(0) }
- } else {
- raw.filter { it != 0 }
- }
- if (codes.isEmpty()) continue
- val dpad = type == "D_PAD"
- val stick = type == "STICK"
- val shape = when {
- dpad -> SCREEN_KEY_DPAD
- stick -> SCREEN_KEY_STICK
- else -> screenKeyShape(element.optString("shape"))
- }
- val scale = element.optDouble("scale", 1.0).toFloat().takeIf { it > 0f } ?: 1f
- val sizePx = when {
- dpad || stick -> 14f * snap * scale / 2.3f
- shape == SCREEN_KEY_CIRCLE -> 6f * snap * scale
- else -> 4f * snap * scale
- }
- keys += ScreenKey(
- codes = codes,
- x = element.optDouble("x", 0.5).toFloat().coerceIn(0f, 1f),
- y = element.optDouble("y", 0.5).toFloat().coerceIn(0f, 1f),
- size = (sizePx / density).roundToInt().coerceIn(ScreenKeys.MIN_SIZE, ScreenKeys.MAX_SIZE),
- text = element.optString("text").take(24),
- opacity = element.optDouble("opacity", 1.0).toFloat().coerceIn(0.2f, 1f),
- shape = shape,
- toggle = element.optBoolean("toggleSwitch"),
- )
- }
- return keys
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt
index d2ae03b696..3cbc12a227 100644
--- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt
+++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt
@@ -10,7 +10,7 @@ enum class SecondScreenMode(val id: String, @StringRes val label: Int) {
KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_trackpad),
TERMINAL("terminal", R.string.second_mode_terminal),
DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls),
- CUSTOM_CONTROLS("custom-controls", R.string.input_custom_controls),
+ CUSTOM_CONTROLS("custom-controls", R.string.input_profile_controls_mode),
DASHBOARD("dashboard", R.string.second_mode_dashboard),
DESKTOP("desktop", R.string.second_mode_desktop);
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt
index 9375bb77a9..2afc537c97 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/ControllerSettings.kt
@@ -1,85 +1,20 @@
package com.droiddeck.launcher.ui
-import com.droiddeck.launcher.R
-import androidx.compose.ui.res.stringResource
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
+import androidx.compose.runtime.*
+import androidx.compose.ui.platform.LocalContext
import com.droiddeck.launcher.input.ControllerPrefs
-import com.droiddeck.launcher.session.SessionPrefs
-class ControllerActions(
- val onOsc: (String) -> Unit,
- val onTint: (Int) -> Unit,
- val onOpacity: (Int) -> Unit,
- val onSize: (Int) -> Unit,
- val onStickClick: (Boolean) -> Unit,
- val onAdaptiveSticks: (Boolean) -> Unit,
- val onRumble: (Boolean) -> Unit,
- val onDeadZone: (Int) -> Unit,
- val onSteamButton: (Boolean) -> Unit,
- val onQamButton: (Boolean) -> Unit,
- val onKeyboardButton: (Boolean) -> Unit,
- val onJoyConVr: (Boolean) -> Unit,
- val onEditLayout: () -> Unit,
- val onResetLayout: () -> Unit,
- val onMapping: () -> Unit,
- val onResetAll: () -> Unit,
-)
+class ControllerActions(val onMapping: () -> Unit)
@Composable
-private fun Swatch(color: Int) {
- Box(Modifier.size(14.dp).background(Color(color), CircleShape).border(1.dp, Color.White.copy(alpha = 0.35f), CircleShape))
-}
-
-@Composable
-fun ColumnScope.ControllerRows(host: MenuHost, oscMode: String, c: ControllerPrefs.Settings, a: ControllerActions) {
- ChoiceRow(
- host, "controller-osc", stringResource(R.string.mode_osc), stringResource(R.string.ctrl_osc_hint),
- 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)),
- oscMode, note = stringResource(R.string.mode_osc_note), onPick = a.onOsc,
- )
- val tintOpen = host.open == "controller-tint"
- SettingsRow(stringResource(R.string.ctrl_color), stringResource(R.string.ctrl_color_hint), highlighted = tintOpen) {
- Box {
- ValueChip(ControllerPrefs.tints.firstOrNull { it.first == c.tint }?.second?.let { stringResource(it) } ?: stringResource(R.string.ctrl_custom), tintOpen) {
- host.open = if (tintOpen) null else "controller-tint"
- }
- AnchoredMenu(tintOpen, onDismiss = { if (host.open == "controller-tint") host.open = null }, title = stringResource(R.string.ctrl_color)) { firstItemFocus ->
- ControllerPrefs.tints.forEachIndexed { index, (color, name) ->
- MenuItem(stringResource(name), checked = c.tint == color, leading = { Swatch(color) }, focusRequester = if (index == 0) firstItemFocus else null) {
- a.onTint(color)
- host.open = null
- }
- }
- }
- }
+internal fun rememberControllerSettings(): ControllerPrefs.Settings {
+ val context = LocalContext.current
+ var settings by remember { mutableStateOf(ControllerPrefs.read(context)) }
+ DisposableEffect(context) {
+ val prefs = ControllerPrefs.prefs(context)
+ val listener = android.content.SharedPreferences.OnSharedPreferenceChangeListener { _, _ -> settings = ControllerPrefs.read(context) }
+ prefs.registerOnSharedPreferenceChangeListener(listener)
+ onDispose { prefs.unregisterOnSharedPreferenceChangeListener(listener) }
}
- ChoiceRow(host, "controller-opacity", stringResource(R.string.ctrl_opacity), null, ControllerPrefs.opacities.map { it to stringResource(R.string.ctrl_percent, it) }, c.opacity, onPick = a.onOpacity)
- ChoiceRow(host, "controller-size", stringResource(R.string.ctrl_size), stringResource(R.string.ctrl_size_hint), ControllerPrefs.sizes.map { it to stringResource(R.string.ctrl_percent, it) }, c.size, onPick = a.onSize)
- ToggleRow(host, "controller-stick-click", stringResource(R.string.ctrl_stick_click), stringResource(R.string.ctrl_stick_click_hint), c.stickClick, onChange = a.onStickClick)
- ToggleRow(host, "controller-adaptive", stringResource(R.string.ctrl_adaptive), stringResource(R.string.ctrl_adaptive_hint), c.adaptiveSticks, onChange = a.onAdaptiveSticks)
- ToggleRow(host, "controller-rumble", stringResource(R.string.ctrl_rumble), null, c.rumble, onChange = a.onRumble)
- ChoiceRow(host, "controller-dead-zone", stringResource(R.string.ctrl_dead_zone), null, ControllerPrefs.deadZones.map { it to stringResource(R.string.ctrl_percent, it) }, c.deadZone, onPick = a.onDeadZone)
- ToggleRow(host, "controller-steam", stringResource(R.string.ctrl_steam_button), null, c.steamButton, onChange = a.onSteamButton)
- ToggleRow(host, "controller-qam", stringResource(R.string.ctrl_qam_button), null, c.qamButton, onChange = a.onQamButton)
- ToggleRow(host, "controller-keyboard", stringResource(R.string.ctrl_keyboard_button), null, c.keyboardButton, onChange = a.onKeyboardButton)
- ToggleRow(host, "controller-joycon-vr", stringResource(R.string.ctrl_joycon_vr), stringResource(R.string.ctrl_joycon_vr_hint), c.joyConVr, onChange = a.onJoyConVr)
- SettingsRow(stringResource(R.string.ctrl_layout), if (c.customLayout) stringResource(R.string.ctrl_layout_custom) else stringResource(R.string.ctrl_layout_default)) {
- Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
- SecondaryButton(stringResource(R.string.ctrl_edit)) { a.onEditLayout() }
- SecondaryButton(stringResource(R.string.ctrl_reset), enabled = c.customLayout) { a.onResetLayout() }
- }
- }
- ActionRow(stringResource(R.string.input_settings), stringResource(R.string.input_settings_hint), stringResource(R.string.ctrl_configure), a.onMapping)
- ActionRow(stringResource(R.string.ctrl_reset_all), stringResource(R.string.ctrl_reset_all_hint), stringResource(R.string.ctrl_reset), a.onResetAll)
+ return settings
}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt
deleted file mode 100644
index 557416deb0..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt
+++ /dev/null
@@ -1,781 +0,0 @@
-package com.droiddeck.launcher.ui
-
-import com.droiddeck.launcher.R
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-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
-import android.view.HapticFeedbackConstants
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.HorizontalScrollView
-import android.widget.LinearLayout
-import android.widget.TextView
-import com.droiddeck.launcher.input.DeckControls
-import com.droiddeck.launcher.input.InputRole
-import com.droiddeck.launcher.input.InputControl
-import com.droiddeck.launcher.input.InputSurfaceElement
-import com.droiddeck.launcher.input.PadBridge
-import com.droiddeck.launcher.input.PadState
-import com.droiddeck.launcher.session.SessionService
-import com.droiddeck.launcher.session.SessionPrefs
-import com.droiddeck.launcher.session.SessionState
-import kotlin.math.atan2
-import kotlin.math.hypot
-import kotlin.math.min
-
-@SuppressLint("ViewConstructor")
-class DeckControlsPanel(
- context: Context,
- private val onClose: () -> Unit,
- private val onSteamMenu: () -> Unit,
- private val onQam: () -> Unit,
- private val pad: PadBridge? = null,
- private val customLayout: List? = null,
- private val inputRole: InputRole = InputRole.SECONDARY,
- private val portraitDock: Boolean = false,
- private val onMenu: (() -> Unit)? = null,
- private val onSwap: (() -> Unit)? = null,
-) : LinearLayout(context) {
- private enum class Tab(val label: Int) { GAMEPAD(R.string.deck_tab_gamepad), GRIPS(R.string.deck_tab_grips), LEFT(R.string.deck_tab_left), RIGHT(R.string.deck_tab_right), BOTH(R.string.deck_tab_both) }
-
- private val deckSource = DeckControls.source(inputRole)
- private val content = FrameLayout(context)
- val deckControls = pad == null || SessionState.deckPad
- private val tabViews = HashMap()
- private val topBar: View by lazy { tabsRow() }
-
- init {
- orientation = VERTICAL
- setBackgroundColor(Color.BLACK)
- val title = context.getString(when {
- customLayout != null -> R.string.input_custom_controls
- deckControls -> R.string.second_mode_deck_controls
- else -> R.string.deck_tab_gamepad
- })
- val extras = listOfNotNull(onSwap?.let { BarExtra(context.getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, onClick = it) })
- addView(bottomScreenBarView(context) { sessionBarModel(title, onClose, onMenu, onSteamMenu, onQam, extras) },
- LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT))
- addView(topBar, LayoutParams(LayoutParams.MATCH_PARENT, dp(52)))
- addView(content, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f))
- if (customLayout != null && pad != null) renderCustom(pad, customLayout)
- else select(if (pad != null && !deckControls) Tab.GAMEPAD else if (pad != null) selectedWithPad else selected)
- }
-
- private fun renderCustom(pad: PadBridge, layout: List) {
- topBar.visibility = View.GONE
- val canvas = object : ViewGroup(context) {
- override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
- val w = MeasureSpec.getSize(widthMeasureSpec)
- val h = MeasureSpec.getSize(heightMeasureSpec)
- setMeasuredDimension(w, h)
- for (i in layout.indices) getChildAt(i).measure(MeasureSpec.makeMeasureSpec((w * layout[i].width).toInt(), MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec((h * layout[i].height).toInt(), MeasureSpec.EXACTLY))
- }
- override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
- for (i in layout.indices) {
- val e = layout[i]
- val child = getChildAt(i)
- val x = (width * e.x).toInt(); val y = (height * e.y).toInt()
- child.layout(x, y, x + child.measuredWidth, y + child.measuredHeight)
- }
- }
- }
- for (element in layout) {
- val c = element.control
- canvas.addView(when (c) {
- InputControl.LS, InputControl.RS -> StickView(context, pad, c == InputControl.RS)
- InputControl.LEFT_PAD, InputControl.RIGHT_PAD -> TrackpadView(context, c == InputControl.RIGHT_PAD)
- InputControl.LEFT_CLICK, InputControl.RIGHT_CLICK -> ClickBar(context, c == InputControl.RIGHT_CLICK)
- InputControl.L4, InputControl.R4, InputControl.L5, InputControl.R5 -> GripButton(context, c.label, null, 1 shl (c.ordinal - InputControl.L4.ordinal))
- else -> PadButton(context, pad, c.label) { state, down ->
- when (c) {
- InputControl.LT -> state.leftTrigger = if (down) 1f else 0f
- InputControl.RT -> state.rightTrigger = if (down) 1f else 0f
- InputControl.UP -> state.up = down
- InputControl.RIGHT -> state.right = down
- InputControl.DOWN -> state.down = down
- InputControl.LEFT -> state.left = down
- else -> state.press(when (c) {
- InputControl.GUIDE -> PadState.GUIDE; InputControl.QAM -> PadState.QAM
- else -> c.ordinal
- }, down)
- }
- }
- })
- }
- content.addView(canvas, FrameLayout.LayoutParams(-1, -1))
- }
-
- override fun onDetachedFromWindow() {
- deckSource.release()
- pad?.releaseTouch(this)
- deckSource.close()
- super.onDetachedFromWindow()
- }
-
- private fun tabsRow(): View = LinearLayout(context).apply {
- orientation = HORIZONTAL
- gravity = Gravity.CENTER
- setPadding(dp(12), 0, dp(12), dp(8))
- val tabs = LinearLayout(context).apply {
- orientation = HORIZONTAL
- background = outline(CORNER_PILL, SURFACE)
- setPadding(dp(4), dp(4), dp(4), dp(4))
- for (tab in Tab.values()) {
- if (!deckControls && tab != Tab.GAMEPAD) continue
- if (tab == Tab.GAMEPAD && pad == null) continue
- val view = TextView(context).apply {
- text = context.getString(tab.label)
- textSize = 14f
- typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
- gravity = Gravity.CENTER
- isSingleLine = true
- setPadding(dp(14), 0, dp(14), 0)
- setOnClickListener { select(tab) }
- }
- tabViews[tab] = view
- addView(view, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT))
- }
- }
- val centre = HorizontalScrollView(context).apply {
- isHorizontalScrollBarEnabled = false
- overScrollMode = View.OVER_SCROLL_NEVER
- addView(tabs, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, dp(44)))
- }
- addView(centre, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT))
- }
-
- private fun select(tab: Tab) {
- if (pad != null) selectedWithPad = tab else selected = tab
- deckSource.release()
- for ((each, view) in tabViews) {
- val on = each == tab
- view.background = if (on) filled(CORNER_PILL, ACCENT) else null
- view.setTextColor(if (on) ON_ACCENT else TEXT_DIM)
- }
- tabViews[tab]?.let { selectedView ->
- (selectedView.parent?.parent as? HorizontalScrollView)?.post {
- val left = selectedView.left
- val right = selectedView.right
- val scroll = selectedView.parent?.parent as? HorizontalScrollView ?: return@post
- when {
- left < scroll.scrollX -> scroll.smoothScrollTo(left, 0)
- right > scroll.scrollX + scroll.width -> scroll.smoothScrollTo(right - scroll.width, 0)
- }
- }
- }
- content.removeAllViews()
- pad?.releaseTouch(this)
- topBar.visibility = if (tab == Tab.GAMEPAD || tabViews.size < 2) View.GONE else View.VISIBLE
- content.addView(
- when (tab) {
- Tab.GRIPS -> gripsGrid()
- Tab.LEFT -> singlePad(right = false)
- Tab.RIGHT -> singlePad(right = true)
- Tab.BOTH -> bothPads()
- Tab.GAMEPAD -> gamepad(pad ?: return)
- },
- FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT),
- )
- }
-
- private fun gripsGrid(): View = LinearLayout(context).apply {
- orientation = HORIZONTAL
- setPadding(dp(12), dp(6), dp(12), dp(12))
- fun column(upper: View, lower: View) = LinearLayout(context).apply {
- orientation = VERTICAL
- addView(upper, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f).apply { bottomMargin = dp(6) })
- addView(lower, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f).apply { topMargin = dp(6) })
- }
- addView(column(GripButton(context, "L4", context.getString(R.string.deck_left_upper), DeckControls.L4), GripButton(context, "L5", context.getString(R.string.deck_left_lower), DeckControls.L5)),
- LayoutParams(0, LayoutParams.MATCH_PARENT, 1f).apply { rightMargin = dp(6) })
- addView(column(GripButton(context, "R4", context.getString(R.string.deck_right_upper), DeckControls.R4), GripButton(context, "R5", context.getString(R.string.deck_right_lower), DeckControls.R5)),
- LayoutParams(0, LayoutParams.MATCH_PARENT, 1f).apply { leftMargin = dp(6) })
- }
-
- private fun singlePad(right: Boolean): View = LinearLayout(context).apply {
- orientation = VERTICAL
- setPadding(dp(12), dp(6), dp(12), dp(12))
- addView(TrackpadView(context, right), LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f).apply { bottomMargin = dp(12) })
- addView(ClickBar(context, right), LayoutParams(LayoutParams.MATCH_PARENT, dp(76)))
- }
-
- private fun bothPads(): View = LinearLayout(context).apply {
- orientation = VERTICAL
- setPadding(dp(12), dp(6), dp(12), dp(12))
- val pads = LinearLayout(context).apply {
- orientation = HORIZONTAL
- addView(TrackpadView(context, right = false), LayoutParams(0, LayoutParams.MATCH_PARENT, 1f).apply { rightMargin = dp(6) })
- addView(TrackpadView(context, right = true), LayoutParams(0, LayoutParams.MATCH_PARENT, 1f).apply { leftMargin = dp(6) })
- }
- addView(pads, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f).apply { bottomMargin = dp(12) })
- val grips = LinearLayout(context).apply {
- orientation = HORIZONTAL
- val row = listOf("L4" to DeckControls.L4, "L5" to DeckControls.L5, "R5" to DeckControls.R5, "R4" to DeckControls.R4)
- row.forEachIndexed { index, (label, bit) ->
- addView(GripButton(context, label, null, bit), LayoutParams(0, LayoutParams.MATCH_PARENT, 1f).apply {
- if (index > 0) leftMargin = dp(6)
- if (index < row.size - 1) rightMargin = dp(6)
- })
- }
- }
- addView(grips, LayoutParams(LayoutParams.MATCH_PARENT, dp(84)))
- }
-
- private fun gamepad(pad: PadBridge): View = GamepadLayout(context, portraitDock).apply {
- fun pill(label: String, write: (PadState, Boolean) -> Unit) = PadButton(context, pad, label, write)
- place(surfaceSlot(pad, right = false), GamepadGeometry.Slot.LEFT_MAIN)
- place(DirectionPad(context, pad), GamepadGeometry.Slot.LEFT_SECOND)
- place(surfaceSlot(pad, right = true), GamepadGeometry.Slot.RIGHT_MAIN)
- place(FaceButtons(context, pad), GamepadGeometry.Slot.RIGHT_SECOND)
- place(pill("LT") { st, d -> st.leftTrigger = if (d) 1f else 0f }, GamepadGeometry.Slot.LEFT_OUTER_SHOULDER)
- place(pill("LB") { st, d -> st.press(PadState.LB, d) }, GamepadGeometry.Slot.LEFT_INNER_SHOULDER)
- place(pill("RB") { st, d -> st.press(PadState.RB, d) }, GamepadGeometry.Slot.RIGHT_INNER_SHOULDER)
- place(pill("RT") { st, d -> st.rightTrigger = if (d) 1f else 0f }, GamepadGeometry.Slot.RIGHT_OUTER_SHOULDER)
- place(pill("VIEW") { st, d -> st.press(PadState.SELECT, d) }, GamepadGeometry.Slot.VIEW)
- place(pill("MENU") { st, d -> st.press(PadState.START, d) }, GamepadGeometry.Slot.MENU)
- if (deckControls) place(centreTap("\u25a6 " + context.getString(R.string.deck_panels), context.getString(R.string.deck_more_controls)) { select(Tab.BOTH) },
- GamepadGeometry.Slot.PANELS)
- if (portraitDock && deckControls) {
- place(GripButton(context, "L4", null, DeckControls.L4), GamepadGeometry.Slot.L4)
- place(GripButton(context, "L5", null, DeckControls.L5), GamepadGeometry.Slot.L5)
- place(GripButton(context, "R5", null, DeckControls.R5), GamepadGeometry.Slot.R5)
- place(GripButton(context, "R4", null, DeckControls.R4), GamepadGeometry.Slot.R4)
- }
- }
-
- private fun centreTap(label: String, description: String, onClick: () -> Unit) = TextView(context).apply {
- text = label
- contentDescription = description
- textSize = 13f
- maxLines = 1
- setAutoSizeTextTypeUniformWithConfiguration(9, 13, 1, android.util.TypedValue.COMPLEX_UNIT_SP)
- typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
- letterSpacing = 0.08f
- gravity = Gravity.CENTER
- setTextColor(TEXT)
- background = outline(CORNER_PILL, SURFACE)
- setOnClickListener {
- performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- onClick()
- }
- }
-
- private fun surfaceSlot(pad: PadBridge, right: Boolean): View = FrameLayout(context).apply {
- if (!deckControls) {
- addView(StickView(context, pad, right),
- FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT))
- return@apply
- }
- val slot = this
- fun show() {
- slot.removeAllViews()
- val stick = SessionPrefs.gamepadSurface(context, right) == SessionPrefs.SURFACE_STICK
- slot.addView(if (stick) StickView(context, pad, right) else TrackpadView(context, right, captioned = false),
- FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT))
- val chip = TextView(context).apply {
- text = "\u21c4"
- contentDescription = context.getString(R.string.deck_surface_switch)
- textSize = 14f
- typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
- gravity = Gravity.CENTER
- setTextColor(TEXT_DIM)
- background = outline(CORNER_PILL, SURFACE)
- setOnClickListener {
- performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- SessionPrefs.setGamepadSurface(context, right,
- if (stick) SessionPrefs.SURFACE_TRACKPAD else SessionPrefs.SURFACE_STICK)
- show()
- }
- }
- slot.addView(chip, FrameLayout.LayoutParams(dp(30), dp(30),
- (if (right) Gravity.START else Gravity.END) or Gravity.TOP).apply { setMargins(dp(6), dp(6), dp(6), dp(6)) })
- }
- show()
- }
-
- fun takesTouchAt(x: Float, y: Float): Boolean = controlUnder(this, x, y)
-
- private fun controlUnder(view: View, x: Float, y: Float): Boolean {
- if (view.visibility != VISIBLE || x < 0f || y < 0f || x >= view.width || y >= view.height) return false
- if (view.isClickable || view is HorizontalScrollView || view is Surface || view is DirectionPad || view is FaceButtons ||
- view is androidx.compose.ui.platform.ComposeView) return true
- val group = view as? ViewGroup ?: return false
- return (group.childCount - 1 downTo 0).any { i ->
- val child = group.getChildAt(i)
- controlUnder(child, x + group.scrollX - child.x, y + group.scrollY - child.y)
- }
- }
-
- private fun outline(radius: Float, fill: Int) = outline(context, radius, fill)
-
- private fun filled(radius: Float, fill: Int) = GradientDrawable().apply {
- cornerRadius = radius * resources.displayMetrics.density
- setColor(fill)
- }
-
- private fun dp(value: Int): Int = dp(context, value)
-
-
- private abstract class Surface(context: Context) : View(context) {
- 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)
- }
- protected val captionPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
- textAlign = Paint.Align.CENTER
- color = TEXT_DIM
- }
-
- protected fun drawSurface(canvas: Canvas, lit: Boolean) {
- val inset = density
- rect.set(inset, inset, width - inset, height - inset)
- val radius = CORNER * density
- fill.color = if (lit) ACCENT_WASH else SURFACE
- canvas.drawRoundRect(rect, radius, radius, fill)
- stroke.color = if (lit) ACCENT else LINE
- stroke.strokeWidth = (if (lit) 2f else 1f) * density
- canvas.drawRoundRect(rect, radius, radius, stroke)
- }
- }
-
- private open class HoldButton(
- context: Context,
- private val label: String,
- private val caption: String?,
- private val onChange: (Boolean) -> Unit,
- ) : Surface(context) {
- private var down = false
-
- override fun onDraw(canvas: Canvas) {
- drawSurface(canvas, down)
- val cx = width / 2f
- labelPaint.textSize = min(height * 0.3f, 30 * density)
- val labelWidth = labelPaint.measureText(label)
- if (labelWidth > width * 0.84f) labelPaint.textSize *= width * 0.84f / labelWidth
- labelPaint.color = if (down) ACCENT else TEXT
- val labelY = height / 2f + labelPaint.textSize * (if (caption == null) 0.35f else 0.1f)
- canvas.drawText(label, cx, labelY, labelPaint)
- if (caption != null) {
- captionPaint.textSize = 12 * density
- canvas.drawText(caption, cx, labelY + 22 * density, captionPaint)
- }
- }
-
- @SuppressLint("ClickableViewAccessibility")
- override fun onTouchEvent(event: MotionEvent): Boolean {
- when (event.actionMasked) {
- MotionEvent.ACTION_DOWN -> set(true)
- MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> set(false)
- }
- return true
- }
-
- private fun set(pressed: Boolean) {
- if (down == pressed) return
- down = pressed
- if (pressed) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- onChange(pressed)
- invalidate()
- }
- }
-
- private inner class GripButton(context: Context, label: String, caption: String?, bit: Int) :
- HoldButton(context, label, caption, { deckSource.setGrip(bit, it) })
-
- private inner class ClickBar(context: Context, right: Boolean) :
- HoldButton(context, context.getString(R.string.deck_click), if (right) context.getString(R.string.deck_right_trackpad) else context.getString(R.string.deck_left_trackpad), { deckSource.setClick(right, it) })
-
- private inner class TrackpadView(context: Context, private val right: Boolean, private val captioned: Boolean = true) : Surface(context) {
- private var touching = false
- 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((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)
- }
- }
-
- @SuppressLint("ClickableViewAccessibility")
- override fun onTouchEvent(event: MotionEvent): Boolean {
- when (event.actionMasked) {
- MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
- touch(event.getX(0), event.getY(0))
- click(event.pointerCount > 1)
- }
- MotionEvent.ACTION_POINTER_DOWN -> click(true)
- MotionEvent.ACTION_POINTER_UP -> {
- val stays = if (event.actionIndex == 0) 1 else 0
- touch(event.getX(stays), event.getY(stays))
- click(event.pointerCount - 1 > 1)
- }
- MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
- click(false)
- touching = false
- deckSource.setPad(right, touching = false)
- invalidate()
- }
- }
- return true
- }
-
- private fun touch(x: Float, y: Float) {
- fingerX = x.coerceIn(0f, width.toFloat())
- fingerY = y.coerceIn(0f, height.toFloat())
- touching = true
- deckSource.setPad(right, true, (fingerX - width / 2f) / (width / 2f), -(fingerY - height / 2f) / (height / 2f))
- invalidate()
- }
-
- private fun click(down: Boolean) {
- if (clicked == down) return
- clicked = down
- if (down) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- deckSource.setClick(right, down)
- invalidate()
- }
- }
-
- private inner class PadButton(
- context: Context,
- private val pad: PadBridge,
- label: String,
- private val write: (PadState, Boolean) -> Unit,
- ) : HoldButton(context, label, null, { down -> pad.applyTouch(this@DeckControlsPanel, inputRole) { write(it, down) } }) {
- override fun onDetachedFromWindow() {
- pad.applyTouch(this@DeckControlsPanel, inputRole) { write(it, false) }
- super.onDetachedFromWindow()
- }
- }
-
- private inner class StickView(context: Context, private val pad: PadBridge, private val right: Boolean) : Surface(context) {
- private var touching = false
- private var clicking = false
- private var lastUp = 0L
- private var originX = 0f
- 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)
-
- private fun reach() = min(width, height) * 0.30f
-
- override fun onDraw(canvas: Canvas) {
- drawSurface(canvas, clicking)
- val cx = if (touching) originX else width / 2f
- val cy = if (touching) originY else height / 2f
- 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)
- }
-
- @SuppressLint("ClickableViewAccessibility")
- override fun onTouchEvent(event: MotionEvent): Boolean {
- val r = reach().coerceAtLeast(1f)
- when (event.actionMasked) {
- MotionEvent.ACTION_DOWN -> {
- originX = event.x.coerceIn(r, (width - r).coerceAtLeast(r))
- originY = event.y.coerceIn(r, (height - r).coerceAtLeast(r))
- touching = true
- performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- if (event.eventTime - lastUp < CLICK_MS) setClick(true)
- follow(event.x, event.y, r)
- }
- MotionEvent.ACTION_MOVE -> follow(event.getX(0), event.getY(0), r)
- MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
- touching = false
- lastUp = event.eventTime
- setClick(false)
- move(0f, 0f, 1f)
- }
- }
- return true
- }
-
- private fun follow(x: Float, y: Float, r: Float) {
- var dx = x - originX
- var dy = y - originY
- val length = hypot(dx, dy)
- if (length > r) { dx *= r / length; dy *= r / length }
- move(dx, dy, r)
- }
-
- private fun move(dx: Float, dy: Float, r: Float) {
- knobX = dx
- knobY = dy
- pad.applyTouch(this@DeckControlsPanel, inputRole, if (right) PadBridge.RIGHT_STICK else PadBridge.LEFT_STICK) { s ->
- if (right) { s.rightX = dx / r; s.rightY = dy / r } else { s.leftX = dx / r; s.leftY = dy / r }
- }
- invalidate()
- }
-
- private fun setClick(down: Boolean) {
- if (clicking == down) return
- clicking = down
- if (down) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- pad.applyTouch(this@DeckControlsPanel, inputRole) { s -> s.press(if (right) PadState.R3 else PadState.L3, down) }
- }
-
- override fun onDetachedFromWindow() {
- setClick(false)
- if (knobX != 0f || knobY != 0f) move(0f, 0f, 1f)
- super.onDetachedFromWindow()
- }
- }
-
- private inner class DirectionPad(context: Context, private val pad: PadBridge) : View(context) {
- private val density = resources.displayMetrics.density
- private var held = 0
- private val arm = Paint(Paint.ANTI_ALIAS_FLAG)
- 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)
- }
-
- @SuppressLint("ClickableViewAccessibility")
- override fun onTouchEvent(event: MotionEvent): Boolean {
- val bits = when (event.actionMasked) {
- MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
- val dx = event.getX(0) - width / 2f
- val dy = event.getY(0) - height / 2f
- if (hypot(dx, dy) < min(width, height) * 0.08f) 0 else {
- val sector = ((Math.toDegrees(atan2(dy.toDouble(), dx.toDouble())) + 360 + 22.5) % 360 / 45).toInt()
- intArrayOf(2, 2 or 4, 4, 4 or 8, 8, 8 or 1, 1, 1 or 2)[sector]
- }
- }
- else -> 0
- }
- set(bits)
- return true
- }
-
- private fun set(bits: Int) {
- if (bits == held) return
- if (bits and held.inv() != 0) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- held = bits
- pad.applyTouch(this@DeckControlsPanel, inputRole) { s ->
- s.up = bits and 1 != 0; s.right = bits and 2 != 0; s.down = bits and 4 != 0; s.left = bits and 8 != 0
- }
- invalidate()
- }
-
- override fun onDetachedFromWindow() {
- set(0)
- super.onDetachedFromWindow()
- }
- }
-
- private inner class FaceButtons(context: Context, private val pad: PadBridge) : View(context) {
- private val buttons = listOf(PadState.Y to "Y", PadState.B to "B", PadState.A to "A", PadState.X to "X")
- private var held = emptySet()
- private val fill = Paint(Paint.ANTI_ALIAS_FLAG)
- private val text = Paint(Paint.ANTI_ALIAS_FLAG).apply {
- textAlign = Paint.Align.CENTER
- typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
- }
-
- private fun layout(): Pair>, Float> {
- val cx = width / 2f
- val cy = height / 2f
- val spread = min(width, height) * 0.30f
- val radius = min(width, height) * 0.16f
- return listOf(cx to cy - spread, cx + spread to cy, cx to cy + spread, cx - spread to cy) to radius
- }
-
- override fun onDraw(canvas: Canvas) {
- val (centres, radius) = layout()
- text.textSize = radius * 0.9f
- buttons.forEachIndexed { i, (button, label) ->
- val (x, y) = centres[i]
- val down = button in held
- fill.color = if (down) ACCENT else KNOB
- canvas.drawCircle(x, y, radius, fill)
- text.color = if (down) ON_ACCENT else TEXT
- canvas.drawText(label, x, y + text.textSize * 0.35f, text)
- }
- }
-
- @SuppressLint("ClickableViewAccessibility")
- override fun onTouchEvent(event: MotionEvent): Boolean {
- val (centres, radius) = layout()
- val now = HashSet()
- val ending = event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL
- if (!ending) for (p in 0 until event.pointerCount) {
- if (event.actionMasked == MotionEvent.ACTION_POINTER_UP && p == event.actionIndex) continue
- val x = event.getX(p)
- val y = event.getY(p)
- val nearest = centres.indices.minByOrNull { hypot(centres[it].first - x, centres[it].second - y) } ?: continue
- if (hypot(centres[nearest].first - x, centres[nearest].second - y) <= radius * 1.6f) now.add(buttons[nearest].first)
- }
- set(now)
- return true
- }
-
- private fun set(now: Set) {
- if (now == held) return
- if ((now - held).isNotEmpty()) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- val before = held
- held = now
- pad.applyTouch(this@DeckControlsPanel, inputRole) { s -> for (b in before + now) s.press(b, b in now) }
- invalidate()
- }
-
- override fun onDetachedFromWindow() {
- set(emptySet())
- super.onDetachedFromWindow()
- }
- }
-
- private class GamepadLayout(context: Context, private val portraitDock: Boolean) : ViewGroup(context) {
- private val slots = LinkedHashMap()
-
- fun place(view: View, slot: GamepadGeometry.Slot) {
- slots[view] = slot
- addView(view)
- }
-
- private fun boxes(w: Int, h: Int) = GamepadGeometry.layout(w.toFloat(), h.toFloat(), resources.displayMetrics.density, portraitDock)
-
- override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
- val w = MeasureSpec.getSize(widthMeasureSpec)
- val h = MeasureSpec.getSize(heightMeasureSpec)
- setMeasuredDimension(w, h)
- val boxes = boxes(w, h)
- for ((view, slot) in slots) {
- val box = boxes[slot]
- view.visibility = if (box == null) View.GONE else View.VISIBLE
- if (box == null) continue
- view.measure(MeasureSpec.makeMeasureSpec(box.width.toInt().coerceAtLeast(1), MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec(box.height.toInt().coerceAtLeast(1), MeasureSpec.EXACTLY))
- }
- }
-
- override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
- val boxes = boxes(r - l, b - t)
- for ((view, slot) in slots) {
- val box = boxes[slot] ?: continue
- val left = box.left.toInt()
- val top = box.top.toInt()
- view.layout(left, top, left + box.width.toInt().coerceAtLeast(1), top + box.height.toInt().coerceAtLeast(1))
- }
- }
- }
-
- companion object {
- private const val CLICK_MS = 300L
-
- private var selected = Tab.BOTH
- private var selectedWithPad = Tab.BOTH
-
- private const val CORNER = 20f
- 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)
- private val SURFACE = Color.rgb(0x0A, 0x0B, 0x0D)
- private val LINE = Color.rgb(0x26, 0x29, 0x2E)
- private val GUIDE = Color.rgb(0x16, 0x18, 0x1B)
- private val TEXT = Color.rgb(0xF2, 0xF4, 0xF7)
- private val TEXT_DIM = Color.rgb(0x7A, 0x80, 0x8A)
- private val KNOB = Color.rgb(0x2A, 0x2D, 0x33)
-
- 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 {
- cornerRadius = radius * context.resources.displayMetrics.density
- setColor(fill)
- setStroke(dp(context, 1), LINE)
- }
-
- internal fun roundButton(context: Context, label: String, description: String, onClick: () -> Unit, wide: Boolean = false) =
- TextView(context).apply {
- text = label
- contentDescription = description
- textSize = if (wide) 13f else 20f
- typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
- letterSpacing = if (wide) 0.08f else 0f
- gravity = Gravity.CENTER
- setTextColor(TEXT)
- background = outline(context, CORNER_PILL, SURFACE)
- setPadding(if (wide) dp(context, 16) else 0, 0, if (wide) dp(context, 16) else 0, 0)
- minWidth = dp(context, 44)
- layoutParams = LinearLayout.LayoutParams(if (wide) LinearLayout.LayoutParams.WRAP_CONTENT else dp(context, 44), dp(context, 44))
- setOnClickListener {
- performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- onClick()
- }
- }
-
- internal fun menuButton(context: Context, onClick: () -> Unit) =
- iconButton(context, R.drawable.ic_stat_session, context.getString(R.string.touch_droiddeck_menu), onClick)
-
- internal fun iconButton(context: Context, icon: Int, description: String, onClick: () -> Unit) = android.widget.ImageView(context).apply {
- setImageResource(icon)
- setColorFilter(TEXT)
- contentDescription = description
- scaleType = android.widget.ImageView.ScaleType.CENTER_INSIDE
- val pad = dp(context, 11)
- setPadding(pad, pad, pad, pad)
- background = outline(context, CORNER_PILL, SURFACE)
- layoutParams = LinearLayout.LayoutParams(dp(context, 44), dp(context, 44))
- setOnClickListener {
- performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
- onClick()
- }
- }
- }
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
index 66dd4e0e1d..ac844177df 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt
@@ -245,7 +245,7 @@ internal fun SetupPanel(
PageHeader(stringResource(R.string.setup_title)) {
Box(Modifier.weight(1f)) { SheetChips(tabs, tab, chipFocus, onPick = pick) }
}
- Column(modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = 24.dp)) {
+ Column(modifier = Modifier.weight(1f).fillMaxWidth().then(if (tab == 1) Modifier else Modifier.verticalScroll(rememberScrollState())).padding(bottom = if (tab == 1) 0.dp else 24.dp)) {
when (tab) {
0 -> {
// Setup's "Safe mode" row, under the GPU row while the bridge is on and can be used here.
@@ -413,9 +413,7 @@ internal fun SetupPanel(
}
1 -> {
val controller = s.controller
- if (controller != null && a.controller != null) SettingsGroup(stringResource(R.string.setup_controller)) {
- ControllerRows(host, s.oscMode, controller, a.controller)
- }
+ if (controller != null && a.controller != null) InputSettingsPage(onBack = { pick(0) }, embedded = true)
if (s.controller == null || a.controller == null) Note(stringResource(R.string.setup_controller_unavailable))
}
2 -> {
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputActionEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputActionEditor.kt
new file mode 100644
index 0000000000..a53de480bb
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputActionEditor.kt
@@ -0,0 +1,136 @@
+package com.droiddeck.launcher.ui
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+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.unit.dp
+import com.droiddeck.launcher.R
+import com.droiddeck.launcher.input.*
+
+@Composable
+internal fun InputActionEditor(
+ control: InputControl, current: InputAction, title: String, onBack: () -> Unit, onSave: (InputAction) -> Unit,
+ element: InputSurfaceElement? = null, nativeTargets: Boolean = true, detail: String? = null,
+ properties: (@Composable ColumnScope.() -> Unit)? = null,
+ click: Boolean = false,
+) {
+ val context = LocalContext.current
+ val host = rememberMenuHost()
+ var draft by remember(current, title) { mutableStateOf(current) }
+ val drafts = remember(current, title) { mutableMapOf() }
+ fun typeOf(action: InputAction): String = when (action) {
+ is InputAction.Native -> "native"; InputAction.Disabled -> "disabled"
+ is InputAction.MouseButton -> "mouse"; is InputAction.Command -> "command"
+ is InputAction.Pointer -> "pointer"; is InputAction.Scroll -> "scroll"
+ is InputAction.Directions -> "directions"; is InputAction.Keys -> "keys"
+ }
+ var localType by remember(current, title) { mutableStateOf(typeOf(current).takeUnless { it == "native" || it == "disabled" } ?: "keys") }
+ fun switch(type: String, initial: () -> InputAction) {
+ drafts[typeOf(draft)] = draft
+ draft = drafts[type] ?: initial()
+ if (type != "native" && type != "disabled") localType = type
+ }
+ var keys by remember { mutableStateOf(false) }
+ var direction by remember { mutableStateOf(null) }
+ fun valid(action: InputAction) = if (click) action.validForClick() else if (element != null) action.validFor(element) else action.validFor(control)
+ val nativeOptions = remember(control, element, nativeTargets, click) {
+ (listOf(InputAction.Native()) + if (nativeTargets) InputControl.entries.map { InputAction.Native(it) } else emptyList()).filter(::valid)
+ }
+ val route = when (draft) { is InputAction.Native -> 0; InputAction.Disabled -> 2; else -> 1 }
+ BackHandler(onBack = onBack)
+ SettingsPage(host, title, onBack, eyebrow = stringResource(R.string.input_properties), lede = detail,
+ action = { PrimaryButton(stringResource(R.string.gesture_save_changes), enabled = valid(draft),
+ modifier = Modifier.testTag("input-action-save")) { onSave(draft) } }) {
+ properties?.invoke(this)
+ Spacer(Modifier.height(12.dp))
+ SheetChips(listOf(stringResource(R.string.input_route_controller), stringResource(R.string.input_route_local), stringResource(R.string.input_disabled)), route) {
+ when (it) {
+ 0 -> switch("native") { nativeOptions.firstOrNull() ?: InputAction.Disabled }
+ 2 -> switch("disabled") { InputAction.Disabled }
+ else -> switch(localType) { InputAction.Keys(listOf(28)) }
+ }
+ }
+ Spacer(Modifier.height(16.dp))
+ when (route) {
+ 0 -> SettingsGroup(stringResource(R.string.input_route_controller)) {
+ ChoiceRow(host, "native-target", stringResource(R.string.input_remap_native), stringResource(R.string.input_controller_route_hint),
+ nativeOptions.map { it to (it.target?.label ?: stringResource(if (nativeTargets) R.string.input_native else R.string.input_normal_binding)) },
+ draft as InputAction.Native) { draft = it }
+ }
+ 2 -> Text(stringResource(R.string.input_disabled_hint), Modifier.padding(16.dp))
+ else -> {
+ val types = listOf("keys" to stringResource(R.string.input_keys), "mouse" to stringResource(R.string.input_mouse_click),
+ "command" to stringResource(R.string.input_command)) + if (control.dimensions == 2) listOf(
+ "pointer" to stringResource(R.string.input_pointer), "scroll" to stringResource(R.string.input_scroll),
+ "directions" to stringResource(R.string.input_direction_keys)) else emptyList()
+ val type = when (draft) { is InputAction.MouseButton -> "mouse"; is InputAction.Command -> "command";
+ is InputAction.Pointer -> "pointer"; is InputAction.Scroll -> "scroll"; is InputAction.Directions -> "directions"; else -> "keys" }
+ SettingsGroup(stringResource(R.string.input_action)) {
+ ChoiceRow(host, "action-type", stringResource(R.string.input_action), null, types, type) {
+ switch(it) { when (it) { "mouse" -> InputAction.MouseButton(272); "command" -> InputAction.Command(InputCommand.MENU);
+ "pointer" -> InputAction.Pointer(); "scroll" -> InputAction.Scroll();
+ "directions" -> InputAction.Directions(103, 106, 108, 105); else -> InputAction.Keys(listOf(28)) } }
+ }
+ if (!click && draft !is InputAction.Pointer && draft !is InputAction.Scroll && draft !is InputAction.Directions) {
+ val hint = when {
+ control.isTrackpad -> R.string.input_contact_action_hint
+ control.dimensions == 2 -> R.string.input_axis_action_hint
+ control == InputControl.LT || control == InputControl.RT -> R.string.input_trigger_action_hint
+ else -> null
+ }
+ hint?.let { Text(stringResource(it), Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+ style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) }
+ }
+ when (val action = draft) {
+ is InputAction.Keys -> ActionRow(stringResource(R.string.input_keys), actionLabel(action), stringResource(R.string.ctrl_edit), { keys = true })
+ is InputAction.MouseButton -> ChoiceRow(host, "mouse-button", stringResource(R.string.input_mouse_click), null,
+ (272..274).map { it to actionLabel(InputAction.MouseButton(it)) }, action.code) { draft = InputAction.MouseButton(it) }
+ is InputAction.Command -> ChoiceRow(host, "command", stringResource(R.string.input_command), null,
+ InputCommand.entries.map { it to commandLabel(it) }, action.command) { draft = InputAction.Command(it) }
+ is InputAction.Pointer -> {
+ Text(stringResource(R.string.input_pointer_speed, action.speed.toInt()), Modifier.padding(horizontal = 16.dp, vertical = 8.dp), color = MaterialTheme.colorScheme.onSurface)
+ Slider(action.speed, { draft = action.copy(speed = it) }, valueRange = 100f..3000f, modifier = Modifier.padding(horizontal = 16.dp))
+ }
+ is InputAction.Scroll -> {
+ ChoiceRow(host, "scroll-axis", stringResource(R.string.input_scroll_axis), null,
+ listOf(false to stringResource(R.string.input_vertical), true to stringResource(R.string.input_horizontal)), action.horizontal) {
+ draft = action.copy(horizontal = it)
+ }
+ Text(stringResource(R.string.input_scroll_speed, action.speed.toInt()), Modifier.padding(horizontal = 16.dp, vertical = 8.dp), color = MaterialTheme.colorScheme.onSurface)
+ Slider(action.speed, { draft = action.copy(speed = it) }, valueRange = 1f..60f, modifier = Modifier.padding(horizontal = 16.dp))
+ }
+ is InputAction.Directions -> {
+ ToggleRow(host, "direction-diagonals", stringResource(R.string.input_diagonal_keys), stringResource(R.string.input_diagonal_keys_hint), action.diagonals != null) {
+ draft = action.copy(diagonals = if (it) action.diagonals ?: listOf(0, 0, 0, 0) else null)
+ }
+ val codes = listOf(action.up, action.right, action.down, action.left) + action.diagonals.orEmpty()
+ val arrows = listOf("↑", "→", "↓", "←", "↗", "↘", "↙", "↖")
+ codes.forEachIndexed { i, code ->
+ ActionRow(arrows[i], if (code == 0) stringResource(if (i < 4) R.string.input_disabled else R.string.input_diagonal_neighbors) else pcKeyLabel(context, code), stringResource(R.string.ctrl_edit), { direction = i })
+ }
+ }
+ else -> Unit
+ }
+ }
+ }
+ }
+ }
+ if (keys) KeyCombinationPicker(onDismiss = { keys = false }, initial = (draft as? InputAction.Keys)?.codes.orEmpty(),
+ sequence = true, sequenceLimit = 8, title = stringResource(R.string.input_keys), confirm = stringResource(R.string.gesture_save_changes), onAdd = {
+ draft = InputAction.Keys(it.sortedBy { code -> if (code in PC_MODIFIERS) 0 else 1 }); keys = false
+ })
+ direction?.let { at ->
+ val action = draft as? InputAction.Directions ?: return@let
+ val codes = listOf(action.up, action.right, action.down, action.left) + action.diagonals.orEmpty()
+ KeyCombinationPicker(onDismiss = { direction = null }, initial = listOf(codes[at]).filter { it != 0 }, sequence = true, sequenceLimit = 1, allowEmpty = true,
+ title = stringResource(R.string.input_direction_keys), confirm = stringResource(R.string.gesture_save_changes), onAdd = {
+ val next = codes.toMutableList().also { values -> values[at] = it.firstOrNull() ?: 0 }
+ draft = InputAction.Directions(next[0], next[1], next[2], next[3], if (action.diagonals != null) next.drop(4) else null); direction = null
+ })
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputBindingWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputBindingWidgets.kt
new file mode 100644
index 0000000000..eb0337193b
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputBindingWidgets.kt
@@ -0,0 +1,55 @@
+package com.droiddeck.launcher.ui
+
+import androidx.compose.foundation.focusable
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.input.key.onPreviewKeyEvent
+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 actionLabel(action: InputAction): String {
+ val context = LocalContext.current
+ return when (action) {
+ is InputAction.Native -> action.target?.let { stringResource(R.string.input_native_target, it.label) } ?: stringResource(R.string.input_native)
+ InputAction.Disabled -> stringResource(R.string.input_disabled)
+ is InputAction.Keys -> action.codes.joinToString(" + ") { pcKeyLabel(context, it) }
+ is InputAction.MouseButton -> stringResource(when (action.code) { 272 -> R.string.input_mouse_left; 273 -> R.string.input_mouse_right; else -> R.string.input_mouse_middle })
+ is InputAction.Command -> commandLabel(action.command)
+ is InputAction.Directions -> listOf(action.up, action.right, action.down, action.left).joinToString(" / ") { pcKeyLabel(context, it) }
+ is InputAction.Pointer -> stringResource(R.string.input_pointer)
+ is InputAction.Scroll -> stringResource(if (action.horizontal) R.string.input_scroll_horizontal else R.string.input_scroll_vertical)
+ }
+}
+
+@Composable
+internal fun commandLabel(command: InputCommand) = stringResource(when (command) {
+ InputCommand.MENU -> R.string.input_command_menu
+ InputCommand.KEYBOARD -> R.string.input_command_keyboard
+ InputCommand.STEAM -> R.string.input_command_steam
+ InputCommand.QUICK_ACCESS -> R.string.input_command_qam
+})
+
+@Composable
+internal fun InputCaptureDialog(onDismiss: () -> Unit, onPick: (PhysicalInputKey) -> Unit) {
+ val focus = remember { FocusRequester() }
+ var captured by remember { mutableStateOf(null) }
+ AlertDialog(onDismissRequest = onDismiss, title = { Text(stringResource(R.string.input_capture)) },
+ modifier = Modifier.onPreviewKeyEvent {
+ val event = it.nativeKeyEvent
+ val key = PhysicalInputKey.capture(event)
+ if (key != null) {
+ if (event.action == android.view.KeyEvent.ACTION_DOWN && event.repeatCount == 0) captured = key
+ true
+ } else false
+ }.focusRequester(focus).focusable(),
+ text = { Text(captured?.label ?: stringResource(R.string.input_capture_hint)) },
+ confirmButton = { TextButton(enabled = captured != null, onClick = { captured?.let(onPick) }) { Text(stringResource(R.string.ctrl_edit)) } },
+ dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) } })
+ LaunchedEffect(Unit) { focus.requestFocus() }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputDisplayContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputDisplayContent.kt
new file mode 100644
index 0000000000..a65134b7d6
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputDisplayContent.kt
@@ -0,0 +1,58 @@
+package com.droiddeck.launcher.ui
+
+import android.app.Presentation
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Display
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
+import androidx.compose.runtime.*
+import androidx.compose.ui.platform.ComposeView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeViewModelStoreOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+
+internal val LocalInputActivity = staticCompositionLocalOf { null }
+
+@Composable
+internal fun InputDisplayContent(host: ComponentActivity, display: Display, onDismiss: () -> Unit, content: @Composable () -> Unit) {
+ val parent = rememberCompositionContext()
+ val currentContent by rememberUpdatedState(content)
+ val dismiss by rememberUpdatedState(onDismiss)
+ DisposableEffect(host, display.displayId) {
+ val presentation = object : Presentation(host, display) {
+ var compose: ComposeView? = null
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ window?.apply {
+ setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+ prepareInputEditor()
+ decorView.setViewTreeLifecycleOwner(host)
+ decorView.setViewTreeViewModelStoreOwner(host)
+ decorView.setViewTreeSavedStateRegistryOwner(host)
+ decorView.setViewTreeOnBackPressedDispatcherOwner(host)
+ }
+ // Presentation contexts cannot host TYPE_APPLICATION dialogs on Android 12+.
+ compose = ComposeView(host).also {
+ it.setParentCompositionContext(parent)
+ it.setContent { CompositionLocalProvider(LocalInputActivity provides host) { currentContent() } }
+ setContentView(it)
+ }
+ }
+ override fun dismiss() { compose?.disposeComposition(); compose = null; super.dismiss() }
+ }
+ presentation.setOnCancelListener { dismiss() }
+ presentation.show()
+ val observer = LifecycleEventObserver { _, event ->
+ if (event == Lifecycle.Event.ON_STOP) presentation.hide()
+ if (event == Lifecycle.Event.ON_START) presentation.show()
+ }
+ host.lifecycle.addObserver(observer)
+ onDispose { host.lifecycle.removeObserver(observer); presentation.dismiss() }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputElementProperties.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputElementProperties.kt
new file mode 100644
index 0000000000..0ba8b03f96
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputElementProperties.kt
@@ -0,0 +1,51 @@
+package com.droiddeck.launcher.ui
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.foundation.Canvas
+import androidx.compose.ui.graphics.nativeCanvas
+import com.droiddeck.launcher.input.*
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.droiddeck.launcher.R
+
+@Composable
+internal fun InputElementProperties(element: InputSurfaceElement, onChange: (InputSurfaceElement) -> Unit) {
+ OutlinedTextField(element.name, { onChange(element.copy(name = it.take(80))) }, label = { Text(stringResource(R.string.input_name)) },
+ singleLine = true, modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp))
+ if (element.kind == InputElementKind.BUTTON || element.kind == InputElementKind.TRIGGER) {
+ val host = rememberMenuHost()
+ val context = LocalContext.current
+ ToggleRow(host, "element-toggle", stringResource(R.string.input_toggle_button), stringResource(R.string.input_toggle_button_hint), 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)) }
+ val open = host.open == "element-icon"
+ SettingsRow(stringResource(R.string.input_button_symbol), null, highlighted = open) {
+ Box {
+ ValueChip(if (element.image.isNotEmpty()) stringResource(R.string.input_imported_image) else if (element.icon == 0) stringResource(R.string.input_button_text) else pcKeyLabel(context, element.icon), open) { host.open = if (open) null else "element-icon" }
+ AnchoredMenu(open, onDismiss = { host.open = null }, title = stringResource(R.string.input_button_symbol)) { firstItemFocus ->
+ MenuItem(stringResource(R.string.input_button_text), element.icon == 0 && element.image.isEmpty(), focusRequester = firstItemFocus) { onChange(element.copy(icon = 0, image = "")); host.open = null }
+ for (code in InputButtonIcons.codes) MenuItem(pcKeyLabel(context, code), element.icon == code && element.image.isEmpty(), leading = {
+ val color = MaterialTheme.colorScheme.onSurface
+ Canvas(Modifier.size(22.dp)) {
+ val paint = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { this.color = android.graphics.Color.argb((color.alpha * 255).toInt(), (color.red * 255).toInt(), (color.green * 255).toInt(), (color.blue * 255).toInt()) }
+ InputButtonIcons.draw(drawContext.canvas.nativeCanvas, code, size.width / 2, size.height / 2, size.minDimension, paint)
+ }
+ }) { onChange(element.copy(icon = code, image = "")); host.open = null }
+ }
+ }
+ }
+ }
+ 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)) }
+ }
+ if (element.kind == InputElementKind.STICK) {
+ val host = rememberMenuHost()
+ ToggleRow(host, "element-floating", stringResource(R.string.input_floating_stick), null, element.floating) { onChange(element.copy(floating = it)) }
+ ToggleRow(host, "element-hide-idle", stringResource(R.string.input_hide_idle), null, element.hideWhenIdle) { onChange(element.copy(hideWhenIdle = it)) }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt
new file mode 100644
index 0000000000..c4c2047d0a
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputLayoutWidgets.kt
@@ -0,0 +1,88 @@
+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.clickable
+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().clickable(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)
+ }
+ TextButton(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
+ 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)
+ contentDescription = layout.name
+ invalidate()
+ }
+ override fun onDraw(canvas: Canvas) {
+ canvas.save()
+ canvas.clipRect(0, 0, width, height)
+ canvas.drawColor(android.graphics.Color.rgb(10, 11, 13))
+ val scale = minOf(width / 1000f, height / sourceHeight.toFloat())
+ canvas.translate((width - 1000 * scale) / 2, (height - sourceHeight * scale) / 2)
+ canvas.scale(scale, scale)
+ renderer.draw(canvas)
+ canvas.restore()
+ }
+}
+
+@Composable
+internal fun InputColorRow(host: MenuHost, value: Int, onPick: (Int) -> Unit) {
+ val open = host.open == "layout-color"
+ SettingsRow(stringResource(R.string.ctrl_color), null, highlighted = open) {
+ Box {
+ ValueChip(ControllerPrefs.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 ->
+ ControllerPrefs.tints.forEachIndexed { index, (color, name) ->
+ MenuItem(stringResource(name), checked = value == color, leading = {
+ Box(Modifier.size(14.dp).background(Color(color), CircleShape).border(1.dp, Color.White.copy(alpha = .35f), CircleShape))
+ }, focusRequester = if (index == 0) firstItemFocus else null) {
+ onPick(color)
+ host.open = null
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt
new file mode 100644
index 0000000000..ab7dcee975
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputQuickSettings.kt
@@ -0,0 +1,82 @@
+package com.droiddeck.launcher.ui
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.clickable
+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).clickable { 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 = { TextButton(enabled = name.isNotBlank(), onClick = { update(null) { it.saveSelection(desktop, name) }; naming = false }) { Text(stringResource(R.string.gesture_save_changes)) } },
+ dismissButton = { TextButton(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 = { TextButton(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 d37716005f..c1eed9db94 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSettingsPage.kt
@@ -1,225 +1,410 @@
package com.droiddeck.launcher.ui
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.focusable
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.*
import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
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
@Composable
fun InputSettingsDialog(onBack: () -> Unit, onChanged: () -> Unit) {
+ 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)) {
- Surface(Modifier.fillMaxWidth(0.95f).fillMaxHeight(0.95f)) {
- InputSettingsPage(onBack, onChanged)
- }
+ InputSettingsPane(onBack, onChanged)
}
}
@Composable
-fun InputSettingsPage(onBack: () -> Unit, onChanged: () -> Unit = {}) {
+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 { }
+ }
+ 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 })
+ }
+ }
+ }
+}
+
+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)
+
+@Composable
+fun InputSettingsPage(onBack: () -> Unit, onChanged: () -> Unit = {}, embedded: Boolean = false, onSurfaceEditing: (Boolean) -> Unit = {}) {
+ CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
+ InputSettingsContent(onBack, onChanged, embedded, onSurfaceEditing)
+ }
+}
+
+@Composable
+private fun InputSettingsContent(onBack: () -> Unit, onChanged: () -> Unit, embedded: Boolean, onSurfaceEditing: (Boolean) -> Unit) {
val context = LocalContext.current
val host = rememberMenuHost()
- var measuring by remember { mutableStateOf(InputTiming.enabled) }
- var timing by remember { mutableStateOf(InputTiming.report()) }
- var id by remember { mutableStateOf(InputProfile.GAME) }
- var profile by remember { mutableStateOf(InputProfiles.read(context, id)) }
- var selected by remember { mutableStateOf(InputProfiles.selection(context)) }
+ var library by remember { mutableStateOf(InputLibraries.read(context)) }
+ var page by remember { mutableStateOf(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 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 editKey by remember { mutableStateOf(null) }
var surface by remember { mutableStateOf(false) }
- val names = listOf(InputProfile.GAME to stringResource(R.string.input_profile_game), InputProfile.DESKTOP to stringResource(R.string.input_profile_desktop))
- SettingsPage(host, title = stringResource(R.string.input_settings), eyebrow = stringResource(R.string.setup_controller),
- lede = stringResource(R.string.input_settings_hint), onBack = onBack) {
- SettingsGroup(stringResource(R.string.shortcuts_title)) {
- PhysicalShortcutRows()
+ LaunchedEffect(surface) { onSurfaceEditing(surface) }
+ DisposableEffect(Unit) { onDispose { onSurfaceEditing(false) } }
+ var managingLayout by remember { mutableStateOf(null) }
+ var error by remember { mutableStateOf(null) }
+ val controller = rememberControllerSettings()
+ var oscMode by remember { mutableStateOf(SessionPrefs.oscMode(context)) }
+ 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)
}
- SettingsGroup(stringResource(R.string.input_profiles)) {
- ChoiceRow(host, "input-active", stringResource(R.string.input_active_profile), stringResource(R.string.input_auto_hint),
- listOf(InputProfiles.AUTO to stringResource(R.string.common_auto)) + names, selected) {
- InputProfiles.select(context, it); selected = it; onChanged()
- }
- ChoiceRow(host, "input-edit-profile", stringResource(R.string.input_edit_profile), null, names, id) {
- id = it; profile = InputProfiles.read(context, it)
- }
- ChoiceRow(host, "input-source", stringResource(R.string.input_source), null,
- listOf(InputRole.PHYSICAL.name to stringResource(R.string.input_physical), InputRole.PRIMARY.name to stringResource(R.string.input_primary),
- InputRole.SECONDARY.name to stringResource(R.string.input_secondary)), role.name) { role = InputRole.valueOf(it) }
+ }
+ 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)
+ 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) }
}
- SettingsGroup(stringResource(R.string.input_bindings)) {
- for (control in InputControl.entries) {
- ActionRow(control.label, actionLabel(profile.action(role, control)), stringResource(R.string.ctrl_edit), { edit = control }, modifier = Modifier.testTag("input-binding-${control.id}"))
- }
- }
- if (role == InputRole.PHYSICAL) SettingsGroup(stringResource(R.string.input_extra_keys)) {
- for (binding in profile.keys) {
- ActionRow(binding.key.label, if (binding.action is InputAction.Native) stringResource(R.string.input_normal_binding) else actionLabel(binding.action), stringResource(R.string.ctrl_edit), { editKey = binding.key })
- TextButton(onClick = {
- profile = profile.copy(keys = profile.keys - binding); InputProfiles.save(context, profile); onChanged()
- }) { Text(stringResource(R.string.input_remove_binding)) }
- }
- ActionRow(stringResource(R.string.input_capture), stringResource(R.string.input_capture_hint), stringResource(R.string.ctrl_edit), { capture = true })
- }
- SettingsGroup(stringResource(R.string.input_latency)) {
- Text(stringResource(R.string.input_latency_hint))
- Row {
- Switch(measuring, onCheckedChange = { measuring = it; InputTiming.enabled = it; if (it) InputTiming.reset() })
- Text(stringResource(R.string.input_measure))
- }
- Text(timing)
- TextButton(onClick = { timing = InputTiming.report(); android.util.Log.i("InputTiming", timing) }) { Text(stringResource(R.string.input_read_timing)) }
- }
- SettingsGroup(stringResource(R.string.input_surface)) {
- ActionRow(stringResource(R.string.input_surface_edit), stringResource(R.string.input_surface_hint), stringResource(R.string.ctrl_edit), { surface = true }, modifier = Modifier.testTag("input-surface-edit"))
- ActionRow(stringResource(R.string.ctrl_reset_mapping), null, stringResource(R.string.ctrl_reset), {
- InputProfiles.reset(context, id); profile = InputProfiles.read(context, id); onChanged()
+ }
+ fun editPart(nextRole: InputRole) { role = nextRole; bindingsTab = 0; go(InputPage.SOURCE) }
+ val editing = edit
+ 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 }
+ ?: 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 = { if (!editing.click) elementProperties?.let { e -> InputElementProperties(e) { 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))
+ 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) {
+ 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) {
+ 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 (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) }
+ TextButton(onClick = { newProfile(false) }, modifier = Modifier.padding(8.dp)) { Text(stringResource(R.string.input_new_profile)) }
+ }
+ SettingsGroup(stringResource(R.string.input_device_settings)) {
+ 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() }
+ }
+ SettingsGroup(stringResource(R.string.shortcuts_title)) { PhysicalShortcutRows() }
+ SettingsGroup(stringResource(R.string.input_latency)) {
+ var measuring by remember { mutableStateOf(InputTiming.enabled) }
+ var timing by remember { mutableStateOf(InputTiming.report()) }
+ InputHint(stringResource(R.string.input_latency_hint))
+ ToggleRow(host, "input-measure", stringResource(R.string.input_measure), null, measuring) { measuring = it; InputTiming.enabled = it; if (it) InputTiming.reset() }
+ var reading by remember { mutableStateOf(false) }
+ ActionRow(stringResource(R.string.input_measurements), stringResource(R.string.input_measure_instructions),
+ stringResource(R.string.input_read_timing), { timing = InputTiming.report(); reading = true })
+ if (reading) AlertDialog(onDismissRequest = { reading = false }, title = { Text(stringResource(R.string.input_measurements)) },
+ text = { Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+ Text(timing)
+ Text(stringResource(R.string.input_measure_instructions), style = MaterialTheme.typography.bodySmall)
+ } }, confirmButton = { TextButton(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) } }
+ }
+ 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) }
+ }
+ }
+ }
+ }
+ 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_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)),
+ 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) {
+ 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))) } }
+ }
+ 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
+ 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) }
+ TextButton(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()) TextButton(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))
+ }
+ TextButton(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)) }
+ }
+
+ }
+ 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) }
+ }
+ }
+ }
+
+ }
}
}
- edit?.let { control ->
- InputActionDialog(control, profile.action(role, control), onDismiss = { edit = null }) { action ->
- profile = profile.withBinding(role, control, action)
- InputProfiles.save(context, profile)
- edit = null
- onChanged()
- }
- }
- if (capture) InputCaptureDialog(onDismiss = { capture = false }) { capture = false; editKey = it }
- editKey?.let { key -> InputActionDialog(InputControl.A, profile.keys.firstOrNull { it.key == key }?.action ?: InputAction.Disabled,
- onDismiss = { editKey = null }, nativeTargets = false, title = key.label, onPick = { action ->
- profile = profile.copy(keys = profile.keys.filterNot { it.key == key } + PhysicalInputBinding(key, action))
- InputProfiles.save(context, profile); editKey = null; onChanged()
- }) }
- if (surface) InputSurfaceDialog(id, onDismiss = { surface = false }, onChanged)
+ 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 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 = { TextButton(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 = { TextButton(onClick = { confirmation = null; request.action() }) { Text(stringResource(R.string.common_ok)) } },
+ dismissButton = { TextButton(onClick = { confirmation = null }) { Text(stringResource(R.string.common_cancel)) } }) }
+ error?.let { message -> AlertDialog(onDismissRequest = { error = null }, title = { Text(stringResource(R.string.input_save_failed)) },
+ text = { Text(message) }, confirmButton = { TextButton(onClick = { error = null }) { Text(stringResource(R.string.common_ok)) } }) }
}
@Composable
-private fun actionLabel(action: InputAction): String {
- val context = LocalContext.current
- return when (action) {
- is InputAction.Native -> action.target?.let { stringResource(R.string.input_native_target, it.label) } ?: stringResource(R.string.input_native)
- InputAction.Disabled -> stringResource(R.string.input_disabled)
- is InputAction.Keys -> action.codes.joinToString(" + ") { pcKeyLabel(context, it) }
- is InputAction.MouseButton -> stringResource(when (action.code) { 272 -> R.string.input_mouse_left; 273 -> R.string.input_mouse_right; else -> R.string.input_mouse_middle })
- is InputAction.Command -> commandLabel(action.command)
- is InputAction.Directions -> listOf(action.up, action.right, action.down, action.left).joinToString(" / ") { pcKeyLabel(context, it) }
- is InputAction.Pointer -> stringResource(R.string.input_pointer)
- is InputAction.Scroll -> stringResource(R.string.input_scroll)
+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().clickable { shared = !shared }, verticalAlignment = Alignment.CenterVertically) {
+ Checkbox(shared, { shared = it }, Modifier.testTag("input-share-physical"))
+ Text(stringResource(R.string.input_share_physical))
+ }
+ Text(stringResource(R.string.input_new_independent_hint), style = MaterialTheme.typography.bodySmall)
+ }
+ } }, confirmButton = { TextButton(enabled = name.isNotBlank(), onClick = { request.save(name.trim(), source, shared); onDismiss() }) { Text(stringResource(R.string.gesture_save_changes)) } },
+ dismissButton = { TextButton(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().clickable { shared = link }, verticalAlignment = Alignment.CenterVertically) {
+ RadioButton(shared == link, { shared = link })
+ Text(stringResource(if (link) R.string.input_keep_shared else R.string.input_independent_copy))
+ }
+ } }, confirmButton = { TextButton(onClick = { request.apply(shared); onDismiss() }) { Text(stringResource(R.string.common_ok)) } },
+ dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } })
+}
+
+@Composable
+private fun InputControlGrid(preset: SavedInputBindings, available: List, axes: Boolean, onPick: (InputControl) -> Unit) {
+ val controls = available.filter { (it.dimensions == 2 || it == InputControl.LT || it == InputControl.RT) == axes }
+ BoxWithConstraints(Modifier.fillMaxWidth().padding(12.dp)) {
+ val columns = if (maxWidth < 480.dp) 2 else 4
+ Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+ for (row in controls.chunked(columns)) Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ for (control in row) OutlinedCard(onClick = { onPick(control) }, modifier = Modifier.weight(1f).testTag("input-binding-${control.id}")) {
+ Column(Modifier.padding(12.dp).heightIn(min = 48.dp)) {
+ Text(control.label, style = MaterialTheme.typography.titleMedium)
+ Text(actionLabel(preset.controls[control] ?: InputAction.Native()), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
+ }
+ }
+ repeat(columns - row.size) { Spacer(Modifier.weight(1f)) }
+ }
+ }
}
}
@Composable
-private fun commandLabel(command: InputCommand) = stringResource(when (command) {
- InputCommand.MENU -> R.string.input_command_menu
- InputCommand.KEYBOARD -> R.string.input_command_keyboard
- InputCommand.STEAM -> R.string.input_command_steam
- InputCommand.QUICK_ACCESS -> R.string.input_command_qam
+private fun InputNavigationRow(title: String, detail: String?, modifier: Modifier = Modifier, leading: (@Composable () -> Unit)? = null, onClick: () -> Unit) {
+ Row(modifier.fillMaxWidth().clickable(role = Role.Button, 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)
+ }
+ Text("›", style = MaterialTheme.typography.headlineSmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
+ }
+}
+
+@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 InputActionDialog(control: InputControl, current: InputAction, onDismiss: () -> Unit, nativeTargets: Boolean = true, title: String = control.label, onPick: (InputAction) -> Unit) {
- var keys by remember { mutableStateOf(false) }
- var directions by remember { mutableStateOf(false) }
- var native by remember { mutableStateOf(false) }
- var speed by remember { mutableFloatStateOf(when (current) { is InputAction.Pointer -> current.speed; else -> 900f }) }
- AlertDialog(onDismissRequest = onDismiss, title = { Text(title) }, confirmButton = {},
- dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) } },
- text = {
- Column(Modifier.verticalScroll(rememberScrollState())) {
- TextButton(onClick = { onPick(InputAction.Native()) }) { Text(stringResource(if (nativeTargets) R.string.input_native else R.string.input_normal_binding)) }
- if (nativeTargets) TextButton(onClick = { native = true }) { Text(stringResource(R.string.input_remap_native)) }
- TextButton(onClick = { onPick(InputAction.Disabled) }) { Text(stringResource(R.string.input_disabled)) }
- HorizontalDivider()
- TextButton(onClick = { keys = true }) { Text(stringResource(R.string.input_keys)) }
- if (control.dimensions == 2) {
- Text(stringResource(R.string.input_pointer_speed, speed.toInt()))
- Slider(value = speed, onValueChange = { speed = it }, valueRange = 100f..3000f)
- TextButton(onClick = { onPick(InputAction.Pointer(speed)) }) { Text(stringResource(R.string.input_pointer)) }
- TextButton(onClick = { onPick(InputAction.Scroll()) }) { Text(stringResource(R.string.input_scroll)) }
- TextButton(onClick = { directions = true }) { Text(stringResource(R.string.input_direction_keys)) }
- }
- for (code in 272..274) TextButton(onClick = { onPick(InputAction.MouseButton(code)) }) { Text(actionLabel(InputAction.MouseButton(code))) }
- for (command in InputCommand.entries) TextButton(onClick = { onPick(InputAction.Command(command)) }) { Text(commandLabel(command)) }
- }
- })
- if (keys) InputKeysDialog((current as? InputAction.Keys)?.codes.orEmpty(), onDismiss = { keys = false }, onPick = { onPick(InputAction.Keys(it)) })
- if (native) AlertDialog(onDismissRequest = { native = false }, title = { Text(stringResource(R.string.input_remap_native)) }, confirmButton = {},
- text = { Column(Modifier.verticalScroll(rememberScrollState())) {
- for (target in InputControl.entries) if (InputAction.Native(target).validFor(control)) {
- TextButton(onClick = { onPick(InputAction.Native(target)) }) { Text(target.label) }
- }
- } })
- if (directions) InputDirectionsDialog((current as? InputAction.Directions) ?: InputAction.Directions(103, 106, 108, 105),
- onDismiss = { directions = false }, onPick = onPick)
-}
-
-@OptIn(ExperimentalLayoutApi::class)
-@Composable
-private fun InputKeysDialog(initial: List, onDismiss: () -> Unit, onPick: (List) -> Unit, single: Boolean = false) {
- val context = LocalContext.current
- var codes by remember { mutableStateOf(initial) }
- AlertDialog(onDismissRequest = onDismiss, title = { Text(stringResource(R.string.input_keys)) },
- confirmButton = { TextButton(enabled = codes.isNotEmpty(), onClick = {
- onPick(codes.sortedBy { if (it in PC_MODIFIERS) 0 else 1 })
- }) { Text(stringResource(R.string.gesture_save_changes)) } },
- dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) } },
- text = { Column(Modifier.verticalScroll(rememberScrollState())) {
- Text(codes.joinToString(" + ") { pcKeyLabel(context, it) })
- FlowRow(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
- for (key in PC_KEYS.values) FilterChip(selected = key.code in codes, onClick = {
- codes = if (single) listOf(key.code) else if (key.code in codes) codes - key.code else (codes + key.code).take(8)
- }, label = { Text(pcKeyLabel(context, key.code)) })
- }
- } })
-}
-
-@Composable
-private fun InputDirectionsDialog(initial: InputAction.Directions, onDismiss: () -> Unit, onPick: (InputAction) -> Unit) {
- val context = LocalContext.current
- var codes by remember { mutableStateOf(listOf(initial.up, initial.right, initial.down, initial.left)) }
- var editing by remember { mutableStateOf(null) }
- AlertDialog(onDismissRequest = onDismiss, title = { Text(stringResource(R.string.input_direction_keys)) },
- confirmButton = { TextButton(onClick = { onPick(InputAction.Directions(codes[0], codes[1], codes[2], codes[3])) }) { Text(stringResource(R.string.gesture_save_changes)) } },
- text = { Column {
- listOf("↑", "→", "↓", "←").forEachIndexed { i, label ->
- TextButton(onClick = { editing = i }) { Text("$label ${pcKeyLabel(context, codes[i])}") }
- }
- TextButton(onClick = { codes = listOf(17, 32, 31, 30) }) { Text("W / D / S / A") }
- } })
- editing?.let { i -> InputKeysDialog(listOf(codes[i]), onDismiss = { editing = null }, single = true, onPick = { value ->
- codes = codes.toMutableList().also { it[i] = value.first() }; editing = null
- }) }
-}
-
-@Composable
-private fun InputCaptureDialog(onDismiss: () -> Unit, onPick: (PhysicalInputKey) -> Unit) {
- val focus = remember { FocusRequester() }
- var captured by remember { mutableStateOf(null) }
- AlertDialog(onDismissRequest = onDismiss, title = { Text(stringResource(R.string.input_capture)) },
- modifier = Modifier.onPreviewKeyEvent {
- val event = it.nativeKeyEvent
- val key = PhysicalInputKey.capture(event)
- if (key != null) {
- if (event.action == android.view.KeyEvent.ACTION_DOWN && event.repeatCount == 0) captured = key
- true
- } else false
- }.focusRequester(focus).focusable(),
- text = { Text(captured?.label ?: stringResource(R.string.input_capture_hint)) },
- confirmButton = { TextButton(enabled = captured != null, onClick = { captured?.let(onPick) }) { Text(stringResource(R.string.ctrl_edit)) } },
- dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) } })
- LaunchedEffect(Unit) { focus.requestFocus() }
+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 c905787ffc..002e05b6fb 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt
@@ -1,57 +1,330 @@
package com.droiddeck.launcher.ui
-import androidx.compose.foundation.background
+import android.app.Presentation
+import android.hardware.display.DisplayManager
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.Display
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.BackHandler
+import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.background
+import androidx.compose.foundation.horizontalScroll
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
import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntSize
+import kotlin.math.roundToInt
+import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+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 androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.DialogWindowProvider
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeViewModelStoreOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
import com.droiddeck.launcher.R
+import com.droiddeck.launcher.SessionActivity
import com.droiddeck.launcher.input.*
+import com.droiddeck.launcher.session.SessionState
+
+private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputBindings) {
+ 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(true)
+ var adding by mutableStateOf(false)
+ var properties by mutableStateOf(false)
+ var clickProperties by mutableStateOf(false)
+ var history by mutableStateOf, Map, Map>>>(emptyList())
+ val element get() = elements.firstOrNull { it.id == selected }
+ val dirty get() = elements != layout.elements || actions != preset.elements || clicks != preset.clicks
+ fun checkpoint() { history = (history + Triple(elements, actions, clicks)).takeLast(40) }
+ fun undo() { history.lastOrNull()?.let { elements = it.first; actions = it.second; clicks = it.third; history = history.dropLast(1) } }
+ 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) {
+fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> Unit,
+ role: InputRole = InputRole.SECONDARY, layoutId: String? = null, bindingsId: String? = null) {
val context = LocalContext.current
- var layout by remember { mutableStateOf(InputSurfaceLayout.read(context, profile)) }
- var selected by remember { mutableStateOf(InputControl.A) }
- var adding by remember { mutableStateOf(false) }
- val element = layout.firstOrNull { it.control == selected }
- fun change(next: InputSurfaceElement) { layout = layout.map { if (it.control == next.control) next.bounded() else it } }
- AlertDialog(onDismissRequest = onDismiss, title = { Text(stringResource(R.string.input_surface_edit)) },
- confirmButton = { TextButton(onClick = { InputSurfaceLayout.save(context, profile, layout); onChanged(); onDismiss() }) { Text(stringResource(R.string.gesture_save_changes)) } },
- dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) } },
- text = { Column(Modifier.verticalScroll(rememberScrollState())) {
- Text(stringResource(R.string.input_surface_hint))
- BoxWithConstraints(Modifier.fillMaxWidth().height(180.dp).background(MaterialTheme.colorScheme.surfaceVariant)) {
- for (e in layout) Surface(Modifier.offset(maxWidth * e.x, maxHeight * e.y).size(maxWidth * e.width, maxHeight * e.height)
- .padding(2.dp).clickable { selected = e.control },
- color = if (e.control == selected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.secondaryContainer) {
- Text(e.control.label, Modifier.padding(4.dp), style = MaterialTheme.typography.labelSmall)
+ 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
+ val draft = remember { SurfaceDraft(savedLayout, savedBindings) }
+ 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)
+ else if (role == InputRole.PRIMARY) host?.window?.decorView?.display
+ else {
+ val displays = SecondScreenDisplays.available(manager, host?.window?.decorView?.display?.displayId ?: Display.DEFAULT_DISPLAY)
+ manager.getDisplay(displays.firstOrNull { it.id == SessionState.secondScreenDisplay }?.id ?: displays.firstOrNull()?.id ?: -1)
+ }
+ }
+ val remote = target != null && target.displayId != host?.window?.decorView?.display?.displayId
+ fun leave() { if (draft.dirty) discard = true else onDismiss() }
+ fun save() {
+ runCatching {
+ 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)).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) }
+ }
+ DisposableEffect(manager) {
+ val listener = object : DisplayManager.DisplayListener {
+ override fun onDisplayAdded(id: Int) { revision++ }
+ override fun onDisplayRemoved(id: Int) { revision++ }
+ override fun onDisplayChanged(id: Int) { revision++ }
+ }
+ manager.registerDisplayListener(listener, Handler(Looper.getMainLooper()))
+ onDispose { manager.unregisterDisplayListener(listener) }
+ }
+ if (remote && host != null) DisposableEffect(target!!.displayId, host) {
+ val presentation = SurfaceEditorPresentation(host, target, transparent = host is SessionActivity && role == InputRole.PRIMARY) {
+ SurfaceCanvas(draft, transparent = host is SessionActivity && role == InputRole.PRIMARY)
+ }
+ runCatching { presentation.show() }.onFailure { failure = it.message }
+ val observer = LifecycleEventObserver { _, event ->
+ if (event == Lifecycle.Event.ON_STOP) presentation.hide()
+ if (event == Lifecycle.Event.ON_START) runCatching { presentation.show() }
+ }
+ host.lifecycle.addObserver(observer)
+ onDispose { host.lifecycle.removeObserver(observer); presentation.dismiss() }
+ }
+ // Compose 1.6 custom dialog sizing subtracts system bars even when they are hidden.
+ Dialog(onDismissRequest = ::leave, properties = DialogProperties(usePlatformDefaultWidth = true, decorFitsSystemWindows = false)) {
+ val editorWindow = (LocalView.current.parent as? DialogWindowProvider)?.window
+ DisposableEffect(editorWindow) {
+ editorWindow?.prepareInputEditor()
+ if (host is SessionActivity && role == InputRole.PRIMARY) editorWindow?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+ onDispose { }
+ }
+ Surface(Modifier.fillMaxSize(), color = if (host is SessionActivity && role == InputRole.PRIMARY && !draft.properties && !remote)
+ androidx.compose.ui.graphics.Color.Transparent else MaterialTheme.colorScheme.surface) {
+ val element = draft.element
+ BackHandler { if (draft.properties) draft.properties = false else leave() }
+ when {
+ draft.properties && element != null -> {
+ 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 = {
+ if (!draft.clickProperties) InputElementProperties(properties) { 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
+ })
+ }
+ 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 (element != null) {
- Text(element.control.label)
- Text(stringResource(R.string.input_position_x)); Slider(element.x, { change(element.copy(x = it)) }, valueRange = 0f..0.9f)
- Text(stringResource(R.string.input_position_y)); Slider(element.y, { change(element.copy(y = it)) }, valueRange = 0f..0.9f)
- Text(stringResource(R.string.input_width)); Slider(element.width, { change(element.copy(width = it)) }, valueRange = 0.1f..1f)
- Text(stringResource(R.string.input_height)); Slider(element.height, { change(element.copy(height = it)) }, valueRange = 0.1f..1f)
- TextButton(onClick = { layout = layout.filter { it.control != selected } }) { Text(stringResource(R.string.input_remove_element)) }
+ }
+ }
+ if (draft.adding) AlertDialog(onDismissRequest = { draft.adding = false }, title = { Text(stringResource(R.string.input_add_element)) }, confirmButton = {}, text = { Column {
+ for (kind in InputElementKind.entries) TextButton(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 = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_ok)) } },
+ dismissButton = { TextButton(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 = { TextButton(onClick = { failure = null }) { Text(stringResource(R.string.common_ok)) } }) }
+}
+
+@Composable
+private fun SurfaceCanvas(draft: SurfaceDraft, transparent: Boolean = false) {
+ AndroidView(factory = { InputSurfaceEditorView(it) }, modifier = Modifier.fillMaxSize().testTag("input-layout-canvas"),
+ update = { view ->
+ view.setBackgroundColor(if (transparent) android.graphics.Color.TRANSPARENT else android.graphics.Color.rgb(10, 11, 13))
+ view.style = draft.layout.style; view.elements = draft.elements; view.selected = draft.selected; view.snap = draft.snap
+ view.isEnabled = !draft.properties && !draft.adding
+ view.onSelect = { if (!draft.properties) draft.selected = it }
+ view.onBeginEdit = draft::checkpoint
+ view.onChange = { e -> if (!draft.properties) draft.elements = draft.elements.map { if (it.id == e.id) e else it } }
+
+ })
+}
+
+@Composable
+private fun FloatingSurfaceTools(draft: SurfaceDraft, onSave: () -> Unit, onLeave: () -> Unit) {
+ 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
+ }
+ }
+ .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)
+ }
+ }
}
- TextButton(onClick = { adding = true }) { Text(stringResource(R.string.input_add_element)) }
- TextButton(onClick = { layout = InputSurfaceLayout.defaults() }) { Text(stringResource(R.string.ctrl_reset)) }
- } })
- if (adding) AlertDialog(onDismissRequest = { adding = false }, title = { Text(stringResource(R.string.input_add_element)) }, confirmButton = {},
- text = { Column(Modifier.verticalScroll(rememberScrollState())) {
- for (control in InputControl.entries) if (layout.none { it.control == control }) {
- TextButton(onClick = {
- layout = layout + InputSurfaceElement(control, 0.1f, 0.1f, if (control.dimensions == 2) 0.4f else 0.2f, 0.3f)
- selected = control; adding = false
- }) { Text(control.label) }
+ }
+ }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun SurfaceToolbar(draft: SurfaceDraft, onSave: () -> Unit, onLeave: () -> Unit) {
+ 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_undo), enabled = draft.history.isNotEmpty(), compact = true) { draft.undo() }
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Checkbox(draft.snap, { draft.snap = it })
+ Text(stringResource(R.string.ctrl_editor_snap))
+ }
+ PrimaryButton(stringResource(R.string.input_editor_done), compact = true, onClick = onSave)
+ }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun SurfaceSelection(draft: SurfaceDraft) {
+ Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+ draft.element?.let { e ->
+ Text(e.name, style = MaterialTheme.typography.titleMedium)
+ 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
+ }
}
- } })
+ } ?: Text(stringResource(R.string.input_editor_hint))
+ }
+}
+
+private fun InputElementKind.label() = when (this) {
+ InputElementKind.BUTTON -> R.string.input_element_button
+ InputElementKind.STICK -> R.string.input_element_stick
+ InputElementKind.TRACKPAD -> R.string.input_element_trackpad
+ InputElementKind.DPAD -> R.string.input_element_dpad
+ InputElementKind.TRIGGER -> R.string.input_element_trigger
+}
+
+private class SurfaceEditorPresentation(private val host: ComponentActivity, display: Display, private val transparent: Boolean, private val content: @Composable () -> Unit) : Presentation(host, display) {
+ private var view: ComposeView? = null
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setCancelable(false)
+ window?.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+ window?.prepareInputEditor()
+ window?.decorView?.let {
+ it.setViewTreeLifecycleOwner(host); it.setViewTreeViewModelStoreOwner(host)
+ it.setViewTreeSavedStateRegistryOwner(host); it.setViewTreeOnBackPressedDispatcherOwner(host)
+ }
+ window?.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.TRANSPARENT))
+ view = ComposeView(context).also { it.setContent { DroidDeckTheme {
+ Surface(Modifier.fillMaxSize(), color = if (transparent) androidx.compose.ui.graphics.Color.Transparent else MaterialTheme.colorScheme.surface) { content() }
+ } }; setContentView(it) }
+ }
+ override fun dismiss() { view?.disposeComposition(); view = null; super.dismiss() }
+}
+
+@Suppress("DEPRECATION")
+internal fun Window.prepareInputEditor() {
+ addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_FULLSCREEN)
+ setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT)
+ decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+ View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt
new file mode 100644
index 0000000000..d03eaa6e9f
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt
@@ -0,0 +1,107 @@
+package com.droiddeck.launcher.ui
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.view.HapticFeedbackConstants
+import android.view.MotionEvent
+import android.view.ViewConfiguration
+import android.widget.FrameLayout
+import com.droiddeck.launcher.input.InputSurfaceElement
+import com.droiddeck.launcher.input.InputSurfaceStyle
+import com.droiddeck.launcher.input.snapSurfaceElement
+import kotlin.math.abs
+
+internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) {
+ var elements: List = emptyList()
+ set(value) { field = value; preview.updateCustomLayout(value); invalidate() }
+ var style = InputSurfaceStyle()
+ set(value) { field = value; preview.updateStyle(value) }
+ var snap = true
+ set(value) { field = value; if (!value) clearGuides() }
+ private var guideX: Float? = null
+ private var guideY: Float? = null
+ var selected: String? = null
+ set(value) { field = value; invalidate() }
+ var onSelect: (String?) -> Unit = {}
+ var onBeginEdit: () -> Unit = {}
+ var onChange: (InputSurfaceElement) -> Unit = {}
+ private val preview = InputSurfaceView(context)
+ private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(26, 159, 255); strokeWidth = 2 * resources.displayMetrics.density }
+ private val radius = 14 * resources.displayMetrics.density
+ private var original: InputSurfaceElement? = null
+ private var downX = 0f
+ private var downY = 0f
+ private var corner = 0
+ private var dragging = false
+
+ init {
+ setBackgroundColor(Color.rgb(10, 11, 13))
+ addView(preview, LayoutParams(-1, -1))
+ }
+
+ override fun dispatchDraw(canvas: Canvas) {
+ super.dispatchDraw(canvas)
+ paint.style = Paint.Style.STROKE
+ guideX?.let { canvas.drawLine(width * it, 0f, width * it, height.toFloat(), paint) }
+ guideY?.let { canvas.drawLine(0f, height * it, width.toFloat(), height * it, paint) }
+ val e = elements.firstOrNull { it.id == selected } ?: return
+ val l = width * e.x; val t = height * e.y; val r = l + width * e.width; val b = t + height * e.height
+ paint.style = Paint.Style.STROKE; canvas.drawRect(l, t, r, b, paint)
+ paint.style = Paint.Style.FILL
+ for (x in listOf(l, r)) for (y in listOf(t, b)) canvas.drawCircle(x, y, radius / 3, paint)
+ }
+
+ private fun clearGuides() { guideX = null; guideY = null; invalidate() }
+
+ override fun onInterceptTouchEvent(event: MotionEvent) = true
+
+ @SuppressLint("ClickableViewAccessibility")
+ override fun onTouchEvent(event: MotionEvent): Boolean {
+ if (!isEnabled || width == 0 || height == 0) return true
+ when (event.actionMasked) {
+ MotionEvent.ACTION_DOWN -> {
+ clearGuides()
+ downX = event.x; downY = event.y; dragging = false; corner = 0
+ val current = elements.firstOrNull { it.id == selected }
+ if (current != null) {
+ val left = width * current.x; val top = height * current.y
+ val right = left + width * current.width; val bottom = top + height * current.height
+ val horizontal = if (abs(downX - left) < radius) 1 else if (abs(downX - right) < radius) 2 else 0
+ val vertical = if (abs(downY - top) < radius) 4 else if (abs(downY - bottom) < radius) 8 else 0
+ if (horizontal != 0 && vertical != 0) corner = horizontal or vertical
+ }
+ original = if (corner != 0) current else elements.asReversed().firstOrNull {
+ downX / width in it.x..(it.x + it.width) && downY / height in it.y..(it.y + it.height)
+ }
+ selected = original?.id; onSelect(selected)
+ }
+ MotionEvent.ACTION_MOVE -> {
+ val e = original ?: return true
+ if (!dragging && abs(event.x - downX) + abs(event.y - downY) > ViewConfiguration.get(context).scaledTouchSlop) {
+ dragging = true; onBeginEdit()
+ }
+ if (!dragging) return true
+ val dx = (event.x - downX) / width; val dy = (event.y - downY) / height
+ val next = if (corner == 0) e.copy(x = (e.x + dx).coerceIn(0f, 1f - e.width), y = (e.y + dy).coerceIn(0f, 1f - e.height))
+ else {
+ val left = if (corner and 1 != 0) (e.x + dx).coerceIn(0f, e.x + e.width - .03f) else e.x
+ val top = if (corner and 4 != 0) (e.y + dy).coerceIn(0f, e.y + e.height - .03f) else e.y
+ val right = if (corner and 2 != 0) (e.x + e.width + dx).coerceIn(left + .03f, 1f) else e.x + e.width
+ val bottom = if (corner and 8 != 0) (e.y + e.height + dy).coerceIn(top + .03f, 1f) else e.y + e.height
+ e.copy(x = left, y = top, width = right - left, height = bottom - top).bounded()
+ }
+ val aligned = if (snap) snapSurfaceElement(next, elements.filter { it.id != e.id }, 9 * resources.displayMetrics.density / width,
+ 9 * resources.displayMetrics.density / height, corner) else null
+ if (aligned != null && (aligned.x != null && aligned.x != guideX || aligned.y != null && aligned.y != guideY)) performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)
+ guideX = aligned?.x; guideY = aligned?.y
+ onChange(aligned?.element ?: next)
+ invalidate()
+ }
+ MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { original = null; dragging = false; clearGuides() }
+ }
+ return true
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt
new file mode 100644
index 0000000000..b016165646
--- /dev/null
+++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt
@@ -0,0 +1,532 @@
+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.RadialGradient
+import android.graphics.RectF
+import android.graphics.Shader
+import android.graphics.Typeface
+import android.graphics.drawable.GradientDrawable
+import android.view.Gravity
+import android.view.HapticFeedbackConstants
+import android.view.ViewConfiguration
+import android.view.MotionEvent
+import com.droiddeck.launcher.input.TouchpadGestures
+import com.droiddeck.launcher.input.PointerGestures
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.HorizontalScrollView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.droiddeck.launcher.input.InputRole
+import com.droiddeck.launcher.input.InputControl
+import com.droiddeck.launcher.input.InputSurfaceElement
+import com.droiddeck.launcher.input.InputSurfaceStyle
+import com.droiddeck.launcher.input.pointerSubset
+import com.droiddeck.launcher.input.InputSurfaceSource
+import com.droiddeck.launcher.input.InputElementKind
+import com.droiddeck.launcher.input.InputButtonIcons
+import com.droiddeck.launcher.input.InputButtonShape
+import java.io.File
+import com.droiddeck.launcher.input.PadBridge
+import com.droiddeck.launcher.session.SessionPrefs
+import kotlin.math.atan2
+import kotlin.math.hypot
+import kotlin.math.min
+
+@SuppressLint("ViewConstructor")
+class InputSurfaceView(
+ context: Context,
+ private val pad: PadBridge? = null,
+ private var customLayout: List = emptyList(),
+ private val inputRole: InputRole = InputRole.SECONDARY,
+ private var surfaceStyle: InputSurfaceStyle = InputSurfaceStyle(),
+) : FrameLayout(context) {
+ private val content = FrameLayout(context)
+ private val elementSources = ArrayList()
+ private var customCanvas: ViewGroup? = null
+ init { addView(content, LayoutParams(-1, -1)); renderCustom(pad) }
+
+ var onTouchMiss: ((MotionEvent) -> Unit)? = null
+ private var forwardedPointers = 0
+
+ override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+ if (event.actionMasked == MotionEvent.ACTION_DOWN) forwardedPointers = 0
+ if (onTouchMiss == null) return super.dispatchTouchEvent(event)
+ if (event.actionMasked == MotionEvent.ACTION_DOWN || event.actionMasked == MotionEvent.ACTION_POINTER_DOWN) {
+ val index = event.actionIndex
+ if (!takesTouchAt(event.getX(index), event.getY(index))) forwardedPointers = forwardedPointers or (1 shl event.getPointerId(index))
+ else if (SessionPrefs.lowLatency(context)) requestUnbufferedDispatch(event)
+ }
+ if (forwardedPointers == 0) return super.dispatchTouchEvent(event)
+ var all = 0
+ for (index in 0 until event.pointerCount) all = all or (1 shl event.getPointerId(index))
+ event.pointerSubset(all and forwardedPointers.inv())?.let { split ->
+ try { super.dispatchTouchEvent(split) } finally { split.recycle() }
+ }
+ event.pointerSubset(all and forwardedPointers)?.let { split ->
+ try { onTouchMiss?.invoke(split) } finally { split.recycle() }
+ }
+ if (event.actionMasked == MotionEvent.ACTION_POINTER_UP) forwardedPointers = forwardedPointers and (1 shl event.getPointerId(event.actionIndex)).inv()
+ if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) forwardedPointers = 0
+ return true
+ }
+
+ fun updateStyle(style: InputSurfaceStyle) {
+ if (surfaceStyle == style) return
+ surfaceStyle = style
+ customCanvas?.let { canvas -> for (i in 0 until canvas.childCount) styleElement(canvas.getChildAt(i)) }
+ }
+
+ private fun styleElement(view: View) {
+ view.alpha = surfaceStyle.opacity / 100f * ((view.tag as? InputSurfaceElement)?.opacity ?: 1f)
+ (view as? Surface)?.tint = surfaceStyle.tint
+ view.invalidate()
+ }
+
+ fun updateCustomLayout(layout: List) {
+ val sameElements = customLayout.map { it.copy(x = 0f, y = 0f, width = 1f, height = 1f) } == layout.map { it.copy(x = 0f, y = 0f, width = 1f, height = 1f) }
+ customLayout = layout
+ if (sameElements) customCanvas?.requestLayout() else {
+ elementSources.forEach { it.close() }; elementSources.clear()
+ content.removeAllViews(); renderCustom(pad)
+ }
+ }
+
+ fun releaseInputs() {
+ val now = android.os.SystemClock.uptimeMillis()
+ val cancel = MotionEvent.obtain(now, now, MotionEvent.ACTION_CANCEL, 0f, 0f, 0)
+ try { super.dispatchTouchEvent(cancel) } finally { cancel.recycle() }
+ forwardedPointers = 0
+ elementSources.forEach { it.release() }
+ }
+
+ private fun renderCustom(pad: PadBridge?) {
+ val canvas = object : ViewGroup(context) {
+ override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+ val layout = customLayout
+ val w = MeasureSpec.getSize(widthMeasureSpec)
+ val h = MeasureSpec.getSize(heightMeasureSpec)
+ setMeasuredDimension(w, h)
+ for (i in layout.indices) getChildAt(i).measure(MeasureSpec.makeMeasureSpec((w * layout[i].width).toInt(), MeasureSpec.EXACTLY),
+ MeasureSpec.makeMeasureSpec((h * layout[i].height).toInt(), MeasureSpec.EXACTLY))
+ }
+ override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+ val layout = customLayout
+ for (i in layout.indices) {
+ val e = layout[i]
+ val child = getChildAt(i)
+ val x = (width * e.x).toInt(); val y = (height * e.y).toInt()
+ child.layout(x, y, x + child.measuredWidth, y + child.measuredHeight)
+ }
+ }
+ }
+ 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, source, element.floating, element.hideWhenIdle && pad != null)
+ InputElementKind.TRACKPAD -> TrackpadView(context, element.control == InputControl.RIGHT_PAD, source = source)
+ InputElementKind.DPAD -> DirectionPad(context, source)
+ else -> HoldButton(context, element, source)
+ }.apply { tag = element; contentDescription = element.name; styleElement(this); source?.onStateChanged = { postInvalidate() } })
+ }
+ content.addView(canvas, FrameLayout.LayoutParams(-1, -1))
+ customCanvas = canvas
+ }
+
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+ if (pad != null && elementSources.isEmpty()) {
+ content.removeAllViews()
+ renderCustom(pad)
+ }
+ }
+
+ override fun onDetachedFromWindow() {
+ elementSources.forEach { it.close() }
+ elementSources.clear()
+ super.onDetachedFromWindow()
+ }
+
+ fun takesTouchAt(x: Float, y: Float): Boolean = controlUnder(this, x, y)
+
+ private fun controlUnder(view: View, x: Float, y: Float): Boolean {
+ if (view.visibility != VISIBLE || x < 0f || y < 0f || x >= view.width || y >= view.height) return false
+ if (view.isClickable || view is HorizontalScrollView || view is Surface || view is DirectionPad ||
+ view is androidx.compose.ui.platform.ComposeView) return true
+ val group = view as? ViewGroup ?: return false
+ return (group.childCount - 1 downTo 0).any { i ->
+ val child = group.getChildAt(i)
+ controlUnder(child, x + group.scrollX - child.x, y + group.scrollY - child.y)
+ }
+ }
+
+ 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)
+ }
+ 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) {
+ val inset = 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 }
+ 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)
+ }
+ }
+
+ private class HoldButton(context: Context, private val element: InputSurfaceElement, private val source: InputSurfaceSource?) : Surface(context) {
+ private var down = false
+ private val bitmap = element.image.takeIf { it.matches(Regex("[A-Za-z0-9_.-]{1,128}")) && it != "." && it != ".." }?.let { name ->
+ val file = File(File(context.filesDir, "screenkeys"), name)
+ val size = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+ BitmapFactory.decodeFile(file.path, size)
+ val options = BitmapFactory.Options().apply {
+ while (size.outWidth / inSampleSize.coerceAtLeast(1) > 512 || size.outHeight / inSampleSize.coerceAtLeast(1) > 512)
+ inSampleSize = inSampleSize.coerceAtLeast(1) * 2
+ }
+ if (file.isFile) BitmapFactory.decodeFile(file.path, options) else null
+ }
+ private val imageRect = RectF()
+
+ override fun onDraw(canvas: Canvas) {
+ val lit = if (element.toggle) source?.latched == true else down
+ drawSurface(canvas, lit, element.buttonShape)
+ val cx = width / 2f
+ labelPaint.color = if (lit) ACCENT else TEXT
+ 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)
+ canvas.drawBitmap(it, null, imageRect, labelPaint)
+ return
+ }
+ if (element.icon != 0 && InputButtonIcons.draw(canvas, element.icon, cx, height / 2f, min(width, height) * .68f, labelPaint)) return
+ if (!element.showLabel) 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)
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ override fun onTouchEvent(event: MotionEvent): Boolean {
+ when (event.actionMasked) {
+ MotionEvent.ACTION_DOWN -> set(true)
+ MotionEvent.ACTION_UP -> set(false)
+ MotionEvent.ACTION_CANCEL -> { set(false); source?.release() }
+ }
+ return true
+ }
+
+ override fun onDetachedFromWindow() { set(false); source?.release(); super.onDetachedFromWindow() }
+
+ private fun set(pressed: Boolean) {
+ if (down == pressed) return
+ down = pressed
+ if (pressed) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+ source?.update(if (pressed) 1f else 0f)
+ invalidate()
+ }
+ }
+
+ private inner class TrackpadView(context: Context, private val right: Boolean, private val captioned: Boolean = true,
+ 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 {
+ override fun onMove(x: Float, y: Float) {
+ source?.pointerDelta(2 * (x - gestureX) / width.coerceAtLeast(1), 2 * (y - gestureY) / height.coerceAtLeast(1))
+ gestureX = x; gestureY = y
+ }
+ override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { source?.gestureButton(button, pressed) }
+ override fun onWheel(steps: Int) { source?.gestureWheel(steps) }
+ override fun onLongPress() { performHapticFeedback(HapticFeedbackConstants.LONG_PRESS) }
+ }).apply { bounds = RectF(-1e9f, -1e9f, 1e9f, 1e9f) }
+
+ private var touching = false
+ 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)
+ }
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ override fun onTouchEvent(event: MotionEvent): Boolean {
+ if (source?.mouseGestures == true) {
+ if (event.actionMasked == MotionEvent.ACTION_DOWN) {
+ gestureX = 0f; gestureY = 0f; mouse.place(0f, 0f)
+ source.gestureContact(true)
+ }
+ touching = event.actionMasked != MotionEvent.ACTION_UP && event.actionMasked != MotionEvent.ACTION_CANCEL
+ fingerX = event.x; fingerY = event.y
+ mouse.onTouch(event)
+ if (!touching) source.gestureContact(false)
+ invalidate()
+ return true
+ }
+ when (event.actionMasked) {
+ MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
+ touch(event.getX(0), event.getY(0))
+ click(event.pointerCount > 1)
+ }
+ MotionEvent.ACTION_POINTER_DOWN -> click(true)
+ MotionEvent.ACTION_POINTER_UP -> {
+ val stays = if (event.actionIndex == 0) 1 else 0
+ touch(event.getX(stays), event.getY(stays))
+ click(event.pointerCount - 1 > 1)
+ }
+ MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+ click(false)
+ touching = false
+ source?.update(0f, 0f, false)
+ invalidate()
+ }
+ }
+ return true
+ }
+
+ override fun onDetachedFromWindow() { mouse.cancel(); source?.release(); super.onDetachedFromWindow() }
+
+ private fun touch(x: Float, y: Float) {
+ fingerX = x.coerceIn(0f, width.toFloat())
+ fingerY = y.coerceIn(0f, height.toFloat())
+ touching = true
+ val xAxis = (fingerX - width / 2f) / (width / 2f).coerceAtLeast(1f)
+ val yAxis = -(fingerY - height / 2f) / (height / 2f).coerceAtLeast(1f)
+ source?.update(xAxis, yAxis, true)
+ invalidate()
+ }
+
+ private fun click(down: Boolean) {
+ if (clicked == down) return
+ clicked = down
+ if (down) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+ source?.click(down)
+ invalidate()
+ }
+ }
+
+ private inner class StickView(context: Context, private val source: InputSurfaceSource? = null, private val floating: Boolean = true, private val hideWhenIdle: Boolean = false) : Surface(context) {
+ private var touching = false
+ private var clicking = false
+ private var lastUp = 0L
+ private var originX = 0f
+ 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)
+
+ private fun reach() = min(width, height) * 0.30f
+
+ override fun onDraw(canvas: Canvas) {
+ if (hideWhenIdle && !touching) return
+ drawSurface(canvas, clicking)
+ val cx = if (touching) originX else width / 2f
+ val cy = if (touching) originY else height / 2f
+ 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)
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ override fun onTouchEvent(event: MotionEvent): Boolean {
+ val r = reach().coerceAtLeast(1f)
+ when (event.actionMasked) {
+ MotionEvent.ACTION_DOWN -> {
+ originX = if (floating) event.x else width / 2f
+ originY = if (floating) event.y else height / 2f
+ touching = true
+ performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+ if (lastUp != 0L && event.eventTime - lastUp < CLICK_MS) setClick(true)
+ follow(event.x, event.y, r, force = true)
+ }
+ MotionEvent.ACTION_MOVE -> follow(event.getX(0), event.getY(0), r)
+ MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+ touching = false
+ lastUp = if (clicking || event.actionMasked == MotionEvent.ACTION_CANCEL) 0L else event.eventTime
+ setClick(false)
+ move(0f, 0f, 1f)
+ }
+ }
+ return true
+ }
+
+ private fun follow(x: Float, y: Float, r: Float, force: Boolean = false) {
+ var dx = x - originX
+ var dy = y - originY
+ val length = hypot(dx, dy)
+ if (length > r) { dx *= r / length; dy *= r / length }
+ if (force || dx != knobX || dy != knobY) move(dx, dy, r)
+ }
+
+ private fun move(dx: Float, dy: Float, r: Float) {
+ knobX = dx
+ knobY = dy
+ source?.update(dx / r, dy / r)
+ invalidate()
+ }
+
+ private fun setClick(down: Boolean) {
+ if (clicking == down) return
+ clicking = down
+ if (down) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+ source?.click(down)
+ }
+
+ override fun onDetachedFromWindow() {
+ setClick(false)
+ if (knobX != 0f || knobY != 0f) move(0f, 0f, 1f)
+ super.onDetachedFromWindow()
+ }
+ }
+
+ private inner class DirectionPad(context: Context, 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 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)
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ override fun onTouchEvent(event: MotionEvent): Boolean {
+ val bits = when (event.actionMasked) {
+ MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
+ val dx = event.getX(0) - width / 2f
+ val dy = event.getY(0) - height / 2f
+ if (hypot(dx, dy) < min(width, height) * 0.08f) 0 else {
+ val sector = ((Math.toDegrees(atan2(dy.toDouble(), dx.toDouble())) + 360 + 22.5) % 360 / 45).toInt()
+ intArrayOf(2, 2 or 4, 4, 4 or 8, 8, 8 or 1, 1, 1 or 2)[sector]
+ }
+ }
+ else -> 0
+ }
+ set(bits)
+ return true
+ }
+
+ private fun set(bits: Int) {
+ if (bits == held) return
+ if (bits and held.inv() != 0) performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+ held = bits
+ source?.update((if (bits and 2 != 0) 1f else 0f) - (if (bits and 8 != 0) 1f else 0f),
+ (if (bits and 4 != 0) 1f else 0f) - (if (bits and 1 != 0) 1f else 0f))
+
+ invalidate()
+ }
+
+ override fun onDetachedFromWindow() {
+ set(0)
+ super.onDetachedFromWindow()
+ }
+ }
+
+ companion object {
+ private const val CLICK_MS = 300L
+
+
+ private const val CORNER = 20f
+ 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)
+ private val SURFACE = Color.rgb(0x0A, 0x0B, 0x0D)
+ private val LINE = Color.rgb(0x26, 0x29, 0x2E)
+ private val GUIDE = Color.rgb(0x16, 0x18, 0x1B)
+ private val TEXT = Color.rgb(0xF2, 0xF4, 0xF7)
+ private val TEXT_DIM = Color.rgb(0x7A, 0x80, 0x8A)
+ private val KNOB = Color.rgb(0x2A, 0x2D, 0x33)
+
+ 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 {
+ cornerRadius = radius * context.resources.displayMetrics.density
+ setColor(fill)
+ setStroke(dp(context, 1), LINE)
+ }
+
+ internal fun roundButton(context: Context, label: String, description: String, onClick: () -> Unit, wide: Boolean = false) =
+ TextView(context).apply {
+ text = label
+ contentDescription = description
+ textSize = if (wide) 13f else 20f
+ typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD)
+ letterSpacing = if (wide) 0.08f else 0f
+ gravity = Gravity.CENTER
+ setTextColor(TEXT)
+ background = outline(context, CORNER_PILL, SURFACE)
+ setPadding(if (wide) dp(context, 16) else 0, 0, if (wide) dp(context, 16) else 0, 0)
+ minWidth = dp(context, 44)
+ layoutParams = LinearLayout.LayoutParams(if (wide) LinearLayout.LayoutParams.WRAP_CONTENT else dp(context, 44), dp(context, 44))
+ setOnClickListener {
+ performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+ onClick()
+ }
+ }
+
+ }
+}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/KeyCombinationPicker.kt
similarity index 95%
rename from app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt
rename to app/src/main/java/com/droiddeck/launcher/ui/KeyCombinationPicker.kt
index e70249eef2..3a06fbb3bc 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/KeyCombinationPicker.kt
@@ -52,13 +52,16 @@ import com.droiddeck.launcher.input.PcKey
import com.droiddeck.launcher.input.pcKeyLabel
@Composable
-fun ScreenKeyPicker(
+fun KeyCombinationPicker(
onDismiss: () -> Unit,
onAdd: (List) -> Unit,
initial: List = emptyList(),
sequence: Boolean = false,
sequenceLimit: Int = 4,
+ allowEmpty: Boolean = false,
slots: List = emptyList(),
+ title: String = stringResource(R.string.input_keys),
+ confirm: String = stringResource(R.string.gesture_save_changes),
) {
var picked by remember { mutableStateOf(initial) }
val p = LocalPalette.current
@@ -86,7 +89,7 @@ fun ScreenKeyPicker(
) {
Column {
Row(Modifier.fillMaxWidth().padding(start = 16.dp, end = 6.dp), verticalAlignment = Alignment.CenterVertically) {
- Text(stringResource(R.string.screen_keys_add), Modifier.weight(1f), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
+ Text(title, Modifier.weight(1f), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
IconButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, null) }
}
Row(
@@ -136,10 +139,10 @@ fun ScreenKeyPicker(
Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
Button(
onClick = { onAdd(picked) },
- enabled = picked.isNotEmpty(),
+ enabled = allowEmpty || picked.isNotEmpty(),
modifier = Modifier.weight(1f).focusGlide(CircleShape),
) {
- Text(stringResource(R.string.screen_keys_add))
+ Text(confirm)
}
}
}
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 dfaf8b6f71..8489f5cceb 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt
@@ -120,6 +120,7 @@ class ModeSettingsActions(
val onSteamDownloadsInBackground: (Boolean) -> Unit = {},
val onPipAutoEnter: (Boolean) -> Unit = {},
val onOsc: (String) -> Unit,
+ val onInputSettings: () -> Unit,
val onBackHold: (Boolean) -> Unit = {},
val onBackActionsInverted: (Boolean) -> Unit = {},
val onDirectAudio: (Boolean) -> Unit,
@@ -259,6 +260,7 @@ 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(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/PhysicalShortcutsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt
index 7331d49fb0..a30cbbfe92 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.window.DialogProperties
import androidx.compose.ui.window.DialogWindowProvider
import com.droiddeck.launcher.R
import com.droiddeck.launcher.input.PhysicalShortcuts
+import com.droiddeck.launcher.session.SessionPrefs
@Composable
internal fun PhysicalShortcutRows(
@@ -48,14 +49,22 @@ internal fun PhysicalShortcutRows(
Column {
for (action in PhysicalShortcuts.Action.entries) {
val assigned = bindings.filter { it.action == action }
+ val inverted = SessionPrefs.backActionsInverted(context)
+ val default = stringResource(when (action) {
+ PhysicalShortcuts.Action.STEAM -> R.string.input_shortcut_guide
+ PhysicalShortcuts.Action.QAM -> if (inverted) R.string.input_shortcut_back_once else R.string.input_shortcut_back_twice
+ PhysicalShortcuts.Action.DROIDDECK -> if (inverted) R.string.input_shortcut_back_modes else R.string.input_shortcut_back_once
+ })
SettingsRow(
stringResource(action.label),
- assigned.joinToString { "${it.button.label} · ${it.button.name}" }.ifEmpty { null },
+ assigned.joinToString { "${it.button.label} · ${it.button.name}" }.ifEmpty {
+ if (action == PhysicalShortcuts.Action.QAM && SessionPrefs.backHold(context)) context.getString(R.string.input_shortcut_hold_hint) else null
+ },
) {
SecondaryButton(
- stringResource(if (assigned.isEmpty()) R.string.game_settings_default else R.string.ctrl_custom),
+ if (assigned.isEmpty()) default else assigned.map { it.button.label }.distinct().joinToString(" / "),
compact = true,
- modifier = modifierFor(action).width(LocalChipMinWidth.current)
+ modifier = modifierFor(action).widthIn(min = LocalChipMinWidth.current, max = 240.dp)
.testTag("shortcuts-assign-${action.name}"),
) { editing = action }
}
@@ -165,6 +174,12 @@ internal fun PhysicalShortcutsDialog(
modifier = Modifier.testTag("shortcuts-remove"),
)
}
+ SecondaryButton(stringResource(R.string.input_restore_shortcut), enabled = bindings.any { it.action == action },
+ modifier = Modifier.testTag("shortcuts-restore-default")) {
+ PhysicalShortcuts.restoreDefault(context, action)
+ onChanged()
+ onDismiss()
+ }
SecondaryButton(stringResource(R.string.common_close), modifier = Modifier.testTag("shortcuts-cancel"),
onClick = onDismiss)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt
deleted file mode 100644
index 94e1a5ff27..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt
+++ /dev/null
@@ -1,368 +0,0 @@
-package com.droiddeck.launcher.ui
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.net.Uri
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.detectDragGestures
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.DragIndicator
-import androidx.compose.material.icons.filled.Image
-import androidx.compose.material.icons.filled.Keyboard
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Slider
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.droiddeck.launcher.R
-import com.droiddeck.launcher.input.SCREEN_KEY_CIRCLE
-import com.droiddeck.launcher.input.SCREEN_KEY_DPAD
-import com.droiddeck.launcher.input.SCREEN_KEY_PILL
-import com.droiddeck.launcher.input.SCREEN_KEY_RECT
-import com.droiddeck.launcher.input.SCREEN_KEY_ROUND
-import com.droiddeck.launcher.input.SCREEN_KEY_STICK
-import com.droiddeck.launcher.input.SCREEN_KEY_TRIGGER
-import com.droiddeck.launcher.input.ScreenKeys
-import com.droiddeck.launcher.input.pcKeyLabel
-import com.droiddeck.launcher.input.screenKeyDirections
-import java.io.File
-import kotlin.math.roundToInt
-
-private val PANEL_WIDTH = 600.dp
-private val CHIP_PADDING = androidx.compose.foundation.layout.PaddingValues(horizontal = 6.dp, vertical = 2.dp)
-
-@Composable
-fun ScreenKeyEditor(
- codes: List,
- keyY: Float,
- size: Int,
- opacity: Float,
- shape: Int,
- toggle: Boolean,
- labels: Boolean,
- text: String,
- hasImage: Boolean,
- onResize: (Int) -> Unit,
- onOpacity: (Float) -> Unit,
- onShape: (Int) -> Unit,
- onToggle: (Boolean) -> Unit,
- onLabels: (Boolean) -> Unit,
- onText: (String) -> Unit,
- onImage: (String) -> Unit,
- onClearImage: () -> Unit,
- onBind: () -> Unit,
- onTextFocus: () -> Unit,
- onTextBlur: () -> Unit,
- onDirection: (Int) -> Unit,
- onRemove: () -> Unit,
- onDismiss: () -> Unit,
-) {
- val p = LocalPalette.current
- val context = LocalContext.current
- var offset by remember(codes) { mutableStateOf(Offset.Zero) }
- val density = LocalDensity.current
- val screen = LocalConfiguration.current
- val panelWidthPx = with(density) { PANEL_WIDTH.toPx() }
- val screenWidthPx = screen.screenWidthDp * density.density
- val screenHeightPx = screen.screenHeightDp * density.density
- val atTop = keyY > 0.45f
- val button = shape <= SCREEN_KEY_RECT
- val directions = screenKeyDirections(shape)
- val pickImage = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
- if (uri != null) importImage(context, uri, codes)?.let(onImage)
- }
- Box(
- Modifier.fillMaxSize().systemBarsPadding().padding(horizontal = 10.dp, vertical = 6.dp),
- contentAlignment = if (atTop) Alignment.TopCenter else Alignment.BottomCenter,
- ) {
- Surface(
- Modifier.widthIn(max = PANEL_WIDTH).fillMaxWidth()
- .offset { IntOffset(offset.x.roundToInt(), offset.y.roundToInt()) },
- shape = RoundedCornerShape(18.dp),
- color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2),
- ) {
- Column(Modifier.padding(start = 10.dp, end = 6.dp, top = 2.dp, bottom = 6.dp)) {
- Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
- Icon(
- Icons.Default.DragIndicator, null,
- tint = p.onBackground.copy(alpha = 0.45f),
- modifier = Modifier.pointerInput(panelWidthPx, screenWidthPx, screenHeightPx) {
- detectDragGestures { change, drag ->
- change.consume()
- offset = Offset(
- (offset.x + drag.x).coerceIn(
- -(screenWidthPx - panelWidthPx) / 2f + 8f,
- (screenWidthPx - panelWidthPx) / 2f - 8f,
- ),
- (offset.y + drag.y).coerceIn(
- -screenHeightPx * if (atTop) 0f else 0.75f,
- screenHeightPx * if (atTop) 0.75f else 0f,
- ),
- )
- }
- },
- )
- Box(
- Modifier.weight(1f).height(36.dp)
- .background(p.line2.copy(alpha = 0.24f), RoundedCornerShape(9.dp))
- .padding(horizontal = 10.dp),
- contentAlignment = Alignment.CenterStart,
- ) {
- BasicTextField(
- value = text,
- onValueChange = { onText(it.take(24)) },
- singleLine = true,
- textStyle = TextStyle(
- color = p.onBackground, fontSize = 13.sp,
- fontWeight = FontWeight.Medium,
- ),
- cursorBrush = androidx.compose.ui.graphics.SolidColor(p.primary),
- keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
- modifier = Modifier.fillMaxWidth().onFocusChanged {
- if (it.isFocused) onTextFocus() else onTextBlur()
- }.focusGlide(),
- )
- if (text.isEmpty()) {
- Text(
- stringResource(R.string.screen_key_text),
- color = p.onBackground.copy(alpha = 0.4f),
- style = MaterialTheme.typography.bodySmall,
- )
- }
- }
- if (button) {
- IconButton(onClick = onBind, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) {
- Icon(
- Icons.Default.Keyboard, stringResource(R.string.screen_key_bind),
- tint = p.onBackground.copy(alpha = 0.8f),
- )
- }
- }
- IconButton(onClick = { pickImage.launch("image/*") }, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) {
- Icon(
- Icons.Default.Image, stringResource(R.string.screen_key_image),
- tint = p.onBackground.copy(alpha = 0.8f),
- )
- }
- if (hasImage) IconButton(onClick = onClearImage, modifier = Modifier.width(34.dp).focusGlide(CircleShape)) {
- Icon(Icons.Default.Close, stringResource(R.string.screen_key_image_clear), tint = p.error)
- }
- IconButton(onClick = onRemove, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) {
- Icon(Icons.Default.Delete, stringResource(R.string.common_delete), tint = p.error)
- }
- IconButton(onClick = onDismiss, modifier = Modifier.width(34.dp).focusGlide(CircleShape)) {
- Icon(Icons.Default.Close, null, tint = p.onBackground)
- }
- }
- Row(
- Modifier.fillMaxWidth().padding(vertical = 2.dp),
- horizontalArrangement = Arrangement.spacedBy(4.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- listOf>(
- (if (button) SCREEN_KEY_PILL else null) to R.string.screen_key_type_button,
- SCREEN_KEY_TRIGGER to R.string.screen_key_shape_trigger,
- SCREEN_KEY_DPAD to R.string.touch_dpad,
- SCREEN_KEY_STICK to R.string.deck_surface_stick,
- ).forEach { (value, label) ->
- val selected = if (value == null) button else shape == value
- Chip(stringResource(label), selected, Modifier.weight(1f)) {
- onShape(if (value == null) (if (button) shape else SCREEN_KEY_PILL) else value)
- }
- }
- Box(Modifier.width(1.dp).height(20.dp).background(p.line2))
- listOf(
- SCREEN_KEY_PILL to R.string.screen_key_shape_pill,
- SCREEN_KEY_ROUND to R.string.screen_key_shape_round,
- SCREEN_KEY_CIRCLE to R.string.screen_key_shape_circle,
- SCREEN_KEY_RECT to R.string.screen_key_shape_rect,
- ).forEach { (value, label) ->
- Chip(
- stringResource(label), button && shape == value, Modifier.weight(1f), enabled = button,
- ) { onShape(value) }
- }
- Box(Modifier.width(1.dp).height(20.dp).background(p.line2))
- Text(
- stringResource(R.string.screen_key_toggle), Modifier.padding(start = 6.dp, end = 2.dp),
- style = MaterialTheme.typography.bodySmall, maxLines = 1,
- )
- Switch(checked = toggle, onCheckedChange = onToggle, modifier = Modifier.height(30.dp).focusGlide())
- }
- if (directions.isNotEmpty()) {
- Row(
- Modifier.fillMaxWidth().padding(vertical = 2.dp),
- horizontalArrangement = Arrangement.spacedBy(4.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- directions.forEachIndexed { index, arrow ->
- val code = codes.getOrNull(index) ?: 0
- Chip(
- if (code == 0) arrow else "$arrow ${pcKeyLabel(context, code)}",
- code != 0, Modifier.weight(1f),
- ) { onDirection(index) }
- }
- Text(
- stringResource(R.string.screen_key_text), Modifier.padding(start = 6.dp, end = 2.dp),
- style = MaterialTheme.typography.bodySmall, maxLines = 1,
- )
- Switch(checked = labels, onCheckedChange = onLabels, modifier = Modifier.height(30.dp).focusGlide())
- }
- }
- Row(
- Modifier.fillMaxWidth().padding(top = 2.dp),
- horizontalArrangement = Arrangement.spacedBy(6.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- KeySlider(
- label = stringResource(R.string.screen_key_size),
- value = "$size",
- current = size.toFloat(),
- min = ScreenKeys.MIN_SIZE.toFloat(),
- max = ScreenKeys.MAX_SIZE.toFloat(),
- modifier = Modifier.weight(1f),
- ) { onResize(it.roundToInt()) }
- KeySlider(
- label = stringResource(R.string.screen_key_opacity),
- value = "${(opacity * 100).roundToInt()}%",
- current = opacity,
- min = 0.2f,
- max = 1f,
- modifier = Modifier.weight(1f),
- onChange = onOpacity,
- )
- }
- }
- }
- }
-}
-
-@Composable
-private fun KeySlider(
- label: String,
- value: String,
- current: Float,
- min: Float,
- max: Float,
- modifier: Modifier,
- onChange: (Float) -> Unit,
-) {
- Row(modifier, verticalAlignment = Alignment.CenterVertically) {
- Text(label, style = MaterialTheme.typography.bodySmall, maxLines = 1)
- Slider(current, onChange, Modifier.weight(1f).height(28.dp).focusGlide(), valueRange = min..max)
- Text(
- value, Modifier.width(32.dp), style = MaterialTheme.typography.bodySmall,
- fontWeight = FontWeight.SemiBold, maxLines = 1,
- )
- }
-}
-
-@Composable
-private fun Chip(
- label: String,
- selected: Boolean,
- modifier: Modifier = Modifier,
- enabled: Boolean = true,
- onClick: () -> Unit,
-) {
- val p = LocalPalette.current
- Box(
- modifier
- .background(
- if (selected) p.primary.copy(alpha = 0.18f) else p.line2.copy(alpha = 0.28f),
- CircleShape,
- )
- .focusGlide(RoundedCornerShape(8.dp)).clickable(enabled = enabled, onClick = onClick)
- .padding(vertical = 6.dp),
- contentAlignment = Alignment.Center,
- ) {
- Text(
- label, style = MaterialTheme.typography.labelSmall, maxLines = 1, overflow = TextOverflow.Ellipsis,
- color = when {
- !enabled -> p.onBackground.copy(alpha = 0.28f)
- selected -> p.primary
- else -> p.onBackground.copy(alpha = 0.7f)
- },
- )
- }
-}
-
-private fun importImage(context: Context, uri: Uri, codes: List): String? {
- val dir = File(context.filesDir, ScreenKeys.IMAGE_DIR).apply { mkdirs() }
- val name = "key_" + codes.joinToString("_") + "_" + System.currentTimeMillis() + ".png"
- val longest = (ScreenKeys.MAX_SIZE * context.resources.displayMetrics.density).toInt()
- return runCatching {
- val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
- context.contentResolver.openInputStream(uri)?.use { BitmapFactory.decodeStream(it, null, bounds) }
- val source = maxOf(bounds.outWidth, bounds.outHeight)
- if (source <= 0) return@runCatching null
- var sample = 1
- while (source / (sample * 2) >= longest) sample *= 2
- val bitmap = context.contentResolver.openInputStream(uri)?.use {
- BitmapFactory.decodeStream(it, null, BitmapFactory.Options().apply { inSampleSize = sample })
- } ?: return@runCatching null
- val scale = longest.toFloat() / maxOf(bitmap.width, bitmap.height)
- val scaled = if (scale < 1f) {
- Bitmap.createScaledBitmap(
- bitmap,
- (bitmap.width * scale).toInt().coerceAtLeast(1),
- (bitmap.height * scale).toInt().coerceAtLeast(1),
- true,
- )
- } else {
- bitmap
- }
- try {
- val saved = File(dir, name).outputStream().use { scaled.compress(Bitmap.CompressFormat.PNG, 100, it) }
- if (saved) name else null
- } finally {
- if (scaled !== bitmap) bitmap.recycle()
- scaled.recycle()
- }
- }.getOrNull().also { if (it == null) File(dir, name).delete() }
-}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt
deleted file mode 100644
index 7bc78f7105..0000000000
--- a/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.droiddeck.launcher.ui
-
-import androidx.compose.foundation.shape.CircleShape
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material3.Button
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.unit.dp
-import com.droiddeck.launcher.ui.GlideDialog as Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.droiddeck.launcher.R
-
-@Composable
-fun ScreenLayoutPanel(
- layouts: List,
- onSave: (String) -> Unit,
- onLoad: (String) -> Unit,
- onDelete: (String) -> Unit,
- onImport: (String) -> Unit,
- exportText: () -> String,
- onDismiss: () -> Unit,
-) {
- val p = LocalPalette.current
- val context = LocalContext.current
- var naming by remember { mutableStateOf(false) }
- var name by remember { mutableStateOf("") }
-
- val importer = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
- if (uri == null) return@rememberLauncherForActivityResult
- val text = runCatching {
- context.contentResolver.openInputStream(uri)?.use { it.readBytes().toString(Charsets.UTF_8) }
- }.getOrNull()
- if (text != null) onImport(text)
- }
- val exporter = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/json")) { uri ->
- if (uri == null) return@rememberLauncherForActivityResult
- runCatching { context.contentResolver.openOutputStream(uri)?.use { it.write(exportText().toByteArray()) } }
- }
-
- Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false)) {
- Box(Modifier.fillMaxSize().systemBarsPadding().padding(16.dp), contentAlignment = Alignment.Center) {
- Surface(
- Modifier.widthIn(max = 520.dp).fillMaxWidth(), shape = RoundedCornerShape(22.dp),
- color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2),
- ) {
- Column(Modifier.padding(start = 20.dp, end = 8.dp, top = 6.dp, bottom = 12.dp)) {
- Row(verticalAlignment = Alignment.CenterVertically) {
- Text(
- stringResource(R.string.screen_key_layout), Modifier.weight(1f),
- style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold,
- )
- IconButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, null) }
- }
- Row(Modifier.fillMaxWidth().padding(end = 12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
- TextButton(onClick = { naming = true }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.screen_key_layout_save)) }
- TextButton(onClick = { importer.launch(arrayOf("application/json", "text/plain", "*/*")) }, modifier = Modifier.focusGlide(CircleShape)) {
- Text(stringResource(R.string.boot_movie_import))
- }
- TextButton(onClick = { exporter.launch("droiddeck-layout.icp") }, modifier = Modifier.focusGlide(CircleShape)) {
- Text(stringResource(R.string.screen_key_layout_export))
- }
- }
- Column(Modifier.padding(end = 12.dp).heightIn(max = 320.dp).verticalScroll(rememberScrollState())) {
- layouts.forEach { layout ->
- Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
- Text(
- layout, Modifier.weight(1f).clickable { onLoad(layout) }.padding(vertical = 14.dp),
- style = MaterialTheme.typography.bodyLarge,
- )
- TextButton(onClick = { onDelete(layout) }, modifier = Modifier.focusGlide(CircleShape)) {
- Text(stringResource(R.string.common_delete), color = p.error)
- }
- }
- }
- }
- }
- }
- }
- }
-
- if (naming) {
- Dialog(onDismissRequest = { naming = false }, properties = DialogProperties(usePlatformDefaultWidth = false)) {
- Box(Modifier.fillMaxSize().systemBarsPadding().padding(16.dp), contentAlignment = Alignment.Center) {
- Surface(
- Modifier.widthIn(max = 520.dp).fillMaxWidth(), shape = RoundedCornerShape(22.dp),
- color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2),
- ) {
- Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
- OutlinedTextField(
- name, { name = it.take(24) }, Modifier.fillMaxWidth().focusGlide(), singleLine = true,
- keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
- )
- Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
- TextButton(onClick = { naming = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) }
- Button(onClick = { onSave(name.trim()); naming = false }, enabled = name.isNotBlank(), modifier = Modifier.focusGlide(CircleShape)) {
- Text(stringResource(R.string.screen_key_layout_save))
- }
- }
- }
- }
- }
- }
- }
-}
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 a531752134..625c615f62 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt
@@ -21,8 +21,6 @@ import androidx.savedstate.setViewTreeSavedStateRegistryOwner
import com.droiddeck.launcher.input.KeyboardHost
import com.droiddeck.launcher.input.PadBridge
import com.droiddeck.launcher.input.SecondScreenMode
-import com.droiddeck.launcher.input.InputProfiles
-import com.droiddeck.launcher.input.InputSurfaceLayout
import com.droiddeck.launcher.SessionActivity
import com.droiddeck.launcher.session.BottomDesktop
import com.droiddeck.launcher.session.SessionService
@@ -31,14 +29,10 @@ import com.droiddeck.launcher.session.SessionState
class SecondScreenPresentation(
private val sessionActivity: SessionActivity,
display: Display,
- private val sendPointer: (x: Float, y: Float, width: Float, height: Float) -> Unit,
- private val sendButton: (button: Int, pressed: Boolean) -> Unit,
- private val sendWheel: (steps: Int) -> Unit,
private val onSteamMenu: () -> Unit,
private val onQam: () -> Unit,
private val onClose: () -> Unit,
private val pad: PadBridge? = null,
- private val pointerPosition: () -> androidx.compose.ui.geometry.Offset? = { null },
private val onKeyboardClosed: () -> Unit = {},
private val onMenu: (() -> Unit)? = null,
private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null,
@@ -122,8 +116,9 @@ class SecondScreenPresentation(
}
fun showMode(mode: SecondScreenMode) {
- if (currentMode == mode && isShowing) return
- currentMode = mode
+ val next = if (mode == SecondScreenMode.KEYBOARD_TRACKPAD || mode == SecondScreenMode.DECK_CONTROLS) SecondScreenMode.CUSTOM_CONTROLS else mode
+ if (currentMode == next && isShowing) return
+ currentMode = next
if (created) renderMode()
}
@@ -131,7 +126,7 @@ class SecondScreenPresentation(
if (created && isShowing && currentMode == SecondScreenMode.TERMINAL && terminalPanel?.ready != true) renderMode()
}
- val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode == SecondScreenMode.KEYBOARD_TRACKPAD
+ val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode == SecondScreenMode.CUSTOM_CONTROLS
val showsControls: Boolean get() = isShowing && currentMode != SecondScreenMode.NONE
@@ -209,7 +204,8 @@ class SecondScreenPresentation(
fun showKeyboard(): Boolean {
val host = keyboardHost ?: return false
- host.show()
+ host.toggle()
+ keyboardShown.value = host.shown
return true
}
@@ -233,24 +229,24 @@ class SecondScreenPresentation(
closeDashboard()
root.removeAllViews()
ownComposeViews()
+ val library = com.droiddeck.launcher.input.InputLibraries.read(context)
+ val profileLayout = library.activeLayout(SessionState.mode == SessionService.MODE_DESKTOP, com.droiddeck.launcher.input.InputRole.SECONDARY)
+ val requested = currentMode
val mode = when {
- currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad -> SecondScreenMode.NONE
- currentMode == SecondScreenMode.DASHBOARD && dashboard == null -> SecondScreenMode.NONE
- currentMode == SecondScreenMode.DESKTOP && !BottomDesktop.available() -> SecondScreenMode.NONE
- else -> currentMode
+ requested == SecondScreenMode.DASHBOARD && dashboard == null -> SecondScreenMode.NONE
+ requested == SecondScreenMode.DESKTOP && !BottomDesktop.available() -> SecondScreenMode.NONE
+ else -> requested
}
if (mode == SecondScreenMode.NONE) return
when (mode) {
- SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad()
SecondScreenMode.TERMINAL -> renderTerminal()
SecondScreenMode.CUSTOM_CONTROLS -> {
- val profile = InputProfiles.active(context, SessionState.mode == SessionService.MODE_DESKTOP)
- root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad,
- InputSurfaceLayout.read(context, profile.id), onMenu = onMenu, onSwap = onSwap), weightParams())
- keyboardHost = KeyboardHost(context) { sessionActivity.dispatchKeyEvent(it) }.also { root.addView(it, ViewGroup.LayoutParams(1, 1)) }
+ root.addView(InputSurfaceView(context, pad, profileLayout?.elements.orEmpty(),
+ surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()), weightParams())
+ attachKeyboard()
}
- SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad, onMenu = onMenu, onSwap = onSwap), weightParams())
+ SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.DECK_CONTROLS -> Unit
SecondScreenMode.DASHBOARD -> renderDashboard()
SecondScreenMode.DESKTOP -> {
root.addView(BottomDesktopPanel(context, onClose, onMenu,
@@ -281,17 +277,7 @@ class SecondScreenPresentation(
dashboardView = null
}
- private fun renderKeyboardAndTrackpad() {
- bar(SecondScreenMode.KEYBOARD_TRACKPAD) {
- listOf(BarExtra(context.getString(if (keyboardShown.value) R.string.second_hide_keyboard else R.string.second_show_keyboard),
- icon = R.drawable.ic_bottom_keyboard, active = keyboardShown.value, tag = "bottom-keyboard") {
- keyboardHost?.let { host ->
- host.toggle()
- keyboardShown.value = host.shown
- }
- })
- }
- root.addView(trackpadView(), weightParams())
+ private fun attachKeyboard() {
val host = KeyboardHost(context) { event ->
val handled = sessionActivity.dispatchKeyEvent(event)
if (fieldKeyboard && event.action == KeyEvent.ACTION_UP &&
@@ -303,8 +289,6 @@ class SecondScreenPresentation(
root.addView(host, ViewGroup.LayoutParams(1, 1))
}
- private fun trackpadView(): View = SessionTrackpadView(context, sendPointer, sendButton, sendWheel, pointerPosition)
-
private fun renderTerminal() {
bar(SecondScreenMode.TERMINAL) {
listOf(BarExtra(context.getString(R.string.drawer_keyboard), icon = R.drawable.ic_bottom_keyboard, tag = "bottom-keyboard") {
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 ec13f79997..07289bdf29 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt
@@ -1,9 +1,9 @@
package com.droiddeck.launcher.ui
internal enum class SessionDrawerPage(val firstControl: String) {
- CONTROLLER("touch"),
+ CONTROLLER("input-profile"),
GLASSES("glasses-game"),
- SECOND_SCREEN("second-screen:keyboard-trackpad"),
+ SECOND_SCREEN("second-screen:custom-controls"),
DISPLAY("fg"),
HUD("hud"),
EFFECTS("look"),
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 dc7be96c9f..9eba66e1fa 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt
@@ -272,9 +272,6 @@ class DrawerActions(
val onEditSteamTouch: (() -> Unit)? = null,
val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null,
val onRumble: (Boolean) -> Unit = {},
- val onSteamButton: (Boolean) -> Unit = {},
- val onQamButton: (Boolean) -> Unit = {},
- val onKeyboardButton: (Boolean) -> Unit = {},
val onSuspendPolicy: (String) -> Unit,
val onSteamDownloadsInBackground: (Boolean) -> Unit = {},
val onBackActionsInverted: (Boolean) -> Unit,
@@ -288,14 +285,11 @@ class DrawerActions(
val onDirectCursor: (Boolean) -> Unit = {},
val onTouch: (String) -> Unit,
val onInputSettings: () -> Unit = {},
+ val onInputSelection: (com.droiddeck.launcher.input.InputRole?) -> Unit = {},
val onGestureSettings: () -> Unit = {},
val touchActive: String = "",
val directHoldBehavior: String = MOUSE_BEHAVIOR_CLICK,
val onDirectHoldBehavior: (String) -> Unit = {},
- val onScreenKeys: (() -> Unit)? = null,
- val onScreenLayouts: (() -> Unit)? = null,
- val screenKeysShown: Boolean = true,
- val onScreenKeysShown: (Boolean) -> Unit = {},
val onFexPreset: (String) -> Unit,
val onUpscaler: (Int) -> Unit = {},
val onUpscaleSharpness: (Int) -> Unit = {},
@@ -323,7 +317,6 @@ class DrawerActions(
val onStop: () -> Unit,
val onStopFrom: ((androidx.compose.ui.geometry.Rect?) -> Unit)? = null,
val onClose: () -> Unit,
- val onDismissScreen: (() -> Unit)? = null,
val components: ComponentsManager.Snapshot? = null,
val systemPowerVr: Boolean = false,
val onComponentsRefresh: () -> Unit = {},
@@ -429,7 +422,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
page == SessionDrawerPage.GLASSES -> "glasses-tab-$glassesTab"
page == SessionDrawerPage.SESSION && a.isHomeApp -> "apps"
page == SessionDrawerPage.SECOND_SCREEN -> "second-screen:" +
- (if (a.secondScreenMode == SecondScreenMode.NONE && !a.secondScreenNone) SecondScreenMode.KEYBOARD_TRACKPAD else a.secondScreenMode).id
+ (if (a.secondScreenMode == SecondScreenMode.NONE && !a.secondScreenNone) SecondScreenMode.CUSTOM_CONTROLS else a.secondScreenMode).id
else -> page.firstControl
}
if (turned) focus.forget(page)
@@ -487,7 +480,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
) {
SteamActionPill(
stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"),
- ) { host.open = null; (a.onDismissScreen ?: a.onClose)() }
+ ) { host.open = null; a.onClose() }
if (roomyHeader) Spacer(Modifier.weight(1f))
SteamActionPill(
stringResource(R.string.stores_dl_pause), Icons.Outlined.Pause, focus.track(page, "pause"),
@@ -593,8 +586,11 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
}
SessionDrawerPage.CONTROLLER -> {
SettingsGroup(stringResource(R.string.drawer_page_controller)) {
+ InputQuickSettings(host, desktop = !a.steam && !a.direct, 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.mode_controller), null,
+ 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),
@@ -602,45 +598,35 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
SessionPrefs.CONTROLLER_XBOX360 to stringResource(R.string.mode_controller_x360)),
type, chipModifier = focus.track(page, "pad-type"), onPick = a.onPadType)
}
- ChoiceRow(host, "touch", stringResource(R.string.mode_touch), null,
+ a.controller?.let { c ->
+ ToggleRow(host, "rumble", stringResource(R.string.ctrl_rumble), null, c.rumble,
+ chipModifier = focus.track(page, "rumble"), onChange = a.onRumble)
+
+ }
+ }
+ 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)),
a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch)
- ActionRow(stringResource(R.string.input_settings), null, stringResource(R.string.ctrl_edit), a.onInputSettings,
- modifier = focus.track(page, "input-settings"))
if (a.touchActive == SessionPrefs.TOUCH_PAD)
RelativeMouseRow(host, a, focus.track(page, "relative-mouse"))
if (a.touchActive == SessionPrefs.TOUCH_DIRECT)
- ToggleRow(host, "direct-cursor", stringResource(R.string.drawer_direct_cursor),
- null, a.directCursor,
+ ToggleRow(host, "direct-cursor", stringResource(R.string.input_touch_cursor),
+ stringResource(R.string.input_touch_cursor_hint), 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.gesture_long_press), null,
+ SessionPrefs.TOUCH_DIRECT -> ChoiceRow(host, "long-press", stringResource(R.string.input_touch_hold), stringResource(R.string.input_touch_hold_hint),
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)),
a.directHoldBehavior, chipModifier = focus.track(page, "long-press"),
onPick = a.onDirectHoldBehavior)
}
- if (a.onScreenKeys != null) {
- SettingsRow(stringResource(R.string.screen_keys), null, stacked = narrow) {
- Row(
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(10.dp),
- ) {
- SecondaryButton(stringResource(R.string.ctrl_edit), enabled = a.screenKeysShown,
- modifier = focus.track(page, "screen-keys"), onClick = a.onScreenKeys)
- a.onScreenLayouts?.let { open ->
- SecondaryButton(stringResource(R.string.screen_key_layout),
- modifier = focus.track(page, "screen-key-layouts"), onClick = open)
- }
- ToggleSwitch(a.screenKeysShown, true,
- modifier = focus.track(page, "screen-keys-shown"), onChange = a.onScreenKeysShown)
- }
- }
- }
+ }
+ 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)),
@@ -649,30 +635,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
a.onEditSteamTouch?.let { edit ->
ActionRow(stringResource(R.string.osc_steam_layout), stringResource(R.string.osc_steam_layout_hint), stringResource(R.string.ctrl_edit), edit)
}
- a.controller?.let { c ->
- ToggleRow(host, "rumble", stringResource(R.string.ctrl_rumble), null, c.rumble,
- chipModifier = focus.track(page, "rumble"), onChange = a.onRumble)
- if (a.onScreenButtonsVisible) {
- if (a.steam) {
- ToggleRow(host, "steam-button", stringResource(R.string.ctrl_steam_button), null, c.steamButton,
- chipModifier = focus.track(page, "steam-button"), onChange = a.onSteamButton)
- ToggleRow(host, "qam-button", stringResource(R.string.ctrl_qam_button), null, c.qamButton,
- chipModifier = focus.track(page, "qam-button"), onChange = a.onQamButton)
- }
- ToggleRow(host, "keyboard-button", stringResource(R.string.ctrl_keyboard_button), null, c.keyboardButton,
- chipModifier = focus.track(page, "keyboard-button"), onChange = a.onKeyboardButton)
- }
- }
- 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.mode_back), 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,
- 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}") })
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)
@@ -682,6 +644,18 @@ 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}") })
+ }
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,
@@ -1165,8 +1139,7 @@ private fun SteamVrRow(a: DrawerActions) {
}
internal fun secondScreenModes(none: Boolean, deckPad: Boolean, dashboard: Boolean, desktop: Boolean): List =
- (if (none) listOf(SecondScreenMode.NONE) else emptyList()) + listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL) +
- (if (deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList()) +
+ (if (none) listOf(SecondScreenMode.NONE) else emptyList()) + listOf(SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL) +
(if (dashboard) listOf(SecondScreenMode.DASHBOARD) else emptyList()) +
(if (desktop) listOf(SecondScreenMode.DESKTOP) else emptyList())
@@ -1176,6 +1149,8 @@ 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
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPanels.kt
index 3dbd0da611..35d5538bfb 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/SessionPanels.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPanels.kt
@@ -2,21 +2,17 @@ package com.droiddeck.launcher.ui
import android.content.ClipboardManager
import android.content.Context
-import android.graphics.Canvas
import android.graphics.Color
import android.util.Log
import android.view.Gravity
import android.view.KeyEvent
import android.view.MotionEvent
import android.view.View
-import android.view.ViewConfiguration
import android.view.inputmethod.InputMethodManager
import android.widget.HorizontalScrollView
import android.widget.LinearLayout
import android.widget.TextView
import com.droiddeck.launcher.R
-import com.droiddeck.launcher.input.PointerGestures
-import com.droiddeck.launcher.input.TouchpadGestures
import com.droiddeck.launcher.session.SessionService
import com.droiddeck.launcher.session.SessionTerminal
import com.termux.terminal.TerminalEmulator
@@ -25,71 +21,6 @@ import com.termux.terminal.TerminalSessionClient
import com.termux.view.TerminalView
import com.termux.view.TerminalViewClient
-class SessionTrackpadView(
- context: Context,
- private val sendPointer: (x: Float, y: Float, width: Float, height: Float) -> Unit,
- private val sendButton: (button: Int, pressed: Boolean) -> Unit,
- private val sendWheel: (steps: Int) -> Unit,
- private val pointerPosition: () -> androidx.compose.ui.geometry.Offset? = { null },
-) : View(context) {
- private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt()
-
- private val gestures = TouchpadGestures(ViewConfiguration.get(context).scaledTouchSlop.toFloat(),
- object : PointerGestures.Listener {
- override fun onMove(x: Float, y: Float) {
- sendPointer(x, y, width.toFloat(), height.toFloat())
- invalidate()
- }
-
- override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) {
- sendPointer(x, y, width.toFloat(), height.toFloat())
- sendButton(button, pressed)
- }
-
- override fun onWheel(steps: Int) = sendWheel(steps)
- override fun onLongPress() { performHapticFeedback(android.view.HapticFeedbackConstants.LONG_PRESS) }
- })
-
- init {
- isFocusable = true
- setBackgroundColor(Color.BLACK)
- }
-
- override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
- gestures.bounds = android.graphics.RectF(0f, 0f, w.toFloat(), h.toFloat())
- if (oldw == 0 || oldh == 0) gestures.place(w / 2f, h / 2f)
- }
-
- private val surface = android.graphics.RectF()
- private val fill = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(0x0A, 0x0B, 0x0D) }
- private val edge = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply {
- style = android.graphics.Paint.Style.STROKE
- color = Color.rgb(0x26, 0x29, 0x2E)
- strokeWidth = resources.displayMetrics.density
- }
-
- override fun onDraw(canvas: Canvas) {
- val inset = dp(12).toFloat()
- surface.set(inset, 0f, width - inset, height - inset)
- if (surface.height() <= inset) return
- val radius = dp(20).toFloat()
- canvas.drawRoundRect(surface, radius, radius, fill)
- canvas.drawRoundRect(surface, radius, radius, edge)
- }
-
- override fun onTouchEvent(event: MotionEvent): Boolean {
- if (event.actionMasked == MotionEvent.ACTION_DOWN) pointerPosition()?.let {
- gestures.place(it.x * width, it.y * height)
- }
- return gestures.onTouch(event)
- }
-
- override fun onDetachedFromWindow() {
- gestures.cancel()
- super.onDetachedFromWindow()
- }
-}
-
class SessionTerminalPanel(context: Context) : LinearLayout(context) {
private var terminalSession: TerminalSession? = null
private var terminalView: TerminalView? = null
@@ -129,7 +60,7 @@ class SessionTerminalPanel(context: Context) : LinearLayout(context) {
val keys = LinearLayout(context).apply { orientation = HORIZONTAL; setPadding(dp(12), 0, dp(12), dp(8)) }
fun key(label: String, input: String, onClick: ((TextView) -> Unit)? = null) {
lateinit var button: TextView
- button = DeckControlsPanel.roundButton(context, label, label, { if (onClick != null) onClick(button) else session.write(input) }, wide = true)
+ button = InputSurfaceView.roundButton(context, label, label, { if (onClick != null) onClick(button) else session.write(input) }, wide = true)
if (keys.childCount > 0) keys.addView(View(context), LinearLayout.LayoutParams(dp(8), 1))
keys.addView(button)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt
index 2189b26ba1..b5595a52b7 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt
@@ -509,16 +509,23 @@ fun ChoiceRow(
stacked: Boolean = false,
onPick: (T) -> Unit,
) {
+ SettingsRow(label, hint, highlighted = host.open == key, hintLines = hintLines, stacked = stacked) {
+ ChoiceChip(host, key, label, options, selected, enabled, note, chipModifier, onPick)
+ }
+}
+
+@Composable
+internal fun ChoiceChip(host: MenuHost, key: String, label: String, options: List>, selected: T,
+ enabled: Boolean = true, note: String? = null, modifier: Modifier = Modifier, onPick: (T) -> Unit) {
val open = host.open == key
- SettingsRow(label, hint, highlighted = open, hintLines = hintLines, stacked = stacked) {
- Box {
- ValueChip(options.firstOrNull { it.first == selected }?.second ?: "-", open, enabled, modifier = chipModifier.testTag("setting-$key")) { host.open = if (open) null else key }
- AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { firstItemFocus ->
- options.forEachIndexed { index, (value, text) ->
- MenuItem(text, checked = value == selected, focusRequester = if (index == 0) firstItemFocus else null) {
- onPick(value)
- host.open = null
- }
+ Box {
+ ValueChip(options.firstOrNull { it.first == selected }?.second ?: "-", open, enabled,
+ modifier = modifier.testTag("setting-$key")) { host.open = if (open) null else key }
+ AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { firstItemFocus ->
+ options.forEachIndexed { index, (value, text) ->
+ MenuItem(text, checked = value == selected, focusRequester = if (index == 0) firstItemFocus else null) {
+ onPick(value)
+ host.open = null
}
}
}
@@ -714,6 +721,7 @@ fun SettingsPage(
scroll: androidx.compose.foundation.ScrollState? = null,
scrollContent: Boolean = true,
compactLayout: Boolean = false,
+ showBack: Boolean = true,
header: (@Composable () -> Unit)? = null,
modifier: Modifier = Modifier,
content: @Composable ColumnScope.() -> Unit,
@@ -736,7 +744,7 @@ fun SettingsPage(
horizontalArrangement = Arrangement.spacedBy(12.dp),
modifier = Modifier.fillMaxWidth(),
) {
- BackLink(stringResource(R.string.mode_back), compact = true, onClick = onBack)
+ if (showBack) BackLink(stringResource(R.string.mode_back), compact = true, onClick = onBack)
if (header != null) Box(Modifier.weight(1f)) { header() }
}
}
@@ -746,7 +754,7 @@ fun SettingsPage(
verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp),
modifier = Modifier.padding(bottom = 6.dp),
) {
- BackLink(stringResource(R.string.mode_back), compact = true, onClick = onBack)
+ if (showBack) BackLink(stringResource(R.string.mode_back), compact = true, onClick = onBack)
Text(
title, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground,
maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f),
@@ -758,7 +766,7 @@ fun SettingsPage(
} else {
Rise(0) {
Row(verticalAlignment = Alignment.CenterVertically) {
- BackLink(stringResource(R.string.mode_back), compact = compactLayout, onClick = onBack)
+ if (showBack) BackLink(stringResource(R.string.mode_back), compact = compactLayout, onClick = onBack)
if (eyebrow != null) {
Spacer(Modifier.width(10.dp))
Eyebrow(eyebrow)
diff --git a/app/src/main/res/values/input_library.xml b/app/src/main/res/values/input_library.xml
new file mode 100644
index 0000000000..fc419258a2
--- /dev/null
+++ b/app/src/main/res/values/input_library.xml
@@ -0,0 +1,158 @@
+
+
+ This built-in layout keeps its existing controls. Create a custom layout to add, move or resize elements.
+ Properties
+ Click properties
+ %1$s · Click
+ Buttons
+ Sticks, pads and triggers
+ Hide tools
+ Show tools
+ Controller
+ Send controller input to Steam Input or the game.
+ This element sends no controller, mouse or keyboard input.
+ Mouse click
+ DroidDeck action
+ Action
+ Scroll speed: %1$d steps/s
+ Auto selection
+ Shortcuts and diagnostics
+ Layouts
+ Opening a profile for editing does not activate it.
+ Saved profiles
+ + New profile
+ + New layout
+ + New bindings
+ Saved elements, positions and sizes. Actions are stored in bindings.
+ Used by %1$d profiles
+ %1$s · Used by %2$d profiles. Changes apply to every profile using these bindings.
+ Empty layout
+ Saved parts
+ Choose shared bindings and a layout for each touch screen.
+ Arrange elements directly on the target display. Properties open on the main display.
+ Use this profile
+ Rename
+ Make a copy
+ Delete
+ Add elements to the layout before assigning their actions.
+ Edit on
+ Confirm change
+ Continue with this reset or deletion?
+ Could not save input settings
+ Name
+ Start from
+ Button
+ Stick
+ Trackpad
+ D-pad
+ Trigger
+ Done
+ Undo
+ + Add
+ Drag to move. Drag a corner to resize. Tap Properties to assign an action.
+ Tap to place the new element.
+ Editing on your second screen
+ The selected display is not available. Connect it to edit this layout at its actual size.
+ Discard unsaved layout changes?
+ This layout is used by %1$d profiles. Saved changes apply to all of them.
+ Unassigned
+ Default profiles
+ Desktop mode
+ Game mode
+ The session is pinned to %1$s. Choose Auto in the session menu to use these defaults.
+ Default for Desktop and Game
+ Default for Game mode
+ Default for Desktop mode
+ Device settings
+ Vibration, stick dead zone, shortcuts and diagnostics
+ Controls
+ Buttons, sticks, triggers and extra keys
+ Copy profile
+ Reset actions
+ Reset the actions in %1$s to its base profile defaults? Layouts and other profiles will stay unchanged.
+ Delete %1$s? Modes using it will return to their built-in default profile. Saved layouts and shared settings will remain available.
+ Visibility
+ Applies to all profiles. Auto shows the main-screen controls when no gamepad is connected in Game mode.
+ Edit on screen
+ Saved layouts…
+ Choose a layout or create your own
+ Built-in gamepad options
+ Appearance, buttons and positions
+ These options apply to the built-in main-screen gamepad in every profile. Custom layouts are edited directly on screen.
+ Choose Profile controls in the second-screen session menu. The Profile and Second screen selectors in the Controller menu choose the controls to show.
+ Button actions
+ Shared with %1$s. Edits apply to those profiles too.
+ Reuse settings
+ Use settings from…
+ Copy from another profile or keep settings shared
+ Make independent
+ Keep the current setup and stop sharing changes
+ Layouts store elements and their positions. Each profile can assign its own actions. Edit at full size on the target screen.
+ Current layout
+ Delete the unused layout %1$s and its saved actions?
+ Rename current layout
+ Reuse %1$s from another profile. The other control sources will stay unchanged.
+ Keep physical controls shared
+ By default, all controls and custom layouts are independent copies. Sharing only links the physical controls.
+ Use these elements and positions. Sharing keeps future geometry edits in sync; your button actions remain independent. A different layout starts with unassigned actions.
+ Copy these controls and actions, or link them so future edits apply to both profiles.
+ Keep shared
+ Independent copy
+ Built-in gamepad · positions shared across profiles
+ 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.
+ Held while touching the trackpad; released when you lift your finger. DroidDeck commands run once per touch. The trackpad click is configured separately.
+ Held when the trigger passes 55%; released below 35%. DroidDeck commands run once per press.
+ Scroll direction
+ Vertical
+ Horizontal
+ Scroll horizontally
+ Measurements
+ Enable recording, use controls in a running session, then return and read the results. Measures DroidDeck dispatch time only, not display latency. Recording ends when the app process closes.
+ %1$d controls
+ Other saved layouts (%1$d) ▾
+ Hide other saved layouts (%1$d) ▴
+ Home / Guide
+ Back · single tap
+ Back · double tap
+ 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
+ Circle
+ Rectangle
+ Button label
+ Text
+ Imported image
+ Separate diagonal keys
+ Assign a key to each diagonal. An empty diagonal presses its two neighboring directions.
+ Neighboring directions
+ Your old screen keys are saved as imported profiles below. Select one to use or edit it. Your current profile selections have been kept.
+ The old screen keys could not be imported automatically. The original settings have been kept.
+
diff --git a/app/src/main/res/values/input_strings.xml b/app/src/main/res/values/input_strings.xml
index 5b8c9b167e..77c79ba054 100644
--- a/app/src/main/res/values/input_strings.xml
+++ b/app/src/main/res/values/input_strings.xml
@@ -20,7 +20,8 @@
Directional keys
Move pointer
Pointer speed: %1$d
- Scroll vertically
+ Scroll
+ Scroll vertically
Left mouse button
Right mouse button
Middle mouse button
diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt
new file mode 100644
index 0000000000..813ec2a07b
--- /dev/null
+++ b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt
@@ -0,0 +1,281 @@
+package com.droiddeck.launcher.input
+
+import android.content.Context
+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 InputLibraryTest {
+ private val context: Context get() = RuntimeEnvironment.getApplication()
+ private val prefs get() = context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE)
+ @Before fun reset() {
+ for (name in listOf("input-profiles", "input-surfaces", "controller")) context.getSharedPreferences(name, Context.MODE_PRIVATE).edit().clear().commit()
+ }
+
+ @Test fun migrationPreservesExistingBindingsGeometryAndActiveSelection() {
+ prefs.edit().putString("selected", "desktop").putBoolean("migrated", true)
+ .putString("profile.desktop", """{"version":1,"bindings":[{"role":"PHYSICAL","control":"a","action":{"type":"keys","codes":[29,33]}}]}""").commit()
+ InputSurfaceLayout.saveLegacy(context, "desktop", listOf(InputSurfaceElement(InputControl.B, .3f, .2f, .4f, .4f)))
+ val legacy = InputProfiles.readLegacy(context, "desktop")
+ assertEquals(InputAction.Keys(listOf(29, 33)), legacy.action(InputRole.PHYSICAL, InputControl.A))
+ val library = InputLibraries.read(context)
+ assertEquals(legacy.bindings, library.compile("desktop").bindings)
+ assertEquals(legacy.keys, library.compile("desktop").keys)
+ assertEquals("desktop", library.selected)
+ assertEquals(.3f, library.layout("desktop", InputRole.SECONDARY)!!.elements.single().x)
+ assertEquals(library, InputLibraries.decode(InputLibraries.encode(library)))
+ }
+
+ @Test fun profilesSharePhysicalBindingsWhileUsingDifferentTouchActions() {
+ val original = InputLibraries.read(context)
+ val shared = original.duplicateProfile("desktop", "Editor", "editor", sharePhysical = true)
+ val p = shared.preset(shared.profile("desktop").binding(InputRole.PHYSICAL))
+ val updated = shared.withPreset(p.copy(controls = p.controls + (InputControl.R3 to InputAction.Keys(listOf(29, 33)))))
+ .copyBindings(shared.profile("editor").binding(InputRole.SECONDARY), "Editor touch", "editor", InputRole.SECONDARY, "editor.touch")
+ val touch = updated.preset("editor.touch")
+ val final = updated.withPreset(touch.copy(controls = touch.controls + (InputControl.A to InputAction.Keys(listOf(28))))).validate()
+ assertEquals(InputAction.Keys(listOf(29, 33)), final.compile("editor").action(InputRole.PHYSICAL, InputControl.R3))
+ assertEquals(InputAction.Keys(listOf(29, 33)), final.compile("desktop").action(InputRole.PHYSICAL, InputControl.R3))
+ assertEquals(InputAction.MouseButton(272), final.compile("desktop").action(InputRole.SECONDARY, InputControl.A))
+ assertEquals(InputAction.Keys(listOf(28)), final.compile("editor").action(InputRole.SECONDARY, InputControl.A))
+ assertEquals(final.layout("desktop", InputRole.SECONDARY)!!.elements, final.layout("editor", InputRole.SECONDARY)!!.elements)
+ assertNotEquals(final.layout("desktop", InputRole.SECONDARY)!!.id, final.layout("editor", InputRole.SECONDARY)!!.id)
+ }
+
+ @Test fun copyingPhysicalBindingsOnlyRelinksTheSelectedProfile() {
+ val library = InputLibraries.read(context).duplicateProfile("desktop", "Editor", "editor")
+ val id = library.profile("desktop").binding(InputRole.PHYSICAL)
+ val copied = library.copyBindings(id, "Editor controller", "editor", InputRole.PHYSICAL, "private")
+ assertEquals(id, copied.profile("desktop").binding(InputRole.PHYSICAL))
+ assertEquals("private", copied.profile("editor").binding(InputRole.PHYSICAL))
+ assertEquals(library.preset(id).controls, copied.preset("private").controls)
+ assertEquals(library.profile("editor").parts, library.copyBindings(id, "Library copy").profile("editor").parts)
+ }
+
+ @Test fun copyingProfileIsIndependentAndPreservesElementActions() {
+ val original = InputLibraries.read(context)
+ val library = original.duplicateProfile("desktop", "Editor", "editor").validate()
+ for (role in InputRole.entries) {
+ assertNotEquals(library.profile("desktop").binding(role), library.profile("editor").binding(role))
+ assertEquals(library.compile("desktop").bindings[role], library.compile("editor").bindings[role])
+ if (library.layout("desktop", role)?.editable == true) {
+ assertNotEquals(library.layout("desktop", role)!!.id, library.layout("editor", role)!!.id)
+ assertEquals(library.layout("desktop", role)!!.elements, library.layout("editor", role)!!.elements)
+ }
+ }
+ assertEquals(original.profiles, library.profiles.filterNot { it.id == "editor" })
+ assertEquals(original.selected, library.selected)
+ }
+
+ @Test fun sharingGeometryKeepsActionsIndependentAndDetachingCopiesBoth() {
+ var library = InputLibraries.read(context).duplicateProfile("desktop", "Editor", "editor")
+ val source = library.layout("desktop", InputRole.SECONDARY)!!
+ library = library.useLayout("editor", InputRole.SECONDARY, source.id, shared = true).validate()
+ assertEquals(source.id, library.layout("editor", InputRole.SECONDARY)!!.id)
+ assertNotEquals(library.profile("desktop").binding(InputRole.SECONDARY), library.profile("editor").binding(InputRole.SECONDARY))
+ library = library.usePart("editor", InputRole.SECONDARY, "desktop", shared = true).validate()
+ assertEquals(library.profile("desktop").parts[InputRole.SECONDARY], library.profile("editor").parts[InputRole.SECONDARY])
+ val detached = library.usePart("editor", InputRole.SECONDARY, "editor", shared = false).validate()
+ assertNotEquals(source.id, detached.layout("editor", InputRole.SECONDARY)!!.id)
+ assertNotEquals(detached.profile("desktop").binding(InputRole.SECONDARY), detached.profile("editor").binding(InputRole.SECONDARY))
+ assertEquals(library.compile("editor"), detached.compile("editor"))
+ }
+
+ @Test fun elementIdsSurviveGeometryEditsAndDeletionPrunesEveryLinkedPreset() {
+ val library = InputLibraries.read(context)
+ val layout = library.layout("game", InputRole.SECONDARY)!!
+ val e = InputSurfaceElement(InputControl.A, .1f, .1f, .2f, .2f, "button-1")
+ val b = library.preset(library.profile("game").binding(InputRole.SECONDARY))
+ val saved = library.withLayout(layout.copy(elements = listOf(e)))
+ .withPreset(b.copy(elements = mapOf(e.id to InputAction.Keys(listOf(57)))))
+ .copyBindings(b.id, "Alternative", newId = "alternative").validate()
+ val moved = saved.withLayout(layout.copy(elements = listOf(e.copy(x = .6f)))).validate()
+ assertEquals(InputAction.Keys(listOf(57)), moved.preset(b.id).action(e))
+ val deleted = moved.withLayout(layout.copy(elements = emptyList())).validate()
+ assertTrue(deleted.preset(b.id).elements.isEmpty())
+ assertTrue(deleted.preset("alternative").elements.isEmpty())
+ }
+
+ @Test fun missingAndIncompatibleReferencesAreRejected() {
+ val library = InputLibraries.read(context)
+ assertThrows(IllegalArgumentException::class.java) { library.removeBindings(library.profile("game").binding(InputRole.PHYSICAL)) }
+ assertThrows(IllegalArgumentException::class.java) { library.removeLayout(library.layout("game", InputRole.SECONDARY)!!.id) }
+ assertThrows(IllegalArgumentException::class.java) { library.chooseBindings("game", InputRole.PHYSICAL, library.profile("game").binding(InputRole.SECONDARY)) }
+ assertThrows(IllegalArgumentException::class.java) { library.chooseLayout("game", InputRole.PHYSICAL, InputLibraries.DECK) }
+ }
+
+ @Test fun deletingActiveProfileFallsBackWithoutDeletingSharedParts() {
+ val library = InputLibraries.read(context).duplicateProfile("desktop", "Editor", "editor")
+ val removed = library.copy(selected = "editor", desktop = "editor").removeProfile("editor").validate()
+ assertEquals(InputProfiles.AUTO, removed.selected)
+ assertEquals("desktop", removed.desktop)
+ assertEquals(library.layouts, removed.layouts)
+ assertEquals(library.bindings, removed.bindings)
+ }
+
+ @Test fun futureLibrariesAreNotOverwritten() {
+ val future = org.json.JSONObject(InputLibraries.encode(InputLibraries.read(context))).put("version", 999).toString()
+ prefs.edit().putString("library", future).commit()
+ InputLibraries.read(context)
+ assertThrows(IllegalArgumentException::class.java) { InputLibraries.update(context) { it.copy(selected = "desktop") } }
+ assertEquals(future, prefs.getString("library", null))
+ }
+
+ @Test fun resettingAProfileDoesNotResetSharedBindingsOrAccumulatePrivateCopies() {
+ var library = InputLibraries.read(context).duplicateProfile("desktop", "Editor", "editor", sharePhysical = true)
+ val common = library.preset(library.profile("desktop").binding(InputRole.PHYSICAL))
+ library = library.withPreset(common.copy(controls = common.controls + (InputControl.A to InputAction.Keys(listOf(57)))))
+ .resetProfile("editor").validate()
+ val count = library.bindings.size
+ repeat(100) { library = library.resetProfile("editor").validate() }
+ assertEquals(count, library.bindings.size)
+ assertEquals(InputAction.Keys(listOf(57)), library.compile("desktop").action(InputRole.PHYSICAL, InputControl.A))
+ assertEquals(InputAction.MouseButton(272), library.compile("editor").action(InputRole.PHYSICAL, InputControl.A))
+ }
+
+ @Test fun clickActionsRoundTripAndArePrunedWithTheirElement() {
+ val library = InputLibraries.read(context)
+ val layout = library.layout("desktop", InputRole.SECONDARY)!!
+ val pad = layout.elements.first { it.hasClick }
+ val preset = library.preset(library.profile("desktop").binding(InputRole.SECONDARY))
+ val updated = library.withPreset(preset.copy(clicks = mapOf(pad.id to InputAction.Keys(listOf(29, 33))))).validate()
+ val roundTrip = InputLibraries.decode(InputLibraries.encode(updated))!!
+ assertEquals(InputAction.Keys(listOf(29, 33)), roundTrip.compile("desktop").elementClickAction(InputRole.SECONDARY, pad))
+ assertEquals(preset.action(pad), roundTrip.preset(preset.id).action(pad))
+ assertTrue(roundTrip.withLayout(layout.copy(elements = emptyList())).preset(preset.id).clicks.isEmpty())
+ }
+ @Test fun versionTwoFixedGamepadMigratesOnceWithoutChangingOtherProfiles() {
+ val original = InputLibraries.read(context)
+ val fixed = original.copy(layouts = original.layouts.map { if (it.id == InputLibraries.OVERLAY) it.copy(elements = emptyList(), template = InputLayoutTemplate.OVERLAY) else it },
+ 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)))
+ 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 / 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 quickPartsAreModeSpecificAndDoNotEditSavedProfiles() {
+ val original = InputLibraries.read(context)
+ val mixed = original.selectPart(true, InputRole.SECONDARY, InputStockLayouts.TRACKPAD).validate()
+ assertEquals(original.profiles, mixed.profiles)
+ assertEquals(original.compileActive(false), mixed.compileActive(false))
+ assertEquals(InputLibraries.TRACKPAD, mixed.activeLayout(true, InputRole.SECONDARY)?.id)
+ assertEquals(InputAction.Pointer(), mixed.compileActive(true).elementAction(InputRole.SECONDARY, "legacy:right-pad", InputControl.RIGHT_PAD))
+ assertEquals(mixed, InputLibraries.decode(InputLibraries.encode(mixed)))
+ val restored = mixed.selectProfile(true, InputProfiles.AUTO)
+ assertTrue(restored.selection(true).parts.isEmpty())
+ assertEquals(original.compileActive(true), restored.compileActive(true))
+ }
+
+ @Test fun savedQuickCombinationOwnsIndependentCopiesOfAllThreeParts() {
+ val original = InputLibraries.read(context)
+ val mixed = original.selectPart(true, InputRole.SECONDARY, InputStockLayouts.TRACKPAD)
+ val saved = mixed.saveSelection(true, "Writing", "writing").validate()
+ assertEquals("writing", saved.activeId(true))
+ assertTrue(saved.selection(true).parts.isEmpty())
+ for (role in InputRole.entries) {
+ val source = mixed.activePart(true, role)
+ val copy = saved.activePart(true, role)
+ assertNotEquals(source.bindings, copy.bindings)
+ if (role != InputRole.PHYSICAL) assertNotEquals(source.layout, copy.layout)
+ assertEquals(mixed.preset(source.bindings).elements, saved.preset(copy.bindings).elements)
+ }
+ assertEquals(original.profile("desktop"), saved.profile("desktop"))
+ }
+
+ @Test fun activeQuickPartsCannotBeDeletedAndInvalidCombinationsAreRejected() {
+ val library = InputLibraries.read(context).selectPart(false, InputRole.SECONDARY, InputStockLayouts.RIGHT)
+ assertThrows(IllegalArgumentException::class.java) { library.removeBindings(InputStockLayouts.RIGHT) }
+ assertThrows(IllegalArgumentException::class.java) { library.removeLayout("builtin.right-pad") }
+ assertThrows(IllegalArgumentException::class.java) { library.selectPart(false, InputRole.PHYSICAL, InputStockLayouts.RIGHT).validate() }
+ assertThrows(IllegalArgumentException::class.java) { library.selectProfile(false, "missing").validate() }
+ }
+
+ @Test fun oldFixedLowerPanelsMigrateIntoEditableLayoutsWithWorkingCommands() {
+ val current = InputLibraries.read(context)
+ val profile = current.profile("game")
+ val old = current.copy(layouts = current.layouts.map { if (it.id == InputLibraries.DECK) it.copy(elements = emptyList(), template = InputLayoutTemplate.DECK) else it },
+ bindings = current.bindings.filterNot { it.layoutId == InputLibraries.DECK })
+ .withPreset(SavedInputBindings("old-deck", "Old Deck", false, controls = mapOf(InputControl.L4 to InputAction.Keys(listOf(57)))))
+ .withProfile(profile.copy(parts = profile.parts + (InputRole.SECONDARY to InputPart("old-deck", InputLibraries.DECK)))).validate()
+ val raw = org.json.JSONObject(InputLibraries.encode(old)).put("version", 3).toString()
+ context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE).edit().putString("library", raw).commit()
+ val upgraded = InputLibraries.read(context)
+ assertTrue(upgraded.layout("game", InputRole.SECONDARY)!!.editable)
+ val output = upgraded.compile("game")
+ assertEquals(InputAction.Keys(listOf(57)), output.elementAction(InputRole.SECONDARY, "legacy:l4", InputControl.L4))
+ assertEquals(InputAction.Command(InputCommand.MENU), output.elementAction(InputRole.SECONDARY, "command:0", InputControl.A))
+ assertEquals(upgraded, InputLibraries.read(context))
+ }
+
+ @Test fun stockPresetsAreScopedToTheSecondScreenAndCopiedWithTheirActions() {
+ val library = InputLibraries.read(context)
+ for (layout in InputStockLayouts.layouts()) {
+ val role = InputRole.SECONDARY
+ assertFalse(library.layouts.first { it.id == layout.id }.supports(InputRole.PRIMARY))
+ val changed = library.useLayout("game", role, layout.id, shared = false).validate()
+ val copy = changed.layout("game", role)!!
+ assertNotEquals(layout.id, copy.id)
+ assertEquals(layout.elements, copy.elements)
+ assertEquals(InputAction.Command(InputCommand.MENU), changed.compile("game").elementAction(role, "command:0", InputControl.A))
+ }
+ }
+
+ @Test fun versionFourScopingPreservesLayoutsAlreadySharedAcrossScreens() {
+ val original = InputLibraries.read(context)
+ val deck = original.layouts.first { it.id == InputLibraries.DECK }.copy(screen = InputLayoutScreen.BOTH)
+ val shared = original.withLayout(deck).useLayout("game", InputRole.PRIMARY, deck.id, shared = true)
+ .useLayout("game", InputRole.SECONDARY, deck.id, shared = true)
+ val json = org.json.JSONObject(InputLibraries.encode(shared)).put("version", 4)
+ val layouts = json.getJSONArray("layouts")
+ for (i in 0 until layouts.length()) layouts.getJSONObject(i).remove("screen")
+ context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE).edit().putString("library", json.toString()).commit()
+ val migrated = InputLibraries.read(context)
+ assertEquals(InputLayoutScreen.BOTH, migrated.layouts.first { it.id == deck.id }.screen)
+ assertEquals(shared.profiles, migrated.profiles)
+ assertEquals(shared.bindings, migrated.bindings)
+ assertEquals(migrated, InputLibraries.read(context))
+ }
+
+ @Test fun horizontalScrollAndLayoutTargetSurviveSerialization() {
+ val library = InputLibraries.read(context)
+ val preset = library.preset(library.profile("desktop").binding(InputRole.PHYSICAL))
+ val changed = library.withPreset(preset.copy(controls = preset.controls + (InputControl.RS to InputAction.Scroll(17f, true))))
+ assertEquals(changed, InputLibraries.decode(InputLibraries.encode(changed)))
+ }
+
+}
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 92cdcaa192..80507a831d 100644
--- a/app/src/test/java/com/droiddeck/launcher/input/InputProfilesTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/input/InputProfilesTest.kt
@@ -51,13 +51,15 @@ class InputProfilesTest {
@Test fun unknownVersionDoesNotExecuteBindings() {
context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE).edit()
.putString("profile.game", """{"version":999,"bindings":[]} """).commit()
- assertEquals(InputProfile.defaults(InputProfile.GAME), InputProfiles.read(context, InputProfile.GAME))
+ 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)
}
@Test fun layoutsPersistIndependentOfBindingsAndStayInsideScreen() {
InputSurfaceLayout.save(context, InputProfile.GAME, listOf(InputSurfaceElement(InputControl.A, .95f, -.1f, 2f, 2f)))
val element = InputSurfaceLayout.read(context, InputProfile.GAME).single()
- assertEquals(.9f, element.x); assertEquals(0f, element.y)
+ assertEquals(.95f, element.x); assertEquals(0f, element.y)
assertTrue(element.x + element.width <= 1f)
assertEquals(InputAction.Native(), InputProfiles.read(context, InputProfile.GAME).action(InputRole.SECONDARY, InputControl.A))
}
diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputRouterTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputRouterTest.kt
index 4c13732317..3313995778 100644
--- a/app/src/test/java/com/droiddeck/launcher/input/InputRouterTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/input/InputRouterTest.kt
@@ -10,6 +10,7 @@ class InputRouterTest {
override fun button(code: Int, down: Boolean) { events += "button $code $down" }
override fun pointer(dx: Float, dy: Float) { events += "pointer $dx $dy" }
override fun scroll(steps: Int) { events += "scroll $steps" }
+ override fun scrollHorizontal(steps: Int) { events += "horizontal $steps" }
override fun command(command: InputCommand) { events += command.name }
override fun requestMotion() { events += "motion" }
}
@@ -18,6 +19,47 @@ class InputRouterTest {
private fun bind(control: InputControl, action: InputAction, role: InputRole = InputRole.PHYSICAL) =
InputProfile.defaults(InputProfile.GAME).withBinding(role, control, action)
+ @Test fun radialKeysKeepCustomDiagonalsAndReleaseSharedNeighborKeys() {
+ router.setProfile(bind(InputControl.LS, InputAction.Directions(103, 106, 0, 105, listOf(30, 0, 0, 0))))
+ val stick = router.channel(InputRole.PHYSICAL, InputControl.LS)
+ stick.update(.7f, -.7f)
+ assertEquals(listOf("key 30 true"), output.events)
+ stick.update(-.7f, -.7f)
+ assertEquals(listOf("key 30 true", "key 30 false", "key 105 true", "key 103 true"), output.events)
+ output.events.clear()
+ stick.update(0f, -1f)
+ assertEquals(listOf("key 105 false"), output.events)
+ router.releaseAll()
+ assertEquals(listOf("key 105 false", "key 103 false"), output.events)
+ }
+
+ @Test fun horizontalStickUsesXAndKeepsTheVerticalWheelIndependent() {
+ router.setProfile(bind(InputControl.RS, InputAction.Scroll(20f, true)).withBinding(InputRole.PHYSICAL, InputControl.LS, InputAction.Scroll(20f)))
+ val horizontal = router.channel(InputRole.PHYSICAL, InputControl.RS)
+ val vertical = router.channel(InputRole.PHYSICAL, InputControl.LS)
+ horizontal.update(1f, 0f); vertical.update(0f, -1f)
+ router.tick(.05f)
+ assertTrue(output.events.contains("horizontal 1"))
+ assertTrue(output.events.contains("scroll -1"))
+ output.events.clear()
+ horizontal.update(0f, 1f); vertical.update(1f, 0f)
+ assertFalse(router.tick(.05f))
+ assertTrue(output.events.isEmpty())
+ }
+
+ @Test fun horizontalTouchScrollFollowsContactAndDropsRemainderOnSuspend() {
+ val channel = router.channel(InputRole.SECONDARY, InputControl.RIGHT_PAD, InputAction.Scroll(10f, true))
+ channel.update(0f, 0f, true)
+ channel.update(.25f, .8f, true)
+ assertEquals(listOf("horizontal -2"), output.events)
+ router.releaseAll()
+ output.events.clear()
+ channel.update(0f, 0f, false)
+ channel.update(0f, 0f, true)
+ channel.update(.06f, 0f, true)
+ assertTrue(output.events.isEmpty())
+ }
+
@Test fun nativeProfileReturnsOriginalStateWithoutScheduling() {
val source = router.pad(InputRole.PHYSICAL)
val state = PadState().apply { leftX = .7f; press(PadState.A, true) }
diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSnapTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSnapTest.kt
new file mode 100644
index 0000000000..be726ff63c
--- /dev/null
+++ b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSnapTest.kt
@@ -0,0 +1,33 @@
+package com.droiddeck.launcher.input
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class InputSurfaceSnapTest {
+ private val element = InputSurfaceElement(InputControl.A, .395f, .3f, .2f, .2f)
+ @Test fun snapsToCanvasCenterWithoutChangingSize() {
+ val result = snapSurfaceElement(element, emptyList(), .01f, .01f)
+ assertEquals(.4f, result.element.x, .0001f)
+ assertEquals(.5f, result.x!!, 0f)
+ assertEquals(element.width, result.element.width, 0f)
+ }
+ @Test fun alignsEdgesWithOtherElementsAndLeavesDistantPositionsFree() {
+ val other = element.copy(x = .1f, y = .65f)
+ val aligned = snapSurfaceElement(element.copy(x = .105f), listOf(other), .01f, .01f)
+ assertEquals(.1f, aligned.element.x, .0001f)
+ val free = snapSurfaceElement(element.copy(x = .36f, y = .34f), listOf(other), .01f, .01f)
+ assertNull(free.x); assertNull(free.y)
+ }
+ @Test fun resizingSnapsTheDraggedEdgeAndKeepsTheOppositeEdge() {
+ val result = snapSurfaceElement(element.copy(x = .2f, width = .295f), emptyList(), .01f, .01f, 2 or 8)
+ assertEquals(.2f, result.element.x, 0f)
+ assertEquals(.3f, result.element.width, .0001f)
+ }
+ @Test fun boundsPreventFalseGuidesAndNegativeSize() {
+ val e = element.copy(x = .01f, width = .98f)
+ val result = snapSurfaceElement(e, listOf(element.copy(x = .995f)), .02f, .01f, 1 or 4)
+ assertTrue(result.element.x >= 0f)
+ assertTrue(result.element.x + result.element.width <= 1f)
+ assertTrue(result.element.width >= .03f)
+ }
+}
diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt
new file mode 100644
index 0000000000..593584875f
--- /dev/null
+++ b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt
@@ -0,0 +1,161 @@
+package com.droiddeck.launcher.input
+
+import java.io.File
+import org.junit.After
+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, shadows = [JoyConPadTest.RecordingWriter::class])
+class InputSurfaceSourceTest {
+ private val events = mutableListOf()
+ private val router = InputRouter(object : InputOutput {
+ override fun key(code: Int, down: Boolean) { events += "key:$code:$down" }
+ override fun button(code: Int, down: Boolean) { events += "button:$code:$down" }
+ override fun pointer(dx: Float, dy: Float) { events += "pointer" }
+ override fun scroll(steps: Int) { events += "scroll" }
+ override fun command(command: InputCommand) { events += command.name }
+ override fun requestMotion() {}
+ })
+ private val bridge = PadBridge(File(RuntimeEnvironment.getApplication().cacheDir, "element-input"))
+ private val sources = mutableListOf()
+ @Before fun setup() { bridge.setInputRouter(router); DeckControls.setRouter(router) }
+ @After fun close() { sources.forEach { it.close() }; bridge.stop(); DeckControls.setRouter(null); DeckControls.releaseAll() }
+ private fun button(id: String) = InputSurfaceElement(InputControl.A, .1f, .1f, .2f, .2f, id)
+ private fun source(e: InputSurfaceElement) = InputSurfaceSource(bridge, InputRole.SECONDARY, e).also { sources += it }
+ private fun bind(vararg actions: Pair) {
+ bridge.setInputProfile(InputProfile("test", elements = mapOf(InputRole.SECONDARY to mapOf(*actions))))
+ }
+ private fun state() = JoyConPadTest.RecordingWriter.pads[0] ?: PadState()
+
+ @Test fun toggleUsesSharedOwnershipAndReleasesOnMenuAndProfileChange() {
+ bind("first" to InputAction.Keys(listOf(29)), "second" to InputAction.Keys(listOf(29)))
+ val a = source(button("first").copy(toggle = true)); val b = source(button("second"))
+ a.update(1f); a.update(0f)
+ assertTrue(a.latched)
+ assertEquals(listOf("key:29:true"), events)
+ b.update(1f)
+ a.update(1f); a.update(0f)
+ assertFalse(a.latched)
+ assertEquals(1, events.size)
+ b.update(0f)
+ assertEquals("key:29:false", events.last())
+ a.update(1f); a.update(0f)
+ bridge.setInputEnabled(false)
+ assertFalse(a.latched)
+ assertEquals("key:29:false", events.last())
+ bridge.setInputEnabled(true)
+ a.update(1f); a.update(0f)
+ assertEquals("key:29:true", events.last())
+ bind("first" to InputAction.Keys(listOf(57)))
+ assertFalse(a.latched)
+ assertEquals("key:29:false", events.last())
+ a.update(1f); a.update(0f)
+ assertEquals("key:57:true", events.last())
+ a.release()
+ assertEquals("key:57:false", events.last())
+ }
+
+ @Test fun nativeToggleReleasesWithoutRepressingAcrossProfileChange() {
+ bind("first" to InputAction.Native(InputControl.B))
+ val a = source(button("first").copy(toggle = true))
+ a.update(1f); a.update(0f)
+ assertTrue(state().isDown(PadState.B))
+ bind("first" to InputAction.Native(InputControl.X))
+ assertFalse(state().isDown(PadState.B))
+ a.update(1f); a.update(0f)
+ assertTrue(state().isDown(PadState.X))
+ a.close()
+ assertFalse(state().isDown(PadState.X))
+ }
+
+ @Test fun twoButtonsWithTheSameShapeHaveIndependentActions() {
+ bind("first" to InputAction.Keys(listOf(29)), "second" to InputAction.Keys(listOf(57)))
+ val a = source(button("first")); val b = source(button("second"))
+ a.update(1f); b.update(1f); a.update(0f); b.update(0f)
+ assertEquals(listOf("key:29:true", "key:57:true", "key:29:false", "key:57:false"), events)
+ }
+
+ @Test fun sharedLocalButtonRemainsHeldUntilBothElementsRelease() {
+ bind("first" to InputAction.MouseButton(272), "second" to InputAction.MouseButton(272))
+ val a = source(button("first")); val b = source(button("second"))
+ a.update(1f); b.update(1f); a.close()
+ assertEquals(listOf("button:272:true"), events)
+ b.update(0f)
+ assertEquals(listOf("button:272:true", "button:272:false"), events)
+ a.update(1f)
+ assertEquals(2, events.size)
+ }
+
+ @Test fun nativeTouchOutputIsNotRemappedTwiceAndKeepsOtherOwners() {
+ bridge.setInputProfile(InputProfile("test", bindings = mapOf(InputRole.SECONDARY to mapOf(InputControl.B to InputAction.Disabled)),
+ elements = mapOf(InputRole.SECONDARY to mapOf("first" to InputAction.Native(InputControl.B), "second" to InputAction.Native(InputControl.B)))))
+ val a = source(button("first")); val b = source(button("second"))
+ a.update(1f); b.update(1f)
+ assertTrue(state().isDown(PadState.B))
+ a.close()
+ assertTrue(state().isDown(PadState.B))
+ b.update(0f)
+ assertFalse(state().isDown(PadState.B))
+ }
+
+ @Test fun profileChangeReleasesOldOutputAndRequiresNeutralBeforeNewAction() {
+ bind("first" to InputAction.Keys(listOf(29)))
+ val a = source(button("first")); a.update(1f)
+ bind("first" to InputAction.Keys(listOf(57)))
+ a.update(1f)
+ assertEquals(listOf("key:29:true", "key:29:false"), events)
+ a.update(0f); a.update(1f)
+ assertEquals("key:57:true", events.last())
+ }
+
+ @Test fun unmappedNewButtonsDoNotInheritLegacyBindings() {
+ bridge.setInputProfile(InputProfile.defaults(InputProfile.DESKTOP))
+ source(button("new")).update(1f)
+ assertTrue(events.isEmpty())
+ }
+
+ @Test fun stickClicksAreSuspendedWithTheRestOfInput() {
+ val e = InputSurfaceElement(InputControl.LS, .1f, .1f, .3f, .3f, "stick", InputElementKind.STICK)
+ bind(e.id to InputAction.Native(InputControl.RS))
+ val stick = source(e)
+ stick.click(true)
+ assertTrue(state().isDown(PadState.R3))
+ bridge.setInputEnabled(false)
+ assertFalse(state().isDown(PadState.R3))
+ bridge.setInputEnabled(true); stick.click(true)
+ assertFalse(state().isDown(PadState.R3))
+ stick.click(false); stick.click(true)
+ assertTrue(state().isDown(PadState.R3))
+ stick.close(); stick.click(true)
+ assertFalse(state().isDown(PadState.R3))
+ }
+
+ @Test fun customTrackpadMovementAndClickHaveIndependentActions() {
+ val e = InputSurfaceElement(InputControl.LEFT_PAD, .1f, .1f, .4f, .4f, "mouse", InputElementKind.TRACKPAD)
+ bridge.setInputProfile(InputProfile("test", elements = mapOf(InputRole.SECONDARY to mapOf(e.id to InputAction.Pointer())),
+ clicks = mapOf(InputRole.SECONDARY to mapOf(e.id to InputAction.MouseButton(272)))))
+ val surface = source(e)
+ surface.update(0f, 0f, true); surface.update(.2f, .2f, true); surface.click(true)
+ assertEquals(listOf("pointer", "button:272:true"), events)
+ bridge.setInputEnabled(false)
+ assertEquals("button:272:false", events.last())
+ bridge.setInputEnabled(true); surface.click(true)
+ assertEquals(3, events.size)
+ surface.click(false); surface.click(true); surface.close()
+ assertEquals(listOf("pointer", "button:272:true", "button:272:false", "button:272:true", "button:272:false"), events)
+ }
+
+ @Test fun migratedTrackpadClickStillUsesTheExistingLogicalBinding() {
+ bridge.setInputProfile(InputProfile.defaults(InputProfile.DESKTOP))
+ val e = InputSurfaceElement(InputControl.RIGHT_PAD, .1f, .1f, .4f, .4f)
+ val surface = source(e)
+ surface.click(true); surface.click(false)
+ assertEquals(listOf("button:272:true", "button:272:false"), events)
+ }
+}
diff --git a/app/src/test/java/com/droiddeck/launcher/input/LegacyScreenKeyMigrationTest.kt b/app/src/test/java/com/droiddeck/launcher/input/LegacyScreenKeyMigrationTest.kt
new file mode 100644
index 0000000000..f01e501bc9
--- /dev/null
+++ b/app/src/test/java/com/droiddeck/launcher/input/LegacyScreenKeyMigrationTest.kt
@@ -0,0 +1,68 @@
+package com.droiddeck.launcher.input
+
+import android.content.Context
+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 LegacyScreenKeyMigrationTest {
+ private val context: Context get() = RuntimeEnvironment.getApplication()
+ private val prefs get() = context.getSharedPreferences("input-profiles", Context.MODE_PRIVATE)
+ @Before fun reset() {
+ for (name in listOf("input-profiles", "input-surfaces", "controller")) context.getSharedPreferences(name, Context.MODE_PRIVATE).edit().clear().commit()
+ }
+
+ @Test fun upgradeImportsEverySavedSetWithoutChangingExistingProfilesAndIsIdempotent() {
+ val original = InputLibraries.read(context).selectProfile(false, "desktop")
+ prefs.edit().putString("library", JSONObject(InputLibraries.encode(original)).put("version", 5).toString()).commit()
+ ControllerPrefs.prefs(context).edit().putString("screenKeys", "29+33:0.3,0.7,44::Find::0.6:1:1:1")
+ .putBoolean("screenKeysShown", false).putString("screenLayout.Editor", "28:0.8,0.6,50::::1.0:2:0:1").commit()
+ val migrated = InputLibraries.read(context)
+ assertEquals(original.profiles, migrated.profiles.take(original.profiles.size))
+ assertEquals(original.selections, migrated.selections)
+ assertEquals(2, migrated.profiles.count { it.id.startsWith("migrated.screenkeys.") })
+ val imported = migrated.profiles.first { it.name == "Screen keys (imported)" }
+ val layout = migrated.layout(imported.id, InputRole.PRIMARY)!!
+ assertEquals(InputLayoutScreen.MAIN, layout.screen)
+ assertTrue(layout.elements.single().toggle)
+ assertEquals(InputAction.Keys(listOf(29, 33)), migrated.compile(imported.id).elements[InputRole.PRIMARY]!!.values.single())
+ assertFalse(ControllerPrefs.prefs(context).contains("screenKeys"))
+ assertTrue(prefs.contains(LegacyScreenKeyMigration.BACKUP))
+ assertEquals(migrated, InputLibraries.read(context))
+ assertEquals(migrated, InputLibraries.decode(InputLibraries.encode(migrated)))
+ }
+
+ @Test fun conversionRetainsCoordinatesImagesOpacitySymbolsAndIndependentDiagonalKeys() {
+ val values = LegacyScreenKeyMigration.convert(context,
+ "28:0.25,0.6,50::::0.8:2:0:1;29:0.7,0.8,40::Ctrl:custom.png:0.4:3:1:1;103+30+106+0+108+0+105+0:0.5,0.5,80::::1:6:0:1", 1000, 500, 2f)
+ val enter = values[0].first
+ assertEquals(.25f, enter.x + enter.width / 2, .0001f)
+ assertEquals(.6f, enter.y + enter.height / 2, .0001f)
+ assertEquals(.1f, enter.width, .0001f)
+ assertEquals(.2f, enter.height, .0001f)
+ assertEquals(28, enter.icon)
+ assertEquals(InputButtonShape.CIRCLE, enter.buttonShape)
+ assertEquals("custom.png", values[1].first.image)
+ assertEquals(.4f, values[1].first.opacity)
+ assertTrue(values[1].first.toggle)
+ assertEquals(InputAction.Directions(103, 106, 108, 105, listOf(30, 0, 0, 0)), values[2].second)
+ assertFalse(values[2].first.floating)
+ }
+
+ @Test fun invalidMigrationDoesNotEraseTheOriginalSavedLibraryOrKeys() {
+ val original = JSONObject(InputLibraries.encode(InputLibraries.read(context))).put("version", 5).toString()
+ prefs.edit().putString("library", original).commit()
+ ControllerPrefs.prefs(context).edit().putString("screenKeys", "28:NaN,0.5,44").commit()
+ InputLibraries.read(context)
+ assertEquals(original, prefs.getString("library", null))
+ assertEquals("28:NaN,0.5,44", ControllerPrefs.prefs(context).getString("screenKeys", null))
+ assertFalse(prefs.contains(LegacyScreenKeyMigration.BACKUP))
+ }
+}
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 646df7795a..0245d62f7b 100644
--- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt
@@ -1,16 +1,11 @@
package com.droiddeck.launcher.input
-import kotlin.math.abs
-import kotlin.math.sqrt
import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.view.DisplayCutout
import android.view.MotionEvent
import android.view.View
-import android.view.WindowInsets
import android.widget.FrameLayout
+import java.io.File
+import org.junit.After
import org.junit.Assert.*
import org.junit.Before
import org.junit.Test
@@ -18,453 +13,119 @@ import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.annotation.Config
-import org.robolectric.annotation.GraphicsMode
@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [28], manifest = Config.NONE, qualifiers = "mdpi")
-@GraphicsMode(GraphicsMode.Mode.NATIVE)
+@Config(sdk = [34], manifest = Config.NONE, shadows = [JoyConPadTest.RecordingWriter::class])
class OnScreenControlsTest {
- private lateinit var context: Context
+ private val context: Context get() = RuntimeEnvironment.getApplication()
+ private val bridge = PadBridge(File(context.cacheDir, "surface-overlay"))
private lateinit var view: OnScreenControls
+ private val left = InputSurfaceElement(InputControl.LS, .1f, .3f, .2f, .4f)
+ private val button = InputSurfaceElement(InputControl.A, .7f, .3f, .2f, .3f)
private var time = 1000L
-
- @Before fun setUp() {
- context = RuntimeEnvironment.getApplication()
- context.getSharedPreferences("controller", Context.MODE_PRIVATE).edit().clear().commit()
- ControllerPrefs.setLayout(context, 1200, 800, mapOf("ls" to (0.45f to 0.5f), "rs" to (0.55f to 0.5f)))
- view = OnScreenControls(context, null)
- view.layout(0, 0, 1200, 800)
+ @Before fun setup() {
+ view = OnScreenControls(context, bridge)
+ view.updateLayout(SavedInputLayout("test", "Test", listOf(left, button)))
+ measure(view)
+ }
+ @After fun close() { view.releaseAll(); bridge.stop() }
+ private fun state() = JoyConPadTest.RecordingWriter.pads[0] ?: PadState()
+ private fun measure(target: View) {
+ target.measure(View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(600, View.MeasureSpec.EXACTLY))
+ target.layout(0, 0, 1000, 600)
}
- @Test fun editorSnapsToOtherGroupCentreLines() {
- editor()
- val button = control("lb")
- val target = control("rb")
- val x = value(button, "cx")
- val y = value(button, "cy")
- touch(MotionEvent.ACTION_DOWN, 1 to (x to y))
- touch(MotionEvent.ACTION_MOVE, 1 to (x to y + 5f))
- assertEquals(value(target, "cy"), value(button, "cy"), 0f)
- assertEquals(value(target, "cy"), nullableFloat(view, "snapY")!!, 0f)
- touch(MotionEvent.ACTION_UP, 1 to (x to y + 5f))
- assertNull(nullableFloat(view, "snapY"))
+ @Test fun independentFingersHoldStickAndButtonAndCancelReleasesBoth() {
+ touch(MotionEvent.ACTION_DOWN, 3 to (200f to 300f))
+ touch(MotionEvent.ACTION_MOVE, 3 to (245f to 300f))
+ touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 3 to (245f to 300f), 8 to (800f to 250f))
+ assertTrue(state().leftX > .5f)
+ assertTrue(state().isDown(PadState.A))
+ touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 3 to (245f to 300f), 8 to (800f to 250f))
+ assertFalse(state().isDown(PadState.A))
+ assertTrue(state().leftX > .5f)
+ touch(MotionEvent.ACTION_CANCEL, 3 to (245f to 300f))
+ assertEquals(0f, state().leftX, 0f)
}
- @Test fun editorSnapsToClusterCentresNotTheirOuterButtons() {
- editor()
- val button = control("lb")
- val x = value(button, "cx")
- val row = value(control("y"), "cy") + 3f
- touch(MotionEvent.ACTION_DOWN, 1 to (x to value(button, "cy")))
- touch(MotionEvent.ACTION_MOVE, 1 to (x to row))
- assertEquals(row, value(button, "cy"), 0f)
- assertNull(nullableFloat(view, "snapY"))
- touch(MotionEvent.ACTION_MOVE, 1 to (x to value(control("x"), "cy") + 3f))
- assertEquals(value(control("x"), "cy"), value(button, "cy"), 0f)
- touch(MotionEvent.ACTION_UP, 1 to (x to row))
- }
-
- @Test fun editorDoesNotSnapBeyondDistanceAndCanDragFreeFromGuide() {
- editor()
- val button = control("lb")
- val x = value(button, "cx")
- val y = value(button, "cy")
- val otherYs = (field(view, "controls") as List<*>)
- .filter { field(it!!, "group") != "lb" }
- .map { value(it!!, "cy") }
- val freeY = (100..700 step 31).map(Int::toFloat).first {
- otherYs.minOf { targetY -> abs(it - targetY) } > 12f
- }
- touch(MotionEvent.ACTION_DOWN, 1 to (x to y))
- touch(MotionEvent.ACTION_MOVE, 1 to (x to freeY))
- assertEquals(freeY, value(button, "cy"), 0f)
- assertNull(nullableFloat(view, "snapY"))
- val target = value(control("rb"), "cy")
- touch(MotionEvent.ACTION_MOVE, 1 to (x to target + 5f))
- assertEquals(target, value(button, "cy"), 0f)
- touch(MotionEvent.ACTION_MOVE, 1 to (x to freeY))
- assertEquals(freeY, value(button, "cy"), 0f)
- assertNull(nullableFloat(view, "snapY"))
- touch(MotionEvent.ACTION_UP, 1 to (x to freeY))
- }
-
- @Test fun editorSnapsToScreenCentreAndCanDisableSnapping() {
- editor()
- val button = control("lb")
- val y = value(button, "cy")
- touch(MotionEvent.ACTION_DOWN, 1 to (value(button, "cx") to y))
- touch(MotionEvent.ACTION_MOVE, 1 to (605f to y))
- assertEquals(600f, value(button, "cx"), 0f)
- assertEquals(600f, nullableFloat(view, "snapX")!!, 0f)
- touch(MotionEvent.ACTION_UP, 1 to (605f to y))
-
- ControllerPrefs.setSnap(context, false)
- editor()
- val unsnapped = control("lb")
- val x = value(unsnapped, "cx")
- val startY = value(unsnapped, "cy")
- touch(MotionEvent.ACTION_DOWN, 1 to (x to startY))
- touch(MotionEvent.ACTION_MOVE, 1 to (605f to startY))
- assertEquals(605f, value(unsnapped, "cx"), 0f)
- assertNull(nullableFloat(view, "snapX"))
- touch(MotionEvent.ACTION_UP, 1 to (605f to startY))
- }
-
- @Test fun editorSnapPreferenceDefaultsOnAndCanBeChanged() {
- assertTrue(ControllerPrefs.read(context).snap)
- ControllerPrefs.setSnap(context, false)
- assertFalse(ControllerPrefs.read(context).snap)
- ControllerPrefs.resetAll(context)
- assertTrue(ControllerPrefs.read(context).snap)
- }
-
- @Test fun adaptiveStickHidesUntilTouchedAndReturnsToNeutralOnRelease() {
- val left = control("ls")
- assertEquals(0, pixel(value(left, "cx"), value(left, "cy")))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 7 to (540f to 400f)))
- assertEquals(7, field(left, "pressedBy"))
- assertEquals(540f, value(left, "ax"), 0f)
- assertEquals(400f, value(left, "ay"), 0f)
- assertNotEquals(0, pixel(540f, 400f))
- touch(MotionEvent.ACTION_MOVE, 7 to (580f to 420f))
- assertTrue(value(left, "kx") > 0f)
- assertTrue(value(left, "ky") > 0f)
- touch(MotionEvent.ACTION_UP, 7 to (580f to 420f))
- assertEquals(-1, field(left, "pressedBy"))
- assertEquals(0f, value(left, "kx"), 0f)
- assertEquals(0f, value(left, "ky"), 0f)
- assertEquals(0, pixel(540f, 400f))
- }
-
- @Test fun simultaneousSticksKeepTheirPointersAndReleaseIndependently() {
- val left = control("ls")
- val right = control("rs")
- touch(MotionEvent.ACTION_DOWN, 7 to (540f to 400f))
- touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (540f to 400f), 9 to (660f to 400f))
- assertEquals(7, field(left, "pressedBy"))
- assertEquals(9, field(right, "pressedBy"))
- touch(MotionEvent.ACTION_POINTER_DOWN or (2 shl 8), 7 to (540f to 400f), 9 to (660f to 400f), 11 to (500f to 400f))
- assertEquals(7, field(left, "pressedBy"))
- touch(MotionEvent.ACTION_POINTER_UP or (2 shl 8), 7 to (540f to 400f), 9 to (660f to 400f), 11 to (500f to 400f))
- touch(MotionEvent.ACTION_MOVE, 7 to (700f to 400f), 9 to (500f to 400f))
- assertTrue(value(left, "kx") > 0f)
- assertTrue(value(right, "kx") < 0f)
- touch(MotionEvent.ACTION_POINTER_UP, 7 to (700f to 400f), 9 to (500f to 400f))
- assertEquals(-1, field(left, "pressedBy"))
- assertEquals(9, field(right, "pressedBy"))
- touch(MotionEvent.ACTION_CANCEL, 9 to (500f to 400f))
- for (stick in listOf(left, right)) {
- assertEquals(-1, field(stick, "pressedBy"))
- assertEquals(0f, value(stick, "kx"), 0f)
- }
- }
-
- @Test fun cancelledTouchDoesNotBecomeAStickClick() {
- touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f))
- touch(MotionEvent.ACTION_CANCEL, 1 to (540f to 400f))
- touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f))
- assertEquals(false, field(control("ls"), "clicked"))
- touch(MotionEvent.ACTION_UP, 1 to (540f to 400f))
- touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f))
- assertEquals(true, field(control("ls"), "clicked"))
- }
-
- @Test fun buttonsTakePriorityOverAdaptiveRegions() {
- val button = control("a")
- touch(MotionEvent.ACTION_DOWN, 3 to (value(button, "cx") to value(button, "cy")))
- assertEquals(3, field(button, "pressedBy"))
- assertEquals(-1, field(control("rs"), "pressedBy"))
- }
-
- @Test fun takesTouchAtMatchesWhatATouchDoes() {
- var checked = 0
- for (x in 0 until 1200 step 40) for (y in 0 until 800 step 40) {
- val expected = view.takesTouchAt(x.toFloat(), y.toFloat())
- assertEquals("($x, $y)", expected, touch(MotionEvent.ACTION_DOWN, 0 to (x.toFloat() to y.toFloat())))
- touch(MotionEvent.ACTION_UP, 0 to (x.toFloat() to y.toFloat()))
- if (expected) checked++
- }
- assertTrue("some points land on controls", checked > 0)
- }
-
- @Test fun fixedSticksAndEditorRemainVisibleAtSavedPositions() {
- ControllerPrefs.setAdaptiveSticks(context, false)
+ @Test fun reloadCancelsHeldViewsSoTheNextPressWorks() {
+ touch(MotionEvent.ACTION_DOWN, 0 to (800f to 250f))
+ assertTrue(state().isDown(PadState.A))
view.reload()
- val left = control("ls")
- val x = value(left, "cx")
- val y = value(left, "cy")
- assertNotEquals(0, pixel(x, y))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (0f to y)))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (600f to 200f)))
- touch(MotionEvent.ACTION_DOWN, 1 to (x + 10f to y))
- assertEquals(x, value(left, "ax"), 0f)
- assertEquals(10f, value(left, "kx"), 0f)
- ControllerPrefs.setAdaptiveSticks(context, true)
- view = OnScreenControls(context, null, editing = true)
- view.layout(0, 0, 1200, 800)
- assertNotEquals(0, pixel(value(control("ls"), "cx"), value(control("ls"), "cy")))
+ assertFalse(state().isDown(PadState.A))
+ touch(MotionEvent.ACTION_DOWN, 0 to (800f to 250f))
+ assertTrue(state().isDown(PadState.A))
}
- @Test fun buttonsOnlyAndReloadReleaseAdaptiveSticks() {
- touch(MotionEvent.ACTION_DOWN, 1 to (540f to 400f))
- touch(MotionEvent.ACTION_MOVE, 1 to (570f to 400f))
- view.reload()
- assertEquals(-1, field(control("ls"), "pressedBy"))
- assertEquals(0f, value(control("ls"), "kx"), 0f)
- view.setButtonsOnly(true)
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (600f to 200f)))
+ @Test fun replacingTheLayoutReleasesOldSourcesAndHitRegions() {
+ touch(MotionEvent.ACTION_DOWN, 0 to (800f to 250f))
+ view.updateLayout(SavedInputLayout("empty", "Empty"))
+ measure(view)
+ assertFalse(state().isDown(PadState.A))
+ assertFalse(view.takesTouchAt(800f, 250f))
}
- @Test fun adaptiveActivationKeepsItsVerticalAndInwardLimits() {
- val left = control("ls")
- val x = value(left, "cx")
- val y = value(left, "cy")
- val reach = activationReach(left)
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (x to y - reach - 1f)))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (x to y - reach + 1f)))
- assertEquals(y - reach + 1f, value(left, "ay"), 0.001f)
- touch(MotionEvent.ACTION_UP, 1 to (x to y - reach + 1f))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (x + reach to y - reach)))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (600f to 200f)))
- }
-
- @Test fun leftAdaptiveStickCanStartAtTheLeftEdgeAndReleaseNormally() {
- val left = control("ls")
- val y = value(left, "cy")
- val reach = activationReach(left)
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (0f to y - reach - 1f)))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (0f to y)))
- assertEquals(1, field(left, "pressedBy"))
- assertEquals(0f, value(left, "ax"), 0f)
- assertEquals(0f, value(left, "kx"), 0f)
- touch(MotionEvent.ACTION_MOVE, 1 to (30f to y))
- assertEquals(30f, value(left, "kx"), 0f)
- touch(MotionEvent.ACTION_CANCEL, 1 to (30f to y))
- assertEquals(-1, field(left, "pressedBy"))
- assertEquals(0f, value(left, "kx"), 0f)
- assertEquals(-1, field(control("rs"), "pressedBy"))
- }
-
- @Test fun rightAdaptiveStickKeepsItsSavedActivationCircle() {
- val right = control("rs")
- val x = value(right, "cx")
- val y = value(right, "cy")
- val reach = activationReach(right)
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (1199f to y)))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (x + reach + 1f to y)))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (x + reach - 1f to y)))
- assertEquals(1, field(right, "pressedBy"))
- }
-
- @Test
- @Config(sdk = [30])
- @Suppress("DEPRECATION")
- fun leftActivationStopsAtTheSafeCutoutEdge() {
- val insets = WindowInsets.Builder()
- .setDisplayCutout(DisplayCutout(Rect(24, 0, 0, 0), listOf(Rect(0, 380, 24, 420))))
- .build()
- view.dispatchApplyWindowInsets(insets)
- val left = control("ls")
- val y = value(left, "cy")
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (23f to y)))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (24f to y)))
- assertEquals(1, field(left, "pressedBy"))
- }
-
- @Test fun touchesOutsideActivationAreasStayWithTrackpad() {
+ @Test fun emptySpaceDoesNotConsumeTheUnderlyingTrackpadStream() {
val received = mutableListOf()
- val trackpad = View(context).apply {
- setOnTouchListener { _, event -> received.add(event.actionMasked); true }
- }
val root = FrameLayout(context).apply {
- addView(trackpad, FrameLayout.LayoutParams(1200, 800))
- addView(view, FrameLayout.LayoutParams(1200, 800))
- measure(View.MeasureSpec.makeMeasureSpec(1200, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.EXACTLY))
- layout(0, 0, 1200, 800)
+ addView(View(context).apply { setOnTouchListener { _, e -> received += e.actionMasked; true } }, FrameLayout.LayoutParams(-1, -1))
+ addView(view, FrameLayout.LayoutParams(-1, -1))
}
- for ((action, position) in listOf(
- MotionEvent.ACTION_DOWN to (600f to 200f),
- MotionEvent.ACTION_MOVE to (540f to 400f),
- MotionEvent.ACTION_UP to (540f to 400f),
- )) {
- val event = MotionEvent.obtain(1000L, time++, action, position.first, position.second, 0)
+ measure(root)
+ for (action in listOf(MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_UP)) {
+ val event = MotionEvent.obtain(1000, time++, action, 500f, 100f, 0)
try { assertTrue(root.dispatchTouchEvent(event)) } finally { event.recycle() }
}
assertEquals(listOf(MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_UP), received)
- assertEquals(-1, field(control("ls"), "pressedBy"))
}
- @Test fun trackpadFingerKeepsItsOwnStreamWhileAStickIsHeld() {
- val forwarded = mutableListOf>()
- view.onTouchMiss = { forwarded += Triple(it.actionMasked, it.getPointerId(0), it.getX(0)) }
- touch(MotionEvent.ACTION_DOWN, 7 to (540f to 400f))
- assertTrue(touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (540f to 400f), 9 to (600f to 200f)))
- touch(MotionEvent.ACTION_MOVE, 7 to (500f to 400f), 9 to (650f to 200f))
- touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 7 to (500f to 400f), 9 to (650f to 200f))
- assertEquals(listOf(
- Triple(MotionEvent.ACTION_DOWN, 9, 600f),
- Triple(MotionEvent.ACTION_MOVE, 9, 650f),
- Triple(MotionEvent.ACTION_UP, 9, 650f),
- ), forwarded)
- assertEquals(7, field(control("ls"), "pressedBy"))
- assertTrue(value(control("ls"), "kx") < 0f)
+ @Test fun backgroundFingerIsForwardedWhileAStickIsHeld() {
+ val received = mutableListOf>()
+ view.onTouchMiss = { received += it.actionMasked to it.getPointerId(0) }
+ touch(MotionEvent.ACTION_DOWN, 3 to (200f to 300f))
+ touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 3 to (200f to 300f), 8 to (500f to 100f))
+ touch(MotionEvent.ACTION_MOVE, 3 to (245f to 300f), 8 to (520f to 100f))
+ touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 3 to (245f to 300f), 8 to (520f to 100f))
+ assertEquals(listOf(MotionEvent.ACTION_DOWN to 8, MotionEvent.ACTION_MOVE to 8, MotionEvent.ACTION_UP to 8), received)
+ assertTrue(state().leftX > .5f)
}
- @Test fun stickPressedAfterTrackpadFingerReachesTheControls() {
- val received = mutableListOf>()
- val trackpad = View(context).apply {
- setOnTouchListener { _, event -> received += Triple(event.actionMasked, event.pointerCount, event.getPointerId(0)); true }
- }
- val root = FrameLayout(context).apply {
- isMotionEventSplittingEnabled = true
- addView(trackpad, FrameLayout.LayoutParams(1200, 800))
- addView(view, FrameLayout.LayoutParams(1200, 800))
- measure(View.MeasureSpec.makeMeasureSpec(1200, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.EXACTLY))
- layout(0, 0, 1200, 800)
- }
- fun dispatch(action: Int, vararg pointers: Pair>) {
- val properties = pointers.map { (id, _) -> MotionEvent.PointerProperties().apply { this.id = id; toolType = MotionEvent.TOOL_TYPE_FINGER } }.toTypedArray()
- val coords = pointers.map { (_, position) -> MotionEvent.PointerCoords().apply { x = position.first; y = position.second; pressure = 1f; size = 1f } }.toTypedArray()
- val event = MotionEvent.obtain(1000L, time++, action, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0)
- try { assertTrue(root.dispatchTouchEvent(event)) } finally { event.recycle() }
- }
- dispatch(MotionEvent.ACTION_DOWN, 0 to (600f to 200f))
- dispatch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 0 to (600f to 200f), 1 to (540f to 400f))
- dispatch(MotionEvent.ACTION_MOVE, 0 to (640f to 220f), 1 to (500f to 400f))
- assertEquals(1, field(control("ls"), "pressedBy"))
- assertTrue(value(control("ls"), "kx") < 0f)
- dispatch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 0 to (640f to 220f), 1 to (500f to 400f))
- dispatch(MotionEvent.ACTION_UP, 0 to (640f to 220f))
- assertEquals(-1, field(control("ls"), "pressedBy"))
- assertEquals(Triple(MotionEvent.ACTION_DOWN, 1, 0), received.first())
- assertEquals(Triple(MotionEvent.ACTION_UP, 1, 0), received.last())
- assertTrue(received.all { it.second == 1 && it.third == 0 })
+ @Test fun aBackgroundStreamDoesNotTurnIntoAButtonWhenItCrossesOne() {
+ val received = mutableListOf()
+ view.onTouchMiss = { received += it.actionMasked }
+ touch(MotionEvent.ACTION_DOWN, 3 to (500f to 100f))
+ touch(MotionEvent.ACTION_MOVE, 3 to (800f to 250f))
+ touch(MotionEvent.ACTION_UP, 3 to (800f to 250f))
+ assertFalse(state().isDown(PadState.A))
+ assertEquals(listOf(MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_UP), received)
}
- @Test fun adaptiveActivationLeavesFivePixelsAroundButtonHitTargets() {
- for (id in listOf("a", "rb")) {
- val button = control(id)
- val radius = value(button, "radius")
- val edge = value(button, "cy") - radius * if (id == "rb") 1.05f else 1.25f
- val x = value(button, "cx")
- val left = control("ls")
- moveControl(left, x, edge - 10f)
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (x to edge - 4f)))
- assertEquals(-1, field(left, "pressedBy"))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (x to edge - 6f)))
- assertEquals(1, field(left, "pressedBy"))
- touch(MotionEvent.ACTION_UP, 1 to (x to edge - 6f))
+ @Test fun floatingAndFixedSticksUseTheirConfiguredOrigin() {
+ for (floating in listOf(true, false)) {
+ view.updateLayout(SavedInputLayout("test", "Test", listOf(left.copy(floating = floating))))
+ measure(view)
+ touch(MotionEvent.ACTION_DOWN, 3 to (230f to 300f))
+ assertEquals(if (floating) 0f else .5f, state().leftX, .001f)
+ touch(MotionEvent.ACTION_UP, 3 to (230f to 300f))
}
}
- @Test fun leftExtensionKeepsButtonPriorityAndClearance() {
- val button = control("left")
- val x = value(button, "cx")
- val y = value(button, "cy")
- val edge = y - value(button, "radius") * 1.25f
- val left = control("ls")
- moveControl(left, x + 200f, y)
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (x to y)))
- assertEquals(1, field(button, "pressedBy"))
- assertEquals(-1, field(left, "pressedBy"))
- touch(MotionEvent.ACTION_UP, 1 to (x to y))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (x to edge - 4f)))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (x to edge - 6f)))
- assertEquals(1, field(left, "pressedBy"))
- }
-
- private fun control(id: String): Any = (field(view, "controls") as List<*>).first { field(it!!, "id") == id }!!
- private fun editor() {
- view = OnScreenControls(context, null, editing = true)
- view.layout(0, 0, 1200, 800)
- }
-
- @Test fun keyboardShortcutWorksWithHiddenPadAndButtonsOnly() {
- var opened = 0
- view = OnScreenControls(context, null, onKeyboard = { opened++ })
- view.layout(0, 0, 1200, 800)
- view.setQuickHidden(true)
- assertNotEquals(0, pixel(90f, 766f))
- touch(MotionEvent.ACTION_DOWN, 1 to (90f to 766f))
- assertEquals(0, opened)
- touch(MotionEvent.ACTION_UP, 1 to (90f to 766f))
- assertEquals(1, opened)
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (600f to 400f)))
+ @Test fun systemOnlyVisibilityUsesTheSameLayoutAndReleasesOtherButtons() {
+ val guide = InputSurfaceElement(InputControl.GUIDE, .4f, .7f, .1f, .2f)
+ view.updateLayout(SavedInputLayout("test", "Test", listOf(button, guide)))
+ measure(view)
+ touch(MotionEvent.ACTION_DOWN, 0 to (800f to 250f))
view.setButtonsOnly(true)
- touch(MotionEvent.ACTION_DOWN, 1 to (600f to 756f))
- touch(MotionEvent.ACTION_UP, 1 to (600f to 756f))
- assertEquals(2, opened)
- assertEquals(-1, field(control("guide"), "pressedBy"))
- }
-
- @Test fun cancelledDraggedOrDisabledKeyboardShortcutDoesNotOpen() {
- var opened = 0
- view = OnScreenControls(context, null, onKeyboard = { opened++ })
- view.layout(0, 0, 1200, 800)
- touch(MotionEvent.ACTION_DOWN, 1 to (90f to 766f))
- touch(MotionEvent.ACTION_CANCEL, 1 to (90f to 766f))
- touch(MotionEvent.ACTION_UP, 1 to (90f to 766f))
- assertEquals(0, opened)
- touch(MotionEvent.ACTION_DOWN, 1 to (90f to 766f))
- touch(MotionEvent.ACTION_MOVE, 1 to (180f to 766f))
- touch(MotionEvent.ACTION_UP, 1 to (180f to 766f))
- assertEquals(0, opened)
- ControllerPrefs.setKeyboardButton(context, false)
- view.reload()
- view.setQuickHidden(true)
- assertEquals(0, pixel(90f, 766f))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (90f to 766f)))
- }
-
- @Test fun hidingSystemButtonsRemovesHitTargetsInBothOverlayModes() {
- for (buttonsOnly in listOf(false, true)) {
- ControllerPrefs.setSteamButton(context, true)
- ControllerPrefs.setQamButton(context, true)
- view.reload()
- view.setButtonsOnly(buttonsOnly)
- val guide = control("guide")
- val qam = control("qam")
- val gx = value(guide, "cx"); val gy = value(guide, "cy")
- val qx = value(qam, "cx"); val qy = value(qam, "cy")
- assertNotEquals(0, pixel(gx, gy))
- assertNotEquals(0, pixel(qx, qy))
- touch(MotionEvent.ACTION_DOWN, 1 to (gx to gy))
- ControllerPrefs.setSteamButton(context, false)
- view.reload()
- assertEquals(-1, field(guide, "pressedBy"))
- assertEquals(0, pixel(gx, gy))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (gx to gy)))
- assertTrue(touch(MotionEvent.ACTION_DOWN, 1 to (qx to qy)))
- touch(MotionEvent.ACTION_UP, 1 to (qx to qy))
- ControllerPrefs.setQamButton(context, false)
- view.reload()
- assertEquals(0, pixel(qx, qy))
- assertFalse(touch(MotionEvent.ACTION_DOWN, 1 to (qx to qy)))
- }
- }
- private fun field(owner: Any, name: String): Any = owner.javaClass.getDeclaredField(name).apply { isAccessible = true }.get(owner)!!
- private fun nullableFloat(owner: Any, name: String) = owner.javaClass.getDeclaredField(name).apply { isAccessible = true }.get(owner) as Float?
- private fun value(owner: Any, name: String) = field(owner, name) as Float
-
- private fun activationReach(control: Any) = value(control, "radius") * 1.4f * sqrt(1.5f)
-
- private fun moveControl(control: Any, x: Float, y: Float) {
- control.javaClass.getDeclaredField("cx").apply { isAccessible = true }.setFloat(control, x)
- control.javaClass.getDeclaredField("cy").apply { isAccessible = true }.setFloat(control, y)
- }
-
- private fun pixel(x: Float, y: Float): Int {
- val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888)
- view.draw(Canvas(bitmap))
- val color = bitmap.getPixel(x.toInt(), y.toInt())
- bitmap.recycle()
- return color
+ measure(view)
+ assertFalse(state().isDown(PadState.A))
+ assertFalse(view.takesTouchAt(800f, 250f))
+ assertTrue(view.takesTouchAt(450f, 480f))
}
private fun touch(action: Int, vararg pointers: Pair>): Boolean {
val properties = pointers.map { (id, _) -> MotionEvent.PointerProperties().apply { this.id = id; toolType = MotionEvent.TOOL_TYPE_FINGER } }.toTypedArray()
val coords = pointers.map { (_, position) -> MotionEvent.PointerCoords().apply { x = position.first; y = position.second; pressure = 1f; size = 1f } }.toTypedArray()
val event = MotionEvent.obtain(1000L, time++, action, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0)
- return try { view.onTouchEvent(event) } finally { event.recycle() }
+ return try { view.dispatchTouchEvent(event) } finally { event.recycle() }
}
}
diff --git a/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt
deleted file mode 100644
index 14905a5964..0000000000
--- a/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.droiddeck.launcher.input
-
-import android.view.InputDevice
-import android.view.KeyEvent
-import android.view.MotionEvent
-import android.view.View
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-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 = [28], manifest = Config.NONE)
-class ScreenKeysTest {
- private val context = RuntimeEnvironment.getApplication()
-
- @Before fun clearKeys() {
- ControllerPrefs.setScreenKeys(context, emptyList())
- }
-
- @Test fun missesAreForwardedAsTheirOwnTouchStreamWhileAKeyIsHeld() {
- val sent = mutableListOf>()
- val keys = ScreenKeys(context) { code, down -> sent += code to down }
- keys.layout(0, 0, 1000, 600)
- keys.add(listOf(KeyEvent.KEYCODE_W))
- val forwarded = mutableListOf>()
- keys.onTouchMiss = { forwarded += it.actionMasked to it.getPointerId(0) }
-
- send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f))
- send(keys, MotionEvent.ACTION_POINTER_DOWN or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), listOf(0, 1), listOf(300f, 900f), listOf(372f, 550f))
- send(keys, MotionEvent.ACTION_MOVE, listOf(0, 1), listOf(310f, 880f), listOf(372f, 530f))
- send(keys, MotionEvent.ACTION_POINTER_UP or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), listOf(0, 1), listOf(310f, 880f), listOf(372f, 530f))
- send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(310f), listOf(372f))
-
- assertEquals(
- listOf(
- MotionEvent.ACTION_DOWN to 1,
- MotionEvent.ACTION_MOVE to 1,
- MotionEvent.ACTION_UP to 1,
- ),
- forwarded,
- )
- assertEquals(listOf(KeyEvent.KEYCODE_W to true, KeyEvent.KEYCODE_W to false), sent)
- }
-
- @Test fun gestureRecognizerKeepsOneSplitTargetOwnerUntilItsStreamEnds() {
- val gate = GestureTouchStreamGate()
- fun accepts(source: GestureTouchStreamGate.Source, action: Int): Boolean {
- val event = MotionEvent.obtain(0L, 1L, action, 1f, 1f, 0)
- return try { gate.accepts(source, event) } finally { event.recycle() }
- }
-
- assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN))
- assertFalse(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN))
- assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_MOVE))
- assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_UP))
- assertTrue(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN))
- assertFalse(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN))
- assertTrue(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_CANCEL))
- assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN))
- assertFalse(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN))
- gate.reset()
- assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN))
- }
-
- @Test fun takesTouchAtMatchesWhatATouchDoes() {
- val keys = ScreenKeys(context) { _, _ -> }
- keys.layout(0, 0, 1000, 600)
- keys.add(listOf(KeyEvent.KEYCODE_W))
- var checked = 0
- for (x in 0 until 1000 step 25) for (y in 0 until 600 step 25) {
- val expected = keys.takesTouchAt(x.toFloat(), y.toFloat())
- val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, x.toFloat(), y.toFloat(), 0)
- assertEquals("($x, $y)", expected, keys.onTouchEvent(down))
- down.recycle()
- MotionEvent.obtain(0L, 1L, MotionEvent.ACTION_UP, x.toFloat(), y.toFloat(), 0).also { keys.onTouchEvent(it); it.recycle() }
- if (expected) checked++
- }
- assertTrue("some points land on the key", checked > 0)
- }
-
- @Test fun loadingLayoutReleasesLatchedKeysBeforeReplacingEntries() {
- val sent = mutableListOf>()
- val keys = ScreenKeys(context) { code, down -> sent += code to down }
- keys.layout(0, 0, 1000, 600)
- keys.add(listOf(KeyEvent.KEYCODE_SHIFT_LEFT))
- keys.setToggle(listOf(KeyEvent.KEYCODE_SHIFT_LEFT), true)
- send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f))
- send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(300f), listOf(372f))
-
- keys.load("")
-
- assertEquals(listOf(KeyEvent.KEYCODE_SHIFT_LEFT to true, KeyEvent.KEYCODE_SHIFT_LEFT to false), sent)
- }
-
- @Test fun hidingTheViewReleasesLatchedKeys() {
- val sent = mutableListOf>()
- val keys = ScreenKeys(context) { code, down -> sent += code to down }
- keys.layout(0, 0, 1000, 600)
- keys.add(listOf(KeyEvent.KEYCODE_SHIFT_LEFT))
- keys.setToggle(listOf(KeyEvent.KEYCODE_SHIFT_LEFT), true)
- send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f))
- send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(300f), listOf(372f))
-
- keys.visibility = View.GONE
-
- assertEquals(listOf(KeyEvent.KEYCODE_SHIFT_LEFT to true, KeyEvent.KEYCODE_SHIFT_LEFT to false), sent)
- }
-
- private fun send(view: View, action: Int, ids: List, xs: List, ys: List) {
- val properties = Array(ids.size) { index ->
- MotionEvent.PointerProperties().apply {
- id = ids[index]
- toolType = MotionEvent.TOOL_TYPE_FINGER
- }
- }
- val coordinates = Array(ids.size) { index ->
- MotionEvent.PointerCoords().apply {
- x = xs[index]
- y = ys[index]
- pressure = 1f
- size = 1f
- }
- }
- val event = MotionEvent.obtain(
- 0L, 1L, action, ids.size, properties, coordinates, 0, 0,
- 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0,
- )
- try {
- view.onTouchEvent(event)
- } finally {
- event.recycle()
- }
- }
-}
diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt
index 0d64771fe8..f145d58e6d 100644
--- a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt
@@ -79,11 +79,7 @@ class SessionInputPointerTest {
}
@Test fun stickContinuesFromTrackpadPositionAndUpdatesVisibleAndGuestCoordinates() {
- ReflectionHelpers.callInstanceMethod(activity, "moveSecondScreenPointer",
- ReflectionHelpers.ClassParameter.from(Float::class.javaPrimitiveType, 250f),
- ReflectionHelpers.ClassParameter.from(Float::class.javaPrimitiveType, 150f),
- ReflectionHelpers.ClassParameter.from(Float::class.javaPrimitiveType, 1000f),
- ReflectionHelpers.ClassParameter.from(Float::class.javaPrimitiveType, 600f))
+ output.pointer(-400f, -225f)
output.pointer(160f, 90f)
invoke("onPadInput")
assertEquals(Offset(350f, 215.625f), state("cursorPos").value)
@@ -175,6 +171,17 @@ class SessionInputPointerTest {
assertTrue(CompositorShadow.events.isEmpty())
}
+ @Test fun horizontalWheelUsesTheSameDirectionInBothMouseBackends() {
+ output.scrollHorizontal(2)
+ assertEquals(listOf(Triple(11, 0, 240)), CompositorShadow.events)
+ CompositorShadow.events.clear()
+ ReflectionHelpers.setField(activity, "mouseWriter", FakeInputWriter(activity.cacheDir.path, FakeInputWriter.MOUSE_SLOT))
+ ReflectionHelpers.setField(activity, "evdevMouseActive", true)
+ output.scrollHorizontal(2)
+ assertEquals(listOf("wheel:0:2:120"), WriterShadow.mouse)
+ assertTrue(CompositorShadow.events.isEmpty())
+ }
+
@Test fun leavingRawMouseReleasesItsHoldBeforeReturningToTheWaylandSeat() {
ReflectionHelpers.setField(activity, "mouseWriter", FakeInputWriter(activity.cacheDir.path, FakeInputWriter.MOUSE_SLOT))
ReflectionHelpers.setField(activity, "evdevMouseActive", true)
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 38ebeefca9..bcb071e883 100644
--- a/app/src/test/java/com/droiddeck/launcher/input/StickDeadZoneTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/input/StickDeadZoneTest.kt
@@ -400,22 +400,23 @@ class StickDeadZoneTest {
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))
+ 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 controls = ReflectionHelpers.getField>(view, "controls")
- val control = controls.first { ReflectionHelpers.getField(it, "id") == id }
- val x = ReflectionHelpers.getField(control, "cx")
- val y = ReflectionHelpers.getField(control, "cy")
+ val control = elements.first { it.control.id == 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.onTouchEvent(down)) } finally { down.recycle() }
- assertFalse(ReflectionHelpers.getField(control, "dirty"))
+ try { assertTrue(view.dispatchTouchEvent(down)) } finally { down.recycle() }
assertEquals(0f, if (id == "ls") pad().leftX else pad().rightX, 0f)
assertTrue((if (id == "ls") pad().rightX else pad().leftX) > 0f)
bridge.setStickDeadZone(25)
assertEquals(0f, if (id == "ls") pad().leftX else pad().rightX, 0f)
motion(device, MotionEvent.AXIS_X to 0.6f, MotionEvent.AXIS_Z to 0.7f)
- val button = controls.first { ReflectionHelpers.getField(it, "id") == "a" }
- val bx = ReflectionHelpers.getField(button, "cx")
- val by = ReflectionHelpers.getField(button, "cy")
+ val button = elements.first { it.control == InputControl.A }
+ val bx = (button.x + button.width / 2) * 1200
+ val by = (button.y + button.height / 2) * 800
fun buttonTouch(action: Int, time: Long) {
val event = MotionEvent.obtain(1000, time, action or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), 2,
arrayOf(MotionEvent.PointerProperties().apply { this.id = 0; toolType = MotionEvent.TOOL_TYPE_FINGER },
@@ -423,7 +424,7 @@ class StickDeadZoneTest {
arrayOf(MotionEvent.PointerCoords().apply { this.x = x; this.y = y },
MotionEvent.PointerCoords().apply { this.x = bx; this.y = by }),
0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0)
- try { assertTrue(view.onTouchEvent(event)) } finally { event.recycle() }
+ try { assertTrue(view.dispatchTouchEvent(event)) } finally { event.recycle() }
}
buttonTouch(MotionEvent.ACTION_POINTER_DOWN, 1030)
assertTrue(pad().isDown(PadState.A))
@@ -435,7 +436,7 @@ class StickDeadZoneTest {
assertEquals(0.6f, pad().leftX, 0f)
assertEquals(0.7f, pad().rightX, 0f)
val up = MotionEvent.obtain(1000, 1100, MotionEvent.ACTION_UP, x, y, 0)
- try { assertTrue(view.onTouchEvent(up)) } finally { up.recycle() }
+ try { assertTrue(view.dispatchTouchEvent(up)) } finally { up.recycle() }
}
}
}
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 d4ca87a87b..f25207a697 100644
--- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt
@@ -126,6 +126,9 @@ class SettingsResetTest {
}
@Test fun inputProfilesAndSurfacesResetWithoutRestoringLegacyMappings() {
+ 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")
InputProfiles.select(app, InputProfile.DESKTOP)
InputProfiles.save(app, InputProfile.defaults(InputProfile.GAME)
@@ -135,9 +138,9 @@ class SettingsResetTest {
assertTrue(SettingsReset.resetAll(app, gameProfiles = false))
assertEquals(InputProfiles.AUTO, InputProfiles.selection(app))
- assertEquals(InputProfile.defaults(InputProfile.GAME), InputProfiles.read(app, InputProfile.GAME))
- assertEquals(InputProfile.defaults(InputProfile.DESKTOP), InputProfiles.read(app, InputProfile.DESKTOP))
- assertEquals(InputSurfaceLayout.defaults(), InputSurfaceLayout.read(app, InputProfile.DESKTOP))
+ assertEquals(defaultGame, InputProfiles.read(app, InputProfile.GAME))
+ assertEquals(defaultDesktop, InputProfiles.read(app, InputProfile.DESKTOP))
+ assertEquals(defaultSurface, InputSurfaceLayout.read(app, InputProfile.DESKTOP))
}
@Test fun gameTextureFilteringIsKeptUnlessGameProfilesAreReset() {
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 06f4dedfd7..dbb153bce9 100644
--- a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt
@@ -1,7 +1,8 @@
package com.droiddeck.launcher.ui
import com.droiddeck.launcher.session.SessionDisplay
-import com.droiddeck.launcher.ui.GamepadGeometry.Slot
+import com.droiddeck.launcher.input.GamepadGeometry
+import com.droiddeck.launcher.input.GamepadGeometry.Slot
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
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 ecb0dcf51e..d5ca908c6c 100644
--- a/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSettingsTest.kt
@@ -1,8 +1,15 @@
package com.droiddeck.launcher.ui
import android.content.Context
+import android.app.Presentation
+import android.hardware.display.DisplayManager
+import android.view.Display
+import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.test.*
import com.droiddeck.launcher.input.*
+import com.droiddeck.launcher.R
+import com.droiddeck.launcher.session.SessionState
+import com.droiddeck.launcher.session.SessionService
import org.junit.Assert.*
import org.junit.Before
import org.junit.Rule
@@ -10,6 +17,10 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.shadows.ShadowDialog
+import org.robolectric.shadows.ShadowDisplayManager
+import org.robolectric.util.ReflectionHelpers
import org.robolectric.annotation.Config
import org.robolectric.annotation.GraphicsMode
@@ -25,11 +36,75 @@ class InputSettingsTest {
context.getSharedPreferences("controller", Context.MODE_PRIVATE).edit().clear().commit()
}
+ @Test fun steamAndDesktopQuickSettingsOpenTheSameInputLibrary() {
+ val mode = mutableStateOf(SessionService.MODE_STEAM)
+ var opened = 0
+ compose.setContent { DroidDeckTheme {
+ ModeSheetRows(ModeSettings(mode = mode.value, resolution = "auto", hdr = false, hdrReason = null,
+ touchMode = "auto", suspendPolicy = "auto", oscMode = "auto", directAudio = null, mic = null),
+ 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.runOnIdle { assertEquals(1, opened); mode.value = SessionService.MODE_DESKTOP }
+ compose.onNodeWithText(context.getString(R.string.ctrl_edit)).performClick()
+ 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("Left Deck trackpad").performScrollTo().performClick()
+ compose.runOnIdle {
+ val changed = InputLibraries.read(context)
+ assertEquals(InputStockLayouts.LEFT, 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 }) } }
+ compose.onNodeWithText(context.getString(R.string.input_route_controller), substring = false).performClick()
+ compose.onNodeWithText(context.getString(R.string.input_disabled), substring = false).performClick()
+ compose.onNodeWithText(context.getString(R.string.input_route_local), substring = false).performClick()
+ compose.onNodeWithText(context.getString(R.string.input_scroll_speed, 27)).assertExists()
+ compose.onNodeWithTag("setting-action-type").performClick()
+ compose.onNodeWithText(context.getString(R.string.input_mouse_click)).performClick()
+ compose.onNodeWithTag("setting-action-type").performClick()
+ compose.onNodeWithText(context.getString(R.string.input_scroll)).performClick()
+ compose.onNodeWithTag("input-action-save").performClick()
+ compose.runOnIdle { assertEquals(InputAction.Scroll(27f, true), saved) }
+ }
+
@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-binding-a").performScrollTo().performClick()
compose.onNodeWithText("Disabled", substring = false).performScrollTo().performClick()
+ compose.runOnIdle { assertFalse(changed) }
+ compose.onNodeWithTag("input-action-save").performClick()
compose.runOnIdle {
assertTrue(changed)
val profile = InputProfiles.read(context, InputProfile.GAME)
@@ -38,15 +113,240 @@ class InputSettingsTest {
}
}
- @Test fun customLayoutAddsExistingControlAndKeepsProfileBindings() {
+ @Test fun addingCreatesAnUnassignedElementAtTheCanvasCenterWithoutAnotherTouch() {
var changed = false
- compose.setContent { DroidDeckTheme { InputSurfaceDialog(InputProfile.GAME, {}, { changed = true }) } }
- compose.onNodeWithText("Add control").performScrollTo().performClick()
- compose.onNodeWithText("R1", substring = false).performScrollTo().performClick()
- compose.onNodeWithText("Save changes").performClick()
+ val library = InputLibraries.read(context)
+ 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()
compose.runOnIdle {
assertTrue(changed)
- assertTrue(InputSurfaceLayout.read(context, InputProfile.GAME).any { it.control == InputControl.RB })
+ val updated = InputLibraries.read(context)
+ val added = updated.layout(InputProfile.GAME, InputRole.SECONDARY)!!.elements.single { e -> layout.elements.none { it.id == e.id } }
+ assertEquals(InputAction.Disabled, updated.compile(InputProfile.GAME).elementAction(InputRole.SECONDARY, added.id, added.control))
+ assertEquals(.5f, added.x + added.width / 2, .01f)
+ }
+ }
+
+ @Test fun aNewProfileIsIndependentAndDoesNotBecomeActive() {
+ 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.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)
+ }
+ }
+
+ @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()
+ compose.onNodeWithTag("input-binding-a").assertExists()
+ compose.onNodeWithText(context.getString(R.string.mode_back)).performClick()
+ compose.onNodeWithTag("input-part-secondary").assertExists()
+ compose.runOnIdle { assertEquals(InputProfiles.AUTO, InputLibraries.read(context).selected) }
+ }
+
+ @Test fun profileCreationCanExplicitlyShareOnlyPhysicalControls() {
+ 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.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))
+ }
+ }
+
+ @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) }
+ }
+
+ @Test fun localToolsCanMoveAndExpandWithoutMovingTheCanvas() {
+ 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)) } }
+ compose.runOnIdle {
+ val window = ShadowDialog.getLatestDialog().window!!
+ assertEquals(android.view.WindowManager.LayoutParams.MATCH_PARENT, window.attributes.width)
+ 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()
+ 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 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.onNodeWithTag("input-editor-tools").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)
+ shadowOf(display).setFlags(Display.FLAG_PRESENTATION)
+ val open = mutableStateOf(true)
+ try {
+ compose.setContent { DroidDeckTheme {
+ 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.runOnIdle {
+ assertTrue(ShadowDialog.getShownDialogs().filterIsInstance().any { it.isShowing && it.display.displayId == displayId })
+ val dialog = ShadowDialog.getShownDialogs().last { it !is Presentation && it.isShowing }
+ assertEquals(Display.DEFAULT_DISPLAY, dialog.window?.decorView?.display?.displayId)
+ open.value = false
+ }
+ compose.runOnIdle { assertTrue(ShadowDialog.getShownDialogs().none { it.isShowing }) }
+ } finally { ShadowDisplayManager.removeDisplay(displayId) }
+ }
+
+ @Test @Config(sdk = [34]) fun mainEditorOpenedFromSecondarySettingsUsesAnActivityWindow() {
+ val displayId = ShadowDisplayManager.addDisplay("w640dp-h480dp", ReflectionHelpers.getStaticField(Display::class.java, "TYPE_EXTERNAL"))
+ val display = context.getSystemService(DisplayManager::class.java).getDisplay(displayId)
+ shadowOf(display).setFlags(Display.FLAG_PRESENTATION)
+ val open = mutableStateOf(true)
+ try {
+ compose.setContent { DroidDeckTheme {
+ val host = androidx.compose.ui.platform.LocalContext.current.findActivity() as androidx.activity.ComponentActivity
+ if (open.value) InputDisplayContent(host, display, { open.value = false }) {
+ InputSurfaceDialog("game", { open.value = false }, {}, role = InputRole.PRIMARY)
+ }
+ } }
+ compose.onNodeWithTag("input-layout-canvas").assertExists()
+ compose.runOnIdle {
+ assertTrue(ShadowDialog.getShownDialogs().none { it is Presentation && it.display.displayId == Display.DEFAULT_DISPLAY })
+ val editor = ShadowDialog.getShownDialogs().last { it !is Presentation && it.isShowing }
+ assertEquals(Display.DEFAULT_DISPLAY, editor.window?.decorView?.display?.displayId)
+ open.value = false
+ }
+ compose.runOnIdle { assertTrue(ShadowDialog.getShownDialogs().none { it.isShowing }) }
+ } finally { ShadowDisplayManager.removeDisplay(displayId) }
+ }
+
+ @Test @Config(sdk = [34]) fun auxiliaryEditorUsesThatDisplayAndSurvivesItsRemoval() {
+ val displayId = ShadowDisplayManager.addDisplay("w640dp-h480dp", ReflectionHelpers.getStaticField(Display::class.java, "TYPE_EXTERNAL"))
+ val display = context.getSystemService(DisplayManager::class.java).getDisplay(displayId)
+ shadowOf(display).setFlags(Display.FLAG_PRESENTATION)
+ assertTrue(SecondScreenDisplays.available(context.getSystemService(DisplayManager::class.java)).any { it.id == displayId })
+ val previous = SessionState.secondScreenDisplay
+ SessionState.secondScreenDisplay = displayId
+ val open = mutableStateOf(true)
+ try {
+ compose.setContent { DroidDeckTheme { if (open.value) InputSurfaceDialog("game", { open.value = false }, {}) } }
+ compose.onNodeWithText(context.getString(R.string.input_editor_remote)).assertExists()
+ compose.onAllNodesWithText(context.getString(R.string.input_editor_add)).assertCountEquals(1)
+ compose.onNodeWithText(context.getString(R.string.input_hide_tools)).assertDoesNotExist()
+ assertEquals(0f, compose.onNodeWithTag("input-layout-canvas").fetchSemanticsNode().boundsInRoot.top, 1f)
+ compose.runOnIdle {
+ assertTrue(ShadowDialog.getShownDialogs().filterIsInstance().any { it.isShowing && it.display.displayId == displayId })
+ }
+ compose.onNodeWithTag("input-layout-canvas").performTouchInput { click(percentOffset(.25f, .25f)) }
+ compose.onAllNodesWithText(context.getString(R.string.input_properties)).onFirst().performClick()
+ compose.onNodeWithTag("input-action-save").assertIsDisplayed()
+ compose.onNodeWithText("Disabled", substring = false).performScrollTo().performClick()
+ compose.runOnIdle {
+ assertTrue(ShadowDialog.getShownDialogs().any { it !is Presentation && it.isShowing && it.window?.decorView?.display?.displayId == Display.DEFAULT_DISPLAY })
+ ShadowDisplayManager.removeDisplay(displayId)
+ }
+ compose.onNodeWithTag("input-action-save").assertIsDisplayed()
+ compose.onNodeWithTag("input-action-save").performClick()
+ compose.onNodeWithText(context.getString(R.string.input_display_unavailable)).assertExists()
+ compose.onNodeWithText(context.getString(R.string.input_editor_done)).performScrollTo().performClick()
+ compose.runOnIdle {
+ assertFalse(open.value)
+ assertEquals(InputAction.Disabled, InputProfiles.read(context, "game").elementAction(InputRole.SECONDARY, "legacy:left-pad", InputControl.LEFT_PAD))
+ }
+ } finally {
+ SessionState.secondScreenDisplay = previous
+ if (display.isValid) ShadowDisplayManager.removeDisplay(displayId)
}
}
}
diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceGesturesTest.kt
new file mode 100644
index 0000000000..78cdd27115
--- /dev/null
+++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceGesturesTest.kt
@@ -0,0 +1,120 @@
+package com.droiddeck.launcher.ui
+
+import android.os.Looper
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.ComponentActivity
+import com.droiddeck.launcher.input.*
+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.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import java.time.Duration
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [34], shadows = [JoyConPadTest.RecordingWriter::class])
+class InputSurfaceGesturesTest {
+ private val controller = Robolectric.buildActivity(ComponentActivity::class.java).setup()
+ private val activity = controller.get()
+ private val events = mutableListOf()
+ private val moves = mutableListOf>()
+ private val bridge = PadBridge(activity.cacheDir)
+ private val router = InputRouter(object : InputOutput {
+ override fun key(code: Int, down: Boolean) { events += "key:$code:$down" }
+ override fun button(code: Int, down: Boolean) { events += "button:$code:$down" }
+ override fun pointer(dx: Float, dy: Float) { moves += dx to dy }
+ override fun scroll(steps: Int) { events += "scroll:$steps" }
+ override fun command(command: InputCommand) {}
+ override fun requestMotion() { error("Touchpad must not schedule stick frames") }
+ })
+ private lateinit var panel: InputSurfaceView
+ private lateinit var pad: View
+ private var time = 1000L
+ private val element = InputSurfaceElement(InputControl.RIGHT_PAD, 0f, 0f, 1f, 1f, mouseGestures = true)
+ private fun profile(action: InputAction = InputAction.Pointer()) = InputProfile("test",
+ elements = mapOf(InputRole.SECONDARY to mapOf(element.id to action)),
+ clicks = mapOf(InputRole.SECONDARY to mapOf(element.id to InputAction.MouseButton(272))))
+
+ @Before fun setup() {
+ bridge.setInputRouter(router)
+ bridge.setInputProfile(profile())
+ panel = InputSurfaceView(activity, bridge, listOf(element))
+ activity.setContentView(panel)
+ panel.measure(View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(600, View.MeasureSpec.EXACTLY))
+ panel.layout(0, 0, 1000, 600)
+ pad = descendants(panel).first { it.javaClass.simpleName == "TrackpadView" }
+ }
+ @After fun close() { panel.releaseInputs(); bridge.stop(); controller.pause().stop().destroy() }
+
+ @Test fun tapClicksWithoutRepositioningCursorFromAnotherSource() {
+ touch(MotionEvent.ACTION_DOWN); touch(MotionEvent.ACTION_UP)
+ shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(100))
+ assertEquals(listOf("button:272:true", "button:272:false"), events)
+ assertTrue(moves.isEmpty())
+ val other = router.channel(InputRole.PHYSICAL, InputControl.LS, fixedAction = InputAction.Pointer())
+ other.update(0f, 0f, true); other.pointerDelta(.1f, .2f); other.update(0f)
+ val positionChanges = moves.toList()
+ time += 1000
+ touch(MotionEvent.ACTION_DOWN); touch(MotionEvent.ACTION_UP)
+ assertEquals(positionChanges, moves)
+ other.close()
+ }
+
+ @Test fun tapUsesTheConfiguredElementClick() {
+ bridge.setInputProfile(profile().copy(clicks = mapOf(InputRole.SECONDARY to mapOf(element.id to InputAction.Keys(listOf(57))))))
+ touch(MotionEvent.ACTION_DOWN); touch(MotionEvent.ACTION_UP)
+ shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(100))
+ assertEquals(listOf("key:57:true", "key:57:false"), events)
+ }
+
+ @Test fun motionDeliversImmediatelyAndTwoFingerScrollDoesNotMoveThePointer() {
+ touch(MotionEvent.ACTION_DOWN)
+ touch(MotionEvent.ACTION_MOVE, y = 230f)
+ assertTrue(moves.isNotEmpty())
+ touch(MotionEvent.ACTION_UP)
+ time += 1000
+ touch(MotionEvent.ACTION_DOWN)
+ touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), fingers = 2)
+ val before = moves.size
+ touch(MotionEvent.ACTION_MOVE, y = 270f, fingers = 2)
+ assertEquals(before, moves.size)
+ assertTrue(events.any { it.startsWith("scroll:") })
+ }
+
+ @Test fun profileChangeAndMenuSuspensionSuppressPendingGesturePresses() {
+ touch(MotionEvent.ACTION_DOWN)
+ bridge.setInputEnabled(false)
+ bridge.setInputEnabled(true)
+ shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(1000))
+ assertTrue(events.isEmpty())
+ touch(MotionEvent.ACTION_CANCEL)
+ time += 1000
+ touch(MotionEvent.ACTION_DOWN)
+ bridge.setInputProfile(profile(InputAction.Disabled))
+ shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(1000))
+ assertTrue(events.isEmpty())
+ panel.releaseInputs()
+ bridge.setInputProfile(profile())
+ time += 1000
+ touch(MotionEvent.ACTION_DOWN); touch(MotionEvent.ACTION_UP)
+ shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(100))
+ assertEquals(listOf("button:272:true", "button:272:false"), events)
+ }
+
+ private fun touch(action: Int, y: Float = 200f, fingers: Int = 1) {
+ val properties = Array(fingers) { i -> MotionEvent.PointerProperties().apply { id = i; toolType = MotionEvent.TOOL_TYPE_FINGER } }
+ val coords = Array(fingers) { i -> MotionEvent.PointerCoords().apply { x = 200f + 100 * i; this.y = y; pressure = 1f; size = 1f } }
+ val event = MotionEvent.obtain(time - 20, time, action, fingers, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0)
+ try { assertTrue(pad.onTouchEvent(event)) } finally { event.recycle(); time += 10 }
+ }
+ private fun descendants(view: View): Sequence = sequence {
+ yield(view)
+ if (view is ViewGroup) for (i in 0 until view.childCount) yieldAll(descendants(view.getChildAt(i)))
+ }
+}
diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceOwnershipTest.kt
similarity index 70%
rename from app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt
rename to app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceOwnershipTest.kt
index 91fc516361..566c93d772 100644
--- a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceOwnershipTest.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.TextView
import com.droiddeck.launcher.R
-import com.droiddeck.launcher.input.DeckControls
+import com.droiddeck.launcher.input.*
import com.droiddeck.launcher.input.JoyConPadTest
import com.droiddeck.launcher.input.PadBridge
import com.droiddeck.launcher.input.PadState
@@ -25,23 +25,32 @@ import org.robolectric.annotation.Config
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34], shadows = [JoyConPadTest.RecordingWriter::class])
-class DeckControlsPanelOwnershipTest {
+class InputSurfaceOwnershipTest {
private val controller = Robolectric.buildActivity(ComponentActivity::class.java).setup()
private val activity = controller.get()
private val root = FrameLayout(activity)
private val bridge = PadBridge(File(activity.cacheDir, "panel-ownership"))
- private lateinit var panel: DeckControlsPanel
+ private lateinit var panel: InputSurfaceView
private val previousDeckPad = SessionState.deckPad
@Before fun setUp() {
SessionState.deckPad = true
DeckControls.releaseAll()
- SessionPrefs.setGamepadSurface(activity, false, SessionPrefs.SURFACE_STICK)
- SessionPrefs.setGamepadSurface(activity, true, SessionPrefs.SURFACE_TRACKPAD)
+ bridge.setInputRouter(InputRouter(object : InputOutput {
+ override fun key(code: Int, down: Boolean) {}
+ override fun button(code: Int, down: Boolean) {}
+ override fun pointer(dx: Float, dy: Float) {}
+ override fun scroll(steps: Int) {}
+ override fun command(command: InputCommand) {}
+ override fun requestMotion() {}
+ }))
+ val elements = listOf(InputControl.RIGHT_PAD, InputControl.LS, InputControl.A).mapIndexed { i, c ->
+ InputSurfaceElement(c, .02f + i * .3f, .1f, .28f, .4f)
+ } + InputSurfaceElement(InputControl.LS, .02f, .6f, .28f, .3f, "dpad", InputElementKind.DPAD)
+ bridge.setInputProfile(InputProfile("native", elements = mapOf(InputRole.SECONDARY to mapOf("dpad" to InputAction.Native()))))
activity.setContentView(root)
- panel = DeckControlsPanel(activity, {}, {}, {}, bridge)
+ panel = InputSurfaceView(activity, bridge, elements)
root.addView(panel)
- descendants(panel).filterIsInstance().first { it.text == activity.getString(R.string.deck_tab_gamepad) }.performClick()
val trackpad = child("TrackpadView")
trackpad.layout(0, 0, 300, 300)
touch(trackpad, MotionEvent.ACTION_DOWN, 200f, 100f)
@@ -57,14 +66,14 @@ class DeckControlsPanelOwnershipTest {
SessionState.deckPad = previousDeckPad
}
- @Test fun switchingTheOtherStickKeepsTrackpadContactAndClickHeld() {
+ @Test fun removingTheStickKeepsTrackpadContactAndClickHeld() {
val stick = child("StickView")
stick.layout(0, 0, 300, 300)
touch(stick, MotionEvent.ACTION_DOWN, 150f, 150f)
touch(stick, MotionEvent.ACTION_MOVE, 240f, 150f)
assertTrue(state().leftX > 0f)
val position = JoyConPadTest.RecordingWriter.deckPads.copyOf()
- descendants(stick.parent as View).first { it.contentDescription == activity.getString(R.string.deck_surface_switch) }.performClick()
+ (stick.parent as ViewGroup).removeView(stick)
assertEquals(0f, state().leftX)
assertTrackpadStillHeld(position)
root.removeView(panel)
@@ -82,8 +91,8 @@ class DeckControlsPanelOwnershipTest {
assertTrackpadStillHeld(position)
}
- @Test fun removingFaceButtonsReleasesOnlyTheirOwnInput() {
- val buttons = child("FaceButtons")
+ @Test fun removingAButtonReleasesOnlyItsOwnInput() {
+ val buttons = child("HoldButton")
buttons.layout(0, 0, 300, 300)
touch(buttons, MotionEvent.ACTION_DOWN, 150f, 240f)
assertTrue(state().isDown(PadState.A))
@@ -93,49 +102,31 @@ class DeckControlsPanelOwnershipTest {
assertTrackpadStillHeld(position)
}
- @Test fun switchingTabsRemovesTheOldTouchSourceAfterChildrenRelease() {
- val routed = recordTouchRoute()
+ @Test fun replacingTheLayoutReleasesEveryOldControl() {
holdFaceButton()
- assertTrue(routed.last().isDown(PadState.A))
- descendants(panel).filterIsInstance().first { it.text == activity.getString(R.string.deck_tab_grips) }.performClick()
- assertFalse(routed.last().isDown(PadState.A))
+ assertTrue(state().isDown(PadState.A))
+ panel.updateCustomLayout(emptyList())
+ assertFalse(state().isDown(PadState.A))
assertEquals(0, JoyConPadTest.RecordingWriter.grips)
- routed.clear()
bridge.applyExternal({ it.press(PadState.B, true) }, true)
- assertTrue("removed tab still forwards a neutral touch source", routed.isEmpty())
assertTrue(state().isDown(PadState.B))
-
- descendants(panel).filterIsInstance().first { it.text == activity.getString(R.string.deck_tab_gamepad) }.performClick()
- holdFaceButton()
- assertTrue(routed.last().isDown(PadState.A))
+ assertFalse(state().isDown(PadState.A))
}
@Test fun removingThePanelLeavesNoTouchSourceForLaterPhysicalInput() {
- val routed = recordTouchRoute()
holdFaceButton()
root.removeView(panel)
- assertFalse(routed.last().isDown(PadState.A))
- routed.clear()
+ assertFalse(state().isDown(PadState.A))
bridge.applyExternal({ it.press(PadState.B, true) }, true)
- assertTrue("removed panel still forwards a neutral touch source", routed.isEmpty())
assertTrue(state().isDown(PadState.B))
}
private fun holdFaceButton() {
- val buttons = child("FaceButtons")
+ val buttons = child("HoldButton")
buttons.layout(0, 0, 300, 300)
touch(buttons, MotionEvent.ACTION_DOWN, 150f, 240f)
}
- private fun recordTouchRoute(): MutableList {
- val routed = mutableListOf()
- bridge.setTouchRoute(object : PadBridge.TouchRoute {
- override fun active() = true
- override fun accept(state: PadState) { routed += PadState().apply { copyFrom(state) } }
- })
- return routed
- }
-
private fun assertTrackpadStillHeld(position: ShortArray) {
assertEquals(32 or 128, JoyConPadTest.RecordingWriter.grips)
assertArrayEquals(position, JoyConPadTest.RecordingWriter.deckPads)
diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceViewTest.kt
similarity index 54%
rename from app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt
rename to app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceViewTest.kt
index 45f6566977..48616c03a5 100644
--- a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceViewTest.kt
@@ -4,6 +4,8 @@ import android.content.ComponentName
import android.view.MotionEvent
import androidx.activity.ComponentActivity
import android.view.View
+import android.widget.FrameLayout
+import com.droiddeck.launcher.input.*
import com.droiddeck.launcher.input.JoyConPadTest
import com.droiddeck.launcher.input.PadBridge
import com.droiddeck.launcher.session.SessionState
@@ -20,8 +22,42 @@ import java.nio.file.Files
@RunWith(RobolectricTestRunner::class)
@Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter"],
- shadows = [JoyConPadTest.RecordingWriter::class])
-class DeckControlsPanelTest {
+ shadows = [JoyConPadTest.RecordingWriter::class, SessionInputPointerTest.CompositorShadow::class])
+class InputSurfaceViewTest {
+ @Test fun customControlsReleaseOnDetachAndWorkWhenTheSameViewReturns() {
+ val controller = Robolectric.buildActivity(ComponentActivity::class.java).setup()
+ val activity = controller.get()
+ val events = mutableListOf()
+ val bridge = PadBridge(activity.cacheDir)
+ val router = InputRouter(object : InputOutput {
+ override fun key(code: Int, down: Boolean) { events += down }
+ override fun button(code: Int, down: Boolean) {}
+ override fun pointer(dx: Float, dy: Float) {}
+ override fun scroll(steps: Int) {}
+ override fun command(command: InputCommand) {}
+ override fun requestMotion() {}
+ })
+ bridge.setInputRouter(router)
+ bridge.setInputProfile(InputProfile("test", elements = mapOf(InputRole.SECONDARY to mapOf("one" to InputAction.Keys(listOf(57))))))
+ val root = FrameLayout(activity)
+ activity.setContentView(root)
+ val panel = InputSurfaceView(activity, bridge,
+ listOf(InputSurfaceElement(InputControl.A, .2f, .2f, .2f, .2f, "one")))
+ try {
+ repeat(2) {
+ root.addView(panel)
+ panel.measure(View.MeasureSpec.makeMeasureSpec(600, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(600, View.MeasureSpec.EXACTLY))
+ panel.layout(0, 0, 600, 600)
+ val down = MotionEvent.obtain(0, 1, MotionEvent.ACTION_DOWN, 150f, 150f, 0)
+ try { assertTrue(panel.dispatchTouchEvent(down)) } finally { down.recycle() }
+ assertEquals(true, events.last())
+ root.removeView(panel)
+ assertEquals(false, events.last())
+ }
+ assertEquals(listOf(true, false, true, false), events)
+ } finally { root.removeAllViews(); bridge.stop(); controller.pause().stop().destroy() }
+ }
+
@Test fun takesTouchAtMatchesWhatATouchDoes() {
val directory = Files.createTempDirectory("deck-panel").toFile()
try {
@@ -29,12 +65,10 @@ class DeckControlsPanelTest {
val app = RuntimeEnvironment.getApplication()
shadowOf(app.packageManager).addActivityIfNotPresent(ComponentName(app, ComponentActivity::class.java))
val activity = Robolectric.buildActivity(ComponentActivity::class.java).setup().get()
- for (pad in listOf(null, PadBridge(directory))) for (portraitDock in listOf(false, true)) {
+ for (pad in listOf(null, PadBridge(directory))) for (portraitDock in listOf(false, true)) for (layout in InputStockLayouts.layouts()) {
val name = "pad=${pad != null} portraitDock=$portraitDock"
- val panel = DeckControlsPanel(activity, onClose = {}, onSteamMenu = {}, onQam = {},
- pad = pad, portraitDock = portraitDock)
+ val panel = InputSurfaceView(activity, pad, layout.elements)
activity.setContentView(panel)
- assertEquals(name, pad == null, panel.deckControls)
val (w, h) = if (portraitDock) 720 to 1000 else 1200 to 480
panel.measure(View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY),
View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY))
diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputUiLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputUiLayoutTest.kt
new file mode 100644
index 0000000000..2715af7116
--- /dev/null
+++ b/app/src/test/java/com/droiddeck/launcher/ui/InputUiLayoutTest.kt
@@ -0,0 +1,131 @@
+package com.droiddeck.launcher.ui
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.view.View
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.test.*
+import androidx.compose.ui.unit.dp
+import com.droiddeck.launcher.R
+import com.droiddeck.launcher.input.ControllerPrefs
+import com.droiddeck.launcher.input.InputLibraries
+import com.droiddeck.launcher.input.InputProfiles
+import org.junit.Assert.assertEquals
+import com.droiddeck.launcher.input.InputAction
+import com.droiddeck.launcher.input.InputControl
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import java.io.File
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [28])
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+class InputUiLayoutTest {
+ @get:Rule val compose = createRobolectricComposeRule()
+ private lateinit var root: View
+ @Before fun reset() {
+ val context = RuntimeEnvironment.getApplication()
+ for (name in listOf("input-profiles", "input-surfaces", "controller")) context.getSharedPreferences(name, Context.MODE_PRIVATE).edit().clear().commit()
+ }
+
+ @Test fun layoutThumbnailDoesNotPaintOverItsRowOrAdjacentControls() {
+ val context = RuntimeEnvironment.getApplication()
+ val library = InputLibraries.read(context)
+ val preview = InputLayoutPreviewView(context)
+ preview.update(library.layout("game", com.droiddeck.launcher.input.InputRole.SECONDARY)!!, com.droiddeck.launcher.input.InputRole.SECONDARY)
+ preview.measure(View.MeasureSpec.makeMeasureSpec(112, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(76, View.MeasureSpec.EXACTLY))
+ preview.layout(0, 0, 112, 76)
+ val bitmap = Bitmap.createBitmap(240, 160, Bitmap.Config.ARGB_8888)
+ bitmap.eraseColor(android.graphics.Color.MAGENTA)
+ preview.draw(Canvas(bitmap))
+ assertEquals(android.graphics.Color.MAGENTA, bitmap.getPixel(150, 30))
+ assertEquals(android.graphics.Color.MAGENTA, bitmap.getPixel(30, 120))
+ bitmap.recycle()
+ }
+
+ @Test @Config(qualifiers = "w360dp-h800dp")
+ fun phoneKeepsLibraryNavigationAndProfileEditingReachable() {
+ 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("input-binding-a").performScrollTo().assertIsDisplayed().performClick()
+ compose.onNodeWithTag("input-action-save").assertIsDisplayed()
+ screenshot("phone-properties")
+ }
+
+ @Test @Config(qualifiers = "w640dp-h360dp")
+ fun handheldPropertiesLeaveSaveVisibleAboveScrollableContent() {
+ compose.setContent { root = LocalView.current; DroidDeckTheme { Surface { InputActionEditor(InputControl.LS, InputAction.Pointer(), "Left stick", {}, {}) } } }
+ compose.onNodeWithTag("input-action-save").assertIsDisplayed()
+ compose.onNode(SemanticsMatcher.keyIsDefined(SemanticsActions.SetProgress)).performScrollTo().assertIsDisplayed()
+ screenshot("handheld-properties")
+ }
+
+ @Test @Config(qualifiers = "w960dp-h600dp")
+ fun largeScreenShowsTheProfileLibraryInTheExistingTheme() {
+ compose.setContent { root = LocalView.current; DroidDeckTheme { Surface { InputSettingsPage({}) } } }
+ compose.onNodeWithTag("input-profile-game").assertIsDisplayed()
+ screenshot("profiles")
+ }
+
+ @Test @Config(qualifiers = "w960dp-h600dp")
+ fun controllerTabKeepsSetupNavigationWithoutDuplicateEditors() {
+ val context = RuntimeEnvironment.getApplication()
+ compose.setContent {
+ root = LocalView.current
+ DroidDeckTheme {
+ CompositionLocalProvider(LocalFrontFocus provides FrontFocus(), LocalNarrowPane provides false) {
+ FocusGlideHost {
+ SetupPanel(FrontEndState(
+ installed = null, ready = false, available = null, busy = false, stage = "", percent = -1,
+ desktopInstalled = false, offlineAccount = null, offline = false, frameGenLabel = "",
+ romsDir = null, logsEnabled = false, steamGames = emptyList(), emulators = emptyList(), running = null,
+ controller = ControllerPrefs.read(context),
+ ), FrontEndActions(
+ onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {},
+ onRom = {}, onResume = {}, onSteamSettings = {}, onDesktopSettings = {},
+ onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, onFrameGenPick = {},
+ onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {},
+ onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {},
+ onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> },
+ onSetPhantomProcessLimit = { _, _ -> }, controller = ControllerActions({}),
+ ), onOpenDeveloperOptions = {}, onRequestWirelessAdb = {}, onPairWirelessDebugging = {})
+ }
+ }
+ }
+ }
+ 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.onNodeWithText(context.getString(R.string.ctrl_configure)).assertDoesNotExist()
+ screenshot("controller-tab")
+ compose.onNodeWithTag("input-profile-game").performClick()
+ compose.onNodeWithTag("input-part-physical").performScrollTo().performClick()
+ compose.onNodeWithText(context.getString(R.string.setup_tab_launcher)).assertIsDisplayed()
+ screenshot("controller-physical")
+ compose.runOnIdle { assertEquals(InputProfiles.AUTO, InputLibraries.read(context).selected) }
+ }
+
+ private fun screenshot(name: String) {
+ compose.runOnIdle {
+ val image = Bitmap.createBitmap(root.width, root.height, Bitmap.Config.ARGB_8888)
+ root.draw(Canvas(image))
+ val file = File("build/reports/input-ui/$name.png").apply { parentFile?.mkdirs() }
+ file.outputStream().use { image.compress(Bitmap.CompressFormat.PNG, 100, it) }
+ image.recycle()
+ }
+ }
+}
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 0dd70b7b96..864eb0ef64 100644
--- a/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialogTest.kt
@@ -70,6 +70,7 @@ class PhysicalShortcutsDialogTest {
compose.setContent {
DroidDeckTheme { InputSettingsPage(onBack = {}) }
}
+ compose.onNodeWithTag("shortcuts-assign-STEAM").performScrollTo()
compose.onNodeWithTag("shortcuts-assign-STEAM").assertExists()
compose.onNodeWithTag("shortcuts-assign-QAM").assertExists()
compose.onNodeWithTag("shortcuts-assign-DROIDDECK").assertExists()
@@ -134,12 +135,12 @@ class PhysicalShortcutsDialogTest {
compose.setContent { DroidDeckTheme { PhysicalShortcutRows() } }
assign(PhysicalShortcuts.Action.STEAM)
send(KeyEvent.KEYCODE_F3, KeyEvent.ACTION_DOWN)
- compose.onNodeWithTag("shortcuts-remove").performScrollTo().performClick()
+ compose.onNodeWithTag("shortcuts-restore-default").performScrollTo().performClick()
compose.runOnIdle {
assertEquals(PhysicalShortcuts.Action.QAM, PhysicalShortcuts.read(context).single().action)
assertTrue(ControllerPrefs.read(context).selectSteam)
}
- compose.onNodeWithTag("shortcuts-assign-STEAM").assertTextContains(context.getString(R.string.game_settings_default))
+ compose.onNodeWithTag("shortcuts-assign-STEAM").assertTextContains(context.getString(R.string.input_shortcut_guide))
}
@Test fun retryRecoversFromAMissingReleaseWithoutSavingTheOldButton() {
@@ -172,7 +173,7 @@ class PhysicalShortcutsDialogTest {
val label = compose.onNodeWithText(context.getString(R.string.drawer_steam_menu)).getUnclippedBoundsInRoot()
assertTrue(control.right - control.left < 200.dp)
assertTrue("Menu label must not wrap vertically: $label", label.bottom - label.top <= 48.dp)
- compose.onNodeWithTag("shortcuts-assign-STEAM").assertTextContains(context.getString(R.string.ctrl_custom))
+ compose.onNodeWithTag("shortcuts-assign-STEAM").assertTextContains(button.label)
compose.onNodeWithText("${button.label} · ${button.name}").assertExists()
}
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 9265eb297d..aaf7a9a8f9 100644
--- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt
+++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt
@@ -63,6 +63,22 @@ class SessionSecondScreenTest {
@Test fun steamMenuKeepsTheExistingTrackpadAndTerminal() = checkModes(steam = true)
+ @Test fun closingTheDockedDrawerKeepsTheSelectedControlsPanel() {
+ SessionState.mode = SessionService.MODE_STEAM
+ var closes = 0
+ var selected = SecondScreenMode.CUSTOM_CONTROLS
+ compose.setContent {
+ DroidDeckTheme {
+ SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {},
+ actions(true, listOf(SecondScreenDisplay(1, "Bottom screen")),
+ onClose = { closes++ }, select = { selected = it }), docked = true)
+ }
+ }
+ compose.onNodeWithContentDescription(context.getString(R.string.common_close)).performClick()
+ assertEquals(1, closes)
+ assertEquals(SecondScreenMode.CUSTOM_CONTROLS, selected)
+ }
+
@Test fun desktopWithoutASecondDisplayFallsBackToController() {
SessionState.mode = SessionService.MODE_DESKTOP
var page = SessionDrawerPage.SECOND_SCREEN
@@ -102,36 +118,11 @@ class SessionSecondScreenTest {
}
}
- @Test fun trackpadTapUsesPositionLeftByAnotherPointerSource() {
- val activity = Robolectric.buildActivity(SessionActivity::class.java).get()
- val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY)
- val positions = mutableListOf>()
- var position = Offset(0.2f, 0.7f)
- val panel = SecondScreenPresentation(activity, display,
- { x, y, w, h -> positions += x / w to y / h }, { _, _ -> }, {}, {}, {}, {},
- pointerPosition = { position })
- try {
- panel.create()
- panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD)
- val trackpad = descendants(panel.window!!.decorView).first { it is SessionTrackpadView }
- trackpad.layout(0, 0, 1000, 600)
- for (next in listOf(Offset(0.2f, 0.7f), Offset(0.8f, 0.1f))) {
- position = next
- for ((action, time) in listOf(MotionEvent.ACTION_DOWN to 1000L, MotionEvent.ACTION_UP to 1010L)) {
- val event = MotionEvent.obtain(1000, time, action, 300f, 300f, 0)
- try { trackpad.onTouchEvent(event) } finally { event.recycle() }
- }
- assertEquals(next.x, positions.last().first, 0.001f)
- assertEquals(next.y, positions.last().second, 0.001f)
- }
- } finally { panel.closeControls() }
- }
-
@Test fun terminalOpenedBeforeItWasReadyIsRetriedButOtherPanelsAreLeftAlone() {
SessionState.mode = SessionService.MODE_STEAM
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 panel = SecondScreenPresentation(activity, display, {}, {}, {})
try {
panel.show()
panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD)
@@ -244,7 +235,7 @@ class SessionSecondScreenTest {
SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, actions(steam, displays) { selected += it })
}
}
- val modes = listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL)
+ val modes = listOf(SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL)
for (mode in modes) {
compose.onNodeWithText(context.getString(mode.label)).performScrollTo().assertIsDisplayed().performClick()
}
@@ -259,6 +250,7 @@ class SessionSecondScreenTest {
private fun actions(steam: Boolean, displays: List,
micAvailable: Boolean = false, micEnabled: Boolean = false, onMic: (Boolean) -> Unit = {},
+ onClose: () -> Unit = {},
select: (SecondScreenMode) -> Unit = {}) =
DrawerActions(steam = steam, isHomeApp = false, androidApps = emptyList(), hudOn = false,
micAvailable = micAvailable, micEnabled = micEnabled, onMicEnabled = onMic,
@@ -269,5 +261,5 @@ class SessionSecondScreenTest {
onHud = {}, onFrameGenPick = {}, onImportLossless = {}, onKeyboard = {}, onHardwareKeyboard = {},
onSteamMenu = null, onQam = null, onOsc = {}, onSuspendPolicy = {}, onBackActionsInverted = {},
onTouch = {}, onFexPreset = {}, onSecondScreenMode = select, onSecondScreenDisplay = {},
- onLaunchAndroidApp = { _, _ -> }, onBackground = {}, onShareLogs = {}, onStop = {}, onClose = {})
+ onLaunchAndroidApp = { _, _ -> }, onBackground = {}, onShareLogs = {}, onStop = {}, onClose = onClose)
}
diff --git a/docs/development/unified-input-proposal.md b/docs/development/unified-input-proposal.md
index ac9390c326..1d2100b2d9 100644
--- a/docs/development/unified-input-proposal.md
+++ b/docs/development/unified-input-proposal.md
@@ -6,12 +6,13 @@ a functional configuration UI and hardware validation on AYN Thor. The related
maintainer discussions motivate this work; they are not approval of this
implementation.
-The configuration UI is intentionally basic. If maintainers accept the
-architecture, I am happy to refine the UX/UI in the same PR before merge, or in a
-follow-up PR, whichever they prefer. Navigation, binding discovery, layout
-editing, accessibility and localization need further attention. The current UI
-makes the architecture usable and testable rather than establishing its final
-interaction design.
+The configuration UI keeps the existing Setup tabs. Controller contains mode
+defaults, one profile list and device settings. Reusable layouts and actions are
+stored separately but are managed within each profile source. Direct editing on
+the target display has been exercised on AYN Thor, including editing above a live
+Steam session and keeping the secondary canvas separate from the main-screen
+tools. Revision-specific checks and remaining limits are recorded in the
+validation report.
## Why a shared system
@@ -26,11 +27,14 @@ The model separates three concerns:
- **Source role:** physical controller, game overlay (primary) or auxiliary panel
(secondary). Swapping the game and auxiliary panel between displays preserves
the panel's role and bindings.
-- **Profile:** the actions assigned to controls in each role. Game and Desktop are
- the two editable built-in profiles. Auto selects by session mode; explicit
- selection supports a game running inside a desktop session.
-- **Surface layout:** the placement and size of local screen controls. The custom
- second-screen layout is stored independently for each built-in profile.
+- **Profile:** references to a physical binding preset and a layout/binding pair
+ for each touch role. Game and Desktop are editable bases; named profiles can
+ share parts. Auto has separate Steam and Desktop assignments. Opening a profile
+ for editing does not activate it.
+- **Surface layout:** stable element IDs, types, names, positions and sizes.
+ Named custom layouts can be used on either touch role. Actions belong to a
+ separate binding preset associated with that layout. Two desktop profiles can
+ share their physical bindings and layout while using different touch actions.
A binding selects native controller output, a DroidDeck action, or disabled.
Native output continues through the existing game/Steam path, optionally with a
@@ -44,7 +48,8 @@ flowchart TD
Secondary[Secondary custom controls] --> PadBridge
Deck[Deck pads and grips] --> DeckControls
BLE[Steam Controller BLE reports] --> TritonInputRouter
- Profiles[Game / Desktop profile by source role] --> Router[InputRouter]
+ Library[Saved profiles, layouts and binding presets] --> Profiles[Resolved active profile by source role]
+ Profiles --> Router[InputRouter]
PadBridge --> Router
DeckControls --> Router
TritonInputRouter --> Router
@@ -55,7 +60,8 @@ flowchart TD
Motion --> Held
Held --> Guest[Existing guest keyboard and mouse output]
Native --> Steam[Steam Input or guest controller consumer]
- Layout[Independent surface geometry] --> Secondary
+ Layout[Independent surface geometry and element IDs] --> Secondary
+ Layout --> Primary
```
These are routing relationships, not additional asynchronous queues. Native
@@ -66,8 +72,10 @@ publication is performed by the existing source adapters and writers.
| Component | Responsibility |
| --- | --- |
| `InputProfile` | Logical controls, source roles and supported actions |
-| `InputProfiles` | Versioned persistence, selection, validation and migration |
-| `InputSurfaceLayout` | Bounded custom lower-screen geometry, separate from actions |
+| `InputLibraries` / `InputLibrary` | Versioned reusable parts, validated references, selection and migration |
+| `InputProfiles` | Compatibility API for the compiled active profile and legacy migration |
+| `InputSurfaceLayout` | Bounded normalized touch geometry and legacy layout migration |
+| `InputSurfaceSource` | Independently owned per-element routing through existing pad/Deck publishers |
| `InputRouter` | Resolve channels on profile changes, route events, track held outputs |
| `PadBridge` | Existing player slots plus independently owned local touch sources |
| `DeckControls` | Source ownership for Deck grips, contacts, coordinates and clicks |
@@ -88,12 +96,103 @@ captured keys match a device identity plus Android keycode/scancode, rather than
persisting a transient Android device ID. System-reserved keys remain with
Android. This is not a per-device calibration system.
+### Controller navigation
+
+Setup keeps its existing top-level tabs. Controller starts with Desktop and Game
+mode defaults, followed by one profile list and inline device settings. Opening
+or editing a profile does not activate it; the session menu owns the active
+profile override. Quick-menu overrides are called out beside the default selectors.
+
+Each profile opens Physical controller, Main screen or Second screen. Control
+cards and touch element rows open the same large properties editor. Layout
+editing uses the full-size canvas and one draggable, expandable Tools palette. Back
+returns to the source and profile being edited, rather than the library root.
+Saved layouts and reuse commands live inside the relevant source editor; there
+are no parallel top-level layout, binding and profile catalogs.
+
+New profiles copy actions and custom geometry independently by default. Users
+can explicitly keep physical controls shared at creation, or copy/link a source
+from another profile later. Reusing a saved layout can link geometry without
+linking actions. Make independent copies both geometry and actions for that
+source. Reset actions affects only the selected profile, preserving its layouts
+and detaching shared actions before resetting them.
+
+Main-screen visibility remains a global device setting. Color and opacity belong
+to each saved touch layout. The standard gamepad is an ordinary editable layout:
+its legacy positions, appearance and stick options are migrated into elements.
+Other saved resolutions remain selectable layouts. The previous fixed gamepad
+renderer and its separate editor are removed; only its placement calculation is
+retained for migration. Vibration, radial stick dead zone, Joy-Con VR, global
+shortcuts and timing diagnostics are inline below the profile list. This adds no
+settings reads or queues to input dispatch.
+
+### Session profile composition
+
+Both the session drawer and launcher controls sheet expose Profile, Physical
+controller, Main screen and Second screen. Choosing a profile loads its three
+saved parts; choosing one part creates a mode-specific override without editing
+the source profile. Game and Desktop remember their choices separately. Auto
+resolves the corresponding default profile. Selecting a complete profile clears
+part overrides. Save as new profile creates independent copies of all three
+parts, including geometry, appearance and actions.
+
+Fixed lower-screen tabs, side selectors and click bars are removed. Deck pads
+and grips, one or two Deck pads, grips alone, the mouse trackpad with keyboard,
+and a compact gamepad are ordinary editable layout/binding presets. Their menu,
+keyboard and click buttons are ordinary elements too. The compact gamepad reuses
+the previous panel geometry calculation. Existing fixed-panel selections migrate
+to profile controls on first use. Schema 4 also preserves version-3 custom
+layouts and converts legacy fixed layout references without changing physical
+mappings. Active quick-menu parts cannot be deleted.
+
+Mouse touchpad gestures reuse `TouchpadGestures` for relative movement, tap,
+hold-drag, two-finger scrolling and secondary clicks. A tap uses the element's
+configured click action; it does not reposition the pointer. Gesture outputs use
+owned router channels and are suppressed while input is suspended or until a
+held contact returns to neutral after a profile change. Native Deck pad mode
+retains contact/position reporting and click behavior for Steam Input.
+
### Reuse and migration
Existing `FakeInputWriter` transports, player assignment, guest keyboard/mouse
-output, `KeyboardHost`, second-screen presentation and `DeckControlsPanel` are
-reused. The custom lower-screen editor arranges the existing buttons, sticks,
-trackpads and grips; it does not create another emulated controller.
+output, `KeyboardHost` and second-screen presentation are reused. The existing
+button, stick, d-pad and trackpad views now live in `InputSurfaceView`; there is
+no parallel fixed controller panel. The custom editor arranges the existing button, stick, d-pad and trackpad
+views; it does not create another emulated controller. Trigger elements provide
+press/release input. A new element is unassigned until an action is explicitly
+saved. Native sticks and pads retain their existing click gestures.
+Movement/contact and click are separate assignments for sticks and trackpads.
+Both use the same properties editor and router ownership rules; migrated click
+bindings remain editable, and a custom mouse pad can assign its click separately.
+
+The editor uses the target display at actual size. On a dual-screen device,
+Add, Undo, Snap, Save and element properties stay on the activity display; the
+auxiliary display is a full-size canvas with no toolbar inset. On one display,
+a draggable Tools bubble expands into those same tools, including element
+properties, and collapses to leave the canvas accessible. Properties replace the
+canvas and return to the same draft. Snapping aligns centers and edges with
+other elements and the display, including during resize. Done persists geometry and actions together; Cancel discards the
+draft after confirmation. The preview has no input sources and cannot send
+input to the running session.
+
+Primary custom layouts follow the existing on-screen-controls visibility setting;
+Steam's touch-controller mode retains priority. Secondary layouts use Profile controls mode. Terminal, desktop and dashboard
+remain separate panel modes. Steam-managed touch controls keep their own editor; a new editable layout
+can start empty or copy a saved custom layout.
+
+Legacy Game/Desktop mappings, key captures, active selection and lower-screen
+geometry migrate to the library together. Legacy element IDs preserve their
+existing logical bindings. New elements use stable independent IDs, so two
+buttons can have different actions or hold the same output without releasing
+one another. Referenced parts cannot be deleted, and editing an unsupported
+library version cannot overwrite it. Shared edits show their scope; copying a
+binding preset from a profile relinks only that profile's selected role.
+
+Library decoding, validation and preset resolution happen during configuration
+or profile activation. Dispatch uses preconfigured router channels, with no
+preference reads, profile lookups or new asynchronous queues. The physical native
+identity path and frame-based stick motion remain in place. These properties do
+not substitute for a fresh latency comparison on hardware.
The old touch-only mapping and Select-as-Steam settings migrate once into Game's
primary-screen and physical bindings respectively. Their redundant UI is removed.
@@ -193,13 +292,15 @@ Steam Mobile Touch retains its own Steam-managed layout and protocol. Its widget
do not pass through this local remapper. The VR-specific input path also remains
separate. Existing gestures retain their recognizers and share output ownership.
-The two built-in profiles and the bounded custom lower-screen editor are the
-implemented scope. Named profile libraries, import/export, per-app selection,
-macros, tap/hold behavior, multi-button activation chords and a complete freeform
-multi-display editor are deferred. One button emitting Ctrl+F is supported;
-pressing multiple buttons to activate a new binding is not implemented.
+The local UI revision includes named profiles, reusable binding presets and
+custom layouts edited on either display. Import/export, automatic per-app
+selection, macros, configurable tap/hold behavior and multi-button activation
+chords remain deferred. One button emitting Ctrl+F is supported; pressing
+multiple buttons to activate a new binding is not implemented. Built-in Steam
+touch layouts retain their separate Steam-managed editor.
-Native remaps stay within compatible report families. Additional hardware
+Physical native remaps stay within compatible report families. Generic custom
+buttons choose a supported button output explicitly. Additional hardware
adapters must join before publishing consumed controls; an Activity-only
interceptor cannot cover every raw device. Future adapters should use this
contract without replacing device-specific calibration or protocol handling.
@@ -240,3 +341,53 @@ project's direction, whether adapters join at the right point, and whether the
shared ownership/lifecycle contract is suitable for future input sources. The
validation document distinguishes device-tested behavior, host regressions and
remaining coverage. UX/UI refinement can follow agreement on those decisions.
+
+### Settings polish and display targeting
+
+The session Profile row expands to show the three saved parts and the editor.
+Choosing the profile remains a separate selector. Session editing opens its
+settings on the spare display, when available; element properties and editor
+commands stay on the activity display. Main-screen placement over a running
+session uses a transparent canvas so controls can be arranged around game UI.
+Existing visible controls are suspended while editing.
+
+Schema 5 adds an explicit main/secondary/both target to saved layouts. Migration
+infers the target from existing profile and quick-menu references, preserving
+layouts already used on both screens. Layout rows render a miniature with the
+same `InputSurfaceView` renderer; unused legacy copies are retained under Other
+saved layouts. Newly created layouts belong to the source being edited.
+
+Action editing retains a draft for each route and action type. Sticks assigned
+to a digital action press above 55% on either axis and release below 35%; a
+trackpad holds a digital action during contact. These semantics are explained
+next to the action. Horizontal scroll uses the same router and existing evdev
+REL_HWHEEL / Wayland axis transport, with independent fractional accumulation.
+No additional event thread or queue is introduced.
+
+### Screen-key consolidation
+
+Schema 6 imports the retired screen-key overlay into normal saved profiles,
+layouts and element bindings. The active old set and each named saved set become
+separate imported profiles. Current Game/Desktop defaults and quick selections
+remain unchanged; the settings page explains where to find the imported profiles.
+The old editor, overlay View, guest-key dispatch path and session-menu entries
+are removed. Only a one-time reader of the old preferences remains.
+
+Migration converts normalized centers and density-based sizes into the shared
+layout geometry. Key chords, four-way directions, separate eight-way stick
+bindings, toggle buttons, built-in symbols, custom image references, shape and
+opacity are retained. Blank stick diagonals keep their previous behavior of
+pressing neighboring cardinal directions. Imported images are decoded once per
+view, sampled to at most 512 pixels, and read only from the app's existing image
+directory. New buttons can choose text or an existing built-in key symbol.
+
+A converted library and the original raw preferences are committed together
+before old preference entries are removed. Invalid data or capacity failures do
+not erase the old library or keys, and settings show a pending-import notice.
+The backup is recovery data, not a second runtime input configuration.
+
+Toggle buttons use `InputSurfaceSource` and the same router ownership as every
+other element. Releasing one owner cannot release another owner's held key.
+Menu suspension, profile changes, cancellation and detach release latched output.
+Physical native input continues through its existing fast path; no queue, timer
+or additional event thread is introduced for these features.
diff --git a/docs/development/unified-input-validation.md b/docs/development/unified-input-validation.md
index 8417218821..0f8d31ac3e 100644
--- a/docs/development/unified-input-validation.md
+++ b/docs/development/unified-input-validation.md
@@ -4,6 +4,264 @@ Recorded on 2026-10-24. These results distinguish the device-tested candidate fr
the later upstream rebase and host regression fixes. They do not establish zero
latency or complete coverage of every controller and session mode.
+## UI publication candidate, 2026-11-06
+
+The implementation was updated through upstream `a1bc8467f` (merge `aa3757eff`).
+The generic action selector now says **Scroll**; binding summaries still state
+the configured direction. Closing the docked session drawer now invokes its
+ordinary close action instead of disabling the second-screen presentation.
+The global-reset regression compares against a pristine compiled library, which
+includes the editable gamepad's keyboard element.
+
+- All **944 input/UI tests in 125 suites passed**. The final full JVM run completed
+ **3,598 tests in 493 suites: 3,573 passed, 25 failed, no errors or skips**.
+ The failures are the same unchanged upstream log-export tests (24) and
+ case-sensitive WoW add-on import test (1) described below. Input/UI and global
+ settings reset passed in this full run.
+- Initial full runs exhausted this Mac's free disk and produced secondary native
+ runtime/idle failures. Obsolete local test APKs were removed. The completed run
+ used a local Gradle init script with one worker and a fresh test JVM every 25
+ classes to bound temporary-file use. No repository test configuration was
+ weakened and no tests were excluded from the completed run.
+- The APK passed runtime-input, session-asset, native dependency, alignment and
+ v1/v2/v3 signature checks. SHA-256:
+ `611814f11cbac4bab7f97dac5c0b0657d85d8dfbd6b40b741bda1fc13efa6f83`.
+ It was installed over the separate Input Test app with its environment intact;
+ as with earlier local candidates, Rust store engines were omitted.
+- On AYN Thor, closing the lower-screen menu with its X restored the existing
+ controls instead of revealing Android. The live Steam editor, separate lower
+ canvas and upper tools/properties, profile previews, saved layouts, and action
+ pages were exercised. A single Trigger selection added a centered, selected
+ element; the reported occasional extra tap was not reproduced. The temporary
+ editor change was discarded.
+- The user also verified native controls, profile switching, trackpad/pointer
+ and scrolling behavior on the immediately preceding UI candidate. This is
+ distinct from automated UI navigation and the historical latency measurements.
+
+Actual display captures and test reports are retained locally under
+`app/build/reports/input-publish/`. Screenshot publication is subject to the
+user's review. No new latency measurement was made for this UI revision.
+
+## Input settings polish, 2026-11-06
+
+The final input/UI host run passed **941 tests in 124 suites, zero failures**.
+New coverage includes retained route/action drafts, centered element creation
+without a placement tap, collapsed quick-profile settings, schema-4 migration
+with a layout shared across both screens, target/scroll serialization, and
+horizontal scrolling through both guest mouse backends. Existing physical native
+fast-path and ownership tests remain green.
+
+The settings use stable DroidDeck Input labels, contextual axis/contact hints,
+color swatches, opacity sliders and rendered layout thumbnails. Diagnostics now
+open a result dialog and explain how to record a sample and what it measures.
+Shortcut rows show the actual assignment and offer Restore to default.
+
+No new latency comparison was taken for this UI revision. The normal native
+controller path is unchanged. New horizontal wheel work happens only for a local
+scroll action. The user's environment installation is retained. Device verification is recorded below.
+
+### Screen-key removal and Thor verification
+
+The old screen-key overlay, standalone editor, layout panel and separate runtime
+key sender are removed. Schema 6 imports the old active set and every named set
+as editable profiles. Current defaults and selections are kept. Tests cover
+idempotent import, chords, normalized geometry, per-element opacity, shapes,
+image references, symbols, custom diagonals, and retaining the original data
+when migration cannot complete. A backup and the converted library are committed
+together before the old preferences are removed.
+
+New shared element tests exercise latched keyboard and native controller buttons,
+shared ownership, cancellation, menu suspension and profile replacement. Separate
+diagonal bindings release previous keys and preserve neighboring-direction
+fallbacks. No additional input queue or thread is used.
+
+Final APK installed over `com.droiddeck.launcher.inputtest` on AYN Thor:
+`6618be55c28a52746b6504656a480845d25d8a34114daa1829aad5dbb5b5e729`.
+Packaging checked runtime inputs, session assets, native library dependencies and
+v1/v2/v3 signatures. As with the earlier test packages, Rust store engines are
+omitted; the Steam/Desktop environment is retained.
+
+On-device checks:
+
+- The expanded Profile has readable text and one visibly grouped block.
+- Profile source rows and saved-layout rows show bounded thumbnails. The previous
+ black rectangle overflowing the list no longer appears.
+- The original anchored color menu shows its color swatches.
+- Steam → Controller → Edit opens settings on the spare display.
+- Main-screen editing opens on the activity display over live Steam. A second
+ on-device crash was found and fixed: returning from lower-display settings must
+ use the existing activity dialog, not a Presentation on the default display.
+- Adding a button immediately centers and selects it. Its properties and symbol
+ picker open on the main display.
+- Secondary-screen editing leaves only the canvas below and tools above. Adding
+ a trackpad centers and selects it without requiring another placement touch.
+- Temporary edits were discarded. Comparing the before/after saved libraries,
+ excluding new default schema fields, found no changes to the user's profiles,
+ geometry, bindings or selections. Schema changed from 5 to 6.
+- Steam remained READY after closing the editors; the final device log contained
+ no new fatal exception.
+
+The test device had no old screen-key sets to import. Legacy content migration
+and toggle ownership were verified by host regression tests, not by a new
+physical-input latency or end-to-end game test. Evidence is under
+`app/build/reports/input-polish/`; the final installable copy is
+`app/build/input-ui/DroidDeck-Input-Test-unified-screenkeys-2026-11-06.apk`.
+
+## Unified editor and session profile composition, 2026-11-06
+
+The fixed gamepad and its separate editor are replaced with a saved editable
+layout rendered by `InputSurfaceView` on either display. The old fixed lower
+panel, tab switches and separate mouse trackpad view are removed. Deck pads,
+grips, single pads, the mouse trackpad and a compact gamepad are editable presets;
+their menu, keyboard and click buttons are normal elements. The compact preset
+reuses the previous panel geometry calculation.
+
+Schema 4 migrates version-2 overlay references, mappings, saved positions,
+appearance and stick-click preferences, and version-3 fixed lower layouts.
+Other resolution-specific positions remain saved layouts. Future or invalid
+libraries are not overwritten. Physical mappings retain their identities and
+assignments. Existing custom layouts remain intact.
+
+On two displays, the activity hosts Add, Undo, Snap, Done and full-size properties;
+the other display contains only the canvas, without a reserved toolbar strip.
+On the main display a draggable Tools bubble expands into the same tools,
+including Properties. The editor snaps centers and edges while moving and
+resizing. Both source pages list their actual elements. Device settings are
+inline below the profiles.
+
+The quick menu selects a whole profile or overrides Physical controller, Main
+screen and Second screen independently. Game and Desktop selections are separate.
+Changes do not mutate the source profiles; saving a combination creates independent
+copies. Returning to Auto clears the overrides. Tests cover serialization,
+reference validation, deletion protection and preservation of source profiles.
+
+The complete input/UI host run passed **931 tests in 124 suites, zero failures**.
+Coverage includes full-size shared editing, floating tools, display removal,
+geometry migration, source ownership during detach/layout replacement, quick-menu
+composition and saving, native Deck clicks and mouse gestures. Tap and hold use
+the configured element click; ordinary taps do not reposition the cursor. Profile
+changes and menu suspension suppress delayed gesture presses until neutral.
+The neutral-stick/physical-input regression remains covered.
+
+No new end-to-end latency measurement was performed for this revision. The
+physical controller path remains unchanged. Touch output uses the existing
+owned router and guest transports without an additional event queue. Mouse
+movement is delivered synchronously; tap/hold recognition reuses the existing
+`TouchpadGestures` timings. The local APK omits the Rust store engines and uses
+the separate Input Test application ID.
+
+Device verification on AYN Thor confirmed the four quick selectors and saved
+second-screen presets, draggable/expandable tools, full-screen properties and a
+canvas-only secondary display. WindowManager reports the main editor at
+`[0,0][1920,1080]`; the secondary canvas uses the full `1240×1080` display.
+The installed library migrated to schema 4 with existing profile references,
+bindings and custom layouts preserved. A previous test migration's unchanged
+main overlay geometry was corrected from its window-size copy to its saved
+1920×1080 version. No user-edited geometry was replaced.
+
+Final APK SHA-256: `c13326d11f5e8de3b878d83b296ba2f77495baf5c35d1d00dbb0327333c0277d`.
+Runtime assets, native library dependencies and v1/v2/v3 APK signatures passed
+verification. Focused editor/input checks passed again after fixing Compose 1.6
+fullscreen dialog sizing. Live game/desktop input and perceived latency with this
+final build still need user testing; the device checks above cover UI and migration.
+
+## Controller integration and upstream update, 2026-11-06
+
+Merged upstream `bf693d7f7` into the working branch as `ba5876bf6` before the UI
+integration. This includes 90 upstream commits, including radial stick dead zones
+and mouse-button handling. The merge keeps routed source ownership and the new
+upstream raw-stick behavior; the targeted input merge checks passed.
+
+Controller now contains two default-profile selectors, one profile list and a
+Device settings entry. Source-specific action editing and saved layouts are
+inside each profile. New profiles are independent by default, with an explicit
+option to share physical controls. Direct editing and Hide tools / Show tools
+are retained. No input-event queue or preference lookup was added by this UI
+reorganization.
+
+The first full host run executed 3,580 tests in 490 suites: 3,555 passed and 25
+failed, with no skips. All 926 input and UI tests in that run passed. The failures
+are in unchanged upstream log-export tests (24) and WoW add-on import tests (1).
+The log fixtures require `SecureDirectoryStream`, unavailable in this macOS JDK;
+the WoW test assumes `Foo` and `foo` refer to different paths, while this host
+filesystem is case insensitive. A direct Java filesystem probe confirmed both
+conditions. The log-export failures also reproduce when run separately. The
+affected production and test sources match `origin/main`. These host limitations
+have not been hidden by disabling tests or changing production code.
+
+The final input/UI-only run passed all 927 tests in 122 suites.
+
+Additional final checks cover integration in the existing Setup tabs, the lack
+of duplicate Layout/Configure entries, back navigation, independent creation,
+explicit physical sharing, and preserving elements while hiding editor tools.
+Rendered UI checks cover 360×800, 640×360 and 960×600 dp. Earlier latency results
+below are not a fresh measurement of this revision.
+
+The final 26 profile/library/editor checks passed again after the source-specific
+control lists and sharing labels were finalized. The APK passed session-asset
+matching, runtime-input attestation, native dependency/export checks, alignment
+and signing validation. It uses the same local HTTPS/direct-release download
+adaptations as the previous build and still omits the store Rust engines.
+
+Installed the update over `com.droiddeck.launcher.inputtest` on AYN Thor without
+clearing data. Verified Setup → Controller → Desktop → Second screen → Edit on
+screen; the canvas opened on the lower display, Hide tools / Show tools worked,
+and selecting the right trackpad opened large properties on the main display.
+Returned without saving; the stored input-profile preferences matched the backup
+exactly. Device settings had no persisted overrides before or after this check.
+No fresh gameplay or latency measurement was performed in this UI pass.
+
+Final APK SHA-256:
+`f1d16a503661055a0abe8cc954d3fc94f6b9a1c1c626ac38b6c88dba478810d1`.
+
+## Local UI revision, 2026-11-05
+
+This revision adds the Profiles / Layouts / Bindings libraries, migration of the
+previous settings, independently identified touch elements, and a direct editor
+on either display with properties on the activity display.
+
+- The complete JVM/Compose run passed 3,306 tests across 467 suites, with no
+ failures, errors or skipped tests. The native identity fast-path checks remain
+ in that suite. After the final editor-window adjustment, all nine editor and
+ adaptive-layout UI tests passed again.
+- New coverage includes legacy mapping/geometry/selection migration, shared
+ physical presets with separate touch actions, explicit private copies, safe
+ deletion/reset, unsupported schema preservation, independent element actions,
+ overlapping held outputs, suppression across profile/menu changes, and inert
+ editor previews, independent stick/trackpad click bindings, same-view
+ detach/reattach, and saving a draft after the auxiliary display disappears.
+- Both Steam and Desktop quick settings expose the same input library entry.
+- Compose navigation was exercised at 360×800, 640×360 and 960×600 dp. Rendered
+ images are generated under `app/build/reports/input-ui/`. The properties Save
+ control stays outside the scrollable content on the short landscape screen.
+- Updated the existing `com.droiddeck.launcher.inputtest` installation on AYN
+ Thor from 0.6.0 to the local 0.6.9 build without clearing its data. The official
+ package was not replaced. A local backup of the two input preference files was
+ taken before migration; all 61 saved Desktop bindings matched after migration.
+- On Thor, exercised the quick-settings entry, library navigation, full-size
+ editing on both displays, selection on the lower display with properties on
+ the main display, moving an element, Undo and Done. After undoing the move and
+ saving, the complete stored library matched the pre-edit data.
+- The earlier Thor latency measurements below apply to the earlier candidate,
+ not to this library/editor revision. No new end-to-end or dispatch latency
+ claim is made.
+
+The complete local runtime build passed session-asset matching, runtime-input
+attestation, native export/dependency validation, alignment and signature checks.
+The local build-script copy used HTTPS for the Debian archive and direct GitHub
+release downloads when the unauthenticated API was rate limited; checksum and
+revocation checks remained enabled. No build-script changes are included in the
+source diff. As before, the test APK excludes the Epic/GOG/Amazon Rust engines.
+The installed APK SHA-256 is
+`3e3f41589d45b70294f2d59404f591ae76f2ceba8488657e8821aab1bca224b3`.
+
+Before publishing, also test on Thor: create two Desktop profiles sharing physical
+bindings; give them different touch actions; edit and resize on the actual lower
+display; open properties on the top display; save/cancel; swap screens; return
+from Android Home; disconnect/reconnect the auxiliary display; and repeat the
+paired physical-button latency measurement. Verify primary custom overlays with
+on-screen controls enabled and secondary layouts in Custom controls mode.
+
## Revisions and environment
The Thor candidate was `5021e7ac` on base `ac0909ea`, with the local temporary-file,