Skip to content

Make the settings tap sequence deterministic #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RapierXbox merged 1 commit into from
Sep 24, 2026
Merged

Make the settings tap sequence deterministic #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions app/src/main/java/me/rapierxbox/shellyelevatev2/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import android.content.IntentFilter
import android.content.pm.PackageManager
import android.net.http.SslError
import android.os.Bundle
import android.os.SystemClock
import android.util.Log
import android.view.KeyEvent
import android.view.MotionEvent
Expand Down Expand Up @@ -93,6 +94,7 @@ class MainActivity : ComponentActivity() {

private var clicksButtonRight: Int = 0
private var clicksButtonLeft: Int = 0
private var lastSettingsTapAtMs: Long = 0

private val settingsChangedBroadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
Expand Down Expand Up @@ -351,18 +353,34 @@ class MainActivity : ComponentActivity() {
@SuppressLint("ClickableViewAccessibility")
private fun setupSettingsButtons() {
binding.settingButtonOverlayRight.setOnTouchListener { _, event ->
if (event.action == MotionEvent.ACTION_DOWN) clicksButtonRight++
if (event.action == MotionEvent.ACTION_DOWN) {
expireStaleSettingsTaps()
clicksButtonRight++
}
false
}
binding.settingButtonOverlayLeft.setOnTouchListener { _, event ->
if (event.action == MotionEvent.ACTION_DOWN) {
if (clicksButtonRight == 10) clicksButtonLeft++ else resetClicks()
if (clicksButtonLeft == 10) startSettingsActivity()
expireStaleSettingsTaps()
// >= not ==: the overlays pass the touch on to the dashboard underneath, so a
// tap meant for a card in that corner counts too. overshooting the threshold
// used to wedge the sequence for good, since every later tap hit the reset
if (clicksButtonRight >= SETTINGS_TAPS) clicksButtonLeft++ else resetClicks()
if (clicksButtonLeft >= SETTINGS_TAPS) startSettingsActivity()
}
false
}
}

// the counters used to live forever, so taps from ordinary dashboard use accumulated
// between attempts and the sequence started from an unknown state. a pause longer than
// the timeout was never someone entering it
private fun expireStaleSettingsTaps() {
val now = SystemClock.elapsedRealtime()
if (now - lastSettingsTapAtMs > SETTINGS_TAP_TIMEOUT_MS) resetClicks()
lastSettingsTapAtMs = now
}

private fun startSettingsActivity() {
resetClicks()
startActivity(Intent(this, SettingsActivity::class.java))
Expand Down Expand Up @@ -905,4 +923,10 @@ class MainActivity : ComponentActivity() {
cancelRetry()
super.onStop()
}

companion object {
// taps per corner, bottom right first then bottom left
private const val SETTINGS_TAPS = 10
private const val SETTINGS_TAP_TIMEOUT_MS = 2000L
}
}
Loading