mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 12:28:40 +00:00
feat: add configurable touchscreen gestures (#940)
This commit is contained in:
1 parent
fd74819c50
commit
fe7b75318a
55 files changed
+7404
-14
No files matched your search
@@ -81,6 +81,7 @@ import com.droiddeck.launcher.input.SecondScreenDisplay
|
||||
import com.droiddeck.launcher.input.SecondScreenDisplays
|
||||
import com.droiddeck.launcher.input.SecondScreenMode
|
||||
import com.droiddeck.launcher.input.TouchpadGestures
|
||||
import com.droiddeck.launcher.input.TouchscreenGestures
|
||||
import com.droiddeck.launcher.input.ScrollTouchGestures
|
||||
import com.droiddeck.launcher.runtime.LinuxRuntime
|
||||
import com.droiddeck.launcher.session.LoadingState
|
||||
@@ -191,6 +192,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
private lateinit var touchpad: TouchpadGestures
|
||||
private lateinit var directTouchHold: DirectTouchHold
|
||||
private lateinit var threeFingerTap: com.droiddeck.launcher.input.ThreeFingerTap
|
||||
private lateinit var touchscreenGestures: TouchscreenGestures
|
||||
private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig()
|
||||
private var gestureGame: String? = null
|
||||
private var gestureSettingsOpen by mutableStateOf(false)
|
||||
private var recognizedGesture by mutableStateOf<TouchscreenGestures.Gesture?>(null)
|
||||
private var gesturePointerX = 0f
|
||||
private var gesturePointerY = 0f
|
||||
private var gesturePointerReady = false
|
||||
private val clearRecognizedGesture = Runnable { recognizedGesture = null }
|
||||
private val gestureKeysDown = mutableSetOf<Int>()
|
||||
private lateinit var scrollTouch: ScrollTouchGestures
|
||||
private lateinit var padMouse: PadMouse
|
||||
@Volatile private var padMouseOn = false
|
||||
@@ -211,6 +222,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
private val pointerLockListener = WaylandCompositor.PointerLockListener { locked, _, _ ->
|
||||
uiHandler.post {
|
||||
if (pointerLocked == locked) return@post
|
||||
gesturePointerReady = false
|
||||
pointerLocked = locked
|
||||
Log.i(TAG, "pointer lock " + if (locked) "taken by a program" else "released")
|
||||
padMouseCheckedAt = 0L
|
||||
@@ -489,6 +501,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
WaylandCompositor.nativeSendTouch(3, -1, 0, 0)
|
||||
}
|
||||
threeFingerTap = com.droiddeck.launcher.input.ThreeFingerTap(PointerGestures.slop(this) * 2)
|
||||
touchscreenGestures = TouchscreenGestures(
|
||||
ViewConfiguration.get(this).scaledTouchSlop.toFloat(), gestureOutput,
|
||||
)
|
||||
refreshGestureConfig()
|
||||
// A real touch target lets FrameLayout split fingers between the
|
||||
// game surface and on-screen buttons, in either finger-down order.
|
||||
root.isMotionEventSplittingEnabled = true
|
||||
surfaceView.setOnTouchListener { _, event ->
|
||||
routedTouchMode == SessionPrefs.TOUCH_GESTURES && onTouchEvent(event)
|
||||
}
|
||||
padMouse = PadMouse(padMouseListener)
|
||||
bridge.setTouchRoute(object : PadBridge.TouchRoute {
|
||||
override fun active(): Boolean = if (Looper.myLooper() == Looper.getMainLooper()) padMouseMode() else padMouseOn
|
||||
@@ -648,6 +670,32 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.BLACK))
|
||||
},
|
||||
)
|
||||
LaunchedEffect(AgentGuest.focusRevision) {
|
||||
val nextGame = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
|
||||
if (SessionState.mode == SessionService.MODE_RUN) SessionState.program?.let { "program:$it" }
|
||||
else {
|
||||
val snapshot = AgentGuest.focus(this@SessionActivity)
|
||||
val focused = snapshot?.optLong("focusedApp")?.takeIf { it > 0 && it != 769L }
|
||||
val windows = snapshot?.optJSONArray("focusableApps")
|
||||
focused?.toString() ?: windows?.let { values ->
|
||||
(0 until values.length()).map { values.optLong(it) }
|
||||
.filter { it > 0 && it != 769L }.distinct().singleOrNull()?.toString()
|
||||
}
|
||||
}
|
||||
}
|
||||
if (nextGame != gestureGame) { gestureGame = nextGame; refreshGestureConfig() }
|
||||
}
|
||||
LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, pipUi, SessionState.suspended) {
|
||||
if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) {
|
||||
cancelTouchGestures()
|
||||
}
|
||||
}
|
||||
com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture)
|
||||
if (gestureSettingsOpen) com.droiddeck.launcher.ui.TouchGestureDialog(
|
||||
game = gestureGame,
|
||||
onDismiss = { gestureSettingsOpen = false },
|
||||
onSaved = { gestureSettingsOpen = false; refreshGestureConfig() },
|
||||
)
|
||||
androidx.compose.runtime.LaunchedEffect(drawerOpen) {
|
||||
if (drawerOpen) {
|
||||
syncLossless()
|
||||
@@ -823,6 +871,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
SessionService.suspendPolicyChanged(this@SessionActivity)
|
||||
},
|
||||
onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() },
|
||||
onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true },
|
||||
onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() },
|
||||
onSecondScreenMode = ::selectSecondScreenMode,
|
||||
onSecondScreenDisplay = ::selectSecondScreenDisplay,
|
||||
@@ -1543,6 +1592,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
surfaceW = width
|
||||
surfaceH = height
|
||||
if (resized) {
|
||||
cancelTouchGestures()
|
||||
Log.i(TAG, "surface resized to ${width}x$height - rebinding the compositor")
|
||||
CompositorHost.resize(holder.surface) { applyFrameGen() }
|
||||
followWindow(width, height)
|
||||
@@ -1577,6 +1627,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
|
||||
override fun onConfigurationChanged(newConfig: android.content.res.Configuration) {
|
||||
super.onConfigurationChanged(newConfig)
|
||||
cancelTouchGestures()
|
||||
applyFollowOrientation(newConfig)
|
||||
applyUnfoldedControls()
|
||||
}
|
||||
@@ -1585,12 +1636,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
// Hiding the phone surface after a handoff delivers a late destruction
|
||||
// callback. It must not reset the new output's size or attachment.
|
||||
if (holder !== outputHolder()) return
|
||||
cancelTouchGestures()
|
||||
surfaceW = 0
|
||||
surfaceH = 0
|
||||
glassesOutputActive = false
|
||||
CompositorHost.detach(holder.surface)
|
||||
}
|
||||
|
||||
private fun cancelTouchGestures() {
|
||||
if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel()
|
||||
if (::touchpad.isInitialized) touchpad.cancel()
|
||||
if (::scrollTouch.isInitialized) scrollTouch.cancel()
|
||||
scrollTouchGesture = false
|
||||
gesturePointerReady = false
|
||||
}
|
||||
|
||||
private fun panelBounds(): android.graphics.Rect = if (Build.VERSION.SDK_INT >= 30) {
|
||||
windowManager.maximumWindowMetrics.bounds
|
||||
} else {
|
||||
@@ -1992,6 +2052,55 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
super.dispatchKeyEvent(event)
|
||||
}
|
||||
|
||||
private fun refreshGestureConfig() {
|
||||
gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame)
|
||||
if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig)
|
||||
gesturePointerReady = false
|
||||
recognizedGesture = null
|
||||
}
|
||||
|
||||
private val gestureOutput = object : TouchscreenGestures.Output {
|
||||
override fun moveTo(x: Float, y: Float) {
|
||||
val rect = drawnRect() ?: return
|
||||
if (pointerLocked) {
|
||||
if (gesturePointerReady) moveBy(x - gesturePointerX, y - gesturePointerY, true)
|
||||
} else movePointer(x, y)
|
||||
gesturePointerX = if (pointerLocked) x else x.coerceIn(rect.left, rect.right)
|
||||
gesturePointerY = if (pointerLocked) y else y.coerceIn(rect.top, rect.bottom)
|
||||
gesturePointerReady = true
|
||||
cursorVisible = false
|
||||
}
|
||||
override fun moveBy(dx: Float, dy: Float, relative: Boolean) {
|
||||
val rect = drawnRect() ?: return
|
||||
if (relative || pointerLocked) {
|
||||
val scale = SessionState.outputSize.first / rect.width()
|
||||
WaylandCompositor.sendPointerDelta(dx * scale, dy * scale)
|
||||
} else moveTo(gesturePointerX + dx, gesturePointerY + dy)
|
||||
}
|
||||
override fun button(code: Int, down: Boolean) {
|
||||
WaylandCompositor.nativeSendSceneInput(3, code, if (down) 1 else 0)
|
||||
}
|
||||
override fun prepareRelativePan() {
|
||||
if (pointerLocked) return
|
||||
val rect = drawnRect() ?: return
|
||||
// Gamescope retains the last absolute position while a game can warp
|
||||
// its own cursor to the center. Its first unlocked motion must start
|
||||
// from that same origin, before the game switches to pointer lock.
|
||||
moveTo(rect.centerX(), rect.centerY())
|
||||
}
|
||||
override fun key(code: Int, down: Boolean) {
|
||||
if (down) gestureKeysDown.add(code) else gestureKeysDown.remove(code)
|
||||
if (code !in guestKeysDown) WaylandCompositor.nativeSendKey(code, if (down) 1 else 0)
|
||||
}
|
||||
override fun wheel(steps: Int) { WaylandCompositor.nativeSendSceneInput(4, steps, 0) }
|
||||
override fun showKeyboard() { uiHandler.post { touchscreenGestures.cancel(); togglePcKeyboard() } }
|
||||
override fun gesture(gesture: TouchscreenGestures.Gesture) {
|
||||
recognizedGesture = gesture
|
||||
uiHandler.removeCallbacks(clearRecognizedGesture)
|
||||
uiHandler.postDelayed(clearRecognizedGesture, 1200)
|
||||
}
|
||||
}
|
||||
|
||||
private val pointerListener = object : PointerGestures.Listener {
|
||||
override fun onMove(x: Float, y: Float) {
|
||||
if (pointerLocked) moveLockedPointer(x, y) else movePointer(x, y)
|
||||
@@ -2282,6 +2391,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
if (options == null || steamTouchControls?.visibility != View.VISIBLE) return SessionPrefs.touchMode(this)
|
||||
return when {
|
||||
options.inputMode == com.droiddeck.launcher.input.SteamTouchConfig.INPUT_CONTROLLER -> SessionPrefs.TOUCH_OFF
|
||||
SessionPrefs.touchMode(this) == SessionPrefs.TOUCH_GESTURES -> SessionPrefs.TOUCH_GESTURES
|
||||
options.mouseMode == com.droiddeck.launcher.input.SteamTouchConfig.MOUSE_RELATIVE -> SessionPrefs.TOUCH_PAD
|
||||
else -> SessionPrefs.TOUCH_DIRECT
|
||||
}
|
||||
@@ -2294,6 +2404,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
touchpad.sensitivity = 1.15f * speed
|
||||
}
|
||||
if (next == routedTouchMode) return
|
||||
if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel()
|
||||
gesturePointerReady = false
|
||||
if (::touchpad.isInitialized) touchpad.cancel()
|
||||
if (::directTouchHold.isInitialized) directTouchHold.cancel()
|
||||
if (::scrollTouch.isInitialized) scrollTouch.cancel()
|
||||
@@ -2330,6 +2442,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
|
||||
override fun onTouchEvent(event: MotionEvent): Boolean {
|
||||
if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event)
|
||||
if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) return true
|
||||
if (routedTouchMode == SessionPrefs.TOUCH_GESTURES) {
|
||||
if (event.actionMasked == MotionEvent.ACTION_DOWN) gesturePointerReady = false
|
||||
return touchscreenGestures.onTouch(event)
|
||||
}
|
||||
if (event.actionMasked == MotionEvent.ACTION_DOWN) {
|
||||
scrollTouchGesture = scrollTouchMode()
|
||||
scrollRestX = 0f
|
||||
@@ -2561,7 +2678,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
private fun sendGuestKey(code: Int, down: Boolean) {
|
||||
if (down && pipUi) return
|
||||
if (down) guestKeysDown.add(code) else guestKeysDown.remove(code)
|
||||
WaylandCompositor.nativeSendKey(code, if (down) 1 else 0)
|
||||
if (down || code !in gestureKeysDown) WaylandCompositor.nativeSendKey(code, if (down) 1 else 0)
|
||||
}
|
||||
|
||||
private fun pipBounds(): android.graphics.Rect {
|
||||
@@ -2716,7 +2833,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
override fun onPause() {
|
||||
if (runtimeRemovalBlocked) { super.onPause(); return }
|
||||
sessionClipboard.stop()
|
||||
if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel()
|
||||
if (::touchpad.isInitialized) touchpad.cancel()
|
||||
if (::directTouchHold.isInitialized) directTouchHold.cancel()
|
||||
uiHandler.removeCallbacks(clearRecognizedGesture)
|
||||
gestureSettingsOpen = false
|
||||
drawerOpen = false
|
||||
pcKeyboardOpen = false
|
||||
achievementsOpen = false
|
||||
@@ -3092,6 +3213,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
super.onWindowFocusChanged(hasFocus)
|
||||
if (!hasFocus && ::padMouse.isInitialized) padMouse.reset()
|
||||
if (runtimeRemovalBlocked) return
|
||||
if (!hasFocus) {
|
||||
if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel()
|
||||
if (::touchpad.isInitialized) touchpad.cancel()
|
||||
}
|
||||
if (hasFocus && !pipUi) {
|
||||
goFullscreen()
|
||||
refreshClipboard()
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: GPL-3.0
|
||||
* Modified for DroidDeck on 2026-10-15.
|
||||
*/
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
object GestureKeys {
|
||||
val codes: Map<String, Int> = linkedMapOf(
|
||||
"ESC" to 1,
|
||||
"1" to 2,
|
||||
"2" to 3,
|
||||
"3" to 4,
|
||||
"4" to 5,
|
||||
"5" to 6,
|
||||
"6" to 7,
|
||||
"7" to 8,
|
||||
"8" to 9,
|
||||
"9" to 10,
|
||||
"0" to 11,
|
||||
"MINUS" to 12,
|
||||
"EQUAL" to 13,
|
||||
"BKSP" to 14,
|
||||
"TAB" to 15,
|
||||
"Q" to 16,
|
||||
"W" to 17,
|
||||
"E" to 18,
|
||||
"R" to 19,
|
||||
"T" to 20,
|
||||
"Y" to 21,
|
||||
"U" to 22,
|
||||
"I" to 23,
|
||||
"O" to 24,
|
||||
"P" to 25,
|
||||
"BRACKET_LEFT" to 26,
|
||||
"BRACKET_RIGHT" to 27,
|
||||
"ENTER" to 28,
|
||||
"CTRL_L" to 29,
|
||||
"A" to 30,
|
||||
"S" to 31,
|
||||
"D" to 32,
|
||||
"F" to 33,
|
||||
"G" to 34,
|
||||
"H" to 35,
|
||||
"J" to 36,
|
||||
"K" to 37,
|
||||
"L" to 38,
|
||||
"SEMICOLON" to 39,
|
||||
"APOSTROPHE" to 40,
|
||||
"GRAVE" to 41,
|
||||
"SHIFT_L" to 42,
|
||||
"BACKSLASH" to 43,
|
||||
"Z" to 44,
|
||||
"X" to 45,
|
||||
"C" to 46,
|
||||
"V" to 47,
|
||||
"B" to 48,
|
||||
"N" to 49,
|
||||
"M" to 50,
|
||||
"COMMA" to 51,
|
||||
"PERIOD" to 52,
|
||||
"SLASH" to 53,
|
||||
"SHIFT_R" to 54,
|
||||
"KP_MULTIPLY" to 55,
|
||||
"ALT_L" to 56,
|
||||
"SPACE" to 57,
|
||||
"CAPS_LOCK" to 58,
|
||||
"F1" to 59,
|
||||
"F2" to 60,
|
||||
"F3" to 61,
|
||||
"F4" to 62,
|
||||
"F5" to 63,
|
||||
"F6" to 64,
|
||||
"F7" to 65,
|
||||
"F8" to 66,
|
||||
"F9" to 67,
|
||||
"F10" to 68,
|
||||
"NUM_LOCK" to 69,
|
||||
"SCROLL_LOCK" to 70,
|
||||
"KP_7" to 71,
|
||||
"KP_8" to 72,
|
||||
"KP_9" to 73,
|
||||
"KP_SUBTRACT" to 74,
|
||||
"KP_4" to 75,
|
||||
"KP_5" to 76,
|
||||
"KP_6" to 77,
|
||||
"KP_ADD" to 78,
|
||||
"KP_1" to 79,
|
||||
"KP_2" to 80,
|
||||
"KP_3" to 81,
|
||||
"KP_0" to 82,
|
||||
"KP_DEL" to 83,
|
||||
"F11" to 87,
|
||||
"F12" to 88,
|
||||
"KP_ENTER" to 96,
|
||||
"CTRL_R" to 97,
|
||||
"KP_DIVIDE" to 98,
|
||||
"PRTSCN" to 99,
|
||||
"ALT_R" to 100,
|
||||
"HOME" to 102,
|
||||
"UP" to 103,
|
||||
"PRIOR" to 104,
|
||||
"LEFT" to 105,
|
||||
"RIGHT" to 106,
|
||||
"END" to 107,
|
||||
"DOWN" to 108,
|
||||
"NEXT" to 109,
|
||||
"INSERT" to 110,
|
||||
"DEL" to 111,
|
||||
)
|
||||
@JvmStatic fun code(name: String): Int? = codes[name]
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import android.content.Context
|
||||
|
||||
/** Global defaults with optional overrides for the currently focused game. */
|
||||
object GesturePrefs {
|
||||
private fun prefs(context: Context) = context.getSharedPreferences("touch_gestures", Context.MODE_PRIVATE)
|
||||
|
||||
fun hasOverride(context: Context, game: String): Boolean = prefs(context).contains("game.$game")
|
||||
|
||||
fun read(context: Context, game: String? = null): TouchGestureConfig {
|
||||
val p = prefs(context)
|
||||
val json = game?.let { p.getString("game.$it", null) } ?: p.getString("default", null)
|
||||
return if (json == null) TouchGestureConfig() else TouchGestureConfig.fromJson(json)
|
||||
}
|
||||
|
||||
fun save(context: Context, game: String?, config: TouchGestureConfig) {
|
||||
prefs(context).edit().putString(game?.let { "game.$it" } ?: "default", config.toJson()).apply()
|
||||
}
|
||||
|
||||
fun clear(context: Context, game: String?) {
|
||||
prefs(context).edit().remove(game?.let { "game.$it" } ?: "default").apply()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,226 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: GPL-3.0
|
||||
* Modified for DroidDeck on 2026-10-15.
|
||||
*/
|
||||
package com.droiddeck.launcher.input
|
||||
|
||||
import org.json.JSONObject
|
||||
|
||||
data class TouchGestureConfig(
|
||||
val tapEnabled: Boolean = true,
|
||||
val tapAction: String = ACTION_LEFT_CLICK,
|
||||
val dragEnabled: Boolean = true,
|
||||
val dragAction: String = PAN_LEFT_CLICK_DRAG,
|
||||
val longPressEnabled: Boolean = false,
|
||||
val longPressAction: String = ACTION_RIGHT_CLICK,
|
||||
val longPressMouseBehavior: String = MOUSE_BEHAVIOR_HOLD,
|
||||
val longPressDelay: Int = DEFAULT_DELAY_MS,
|
||||
val doubleTapEnabled: Boolean = true,
|
||||
val doubleTapDelay: Int = DEFAULT_DELAY_MS,
|
||||
val twoFingerDragEnabled: Boolean = true,
|
||||
val twoFingerDragAction: String = PAN_ARROW_KEYS,
|
||||
val pinchEnabled: Boolean = true,
|
||||
val pinchAction: String = ZOOM_SCROLL_WHEEL,
|
||||
val twoFingerTapEnabled: Boolean = true,
|
||||
val twoFingerTapAction: String = ACTION_RIGHT_CLICK,
|
||||
val twoFingerHoldEnabled: Boolean = true,
|
||||
val twoFingerHoldAction: String = ACTION_MIDDLE_CLICK,
|
||||
val twoFingerHoldMouseBehavior: String = MOUSE_BEHAVIOR_HOLD,
|
||||
val twoFingerHoldDelay: Int = DEFAULT_DELAY_MS,
|
||||
val threeFingerTapEnabled: Boolean = true,
|
||||
val threeFingerTapAction: String = ACTION_SHOW_KEYBOARD,
|
||||
val threeFingerDragEnabled: Boolean = false,
|
||||
val threeFingerDragAction: String = PAN_ARROW_KEYS,
|
||||
val threeFingerHoldEnabled: Boolean = true,
|
||||
val threeFingerHoldAction: String = ACTION_KEY_ESC,
|
||||
val threeFingerHoldMouseBehavior: String = MOUSE_BEHAVIOR_HOLD,
|
||||
val threeFingerHoldDelay: Int = DEFAULT_DELAY_MS,
|
||||
val showGestureDebugOverlay: Boolean = false,
|
||||
val gestureThreshold: Int = DEFAULT_GESTURE_THRESHOLD,
|
||||
val mouseDragMovementMode: String = MOUSE_DRAG_MOVEMENT_DIRECT,
|
||||
) {
|
||||
|
||||
fun toJson(): String {
|
||||
return JSONObject().apply {
|
||||
put(KEY_TAP_ENABLED, tapEnabled)
|
||||
put(KEY_TAP_ACTION, tapAction)
|
||||
put(KEY_DRAG_ENABLED, dragEnabled)
|
||||
put(KEY_DRAG_ACTION, dragAction)
|
||||
put(KEY_LONG_PRESS_ENABLED, longPressEnabled)
|
||||
put(KEY_LONG_PRESS_ACTION, longPressAction)
|
||||
put(KEY_LONG_PRESS_MOUSE_BEHAVIOR, longPressMouseBehavior)
|
||||
put(KEY_LONG_PRESS_DELAY, longPressDelay)
|
||||
put(KEY_DOUBLE_TAP_ENABLED, doubleTapEnabled)
|
||||
put(KEY_DOUBLE_TAP_DELAY, doubleTapDelay)
|
||||
put(KEY_TWO_FINGER_DRAG_ENABLED, twoFingerDragEnabled)
|
||||
put(KEY_TWO_FINGER_DRAG_ACTION, twoFingerDragAction)
|
||||
put(KEY_PINCH_ENABLED, pinchEnabled)
|
||||
put(KEY_PINCH_ACTION, pinchAction)
|
||||
put(KEY_TWO_FINGER_TAP_ENABLED, twoFingerTapEnabled)
|
||||
put(KEY_TWO_FINGER_TAP_ACTION, twoFingerTapAction)
|
||||
put(KEY_TWO_FINGER_HOLD_ENABLED, twoFingerHoldEnabled)
|
||||
put(KEY_TWO_FINGER_HOLD_ACTION, twoFingerHoldAction)
|
||||
put(KEY_TWO_FINGER_HOLD_MOUSE_BEHAVIOR, twoFingerHoldMouseBehavior)
|
||||
put(KEY_TWO_FINGER_HOLD_DELAY, twoFingerHoldDelay)
|
||||
put(KEY_THREE_FINGER_TAP_ENABLED, threeFingerTapEnabled)
|
||||
put(KEY_THREE_FINGER_TAP_ACTION, threeFingerTapAction)
|
||||
put(KEY_THREE_FINGER_DRAG_ENABLED, threeFingerDragEnabled)
|
||||
put(KEY_THREE_FINGER_DRAG_ACTION, threeFingerDragAction)
|
||||
put(KEY_THREE_FINGER_HOLD_ENABLED, threeFingerHoldEnabled)
|
||||
put(KEY_THREE_FINGER_HOLD_ACTION, threeFingerHoldAction)
|
||||
put(KEY_THREE_FINGER_HOLD_MOUSE_BEHAVIOR, threeFingerHoldMouseBehavior)
|
||||
put(KEY_THREE_FINGER_HOLD_DELAY, threeFingerHoldDelay)
|
||||
put(KEY_SHOW_GESTURE_DEBUG_OVERLAY, showGestureDebugOverlay)
|
||||
put(KEY_GESTURE_THRESHOLD, gestureThreshold)
|
||||
put(KEY_MOUSE_DRAG_MOVEMENT_MODE, mouseDragMovementMode)
|
||||
}.toString()
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val DEFAULT_DELAY_MS = 300
|
||||
const val DEFAULT_GESTURE_THRESHOLD = 40
|
||||
const val ACTION_LEFT_CLICK = "left_click"
|
||||
const val ACTION_RIGHT_CLICK = "right_click"
|
||||
const val ACTION_MIDDLE_CLICK = "middle_click"
|
||||
|
||||
const val MOUSE_BEHAVIOR_HOLD = "hold"
|
||||
const val MOUSE_BEHAVIOR_CLICK = "click"
|
||||
|
||||
const val MOUSE_DRAG_MOVEMENT_DIRECT = "direct"
|
||||
const val MOUSE_DRAG_MOVEMENT_RELATIVE = "relative"
|
||||
const val ACTION_SHOW_KEYBOARD = "show_keyboard"
|
||||
const val ACTION_KEY_ESC = "key_ESC"
|
||||
const val ACTION_KEY_TILDE = "key_TILDE"
|
||||
const val PAN_WASD = "wasd"
|
||||
const val PAN_INVERTED_WASD = "inverted_wasd"
|
||||
const val PAN_ARROW_KEYS = "arrow_keys"
|
||||
const val PAN_INVERTED_ARROW_KEYS = "inverted_arrow_keys"
|
||||
const val PAN_MIDDLE_MOUSE = "middle_mouse_pan"
|
||||
const val PAN_INVERTED_MIDDLE_MOUSE = "inverted_middle_mouse_pan"
|
||||
const val PAN_LEFT_CLICK_DRAG = "left_click_drag"
|
||||
const val PAN_RIGHT_CLICK_DRAG = "right_click_drag"
|
||||
const val ZOOM_SCROLL_WHEEL = "scroll_wheel"
|
||||
const val ZOOM_PLUS_MINUS = "plus_minus"
|
||||
const val ZOOM_PAGE_UP_DOWN = "page_up_down"
|
||||
private const val KEY_TAP_ENABLED = "tapEnabled"
|
||||
private const val KEY_TAP_ACTION = "tapAction"
|
||||
private const val KEY_DRAG_ENABLED = "dragEnabled"
|
||||
private const val KEY_DRAG_ACTION = "dragAction"
|
||||
private const val KEY_LONG_PRESS_ENABLED = "longPressEnabled"
|
||||
private const val KEY_LONG_PRESS_ACTION = "longPressAction"
|
||||
private const val KEY_LONG_PRESS_MOUSE_BEHAVIOR = "longPressMouseBehavior"
|
||||
private const val KEY_LONG_PRESS_DELAY = "longPressDelay"
|
||||
private const val KEY_DOUBLE_TAP_ENABLED = "doubleTapEnabled"
|
||||
private const val KEY_DOUBLE_TAP_DELAY = "doubleTapDelay"
|
||||
private const val KEY_TWO_FINGER_DRAG_ENABLED = "twoFingerDragEnabled"
|
||||
private const val KEY_TWO_FINGER_DRAG_ACTION = "twoFingerDragAction"
|
||||
private const val KEY_PINCH_ENABLED = "pinchEnabled"
|
||||
private const val KEY_PINCH_ACTION = "pinchAction"
|
||||
private const val KEY_TWO_FINGER_TAP_ENABLED = "twoFingerTapEnabled"
|
||||
private const val KEY_TWO_FINGER_TAP_ACTION = "twoFingerTapAction"
|
||||
private const val KEY_TWO_FINGER_HOLD_ENABLED = "twoFingerHoldEnabled"
|
||||
private const val KEY_TWO_FINGER_HOLD_ACTION = "twoFingerHoldAction"
|
||||
private const val KEY_TWO_FINGER_HOLD_MOUSE_BEHAVIOR = "twoFingerHoldMouseBehavior"
|
||||
private const val KEY_TWO_FINGER_HOLD_DELAY = "twoFingerHoldDelay"
|
||||
private const val KEY_THREE_FINGER_TAP_ENABLED = "threeFingerTapEnabled"
|
||||
private const val KEY_THREE_FINGER_TAP_ACTION = "threeFingerTapAction"
|
||||
private const val KEY_THREE_FINGER_DRAG_ENABLED = "threeFingerDragEnabled"
|
||||
private const val KEY_THREE_FINGER_DRAG_ACTION = "threeFingerDragAction"
|
||||
private const val KEY_THREE_FINGER_HOLD_ENABLED = "threeFingerHoldEnabled"
|
||||
private const val KEY_THREE_FINGER_HOLD_ACTION = "threeFingerHoldAction"
|
||||
private const val KEY_THREE_FINGER_HOLD_MOUSE_BEHAVIOR = "threeFingerHoldMouseBehavior"
|
||||
private const val KEY_THREE_FINGER_HOLD_DELAY = "threeFingerHoldDelay"
|
||||
private const val KEY_SHOW_GESTURE_DEBUG_OVERLAY = "showGestureDebugOverlay"
|
||||
private const val KEY_GESTURE_THRESHOLD = "gestureThreshold"
|
||||
private const val KEY_MOUSE_DRAG_MOVEMENT_MODE = "mouseDragMovementMode"
|
||||
|
||||
private fun fallbackDefaults(): TouchGestureConfig = TouchGestureConfig(
|
||||
twoFingerHoldEnabled = false,
|
||||
threeFingerTapEnabled = false,
|
||||
threeFingerHoldEnabled = false,
|
||||
)
|
||||
|
||||
fun fromJson(json: String?): TouchGestureConfig {
|
||||
if (json.isNullOrBlank()) return fallbackDefaults()
|
||||
return try {
|
||||
val obj = JSONObject(json)
|
||||
TouchGestureConfig(
|
||||
tapEnabled = obj.optBoolean(KEY_TAP_ENABLED, true),
|
||||
tapAction = obj.optString(KEY_TAP_ACTION, ACTION_LEFT_CLICK),
|
||||
dragEnabled = obj.optBoolean(KEY_DRAG_ENABLED, true),
|
||||
dragAction = obj.optString(KEY_DRAG_ACTION, PAN_LEFT_CLICK_DRAG),
|
||||
longPressEnabled = obj.optBoolean(KEY_LONG_PRESS_ENABLED, false),
|
||||
longPressAction = obj.optString(KEY_LONG_PRESS_ACTION, ACTION_RIGHT_CLICK),
|
||||
longPressMouseBehavior = normalizeMouseBehavior(
|
||||
obj.optString(KEY_LONG_PRESS_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD)
|
||||
),
|
||||
longPressDelay = obj.optInt(KEY_LONG_PRESS_DELAY, DEFAULT_DELAY_MS),
|
||||
doubleTapEnabled = obj.optBoolean(KEY_DOUBLE_TAP_ENABLED, true),
|
||||
doubleTapDelay = obj.optInt(KEY_DOUBLE_TAP_DELAY, DEFAULT_DELAY_MS),
|
||||
twoFingerDragEnabled = obj.optBoolean(KEY_TWO_FINGER_DRAG_ENABLED, true),
|
||||
twoFingerDragAction = obj.optString(KEY_TWO_FINGER_DRAG_ACTION, PAN_ARROW_KEYS),
|
||||
pinchEnabled = obj.optBoolean(KEY_PINCH_ENABLED, true),
|
||||
pinchAction = obj.optString(KEY_PINCH_ACTION, ZOOM_SCROLL_WHEEL),
|
||||
twoFingerTapEnabled = obj.optBoolean(KEY_TWO_FINGER_TAP_ENABLED, true),
|
||||
twoFingerTapAction = obj.optString(KEY_TWO_FINGER_TAP_ACTION, ACTION_RIGHT_CLICK),
|
||||
twoFingerHoldEnabled = obj.optBoolean(KEY_TWO_FINGER_HOLD_ENABLED, false),
|
||||
twoFingerHoldAction = obj.optString(KEY_TWO_FINGER_HOLD_ACTION, ACTION_MIDDLE_CLICK),
|
||||
twoFingerHoldMouseBehavior = normalizeMouseBehavior(
|
||||
obj.optString(KEY_TWO_FINGER_HOLD_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD)
|
||||
),
|
||||
twoFingerHoldDelay = obj.optInt(KEY_TWO_FINGER_HOLD_DELAY, DEFAULT_DELAY_MS),
|
||||
threeFingerTapEnabled = obj.optBoolean(KEY_THREE_FINGER_TAP_ENABLED, false),
|
||||
threeFingerTapAction = obj.optString(KEY_THREE_FINGER_TAP_ACTION, ACTION_SHOW_KEYBOARD),
|
||||
threeFingerDragEnabled = obj.optBoolean(KEY_THREE_FINGER_DRAG_ENABLED, false),
|
||||
threeFingerDragAction = obj.optString(KEY_THREE_FINGER_DRAG_ACTION, PAN_ARROW_KEYS),
|
||||
threeFingerHoldEnabled = obj.optBoolean(KEY_THREE_FINGER_HOLD_ENABLED, false),
|
||||
threeFingerHoldAction = obj.optString(KEY_THREE_FINGER_HOLD_ACTION, ACTION_KEY_ESC),
|
||||
threeFingerHoldMouseBehavior = normalizeMouseBehavior(
|
||||
obj.optString(KEY_THREE_FINGER_HOLD_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD)
|
||||
),
|
||||
threeFingerHoldDelay = obj.optInt(KEY_THREE_FINGER_HOLD_DELAY, DEFAULT_DELAY_MS),
|
||||
showGestureDebugOverlay = obj.optBoolean(KEY_SHOW_GESTURE_DEBUG_OVERLAY, false),
|
||||
gestureThreshold = obj.optInt(KEY_GESTURE_THRESHOLD, DEFAULT_GESTURE_THRESHOLD),
|
||||
mouseDragMovementMode = normalizeMouseDragMovementMode(
|
||||
obj.optString(KEY_MOUSE_DRAG_MOVEMENT_MODE, MOUSE_DRAG_MOVEMENT_DIRECT),
|
||||
),
|
||||
)
|
||||
} catch (_: Exception) {
|
||||
fallbackDefaults()
|
||||
}
|
||||
}
|
||||
|
||||
private fun normalizeMouseBehavior(value: String): String {
|
||||
return if (value == MOUSE_BEHAVIOR_CLICK) MOUSE_BEHAVIOR_CLICK else MOUSE_BEHAVIOR_HOLD
|
||||
}
|
||||
|
||||
private fun normalizeMouseDragMovementMode(mode: String?): String {
|
||||
return if (mode == MOUSE_DRAG_MOVEMENT_RELATIVE) {
|
||||
MOUSE_DRAG_MOVEMENT_RELATIVE
|
||||
} else {
|
||||
MOUSE_DRAG_MOVEMENT_DIRECT
|
||||
}
|
||||
}
|
||||
|
||||
val PAN_ACTIONS = listOf(
|
||||
PAN_ARROW_KEYS,
|
||||
PAN_INVERTED_ARROW_KEYS,
|
||||
PAN_WASD,
|
||||
PAN_INVERTED_WASD,
|
||||
PAN_MIDDLE_MOUSE,
|
||||
PAN_INVERTED_MIDDLE_MOUSE,
|
||||
PAN_LEFT_CLICK_DRAG,
|
||||
PAN_RIGHT_CLICK_DRAG,
|
||||
)
|
||||
|
||||
val ZOOM_ACTIONS = listOf(
|
||||
ZOOM_SCROLL_WHEEL,
|
||||
ZOOM_PLUS_MINUS,
|
||||
ZOOM_PAGE_UP_DOWN,
|
||||
)
|
||||
|
||||
@JvmStatic
|
||||
fun isMouseButtonAction(action: String?): Boolean =
|
||||
action == ACTION_LEFT_CLICK || action == ACTION_RIGHT_CLICK || action == ACTION_MIDDLE_CLICK
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -168,6 +168,7 @@ object SessionPrefs {
|
||||
const val TOUCH_AUTO = "auto"
|
||||
const val TOUCH_PAD = "touchpad"
|
||||
const val TOUCH_DIRECT = "direct"
|
||||
const val TOUCH_GESTURES = "gestures"
|
||||
const val TOUCH_OFF = "off"
|
||||
|
||||
fun touchMode(context: Context): String = prefs(context).getString("touch", TOUCH_AUTO) ?: TOUCH_AUTO
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import com.droiddeck.launcher.R
|
||||
import java.text.Collator
|
||||
|
||||
internal enum class GestureActionGroup(@StringRes val title: Int) {
|
||||
MOUSE(R.string.gesture_group_mouse), APP(R.string.gesture_group_app),
|
||||
NAVIGATION(R.string.gesture_group_navigation), LETTERS(R.string.gesture_group_letters),
|
||||
NUMBERS(R.string.gesture_group_numbers), FUNCTION(R.string.gesture_group_function),
|
||||
MODIFIERS(R.string.gesture_group_modifiers), NUMPAD(R.string.gesture_group_numpad),
|
||||
SYMBOLS(R.string.gesture_group_symbols),
|
||||
}
|
||||
|
||||
internal data class GestureAction(val id: String, val title: String, val group: GestureActionGroup)
|
||||
|
||||
internal fun gestureActionGroup(id: String): GestureActionGroup {
|
||||
if (id == "show_keyboard") return GestureActionGroup.APP
|
||||
if (id in setOf("left_click", "right_click", "middle_click", "left_click_drag", "right_click_drag",
|
||||
"middle_mouse_pan", "inverted_middle_mouse_pan", "scroll_wheel")) return GestureActionGroup.MOUSE
|
||||
val key = id.removePrefix("key_")
|
||||
return when {
|
||||
key.startsWith("KP_") -> GestureActionGroup.NUMPAD
|
||||
key.length == 1 && key[0] in 'A'..'Z' -> GestureActionGroup.LETTERS
|
||||
key.length == 1 && key[0].isDigit() -> GestureActionGroup.NUMBERS
|
||||
key.matches(Regex("F(?:[1-9]|1[0-2])")) -> GestureActionGroup.FUNCTION
|
||||
key.startsWith("CTRL_") || key.startsWith("SHIFT_") || key.startsWith("ALT_") || key.endsWith("_LOCK") -> GestureActionGroup.MODIFIERS
|
||||
key in setOf("MINUS", "EQUAL", "BRACKET_LEFT", "BRACKET_RIGHT", "SEMICOLON", "APOSTROPHE",
|
||||
"GRAVE", "TILDE", "BACKSLASH", "COMMA", "PERIOD", "SLASH") || id == "plus_minus" -> GestureActionGroup.SYMBOLS
|
||||
else -> GestureActionGroup.NAVIGATION
|
||||
}
|
||||
}
|
||||
|
||||
internal fun filterGestureActions(actions: List<GestureAction>, query: String, group: GestureActionGroup?): List<GestureAction> {
|
||||
val words = query.trim().split(Regex("\\s+")).filter { it.isNotEmpty() }
|
||||
val collator = Collator.getInstance()
|
||||
return actions.filter { action ->
|
||||
(group == null || action.group == group) && words.all { word ->
|
||||
action.title.contains(word, ignoreCase = true) || action.id.removePrefix("key_").replace('_', ' ').contains(word, ignoreCase = true)
|
||||
}
|
||||
}.sortedWith(compareBy<GestureAction> { it.group.ordinal }.thenComparator { a, b ->
|
||||
// Function keys follow their numeric sequence; names use the UI locale.
|
||||
if (a.group == GestureActionGroup.FUNCTION) {
|
||||
a.id.removePrefix("key_F").toInt().compareTo(b.id.removePrefix("key_F").toInt())
|
||||
} else collator.compare(a.title, b.title)
|
||||
}.thenBy { it.id })
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun gestureActionTitle(action: String): String {
|
||||
val named = when (action) {
|
||||
"left_click" -> R.string.gesture_left_click
|
||||
"right_click" -> R.string.gesture_right_click
|
||||
"middle_click" -> R.string.gesture_middle_click
|
||||
"show_keyboard" -> R.string.gesture_keyboard
|
||||
"left_click_drag" -> R.string.gesture_left_drag
|
||||
"right_click_drag" -> R.string.gesture_right_drag
|
||||
"middle_mouse_pan" -> R.string.gesture_middle_pan
|
||||
"inverted_middle_mouse_pan" -> R.string.gesture_middle_pan_inverted
|
||||
"arrow_keys" -> R.string.gesture_arrows
|
||||
"inverted_arrow_keys" -> R.string.gesture_arrows_inverted
|
||||
"inverted_wasd" -> R.string.gesture_wasd_inverted
|
||||
"scroll_wheel" -> R.string.gesture_scroll
|
||||
else -> null
|
||||
}
|
||||
if (named != null) return stringResource(named)
|
||||
return when (action) {
|
||||
"wasd" -> "WASD"
|
||||
"plus_minus" -> "+ / −"
|
||||
"page_up_down" -> stringResource(R.string.gesture_key_page_up) + " / " + stringResource(R.string.gesture_key_page_down)
|
||||
else -> gestureKeyTitle(action.removePrefix("key_"))
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun gestureKeyTitle(key: String): String {
|
||||
if (key.startsWith("KP_")) return stringResource(R.string.gesture_key_numpad, gestureKeyTitle(key.removePrefix("KP_")))
|
||||
val named = when (key) {
|
||||
"ESC" -> R.string.gesture_key_escape
|
||||
"BKSP" -> R.string.gesture_key_backspace
|
||||
"ENTER" -> R.string.gesture_key_enter
|
||||
"TAB" -> R.string.gesture_key_tab
|
||||
"SPACE" -> R.string.gesture_key_space
|
||||
"DEL" -> R.string.gesture_key_delete
|
||||
"INSERT" -> R.string.gesture_key_insert
|
||||
"HOME" -> R.string.gesture_key_home
|
||||
"END" -> R.string.gesture_key_end
|
||||
"PRIOR" -> R.string.gesture_key_page_up
|
||||
"NEXT" -> R.string.gesture_key_page_down
|
||||
"PRTSCN" -> R.string.gesture_key_print_screen
|
||||
"UP" -> R.string.gesture_key_up
|
||||
"DOWN" -> R.string.gesture_key_down
|
||||
"LEFT" -> R.string.gesture_key_left_arrow
|
||||
"RIGHT" -> R.string.gesture_key_right_arrow
|
||||
"CAPS_LOCK" -> R.string.gesture_key_caps_lock
|
||||
"NUM_LOCK" -> R.string.gesture_key_num_lock
|
||||
"SCROLL_LOCK" -> R.string.gesture_key_scroll_lock
|
||||
else -> null
|
||||
}
|
||||
if (named != null) return stringResource(named)
|
||||
if (key.startsWith("CTRL_") || key.startsWith("SHIFT_") || key.startsWith("ALT_")) {
|
||||
val name = stringResource(when (key.substringBefore('_')) {
|
||||
"CTRL" -> R.string.pckb_key_ctrl
|
||||
"SHIFT" -> R.string.gesture_key_shift
|
||||
else -> R.string.pckb_key_alt
|
||||
})
|
||||
return stringResource(if (key.endsWith("_L")) R.string.gesture_key_left else R.string.gesture_key_right, name)
|
||||
}
|
||||
return when (key) {
|
||||
"MINUS", "SUBTRACT" -> "−"
|
||||
"EQUAL" -> "="
|
||||
"ADD" -> "+"
|
||||
"MULTIPLY" -> "×"
|
||||
"DIVIDE", "SLASH" -> "/"
|
||||
"BRACKET_LEFT" -> "["
|
||||
"BRACKET_RIGHT" -> "]"
|
||||
"SEMICOLON" -> ";"
|
||||
"APOSTROPHE" -> "'"
|
||||
"GRAVE" -> "`"
|
||||
"TILDE" -> "~"
|
||||
"BACKSLASH" -> "\\"
|
||||
"COMMA" -> ","
|
||||
"PERIOD" -> "."
|
||||
else -> key.replace('_', ' ')
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.droiddeck.launcher.R
|
||||
import com.droiddeck.launcher.input.TouchscreenGestures.Gesture
|
||||
|
||||
@Composable
|
||||
fun GestureFeedback(gesture: Gesture?) {
|
||||
Box(Modifier.fillMaxSize()) {
|
||||
if (gesture != null) Text(stringResource(when (gesture) {
|
||||
Gesture.TAP -> R.string.gesture_tap
|
||||
Gesture.DRAG -> R.string.gesture_drag
|
||||
Gesture.LONG_PRESS -> R.string.gesture_long_press
|
||||
Gesture.DOUBLE_TAP -> R.string.gesture_double_tap
|
||||
Gesture.TWO_FINGER_TAP -> R.string.gesture_two_tap
|
||||
Gesture.TWO_FINGER_DRAG -> R.string.gesture_two_drag
|
||||
Gesture.TWO_FINGER_HOLD -> R.string.gesture_two_hold
|
||||
Gesture.PINCH -> R.string.gesture_pinch
|
||||
Gesture.THREE_FINGER_TAP -> R.string.gesture_three_tap
|
||||
Gesture.THREE_FINGER_DRAG -> R.string.gesture_three_drag
|
||||
Gesture.THREE_FINGER_HOLD -> R.string.gesture_three_hold
|
||||
}),
|
||||
Modifier.align(Alignment.TopCenter).padding(top = 24.dp)
|
||||
.background(MaterialTheme.colorScheme.surface).padding(horizontal = 16.dp, vertical = 8.dp),
|
||||
color = MaterialTheme.colorScheme.onSurface)
|
||||
}
|
||||
}
|
||||
@@ -250,7 +250,7 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras:
|
||||
SettingsGroup(if (steam) stringResource(R.string.mode_touch_controls) else stringResource(R.string.mode_touch)) {
|
||||
ChoiceRow(
|
||||
host, "touch", stringResource(R.string.mode_touch), null,
|
||||
listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.common_auto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), s.touchMode,
|
||||
listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.common_auto), 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)), s.touchMode,
|
||||
note = stringResource(R.string.mode_touch_note),
|
||||
onPick = a.onTouch,
|
||||
)
|
||||
|
||||
@@ -245,6 +245,7 @@ class DrawerActions(
|
||||
val onLowLatencyController: (Boolean) -> Unit = {},
|
||||
val onLowLatencyTouch: (Boolean) -> Unit = {},
|
||||
val onTouch: (String) -> Unit,
|
||||
val onGestureSettings: () -> Unit = {},
|
||||
val onFexPreset: (String) -> Unit,
|
||||
val onUpscaler: (Int) -> Unit = {},
|
||||
val onUpscaleSharpness: (Int) -> Unit = {},
|
||||
@@ -500,8 +501,11 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
type, chipModifier = focus.track(page, "pad-type"), onPick = a.onPadType)
|
||||
}
|
||||
ChoiceRow(host, "touch", stringResource(R.string.mode_touch), null,
|
||||
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_OFF to stringResource(R.string.widgets_off)),
|
||||
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.gesture_settings), stringResource(R.string.gesture_settings_hint),
|
||||
stringResource(R.string.ctrl_edit), a.onGestureSettings,
|
||||
modifier = focus.track(page, "gesture-settings"))
|
||||
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)),
|
||||
|
||||
@@ -648,8 +648,8 @@ fun MultiRow(
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ActionRow(label: String, hint: String?, button: String, onClick: () -> Unit, progress: Float? = null) {
|
||||
SettingsRow(label, hint) { SecondaryButton(button, progress = progress, onClick = onClick) }
|
||||
fun ActionRow(label: String, hint: String?, button: String, onClick: () -> Unit, progress: Float? = null, modifier: Modifier = Modifier) {
|
||||
SettingsRow(label, hint) { SecondaryButton(button, modifier = modifier, progress = progress, onClick = onClick) }
|
||||
}
|
||||
|
||||
@Composable
|
||||
|
||||
@@ -0,0 +1,345 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.compose.foundation.BorderStroke
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.horizontalScroll
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.selection.selectable
|
||||
import androidx.compose.foundation.selection.toggleable
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowForward
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.Keyboard
|
||||
import androidx.compose.material.icons.filled.Mouse
|
||||
import androidx.compose.material.icons.filled.Search
|
||||
import androidx.compose.material.icons.filled.TouchApp
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalConfiguration
|
||||
import androidx.compose.ui.platform.LocalLayoutDirection
|
||||
import androidx.compose.ui.platform.testTag
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.LayoutDirection
|
||||
import androidx.compose.ui.window.Dialog
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import com.droiddeck.launcher.R
|
||||
import com.droiddeck.launcher.input.GestureKeys
|
||||
import com.droiddeck.launcher.input.GesturePrefs
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.ACTION_LEFT_CLICK
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.ACTION_RIGHT_CLICK
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.ACTION_MIDDLE_CLICK
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.ACTION_SHOW_KEYBOARD
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.ACTION_KEY_TILDE
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.PAN_ACTIONS
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.ZOOM_ACTIONS
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_HOLD
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_CLICK
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_DRAG_MOVEMENT_DIRECT
|
||||
import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_DRAG_MOVEMENT_RELATIVE
|
||||
|
||||
@Composable
|
||||
fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit) {
|
||||
val context = LocalContext.current
|
||||
// Keep an open editor attached to the game it was opened for.
|
||||
val targetGame = remember { game }
|
||||
val initialDefaults = remember { GesturePrefs.read(context) }
|
||||
val initialGame = remember { targetGame?.takeIf { GesturePrefs.hasOverride(context, it) }?.let { GesturePrefs.read(context, it) } }
|
||||
var defaults by remember { mutableStateOf(initialDefaults) }
|
||||
var gameDraft by remember { mutableStateOf(initialGame) }
|
||||
var forGame by rememberSaveable { mutableStateOf(targetGame != null) }
|
||||
val config = if (forGame) gameDraft ?: defaults else defaults
|
||||
val change: (TouchGestureConfig) -> Unit = { if (forGame) gameDraft = it else defaults = it }
|
||||
var tab by rememberSaveable { mutableIntStateOf(0) }
|
||||
val tabs = listOf(R.string.gesture_tab_one, R.string.gesture_tab_two, R.string.gesture_tab_three, R.string.gesture_tab_options)
|
||||
val mouse = listOf(ACTION_LEFT_CLICK, ACTION_RIGHT_CLICK, ACTION_MIDDLE_CLICK)
|
||||
val actions = mouse + ACTION_SHOW_KEYBOARD + GestureKeys.codes.keys.map { "key_$it" } + ACTION_KEY_TILDE
|
||||
val p = LocalPalette.current
|
||||
|
||||
GestureDialogFrame(stringResource(R.string.gesture_settings), stringResource(R.string.gesture_editor_subtitle), onDismiss,
|
||||
footer = {
|
||||
Row(Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 12.dp), horizontalArrangement = Arrangement.End, verticalAlignment = Alignment.CenterVertically) {
|
||||
TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) }
|
||||
Spacer(Modifier.width(12.dp))
|
||||
Button(onClick = {
|
||||
if (defaults != initialDefaults) GesturePrefs.save(context, null, defaults)
|
||||
if (targetGame != null && gameDraft != initialGame) {
|
||||
gameDraft?.let { GesturePrefs.save(context, targetGame, it) } ?: GesturePrefs.clear(context, targetGame)
|
||||
}
|
||||
onSaved()
|
||||
}, modifier = Modifier.testTag("gesture-save")) { Text(stringResource(R.string.gesture_save_changes)) }
|
||||
}
|
||||
}) {
|
||||
Column(Modifier.padding(horizontal = 20.dp)) {
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
GestureFilterChip(!forGame, onClick = { forGame = false }, label = { Text(stringResource(R.string.gesture_defaults)) }, modifier = Modifier.testTag("gesture-scope-default"))
|
||||
if (targetGame != null) GestureFilterChip(forGame, onClick = { forGame = true }, label = { Text(stringResource(R.string.gesture_game)) }, modifier = Modifier.testTag("gesture-scope-game"))
|
||||
if (forGame && gameDraft != null) TextButton(onClick = { gameDraft = null }, modifier = Modifier.testTag("gesture-inherit")) { Text(stringResource(R.string.gesture_use_defaults)) }
|
||||
}
|
||||
Text(stringResource(if (!forGame) R.string.gesture_scope_default else if (gameDraft == null) R.string.gesture_inheriting else R.string.gesture_scope_game),
|
||||
color = p.onSurfaceVariant, style = MaterialTheme.typography.bodySmall, modifier = Modifier.padding(bottom = 12.dp))
|
||||
}
|
||||
ScrollableTabRow(tab, edgePadding = 12.dp, containerColor = p.surface, divider = { HorizontalDivider(color = p.line) }) {
|
||||
tabs.forEachIndexed { index, title ->
|
||||
Tab(tab == index, onClick = { tab = index }, text = { Text(stringResource(title)) }, selectedContentColor = p.onBackground,
|
||||
unselectedContentColor = p.onSurfaceVariant, modifier = Modifier.testTag("gesture-tab-$index"))
|
||||
}
|
||||
}
|
||||
key(tab) {
|
||||
Column(Modifier.weight(1f).fillMaxWidth().verticalScroll(rememberScrollState()).padding(20.dp), verticalArrangement = Arrangement.spacedBy(14.dp)) {
|
||||
when (tab) {
|
||||
0 -> {
|
||||
GestureSection(R.string.gesture_tab_one, R.string.gesture_one_hint)
|
||||
GestureCard(R.string.gesture_tap, config.tapEnabled, { change(config.copy(tapEnabled = it)) }) {
|
||||
GestureActionField("tap", R.string.gesture_tap, config.tapAction, actions) { change(config.copy(tapAction = it)) }
|
||||
}
|
||||
GestureCard(R.string.gesture_drag, config.dragEnabled, { change(config.copy(dragEnabled = it)) }) {
|
||||
GestureActionField("drag", R.string.gesture_drag, config.dragAction, PAN_ACTIONS) { change(config.copy(dragAction = it)) }
|
||||
}
|
||||
GestureCard(R.string.gesture_long_press, config.longPressEnabled, { change(config.copy(longPressEnabled = it)) }) {
|
||||
GestureActionField("long-press", R.string.gesture_long_press, config.longPressAction, actions) { change(config.copy(longPressAction = it)) }
|
||||
GestureHoldOptions(config.longPressAction, config.longPressMouseBehavior, config.longPressDelay, { change(config.copy(longPressMouseBehavior = it)) }, { change(config.copy(longPressDelay = it)) })
|
||||
}
|
||||
GestureCard(R.string.gesture_double_tap, config.doubleTapEnabled, { change(config.copy(doubleTapEnabled = it)) }) {
|
||||
GestureDelay(stringResource(R.string.gesture_double_delay), config.doubleTapDelay) { change(config.copy(doubleTapDelay = it)) }
|
||||
}
|
||||
}
|
||||
1 -> {
|
||||
GestureSection(R.string.gesture_tab_two, R.string.gesture_two_hint)
|
||||
GestureCard(R.string.gesture_two_tap, config.twoFingerTapEnabled, { change(config.copy(twoFingerTapEnabled = it)) }) {
|
||||
GestureActionField("two-tap", R.string.gesture_two_tap, config.twoFingerTapAction, actions) { change(config.copy(twoFingerTapAction = it)) }
|
||||
}
|
||||
GestureCard(R.string.gesture_two_drag, config.twoFingerDragEnabled, { change(config.copy(twoFingerDragEnabled = it)) }) {
|
||||
GestureActionField("two-drag", R.string.gesture_two_drag, config.twoFingerDragAction, PAN_ACTIONS) { change(config.copy(twoFingerDragAction = it)) }
|
||||
}
|
||||
GestureCard(R.string.gesture_two_hold, config.twoFingerHoldEnabled, { change(config.copy(twoFingerHoldEnabled = it)) }) {
|
||||
GestureActionField("two-hold", R.string.gesture_two_hold, config.twoFingerHoldAction, actions) { change(config.copy(twoFingerHoldAction = it)) }
|
||||
GestureHoldOptions(config.twoFingerHoldAction, config.twoFingerHoldMouseBehavior, config.twoFingerHoldDelay, { change(config.copy(twoFingerHoldMouseBehavior = it)) }, { change(config.copy(twoFingerHoldDelay = it)) })
|
||||
}
|
||||
GestureCard(R.string.gesture_pinch, config.pinchEnabled, { change(config.copy(pinchEnabled = it)) }) {
|
||||
GestureActionField("pinch", R.string.gesture_pinch, config.pinchAction, ZOOM_ACTIONS) { change(config.copy(pinchAction = it)) }
|
||||
}
|
||||
}
|
||||
2 -> {
|
||||
GestureSection(R.string.gesture_tab_three, R.string.gesture_three_hint)
|
||||
GestureCard(R.string.gesture_three_tap, config.threeFingerTapEnabled, { change(config.copy(threeFingerTapEnabled = it)) }) {
|
||||
GestureActionField("three-tap", R.string.gesture_three_tap, config.threeFingerTapAction, actions) { change(config.copy(threeFingerTapAction = it)) }
|
||||
}
|
||||
GestureCard(R.string.gesture_three_drag, config.threeFingerDragEnabled, { change(config.copy(threeFingerDragEnabled = it)) }) {
|
||||
GestureActionField("three-drag", R.string.gesture_three_drag, config.threeFingerDragAction, PAN_ACTIONS) { change(config.copy(threeFingerDragAction = it)) }
|
||||
}
|
||||
GestureCard(R.string.gesture_three_hold, config.threeFingerHoldEnabled, { change(config.copy(threeFingerHoldEnabled = it)) }) {
|
||||
GestureActionField("three-hold", R.string.gesture_three_hold, config.threeFingerHoldAction, actions) { change(config.copy(threeFingerHoldAction = it)) }
|
||||
GestureHoldOptions(config.threeFingerHoldAction, config.threeFingerHoldMouseBehavior, config.threeFingerHoldDelay, { change(config.copy(threeFingerHoldMouseBehavior = it)) }, { change(config.copy(threeFingerHoldDelay = it)) })
|
||||
}
|
||||
}
|
||||
3 -> {
|
||||
GestureSection(R.string.gesture_tab_options, R.string.gesture_options_hint)
|
||||
GestureSettingsCard(R.string.gesture_movement) {
|
||||
Text(stringResource(R.string.gesture_movement_hint), color = p.onSurfaceVariant, style = MaterialTheme.typography.bodyMedium)
|
||||
GestureChoiceChips(config.mouseDragMovementMode, listOf(MOUSE_DRAG_MOVEMENT_DIRECT to stringResource(R.string.gesture_direct), MOUSE_DRAG_MOVEMENT_RELATIVE to stringResource(R.string.gesture_relative))) { change(config.copy(mouseDragMovementMode = it)) }
|
||||
Text(stringResource(R.string.gesture_middle_relative_hint), color = p.onSurfaceVariant, style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
GestureSettingsCard(R.string.gesture_recognition) {
|
||||
Text(stringResource(R.string.gesture_threshold, config.gestureThreshold), style = MaterialTheme.typography.bodyMedium)
|
||||
Slider(config.gestureThreshold.toFloat(), { change(config.copy(gestureThreshold = it.toInt())) }, valueRange = 10f..100f, steps = 17)
|
||||
Text(stringResource(R.string.gesture_threshold_hint), color = p.onSurfaceVariant, style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
GestureSettingsCard(R.string.gesture_feedback) {
|
||||
GestureToggle(R.string.gesture_debug, config.showGestureDebugOverlay) { change(config.copy(showGestureDebugOverlay = it)) }
|
||||
}
|
||||
OutlinedButton(onClick = { change(TouchGestureConfig()) }, modifier = Modifier.fillMaxWidth()) { Text(stringResource(R.string.gesture_reset)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureDialogFrame(title: String, subtitle: String, onDismiss: () -> Unit,
|
||||
footer: @Composable () -> Unit = {}, content: @Composable ColumnScope.() -> Unit) {
|
||||
val p = LocalPalette.current
|
||||
// The app window does not opt into RTL, so these dialogs follow their resource locale explicitly.
|
||||
val direction = if (LocalConfiguration.current.layoutDirection == android.view.View.LAYOUT_DIRECTION_RTL) LayoutDirection.Rtl else LayoutDirection.Ltr
|
||||
Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false)) {
|
||||
CompositionLocalProvider(LocalLayoutDirection provides direction) {
|
||||
Box(Modifier.fillMaxSize().systemBarsPadding().imePadding().padding(12.dp), contentAlignment = Alignment.Center) {
|
||||
Surface(Modifier.widthIn(max = 1040.dp).fillMaxWidth().fillMaxHeight(), shape = RoundedCornerShape(22.dp), color = p.background,
|
||||
contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2)) {
|
||||
Column {
|
||||
Row(Modifier.fillMaxWidth().padding(start = 20.dp, end = 8.dp, top = 14.dp, bottom = 12.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Surface(shape = RoundedCornerShape(12.dp), color = p.primary.copy(alpha = 0.14f)) {
|
||||
Icon(Icons.Default.TouchApp, null, tint = p.primary, modifier = Modifier.padding(10.dp).size(24.dp))
|
||||
}
|
||||
Column(Modifier.weight(1f).padding(horizontal = 14.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
||||
Text(title, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.SemiBold)
|
||||
Text(subtitle, style = MaterialTheme.typography.bodySmall, color = p.onSurfaceVariant)
|
||||
}
|
||||
IconButton(onClick = onDismiss) { Icon(Icons.Default.Close, stringResource(R.string.gesture_close)) }
|
||||
}
|
||||
content()
|
||||
HorizontalDivider(color = p.line)
|
||||
footer()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureSection(@StringRes title: Int, @StringRes hint: Int) {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||
Text(stringResource(title), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
|
||||
Text(stringResource(hint), style = MaterialTheme.typography.bodyMedium, color = LocalPalette.current.onSurfaceVariant)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureCard(@StringRes title: Int, checked: Boolean, onToggle: (Boolean) -> Unit,
|
||||
content: @Composable ColumnScope.() -> Unit) {
|
||||
val p = LocalPalette.current
|
||||
Surface(Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp), color = p.surface,
|
||||
border = BorderStroke(1.dp, if (checked) p.line2 else p.line)) {
|
||||
Column {
|
||||
Row(Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = onToggle)
|
||||
.padding(horizontal = 16.dp, vertical = 10.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Column(Modifier.weight(1f).padding(end = 12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||
Text(stringResource(title), style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold)
|
||||
}
|
||||
Switch(checked, onCheckedChange = null)
|
||||
}
|
||||
if (checked) Column(Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp), verticalArrangement = Arrangement.spacedBy(12.dp), content = content)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureActionField(id: String, @StringRes gesture: Int, selected: String, choices: List<String>, onChoose: (String) -> Unit) {
|
||||
var open by remember { mutableStateOf(false) }
|
||||
val p = LocalPalette.current
|
||||
Surface(onClick = { open = true }, modifier = Modifier.fillMaxWidth().testTag("gesture-choice-$id"), shape = RoundedCornerShape(10.dp),
|
||||
color = p.surfaceVariant, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2)) {
|
||||
Row(Modifier.padding(horizontal = 14.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
||||
Text(stringResource(R.string.gesture_action_label), color = p.onSurfaceVariant, style = MaterialTheme.typography.labelSmall)
|
||||
Text(gestureActionTitle(selected), style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Medium)
|
||||
}
|
||||
Icon(Icons.AutoMirrored.Filled.ArrowForward, null, modifier = Modifier.size(19.dp), tint = p.onSurfaceVariant)
|
||||
}
|
||||
}
|
||||
if (open) GestureActionPicker(choices, selected, stringResource(gesture), onDismiss = { open = false }) { open = false; onChoose(it) }
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun GestureActionPicker(choices: List<String>, selected: String, gesture: String, onDismiss: () -> Unit, onChoose: (String) -> Unit) {
|
||||
var query by rememberSaveable { mutableStateOf("") }
|
||||
var category by remember { mutableStateOf<GestureActionGroup?>(null) }
|
||||
val catalog = choices.distinct().map { GestureAction(it, gestureActionTitle(it), gestureActionGroup(it)) }
|
||||
val groups = GestureActionGroup.entries.filter { group -> catalog.any { it.group == group } }
|
||||
val shown = filterGestureActions(catalog, query, category)
|
||||
val p = LocalPalette.current
|
||||
GestureDialogFrame(stringResource(R.string.gesture_action), stringResource(R.string.gesture_action_for, gesture), onDismiss) {
|
||||
OutlinedTextField(query, onValueChange = { query = it }, modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp).testTag("gesture-action-search"),
|
||||
singleLine = true, shape = RoundedCornerShape(12.dp), placeholder = { Text(stringResource(R.string.gesture_search_actions)) },
|
||||
leadingIcon = { Icon(Icons.Default.Search, null) }, trailingIcon = {
|
||||
if (query.isNotEmpty()) IconButton(onClick = { query = "" }) { Icon(Icons.Default.Close, stringResource(R.string.gesture_clear_search)) }
|
||||
})
|
||||
Row(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(horizontal = 20.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
GestureFilterChip(category == null, onClick = { category = null }, label = { Text(stringResource(R.string.gesture_all_actions)) })
|
||||
if (groups.size > 1) groups.forEach { group ->
|
||||
GestureFilterChip(category == group, onClick = { category = group }, label = { Text(stringResource(group.title)) }, modifier = Modifier.testTag("gesture-category-${group.name}"))
|
||||
}
|
||||
}
|
||||
if (shown.isEmpty()) Box(Modifier.weight(1f).fillMaxWidth().padding(24.dp), contentAlignment = Alignment.Center) {
|
||||
Text(stringResource(R.string.gesture_no_actions), color = p.onSurfaceVariant)
|
||||
} else LazyColumn(Modifier.weight(1f).fillMaxWidth().testTag("gesture-action-list"), contentPadding = PaddingValues(start = 20.dp, end = 20.dp, bottom = 16.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
groups.forEach { group ->
|
||||
val entries = shown.filter { it.group == group }
|
||||
if (entries.isNotEmpty()) {
|
||||
item(key = group.name) { Text(stringResource(group.title), style = MaterialTheme.typography.labelLarge, color = p.onSurfaceVariant, modifier = Modifier.padding(top = 12.dp, bottom = 5.dp)) }
|
||||
items(entries, key = { it.id }) { action ->
|
||||
val isSelected = action.id == selected
|
||||
Surface(shape = RoundedCornerShape(12.dp), color = if (isSelected) p.primary.copy(alpha = 0.12f) else p.surface,
|
||||
border = BorderStroke(1.dp, if (isSelected) p.primary else p.line)) {
|
||||
Row(Modifier.fillMaxWidth().selectable(isSelected, role = Role.RadioButton, onClick = { onChoose(action.id) })
|
||||
.testTag("gesture-action-${action.id}").padding(horizontal = 14.dp, vertical = 9.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Icon(when (group) { GestureActionGroup.MOUSE -> Icons.Default.Mouse; GestureActionGroup.APP -> Icons.Default.TouchApp; else -> Icons.Default.Keyboard },
|
||||
null, tint = if (isSelected) p.primary else p.onSurfaceVariant, modifier = Modifier.size(22.dp))
|
||||
Text(action.title, Modifier.weight(1f).padding(horizontal = 14.dp), style = MaterialTheme.typography.bodyLarge)
|
||||
RadioButton(isSelected, onClick = null)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureHoldOptions(action: String, behavior: String, delay: Int, onBehavior: (String) -> Unit, onDelay: (Int) -> Unit) {
|
||||
if (TouchGestureConfig.isMouseButtonAction(action)) {
|
||||
Text(stringResource(R.string.gesture_mouse_behavior), style = MaterialTheme.typography.labelMedium, color = LocalPalette.current.onSurfaceVariant)
|
||||
GestureChoiceChips(behavior, listOf(MOUSE_BEHAVIOR_HOLD to stringResource(R.string.gesture_hold_button), MOUSE_BEHAVIOR_CLICK to stringResource(R.string.gesture_click_once)), onBehavior)
|
||||
}
|
||||
GestureDelay(stringResource(R.string.gesture_hold_delay), delay, onDelay)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureFilterChip(selected: Boolean, onClick: () -> Unit, label: @Composable () -> Unit, modifier: Modifier = Modifier) {
|
||||
val p = LocalPalette.current
|
||||
FilterChip(selected, onClick, label, modifier = modifier, colors = FilterChipDefaults.filterChipColors(
|
||||
containerColor = p.surface, labelColor = p.onSurfaceVariant,
|
||||
selectedContainerColor = p.primary.copy(alpha = 0.16f), selectedLabelColor = p.onBackground))
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureChoiceChips(selected: String, options: List<Pair<String, String>>, choose: (String) -> Unit) {
|
||||
Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
options.forEach { (id, label) -> GestureFilterChip(selected == id, onClick = { choose(id) }, label = { Text(label) }) }
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureSettingsCard(@StringRes title: Int, content: @Composable ColumnScope.() -> Unit) {
|
||||
val p = LocalPalette.current
|
||||
Surface(shape = RoundedCornerShape(16.dp), color = p.surface, border = BorderStroke(1.dp, p.line)) {
|
||||
Column(Modifier.fillMaxWidth().padding(16.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Text(stringResource(title), style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold)
|
||||
content()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureToggle(@StringRes title: Int, checked: Boolean, change: (Boolean) -> Unit) {
|
||||
Row(Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = change).padding(vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(stringResource(title), Modifier.weight(1f).padding(end = 12.dp), style = MaterialTheme.typography.bodyMedium)
|
||||
Switch(checked, null)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun GestureDelay(label: String, value: Int, change: (Int) -> Unit) {
|
||||
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(label, Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium)
|
||||
Text(stringResource(R.string.gesture_ms, value), Modifier.background(LocalPalette.current.surfaceVariant, RoundedCornerShape(6.dp)).padding(horizontal = 10.dp, vertical = 5.dp), style = MaterialTheme.typography.labelLarge)
|
||||
}
|
||||
Slider(value.toFloat().coerceIn(100f, 1000f), { change((it / 50).toInt() * 50) }, valueRange = 100f..1000f, steps = 17)
|
||||
}
|
||||
Reference in new issue
Block a user