Replace HapticFeedbackConstants.VIRTUAL_KEY with HapticFeedbackConsta…

…nts.KEYBOARD_TAP
yuetyam · Sep 8, 2024 · 58f7e25 · 58f7e25
1 parent c8dab9d
commit 58f7e25
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 14 deletions.
diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/BackspaceKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/BackspaceKey.kt
@@ -92,7 +92,7 @@ fun BackspaceKey(modifier: Modifier) {
                                                         },
                                                         onTap = {
                                                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                                                 context.backspace()
                                                         }
                                                 )
@@ -103,7 +103,7 @@ fun BackspaceKey(modifier: Modifier) {
                                                         offsetX += dragAmount
                                                         if (offsetX < -44f) {
                                                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_RELEASE)
                                                                 context.clearBuffer()
                                                         }
                                                 }

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/CangjieKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/CangjieKey.kt
@@ -39,7 +39,7 @@ fun CangjieKey(letter: Char, modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 context.process(keyLetter)
                         }
                         .fillMaxSize(),

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/GlobeKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/GlobeKey.kt
@@ -39,7 +39,7 @@ fun GlobeKey(modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 val manager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
                                 manager.showInputMethodPicker()
                         }

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/LeftKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/LeftKey.kt
@@ -46,7 +46,7 @@ fun LeftKey(modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 context.leftKey()
                         }
                         .fillMaxSize(),

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/LetterKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/LetterKey.kt
@@ -38,7 +38,7 @@ fun LetterKey(letter: String, modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 val text: String = if (keyboardCase.value.isLowercased()) letter else letter.uppercase()
                                 context.process(text)
                         }

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/ReturnKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/ReturnKey.kt
@@ -1,5 +1,6 @@
 package org.jyutping.jyutping.keyboard
 
+import android.os.Build
 import android.view.HapticFeedbackConstants
 import android.view.SoundEffectConstants
 import androidx.compose.foundation.background
@@ -40,7 +41,11 @@ fun ReturnKey(modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                        view.performHapticFeedback(HapticFeedbackConstants.CONFIRM)
+                                } else {
+                                        view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
+                                }
                                 context.performReturn()
                         }
                         .fillMaxSize(),

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/RightKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/RightKey.kt
@@ -46,7 +46,7 @@ fun RightKey(modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 context.rightKey()
                         }
                         .fillMaxSize(),

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/ShiftKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/ShiftKey.kt
@@ -74,12 +74,12 @@ fun ShiftKey(modifier: Modifier) {
                                                 detectTapGestures(
                                                         onDoubleTap = {
                                                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                                                 context.doubleShift()
                                                         },
                                                         onTap = {
                                                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                                                 context.shift()
                                                         }
                                                 )

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/SpaceKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/SpaceKey.kt
@@ -38,7 +38,7 @@ fun SpaceKey(modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 context.space()
                         }
                         .fillMaxSize(),

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/StrokeKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/StrokeKey.kt
@@ -40,7 +40,7 @@ fun StrokeKey(letter: Char, modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 context.process(keyLetter)
                         }
                         .fillMaxSize(),

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/SymbolKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/SymbolKey.kt
@@ -35,7 +35,7 @@ fun SymbolKey(symbol: String, modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 context.input(symbol)
                         }
                         .fillMaxSize(),

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/TransformKey.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/TransformKey.kt
@@ -41,7 +41,7 @@ fun TransformKey(destination: KeyboardForm, modifier: Modifier) {
                 modifier = modifier
                         .clickable(interactionSource = interactionSource, indication = null) {
                                 view.playSoundEffect(SoundEffectConstants.CLICK)
-                                view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
                                 context.transformTo(destination)
                         }
                         .fillMaxSize(),