reset multi-tap state after one second delay (#1106)

Author: iliazeus

app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardKey.kt

@@ -76,6 +76,9 @@ import com.dessalines.thumbkey.utils.toPx
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.TimeMark
+import kotlin.time.TimeSource
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -85,7 +88,7 @@ fun KeyboardKey(
     // key will attempt to capture it instead. This is derived automatically from the keyboard
     // layout, and should not be set directly in the keyboard definition.
     ghostKey: KeyItemC? = null,
-    lastAction: MutableState<KeyAction?>,
+    lastAction: MutableState<Pair<KeyAction, TimeMark>?>,
     animationHelperSpeed: Int,
     animationSpeed: Int,
     autoCapitalize: Boolean,
@@ -210,14 +213,14 @@ fun KeyboardKey(
                 onClick = {
                     // Set the last key info, and the tap count
                     val cAction = key.center.action
-                    lastAction.value?.let { lastAction ->
-                        if (lastAction == cAction && !ime.didCursorMove()) {
+                    lastAction.value?.let { (lastAction, time) ->
+                        if (time.elapsedNow() < 1.seconds && lastAction == cAction && !ime.didCursorMove()) {
                             tapCount += 1
                         } else {
                             tapCount = 0
                         }
                     }
-                    lastAction.value = cAction
+                    lastAction.value = Pair(cAction, TimeSource.Monotonic.markNow())
 
                     // Set the correct action
                     val action = tapActions[tapCount % tapActions.size]
@@ -562,7 +565,7 @@ fun KeyboardKey(
 
                         // Set tapCount and lastAction to avoid issues with multitap after slide
                         tapCount = 0
-                        lastAction.value = action
+                        lastAction.value = Pair(action, TimeSource.Monotonic.markNow())
 
                         // Reset the drags
                         offsetX = 0f

app/src/main/java/com/dessalines/thumbkey/ui/components/keyboard/KeyboardScreen.kt

@@ -72,6 +72,7 @@ import com.dessalines.thumbkey.utils.TAG
 import com.dessalines.thumbkey.utils.getKeyboardMode
 import com.dessalines.thumbkey.utils.keyboardPositionToAlignment
 import com.dessalines.thumbkey.utils.toBool
+import kotlin.time.TimeMark
 
 @Composable
 fun KeyboardScreen(
@@ -96,7 +97,7 @@ fun KeyboardScreen(
     }
 
     // TODO get rid of this crap
-    val lastAction = remember { mutableStateOf<KeyAction?>(null) }
+    val lastAction = remember { mutableStateOf<Pair<KeyAction, TimeMark>?>(null) }
 
     val keyboardDefinition =
         KeyboardLayout.entries.sortedBy { it.ordinal }[