jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-06-08 02:11:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve naming convention

Browse source
This commit is contained in:
Luke Wass 2025-05-27 22:52:21 -05:00
parent 8c2a266c22
commit 8e53ef0ebe
1 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

73
app/src/main/java/de/jrpie/android/launcher/ui/TouchGestureDetector.kt
View file

@ -23,16 +23,16 @@ class TouchGestureDetector(
var height: Int, var height: Int,
var edgeWidth: Float var edgeWidth: Float
) { ) {
private val ANGULAR_THRESHOLD = tan(Math.PI / 6) private val angularThreshold = tan(Math.PI / 6)
private val TOUCH_SLOP: Int private val touchSlop: Int
private val TOUCH_SLOP_SQUARE: Int private val touchSlopSquare: Int
private val DOUBLE_TAP_SLOP: Int private val doubleTapSlop: Int
private val DOUBLE_TAP_SLOP_SQUARE: Int private val doubleTapSlopSquare: Int
private val LONG_PRESS_TIMEOUT: Int private val longPressTimeout: Int
private val TAP_TIMEOUT: Int private val tapTimeout: Int
private val DOUBLE_TAP_TIMEOUT: Int private val doubleTapTimeout: Int
private val MIN_TRIANGLE_HEIGHT = 250 private val minTriangleHeight = 250
private val longPressHandler = Handler(Looper.getMainLooper()) private val longPressHandler = Handler(Looper.getMainLooper())
@ -104,19 +104,19 @@ class TouchGestureDetector(
if (intersectsSystemGestureInsets()) { if (intersectsSystemGestureInsets()) {
return false return false
} }
return sizeSquared() < TOUCH_SLOP_SQUARE return sizeSquared() < touchSlopSquare
} }
init { init {
val configuration = ViewConfiguration.get(context) val configuration = ViewConfiguration.get(context)
TOUCH_SLOP = configuration.scaledTouchSlop touchSlop = configuration.scaledTouchSlop
TOUCH_SLOP_SQUARE = TOUCH_SLOP * TOUCH_SLOP touchSlopSquare = touchSlop * touchSlop
DOUBLE_TAP_SLOP = configuration.scaledDoubleTapSlop doubleTapSlop = configuration.scaledDoubleTapSlop
DOUBLE_TAP_SLOP_SQUARE = DOUBLE_TAP_SLOP * DOUBLE_TAP_SLOP doubleTapSlopSquare = doubleTapSlop * doubleTapSlop
LONG_PRESS_TIMEOUT = ViewConfiguration.getLongPressTimeout() longPressTimeout = ViewConfiguration.getLongPressTimeout()
TAP_TIMEOUT = ViewConfiguration.getTapTimeout() tapTimeout = ViewConfiguration.getTapTimeout()
DOUBLE_TAP_TIMEOUT = ViewConfiguration.getDoubleTapTimeout() doubleTapTimeout = ViewConfiguration.getDoubleTapTimeout()
} }
private var paths = HashMap<Int, PointerPath>() private var paths = HashMap<Int, PointerPath>()
@ -157,7 +157,7 @@ class TouchGestureDetector(
Gesture.LONG_CLICK.invoke(context) Gesture.LONG_CLICK.invoke(context)
} }
} }
}, LONG_PRESS_TIMEOUT.toLong()) }, longPressTimeout.toLong())
} }
// add new pointers // add new pointers
@ -201,16 +201,16 @@ class TouchGestureDetector(
} }
private fun getGestureForDirection(direction: Vector): Gesture? { private fun getGestureForDirection(direction: Vector): Gesture? {
return if (ANGULAR_THRESHOLD * abs(direction.x) > abs(direction.y)) { // horizontal swipe return if (angularThreshold * abs(direction.x) > abs(direction.y)) { // horizontal swipe
if (direction.x > TOUCH_SLOP) if (direction.x > touchSlop)
Gesture.SWIPE_RIGHT Gesture.SWIPE_RIGHT
else if (direction.x < -TOUCH_SLOP) else if (direction.x < -touchSlop)
Gesture.SWIPE_LEFT Gesture.SWIPE_LEFT
else null else null
} else if (ANGULAR_THRESHOLD * abs(direction.y) > abs(direction.x)) { // vertical swipe } else if (angularThreshold * abs(direction.y) > abs(direction.x)) { // vertical swipe
if (direction.y < -TOUCH_SLOP) if (direction.y < -touchSlop)
Gesture.SWIPE_UP Gesture.SWIPE_UP
else if (direction.y > TOUCH_SLOP) else if (direction.y > touchSlop)
Gesture.SWIPE_DOWN Gesture.SWIPE_DOWN
else null else null
} else null } else null
@ -233,10 +233,10 @@ class TouchGestureDetector(
if (pointerCount == 1 && mainPointerPath.isTap()) { if (pointerCount == 1 && mainPointerPath.isTap()) {
// detect taps // detect taps
if (duration in 0..TAP_TIMEOUT) { if (duration in 0..tapTimeout) {
if (timeStart - lastTappedTime < DOUBLE_TAP_TIMEOUT && if (timeStart - lastTappedTime < doubleTapTimeout &&
lastTappedLocation?.let { lastTappedLocation?.let {
(mainPointerPath.last - it).absSquared() < DOUBLE_TAP_SLOP_SQUARE (mainPointerPath.last - it).absSquared() < doubleTapSlopSquare
} == true } == true
) { ) {
Gesture.DOUBLE_CLICK.invoke(context) Gesture.DOUBLE_CLICK.invoke(context)
@ -266,37 +266,36 @@ class TouchGestureDetector(
val startEndMax = mainPointerPath.start.max(mainPointerPath.last) val startEndMax = mainPointerPath.start.max(mainPointerPath.last)
when (gesture) { when (gesture) {
Gesture.SWIPE_DOWN -> { Gesture.SWIPE_DOWN -> {
if (startEndMax.x + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.x) { if (startEndMax.x + minTriangleHeight < mainPointerPath.max.x) {
gesture = Gesture.SWIPE_LARGER gesture = Gesture.SWIPE_LARGER
} else if (startEndMin.x - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.x) { } else if (startEndMin.x - minTriangleHeight > mainPointerPath.min.x) {
gesture = Gesture.SWIPE_SMALLER gesture = Gesture.SWIPE_SMALLER
} }
} }
Gesture.SWIPE_UP -> { Gesture.SWIPE_UP -> {
if (startEndMax.x + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.x) { if (startEndMax.x + minTriangleHeight < mainPointerPath.max.x) {
gesture = Gesture.SWIPE_LARGER_REVERSE gesture = Gesture.SWIPE_LARGER_REVERSE
} else if (startEndMin.x - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.x) { } else if (startEndMin.x - minTriangleHeight > mainPointerPath.min.x) {
gesture = Gesture.SWIPE_SMALLER_REVERSE gesture = Gesture.SWIPE_SMALLER_REVERSE
} }
} }
Gesture.SWIPE_RIGHT -> { Gesture.SWIPE_RIGHT -> {
if (startEndMax.y + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.y) { if (startEndMax.y + minTriangleHeight < mainPointerPath.max.y) {
gesture = Gesture.SWIPE_V gesture = Gesture.SWIPE_V
} else if (startEndMin.y - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.y) { } else if (startEndMin.y - minTriangleHeight > mainPointerPath.min.y) {
gesture = Gesture.SWIPE_LAMBDA gesture = Gesture.SWIPE_LAMBDA
} }
} }
Gesture.SWIPE_LEFT -> { Gesture.SWIPE_LEFT -> {
if (startEndMax.y + MIN_TRIANGLE_HEIGHT < mainPointerPath.max.y) { if (startEndMax.y + minTriangleHeight < mainPointerPath.max.y) {
gesture = Gesture.SWIPE_V_REVERSE gesture = Gesture.SWIPE_V_REVERSE
} else if (startEndMin.y - MIN_TRIANGLE_HEIGHT > mainPointerPath.min.y) { } else if (startEndMin.y - minTriangleHeight > mainPointerPath.min.y) {
gesture = Gesture.SWIPE_LAMBDA_REVERSE gesture = Gesture.SWIPE_LAMBDA_REVERSE
} }
} }
else -> {} else -> {}
} }
@ -314,7 +313,7 @@ class TouchGestureDetector(
} }
} }
if (timeStart - lastTappedTime < 2 * DOUBLE_TAP_TIMEOUT) { if (timeStart - lastTappedTime < 2 * doubleTapTimeout) {
gesture = gesture?.getTapComboVariant() gesture = gesture?.getTapComboVariant()
} }
gesture?.invoke(context) gesture?.invoke(context)