diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt index 63afa4c167..719aae8d7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt @@ -5,7 +5,7 @@ import com.droiddeck.launcher.session.SessionPrefs internal object DroidDeckHudConfig { val DEFAULTS: Map = linkedMapOf( - "hudSize" to "minimal", "hudLocked" to "1", "hudSnap" to "1", "hudScale" to "100", "hudDock" to "none", "hudOpacity" to "80", "hudColor" to "mid", + "hudSize" to "minimal", "hudLocked" to "1", "hudHold" to "collapse", "hudSnap" to "1", "hudScale" to "100", "hudDock" to "none", "hudOpacity" to "80", "hudColor" to "mid", "hudOutline" to "40", "hudOutlineAccent" to "1", "showGpuModel" to "1", "showGPULoad" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showPerCore" to "1", "showTemp" to "1", "showBatteryTemp" to "1", "showGpuTemp" to "0", @@ -18,6 +18,8 @@ internal object DroidDeckHudConfig { "tempUnit" to "c", "tempBands" to "1", "tempAuto" to "1", "tempRedCpu" to "90", "tempRedGpu" to "90", "tempRedBat" to "48", ) + const val HOLD_LOCKS = "lock" + private val NOT_READINGS = setOf("showCPULoad", "showRenderer", "fpsDecimal") /** Orders saved before the GPU switch was named after the alias the HUD actually reads. */ diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index e2ddefc692..59f8a5e6eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -119,6 +119,7 @@ class DroidDeckHudHost(context: Context) { } hud.setOnSizeCycledListener { size -> DroidDeckHudConfig.set(context, "hudSize", size); onConfigChanged?.invoke() } hud.setOnDockChangedListener { token -> setDock(hud, DroidDeckHudDock.from(token)) } + hud.setOnHoldListener { rawX, rawY -> collapseAt(hud, rawX, rawY) } hud.setOnScaledListener { percent -> DroidDeckHudConfig.set(context, "hudScale", percent.toString()) onConfigChanged?.invoke() @@ -291,7 +292,7 @@ class DroidDeckHudHost(context: Context) { DroidDeckHudDock.RIGHT -> (maxX - hud.x) / hud.width DroidDeckHudDock.TOP -> hud.y / hud.height DroidDeckHudDock.BOTTOM -> (maxY - hud.y) / hud.height - DroidDeckHudDock.NONE -> 0f + DroidDeckHudDock.NONE, DroidDeckHudDock.FLOAT -> 0f } if (pulled >= 1f) { setDock(hud, DroidDeckHudDock.NONE); return } wantX = hud.x; wantY = hud.y @@ -375,12 +376,30 @@ class DroidDeckHudHost(context: Context) { hud.scaleX = s; hud.scaleY = s } - private fun setDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + private fun setDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, center: Pair? = null) { if (edge == hud.dock) return - animateDock(hud, edge) { commitDock(hud, edge) } + animateDock(hud, edge, center) { commitDock(hud, edge) } } + private fun collapseAt(hud: DroidDeckHudView, rawX: Float, rawY: Float) { + if (hud.dock != DroidDeckHudDock.NONE) return + val p = hud.parent as? View ?: return + val at = IntArray(2).also { p.getLocationOnScreen(it) } + val x = rawX - at[0] + val y = rawY - at[1] + val edge = if (snaps) nearestEdge(x, y, p.width.toFloat(), p.height.toFloat()) else DroidDeckHudDock.FLOAT + setDock(hud, edge, Pair(x, y)) + } + + private fun nearestEdge(x: Float, y: Float, width: Float, height: Float): DroidDeckHudDock = mapOf( + DroidDeckHudDock.LEFT to x, + DroidDeckHudDock.RIGHT to width - x, + DroidDeckHudDock.TOP to y, + DroidDeckHudDock.BOTTOM to height - y, + ).minByOrNull { it.value }!!.key + private fun commitDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + snapping = false val tabX = hud.x; val tabY = hud.y if (edge != DroidDeckHudDock.NONE) { val p = hud.parent as? View @@ -407,12 +426,17 @@ class DroidDeckHudHost(context: Context) { SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) } - private fun animateDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, commit: () -> Unit) { + private fun animateDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, center: Pair?, commit: () -> Unit) { stopMotion(hud) previewFade?.cancel(); previewFade = null snapping = false hud.alpha = 1f val p = hud.parent as? View + if (edge != DroidDeckHudDock.NONE && center != null) { + val (tabW, tabH) = hud.dockTabSize() + wantX = center.first - tabW / 2f + wantY = center.second - tabH / 2f + } if (Motion.scale == 0f || p == null || !hud.isLaidOut || hud.width <= 0) { hud.scaleX = 1f; hud.scaleY = 1f hud.setDockPreview(DroidDeckHudDock.NONE, 0f) @@ -424,11 +448,14 @@ class DroidDeckHudHost(context: Context) { hud.pivotX = 0f; hud.pivotY = 0f hud.x = left; hud.y = top val (tabW, tabH) = hud.dockTabSize() - wantX = left + (shownW - tabW) / 2f - wantY = top + (shownH - tabH) / 2f + if (center == null) { + wantX = left + (shownW - tabW) / 2f + wantY = top + (shownH - tabH) / 2f + } val (tabX, tabY) = settled(p, edge, tabW, tabH) val sx = tabW / hud.width; val sy = tabH / hud.height val from = hud.dockPreviewBlend + snapping = true hud.animate().x(tabX).y(tabY).scaleX(sx).scaleY(sy).setDuration(Motion.ms(220).toLong()).setInterpolator(EASE) .setUpdateListener { hud.setDockPreview(edge, from + (1f - from) * it.animatedFraction) } .withEndAction { @@ -473,7 +500,7 @@ class DroidDeckHudHost(context: Context) { DroidDeckHudDock.RIGHT -> x = maxX DroidDeckHudDock.TOP -> y = 0f DroidDeckHudDock.BOTTOM -> y = maxY - DroidDeckHudDock.NONE -> {} + DroidDeckHudDock.NONE, DroidDeckHudDock.FLOAT -> {} } return Pair(x, y) } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt index e88997a09b..94bcb2920f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -118,7 +118,7 @@ enum class DroidDeckHudSize(val token: String, val label: String) { } enum class DroidDeckHudDock(val token: String) { - NONE("none"), LEFT("left"), RIGHT("right"), TOP("top"), BOTTOM("bottom"); + NONE("none"), LEFT("left"), RIGHT("right"), TOP("top"), BOTTOM("bottom"), FLOAT("float"); companion object { fun from(token: String?): DroidDeckHudDock = values().firstOrNull { it.token == token } ?: NONE diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index f7211d69e2..bd04d149a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -191,6 +191,8 @@ class DroidDeckHudView(context: Context) : View(context) { private var onMovedListener: BiConsumer? = null private var onSizeCycledListener: Consumer? = null private var onLockChangedListener: Consumer? = null + private var onHoldListener: BiConsumer? = null + fun setOnHoldListener(l: BiConsumer?) { onHoldListener = l } fun setOnMovedListener(l: BiConsumer?) { onMovedListener = l } fun setOnSizeCycledListener(l: Consumer?) { onSizeCycledListener = l } fun setOnLockChangedListener(l: Consumer?) { onLockChangedListener = l } @@ -209,6 +211,7 @@ class DroidDeckHudView(context: Context) : View(context) { override fun onDragged(rawX: Float, rawY: Float) { onDraggedListener?.accept(rawX, rawY) } override fun onFlung(velocityX: Float, velocityY: Float) { onFlungListener?.accept(velocityX, velocityY) } override fun onLockChanged(locked: Boolean) { onLockChangedListener?.accept(locked) } + override fun onHold(rawX: Float, rawY: Float) { onHoldListener?.accept(rawX, rawY) } override fun onPinch(factor: Float) { val next = (scale * factor).coerceIn(MIN_SCALE, MAX_SCALE) if (next == scale) return @@ -224,6 +227,7 @@ class DroidDeckHudView(context: Context) : View(context) { private var tabStartX = 0f private var tabStartY = 0f private var tabDragging = false + private var tabPressed = false private var onTabDraggedListener: BiConsumer? = null private var onTabDroppedListener: Runnable? = null private var onTabDragCancelledListener: Runnable? = null @@ -237,19 +241,24 @@ class DroidDeckHudView(context: Context) : View(context) { tabDownRawX = event.rawX; tabDownRawY = event.rawY tabStartX = x; tabStartY = y tabDragging = false + tabPressed = true } - MotionEvent.ACTION_MOVE -> { + MotionEvent.ACTION_MOVE -> if (tabPressed) { val dx = event.rawX - tabDownRawX; val dy = event.rawY - tabDownRawY if (!tabDragging && dx * dx + dy * dy > touchSlop * touchSlop) tabDragging = true if (tabDragging) onTabDraggedListener?.accept(tabStartX + dx, tabStartY + dy) } - MotionEvent.ACTION_UP -> { + MotionEvent.ACTION_UP -> if (tabPressed) { + tabPressed = false if (tabDragging) { tabDragging = false; onTabDroppedListener?.run() } else onDockChangedListener?.accept(DroidDeckHudDock.NONE.token) } - MotionEvent.ACTION_CANCEL -> if (tabDragging) { - tabDragging = false - onTabDragCancelledListener?.run() + MotionEvent.ACTION_CANCEL -> { + tabPressed = false + if (tabDragging) { + tabDragging = false + onTabDragCancelledListener?.run() + } } } return true @@ -341,6 +350,7 @@ class DroidDeckHudView(context: Context) : View(context) { showSession = switchOn("showSession") tempDisplay = HudMetrics.TempDisplay.from(cfg) lockController.setLocked(cfg.get("hudLocked", "1") == "1") + lockController.setHoldLocks(cfg.get("hudHold", "collapse") == DroidDeckHudConfig.HOLD_LOCKS) dock = DroidDeckHudDock.from(cfg.get("hudDock", "none")) colorIntensity = when (cfg.get("hudColor", "vivid")) { @@ -591,7 +601,7 @@ class DroidDeckHudView(context: Context) : View(context) { DroidDeckHudDock.RIGHT -> intArrayOf(1, 2) DroidDeckHudDock.TOP -> intArrayOf(0, 1) DroidDeckHudDock.BOTTOM -> intArrayOf(2, 3) - DroidDeckHudDock.NONE -> intArrayOf() + DroidDeckHudDock.NONE, DroidDeckHudDock.FLOAT -> intArrayOf() } for (corner in edge) { round[corner * 2] = 0f; round[corner * 2 + 1] = 0f } tabPath.rewind() diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java index b4c1cfc7ea..4fd1eeba6d 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java @@ -36,6 +36,7 @@ public class HudLockController { default void onDragged(float rawX, float rawY) {} default void onFlung(float velocityX, float velocityY) {} void onLockChanged(boolean locked); + default void onHold(float rawX, float rawY) {} default void onPinch(float factor) {} default void onPinchEnd() {} } @@ -53,6 +54,7 @@ public class HudLockController { private final android.view.VelocityTracker velocity = android.view.VelocityTracker.obtain(); private boolean locked = false; + private boolean holdLocks = false; private float downRawX, downRawY, startX, startY; private boolean dragging = false; @@ -80,6 +82,8 @@ public class HudLockController { public void setLocked(boolean locked) { this.locked = locked; } + public void setHoldLocks(boolean holdLocks) { this.holdLocks = holdLocks; } + public boolean isLocked() { return locked; } public boolean isDragging() { return dragging; } @@ -119,6 +123,10 @@ public class HudLockController { @Override public void onLongPress(MotionEvent e) { + if (!holdLocks) { + cb.onHold(e.getRawX(), e.getRawY()); + return; + } locked = !locked; cb.onLockChanged(locked); flash(locked, HOLD_TOGGLE_MS); diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 65a65502f2..cb5d4795f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -37,6 +37,11 @@ internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (Stri DroidDeckHudSize.STRIP to stringResource(R.string.hud_size_strip), ), size, chipModifier = track("hud-size")) { a.onHudSetting("hudSize", it.token) } + ChoiceRow(host, "hud-hold", stringResource(R.string.hud_hold), null, + listOf("collapse" to stringResource(R.string.hud_hold_collapse), + DroidDeckHudConfig.HOLD_LOCKS to stringResource(R.string.hud_hold_lock)), + if (cfg["hudHold"] == DroidDeckHudConfig.HOLD_LOCKS) DroidDeckHudConfig.HOLD_LOCKS else "collapse", + chipModifier = track("hud-hold")) { a.onHudSetting("hudHold", it) } ToggleRow(host, "hud-locked", stringResource(R.string.hud_locked), stringResource(R.string.hud_locked_hint), on("hudLocked"), chipModifier = track("hud-locked")) { a.onHudSetting("hudLocked", flag(it)) } ToggleRow(host, "hud-snap", stringResource(R.string.hud_snap), stringResource(R.string.hud_snap_hint), on("hudSnap"), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index a136eb98f9..a6b9c0f410 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -718,7 +718,10 @@ ضخم شريط تثبيت في مكانه - اسحب HUD لتحريكه؛ والضغط مطولًا يثبّته أو يلغي تثبيته. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل. + اسحب HUD لتحريكه. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل. + ضغط مطوّل + طيّ أو توسيع + تثبيت أو إلغاء التثبيت الالتصاق بالجانبين اترك الواجهة لتنتقل إلى أقرب جانب من الشاشة. اسحبها بسرعة لترميها في ذلك الاتجاه. المظهر diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 4b67e0c5d9..76f633672d 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -712,7 +712,10 @@ Mega Barra Fijar posición - Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. + Arrastra el HUD para moverlo. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. + Pulsación larga + Contraer o expandir + Bloquear o desbloquear Ajustar a los lados Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección. Aspecto diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index db3ed0251e..7f7c8fa7dd 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -710,7 +710,10 @@ Мега Лента Заключване на място - Плъзнете HUD, за да го преместите; продължително натискане го заключва или отключва. Докато е заключен, екранните контроли под него продължават да работят. + Плъзнете HUD, за да го преместите. Докато е заключен, екранните контроли под него продължават да работят. + Продължително натискане + Свиване или разгъване + Заключване или отключване Залепване отстрани Пуснете HUD и той отива към по-близката страна на екрана. Бързо плъзване го хвърля в тази посока. Визия diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5911bb5b41..79f17706e2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -714,7 +714,10 @@ Mega Lišta Zamknout na místě - Přetažením HUD přesunete; dlouhým stiskem ho zamknete nebo odemknete. Když je zamknutý, ovládací prvky na obrazovce pod ním dál fungují. + Přetažením HUD přesunete. Když je zamknutý, ovládací prvky na obrazovce pod ním dál fungují. + Dlouhý stisk + Sbalit nebo rozbalit + Zamknout nebo odemknout Přichytit ke stranám Pusťte HUD a přesune se k bližší straně obrazovky. Rychlým švihnutím ho hodíte tím směrem. Vzhled diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 688154d70a..20c980fa03 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -710,7 +710,10 @@ Mega Bjælke Lås fast - Træk i HUD for at flytte det; et langt tryk låser eller frigør det. Mens det er låst, virker skærmknapperne under det stadig. + Træk i HUD for at flytte det. Mens det er låst, virker skærmknapperne under det stadig. + Langt tryk + Skjul eller udvid + Lås eller frigør Fastgør til siderne Slip HUD\'en, så flytter den sig til skærmens nærmeste side. Et hurtigt stryg kaster den i den retning. Udseende diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fa2e8af220..13927fc841 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -710,7 +710,10 @@ Mega Leiste Position sperren - Ziehe das HUD, um es zu verschieben; langes Drücken sperrt oder entsperrt es. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter. + Ziehe das HUD, um es zu verschieben. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter. + Langes Drücken + Ein- oder ausklappen + Sperren oder entsperren An Seiten einrasten Lass das HUD los, und es springt an die nähere Bildschirmseite. Ein Wischen wirft es in diese Richtung. Aussehen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3db2d2c954..e3f22f509e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -710,7 +710,10 @@ Μέγα Λωρίδα Κλείδωμα θέσης - Σύρετε το HUD για να το μετακινήσετε· ένα παρατεταμένο πάτημα το κλειδώνει ή το ξεκλειδώνει. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν. + Σύρετε το HUD για να το μετακινήσετε. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν. + Παρατεταμένο πάτημα + Σύμπτυξη ή ανάπτυξη + Κλείδωμα ή ξεκλείδωμα Προσκόλληση στα πλάγια Αφήστε το HUD και μετακινείται στην πιο κοντινή πλευρά της οθόνης. Μια γρήγορη κίνηση το πετάει προς εκείνη την κατεύθυνση. Εμφάνιση diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 59c3247794..aa32b7e4e3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -712,7 +712,10 @@ Mega Barra Fijar posición - Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. + Arrastra el HUD para moverlo. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. + Pulsación larga + Contraer o expandir + Bloquear o desbloquear Ajustar a los lados Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección. Aspecto diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f7cf693fd1..b74266792f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -710,7 +710,10 @@ Mega Palkki Lukitse paikalleen - Siirrä HUD:ia vetämällä; pitkä painallus lukitsee tai vapauttaa sen. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen. + Siirrä HUD:ia vetämällä. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen. + Pitkä painallus + Tiivistä tai laajenna + Lukitse tai vapauta Kiinnitä sivuille Kun päästät HUDista irti, se siirtyy näytön lähempään reunaan. Nopea pyyhkäisy heittää sen siihen suuntaan. Ulkoasu diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4b75f5cb3a..48dfb8912c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -712,7 +712,10 @@ Méga Bandeau Verrouiller la position - Faites glisser le HUD pour le déplacer ; un appui long le verrouille ou le déverrouille. Tant qu\'il est verrouillé, les commandes à l\'écran situées dessous restent utilisables. + Faites glisser le HUD pour le déplacer. Tant qu\'il est verrouillé, les commandes à l\'écran situées dessous restent utilisables. + Appui long + Réduire ou développer + Verrouiller ou déverrouiller Aimanter sur les côtés Relâchez le HUD et il rejoint le côté de l’écran le plus proche. Un geste rapide le lance dans cette direction. Apparence diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 96a597cfc6..fe1d106cbd 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -710,7 +710,10 @@ मेगा पट्टी जगह पर लॉक करें - HUD को खिसकाने के लिए उसे ड्रैग करें; देर तक दबाने से वह लॉक या अनलॉक होता है। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं। + HUD को खिसकाने के लिए उसे ड्रैग करें। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं। + देर तक दबाना + सिकोड़ें या फैलाएँ + लॉक या अनलॉक करें किनारों पर चिपकाएँ HUD छोड़ने पर यह स्क्रीन की पास वाली ओर चला जाता है। तेज़ी से झटकने पर यह उसी दिशा में जाता है। लुक diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4ff4641c42..235965d9f6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -710,7 +710,10 @@ Mega Sáv Rögzítés a helyén - Húzd a HUD-ot az áthelyezéshez; hosszú nyomással rögzítheted vagy feloldhatod. Rögzítve is működnek az alatta lévő képernyős vezérlők. + Húzd a HUD-ot az áthelyezéshez. Rögzítve is működnek az alatta lévő képernyős vezérlők. + Hosszú nyomás + Összecsukás vagy kinyitás + Rögzítés vagy feloldás Igazítás az oldalakhoz Engedd el a HUD-ot, és a képernyő közelebbi oldalára ugrik. Egy gyors pöccintés abba az irányba dobja. Megjelenés diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 936a077b1a..1a19df2ab9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -708,7 +708,10 @@ Mega Bilah Kunci posisi - Seret HUD untuk memindahkannya; tekan lama untuk mengunci atau membuka kuncinya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi. + Seret HUD untuk memindahkannya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi. + Tekan lama + Ciutkan atau perluas + Kunci atau buka kunci Tempel ke sisi Lepaskan HUD dan HUD akan pindah ke sisi layar yang lebih dekat. Jentikan cepat melemparnya ke arah itu. Tampilan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0c3ce349e0..1e4396f1d0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -712,7 +712,10 @@ Mega Barra Blocca in posizione - Trascina l\'HUD per spostarlo; una pressione prolungata lo blocca o lo sblocca. Mentre è bloccato, i controlli su schermo sotto di esso continuano a funzionare. + Trascina l\'HUD per spostarlo. Mentre è bloccato, i controlli su schermo sotto di esso continuano a funzionare. + Pressione prolungata + Comprimi o espandi + Blocca o sblocca Aggancia ai lati Rilascia l\'HUD e si sposta sul lato più vicino dello schermo. Un gesto rapido lo lancia in quella direzione. Aspetto diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3ee8ac007d..d3a645e78f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -708,7 +708,10 @@ メガ バー 位置を固定 - HUDはドラッグで移動できます。長押しで固定または解除します。固定中も、下にある画面上のコントロールは使えます。 + HUDはドラッグで移動できます。固定中も、下にある画面上のコントロールは使えます。 + 長押し + 折りたたみ/展開 + 固定/解除 左右に吸着 HUD を離すと、画面の近い方の端に移動します。はじくとその方向へ飛びます。 外観 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a834c4126d..5386999a24 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -708,7 +708,10 @@ 메가 바 위치 고정 - HUD를 드래그하여 이동하고, 길게 눌러 고정하거나 해제합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다. + HUD를 드래그하여 이동합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다. + 길게 누르기 + 접기 또는 펼치기 + 고정 또는 해제 양옆에 맞추기 HUD를 놓으면 화면에서 더 가까운 쪽으로 이동합니다. 튕기면 그 방향으로 이동합니다. 외관 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index f6b5d13b71..689a39db61 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -708,7 +708,10 @@ Mega Jalur Kunci di tempat - Seret HUD untuk mengalihkannya; tekan lama untuk mengunci atau membuka kuncinya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi. + Seret HUD untuk mengalihkannya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi. + Tekan lama + Kuncupkan atau kembangkan + Kunci atau buka kunci Lekap ke sisi Lepaskan HUD dan ia akan beralih ke sisi skrin yang lebih dekat. Kuis pantas melemparkannya ke arah itu. Rupa diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index eff16383da..6b014ec01f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -710,7 +710,10 @@ Mega Linje Lås på plass - Dra HUD-en for å flytte den; et langt trykk låser eller låser den opp. Mens den er låst, fungerer skjermkontrollene under den fortsatt. + Dra HUD-en for å flytte den. Mens den er låst, fungerer skjermkontrollene under den fortsatt. + Langt trykk + Skjul eller utvid + Lås eller lås opp Fest til sidene Slipp HUD-en, så flytter den seg til nærmeste side av skjermen. Et raskt sveip kaster den den veien. Utseende diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 952a625908..542fd99109 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -710,7 +710,10 @@ Mega Balk Vastzetten - Sleep de HUD om hem te verplaatsen; lang drukken zet hem vast of los. Zolang hij vastzit, blijven de schermknoppen eronder werken. + Sleep de HUD om hem te verplaatsen. Zolang hij vastzit, blijven de schermknoppen eronder werken. + Lang drukken + Samenvouwen of uitklappen + Vastzetten of losmaken Vastklikken aan zijkanten Laat de HUD los en hij gaat naar de dichtstbijzijnde kant van het scherm. Met een snelle veeg gooi je hem die kant op. Weergave diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bf84dfe391..62ff8d89e5 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -714,7 +714,10 @@ Mega Pasek Zablokuj w miejscu - Przeciągnij HUD, aby go przesunąć; długie naciśnięcie blokuje go lub odblokowuje. Gdy jest zablokowany, sterowanie ekranowe pod nim nadal działa. + Przeciągnij HUD, aby go przesunąć. Gdy jest zablokowany, sterowanie ekranowe pod nim nadal działa. + Długie naciśnięcie + Zwiń lub rozwiń + Zablokuj lub odblokuj Przyciągaj do boków Puść HUD, a przesunie się do bliższego boku ekranu. Szybki ruch rzuca go w tę stronę. Wygląd diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ad8e4cad98..7730207766 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -712,7 +712,10 @@ Mega Barra Bloquear posição - Arraste o HUD para o mover; um toque longo bloqueia-o ou desbloqueia-o. Enquanto estiver bloqueado, os controlos no ecrã por baixo dele continuam a funcionar. + Arraste o HUD para o mover. Enquanto estiver bloqueado, os controlos no ecrã por baixo dele continuam a funcionar. + Toque longo + Recolher ou expandir + Bloquear ou desbloquear Encaixar nas laterais Solte o HUD e ele vai para a lateral mais próxima do ecrã. Um gesto rápido lança-o nessa direção. Aspeto diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 71e2ec273c..e91887f06d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -712,7 +712,10 @@ Mega Barra Travar posição - Arraste o HUD para movê-lo; um toque longo o trava ou destrava. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando. + Arraste o HUD para movê-lo. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando. + Toque longo + Recolher ou expandir + Travar ou destravar Encaixar nas laterais Solte o HUD e ele vai para a lateral mais próxima da tela. Um gesto rápido o lança nessa direção. Aparência diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 17249cae9b..63883aeb95 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -712,7 +712,10 @@ Mega Bară Blochează pe loc - Trage HUD-ul pentru a-l muta; o apăsare lungă îl blochează sau îl deblochează. Cât timp e blocat, comenzile de pe ecran de sub el funcționează în continuare. + Trage HUD-ul pentru a-l muta. Cât timp e blocat, comenzile de pe ecran de sub el funcționează în continuare. + Apăsare lungă + Restrânge sau extinde + Blochează sau deblochează Fixare în lateral Eliberează HUD-ul și se mută în partea mai apropiată a ecranului. Un gest rapid îl aruncă în acea direcție. Aspect diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f37c125559..437dd171c0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -714,7 +714,10 @@ Мега Полоса Закрепить на месте - Перетащите HUD, чтобы переместить его; долгое нажатие закрепляет или открепляет его. Пока он закреплён, экранные элементы управления под ним продолжают работать. + Перетащите HUD, чтобы переместить его. Пока он закреплён, экранные элементы управления под ним продолжают работать. + Долгое нажатие + Свернуть или развернуть + Закрепить или открепить Прилипание к бокам Отпустите HUD, и он переместится к ближайшей стороне экрана. Резкий жест отбросит его в ту сторону. Внешний вид diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index aa2398a65a..7ed43122c0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -710,7 +710,10 @@ Mega List Lås på plats - Dra HUD:en för att flytta den; ett långt tryck låser eller låser upp den. När den är låst fungerar skärmkontrollerna under den fortfarande. + Dra HUD:en för att flytta den. När den är låst fungerar skärmkontrollerna under den fortfarande. + Långt tryck + Fäll ihop eller fäll ut + Lås eller lås upp Fäst mot sidorna Släpp HUD:en så flyttas den till skärmens närmaste sida. En snabb svepning kastar den åt det hållet. Utseende diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 3e0f71ab9c..e8f6a59300 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -708,7 +708,10 @@ เมกะ แถบ ล็อกตำแหน่ง - ลาก HUD เพื่อย้าย กดค้างเพื่อล็อกหรือปลดล็อก ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้ + ลาก HUD เพื่อย้าย ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้ + กดค้าง + ย่อหรือขยาย + ล็อกหรือปลดล็อก ยึดติดด้านข้าง ปล่อย HUD แล้วจะย้ายไปด้านที่ใกล้กว่าของหน้าจอ ปัดเร็วๆ เพื่อเหวี่ยงไปทางนั้น รูปลักษณ์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 66fa199f4a..6ffa8b121f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -710,7 +710,10 @@ Mega Şerit Yerinde kilitle - Taşımak için HUD\'u sürükleyin; uzun basmak onu kilitler veya kilidini açar. Kilitliyken altındaki ekran kontrolleri çalışmaya devam eder. + Taşımak için HUD\'u sürükleyin. Kilitliyken altındaki ekran kontrolleri çalışmaya devam eder. + Uzun basma + Daralt veya genişlet + Kilitle veya kilidini aç Yanlara yapıştır HUD\'u bıraktığınızda ekranın daha yakın tarafına gider. Hızlı bir kaydırma onu o yöne fırlatır. Görünüm diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7e4aa68072..ce8ad04cfa 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -714,7 +714,10 @@ Мега Смуга Закріпити на місці - Перетягніть HUD, щоб перемістити його; довге натискання закріплює або відкріплює його. Поки його закріплено, екранні елементи керування під ним працюють і далі. + Перетягніть HUD, щоб перемістити його. Поки його закріплено, екранні елементи керування під ним працюють і далі. + Довге натискання + Згорнути або розгорнути + Закріпити або відкріпити Прилипання до боків Відпустіть HUD, і він переміститься до ближчого боку екрана. Різкий жест відкине його в той бік. Вигляд diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d5cd9324b9..791962f61c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -708,7 +708,10 @@ Mega Thanh Khóa vị trí - Kéo HUD để di chuyển; nhấn giữ để khóa hoặc mở khóa. Khi đã khóa, các nút điều khiển trên màn hình bên dưới vẫn hoạt động. + Kéo HUD để di chuyển. Khi đã khóa, các nút điều khiển trên màn hình bên dưới vẫn hoạt động. + Nhấn giữ + Thu gọn hoặc mở rộng + Khóa hoặc mở khóa Bám vào cạnh trái/phải Thả HUD ra và nó sẽ di chuyển sang cạnh màn hình gần hơn. Vuốt nhanh để ném nó theo hướng đó. Giao diện diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8ac0550981..7a3c6139e5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -708,7 +708,10 @@ 超大 横条 锁定位置 - 拖动 HUD 可移动位置;长按可锁定或解锁。锁定时,下方的屏幕控件仍可使用。 + 拖动 HUD 可移动位置。锁定时,下方的屏幕控件仍可使用。 + 长按 + 折叠或展开 + 锁定或解锁 吸附到两侧 松开 HUD 后,它会移到屏幕较近的一侧。轻甩可将它甩向该方向。 外观 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 48a67708d0..f00271c508 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -708,7 +708,10 @@ 超大 橫條 鎖定位置 - 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 + 拖曳 HUD 可移動位置。鎖定時,下方的螢幕控制項仍可使用。 + 長按 + 摺疊或展開 + 鎖定或解鎖 貼齊兩側 放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。 外觀 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cb4fc05a9d..5a9ee79004 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -708,7 +708,10 @@ 超大 橫條 鎖定位置 - 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 + 拖曳 HUD 可移動位置。鎖定時,下方的螢幕控制項仍可使用。 + 長按 + 收合或展開 + 鎖定或解鎖 貼齊兩側 放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。 外觀 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62fed1b62f..ad52dfd63f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -738,7 +738,10 @@ Mega Strip Lock in place - Drag the HUD to move it; a long press locks or unlocks it. While it is locked, on-screen controls under it still work. + Drag the HUD to move it. While it is locked, on-screen controls under it still work. + Long press + Collapse or expand + Lock or unlock Snap to sides Let go of the HUD and it moves to the nearer side of the screen. A flick throws it that way. Look diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudHostCollapseTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudHostCollapseTest.kt new file mode 100644 index 0000000000..531aa6d2c0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudHostCollapseTest.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.hud + +import android.os.Looper +import android.os.SystemClock +import android.provider.Settings +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.widget.FrameLayout +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.Motion +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Before +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.annotation.Config +import org.robolectric.annotation.GraphicsMode +import java.time.Duration +import java.util.function.BiConsumer + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], qualifiers = "xhdpi") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class DroidDeckHudHostCollapseTest { + private fun animate(scale: Float) { + val app = RuntimeEnvironment.getApplication() + Settings.Global.putFloat(app.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, scale) + Motion.refresh(app) + } + + @Before fun noAnimation() = animate(0f) + + @After fun restoreAnimation() = animate(1f) + + private fun collapse(snap: String, hudX: Float, hudY: Float, pressX: Float, pressY: Float, layoutDuringCollapse: Boolean = false): Triple> { + val app = RuntimeEnvironment.getApplication() + SessionPrefs.setDroidDeckHudConfig(app, DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSnap" to snap) + ("hudSize" to "full"))) + SessionPrefs.setDroidDeckHudPosition(app, hudX, hudY) + val root = FrameLayout(app) + val host = DroidDeckHudHost(app) + host.attach(root, 0) + val hud = root.getChildAt(0) as DroidDeckHudView + hud.visibility = View.VISIBLE + hud.showForTest(DroidDeckHudPanelTest.SNAPSHOT, "DXVK", 0L) + val exactly = { size: Int -> View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY) } + root.measure(exactly(2000), exactly(1000)) + root.layout(0, 0, 2000, 1000) + hud.x = hudX; hud.y = hudY + if (layoutDuringCollapse) { + @Suppress("UNCHECKED_CAST") + val collapse = DroidDeckHudView::class.java.getDeclaredField("onHoldListener").also { it.isAccessible = true }.get(hud) as BiConsumer + hud.setOnHoldListener { x, y -> + collapse.accept(x, y) + hud.requestLayout() + root.measure(exactly(2000), exactly(1000)) + root.layout(0, 0, 2000, 1000) + } + } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, pressX, pressY, 0).also { root.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 300L)) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, pressX, pressY, 0).also { root.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(1000)) + root.measure(exactly(2000), exactly(1000)) + root.layout(0, 0, 2000, 1000) + shadowOf(Looper.getMainLooper()).idle() + val stored = DroidDeckHudConfig.load(app)["hudDock"].orEmpty() + return Triple(hud, stored, hud.x to hud.y) + } + + @Test fun withSnappingTheHudCollapsesIntoTheEdgeNearestWhereThePressBegan() { + assertEquals("top", collapse("1", 400f, 40f, 500f, 60f).second) + assertEquals("left", collapse("1", 20f, 300f, 40f, 500f).second) + assertEquals("right", collapse("1", 1500f, 300f, 1900f, 500f).second) + assertEquals("bottom", collapse("1", 400f, 700f, 500f, 980f).second) + } + + @Test fun withoutSnappingTheHudCollapsesWhereItWasTouched() { + val (hud, stored, at) = collapse("0", 600f, 300f, 700f, 350f) + assertEquals("float", stored) + assertEquals(DroidDeckHudDock.FLOAT, hud.dock) + val (tabW, tabH) = hud.dockTabSize() + assertEquals(700f - tabW / 2f, at.first, 2f) + assertEquals(350f - tabH / 2f, at.second, 2f) + } + + @Test fun aLayoutPassDuringTheCollapseKeepsTheTabWhereThePressPutIt() { + animate(1f) + val (hud, stored, at) = collapse("1", 600f, 300f, 700f, 350f, layoutDuringCollapse = true) + val (tabW, tabH) = hud.dockTabSize() + assertEquals("top", stored) + assertEquals(700f - tabW / 2f, SessionPrefs.droidDeckHudPosition(RuntimeEnvironment.getApplication())!!.first, 2f) + assertEquals(700f - tabW / 2f, at.first, 2f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt index 5a534ceb3a..f638ea4afe 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt @@ -38,6 +38,74 @@ class DroidDeckHudPanelTest { assertEquals("1", DroidDeckHudConfig.DEFAULTS["hudLocked"]) } + @Test fun aLongPressCollapsesTheHudUnlessTheUserChoseToLockWithIt() { + assertEquals("collapse", DroidDeckHudConfig.DEFAULTS["hudHold"]) + for ((hold, locked) in listOf("collapse" to "1", "collapse" to "0", "lock" to "1", "lock" to "0")) { + val app = RuntimeEnvironment.getApplication() + val hud = DroidDeckHudView(app) + val parent = FrameLayout(app) + parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudHold" to hold) + ("hudLocked" to locked))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) + parent.measure(exactly, exactly) + parent.layout(0, 0, 2000, 2000) + val holds = ArrayList>() + val locks = ArrayList() + hud.setOnHoldListener { x, y -> holds += x to y } + hud.setOnLockChangedListener { locks += it } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 300L)) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + if (hold == "collapse") { + assertEquals("$hold/$locked collapses from where the press began", listOf(30f to 20f), holds) + assertTrue("$hold/$locked leaves the lock alone", locks.isEmpty()) + } else { + assertTrue("$hold/$locked does not collapse", holds.isEmpty()) + assertEquals("$hold/$locked toggles the lock", listOf(locked != "1"), locks) + } + } + } + + @Test fun releasingTheFingerThatCollapsedTheHudDoesNotExpandItAgain() { + val app = RuntimeEnvironment.getApplication() + val hud = DroidDeckHudView(app) + val parent = FrameLayout(app) + parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + val config = DroidDeckHudConfig.DEFAULTS + ("hudSize" to "full") + hud.applyConfig(DroidDeckHudConfig.encode(config)) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) + parent.measure(exactly, exactly) + parent.layout(0, 0, 2000, 2000) + val docks = ArrayList() + hud.setOnDockChangedListener { docks += it } + hud.setOnHoldListener { _, _ -> hud.applyConfig(DroidDeckHudConfig.encode(config + ("hudDock" to "float"))) } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 300L)) + assertEquals(DroidDeckHudDock.FLOAT, hud.dock) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + assertTrue("the release of the collapsing press is not a tap on the tab: $docks", docks.isEmpty()) + val next = SystemClock.uptimeMillis() + MotionEvent.obtain(next, next, MotionEvent.ACTION_DOWN, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + MotionEvent.obtain(next, next + 40, MotionEvent.ACTION_UP, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + assertEquals("a later tap on the tab expands it", listOf("none"), docks) + } + + @Test fun aFloatingTabIsATabWithoutAnEdge() { + assertEquals(DroidDeckHudDock.FLOAT, DroidDeckHudDock.from("float")) + val hud = DroidDeckHudView(RuntimeEnvironment.getApplication()) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to "full") + ("hudDock" to "float"))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + hud.measure(unspecified, unspecified) + assertTrue("a tab, not the panel: ${hud.measuredWidth}x${hud.measuredHeight}", hud.measuredWidth < 400 && hud.measuredHeight < 200) + } + @Test fun lowMetricsCanBeHiddenIndependentlyInEveryLayoutThatShowsThem() { val metrics = listOf("showLow1" to "1%", "showLow01" to "0.1%", "showLow001" to "0.01%") for (size in DroidDeckHudSize.values().filter { it != DroidDeckHudSize.PILL }) { @@ -331,7 +399,7 @@ class DroidDeckHudPanelTest { hud.passesTouchAt = { _, _ -> control } val locks = ArrayList() hud.setOnLockChangedListener { locks += it } - hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "0"))) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "0") + ("hudHold" to "lock"))) hud.showForTest(SNAPSHOT, "DXVK", 0L) val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) parent.measure(exactly, exactly) @@ -348,7 +416,7 @@ class DroidDeckHudPanelTest { control = true touch() assertEquals("an unlocked HUD keeps the touch (tap, drag, long press)", 0, reached) - hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "1"))) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "1") + ("hudHold" to "lock"))) touch() assertEquals("a locked HUD passes it to the control under it", 1, reached) control = false @@ -377,7 +445,7 @@ class DroidDeckHudPanelTest { assertEquals("a locked, docked HUD still answers a tap", listOf("none"), docks) } - private companion object { + internal companion object { val SNAPSHOT = HudMetrics.Snapshot(64, 52, 3302, 1050, 89, 79, 10_800_000_000L, 16_000_000_000L, 67f, 1_800_000_000L, HudMetrics.Battery(16f, false, 79, 34, null), intArrayOf(91, 91, 48, 50, 48, 19, 17, 73), intArrayOf(2265, 2265, 3148, 3148, 3148, 2956, 2956, 3302),