Correction

MOldtime · MOldtime · commit 3c946c353cf8 · 2024-12-20T21:13:28.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/prefs/AppPrefs.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/prefs/AppPrefs.kt
@@ -83,7 +83,7 @@ class AppPrefs(private val sharedPreferences: SharedPreferences) {
             buttonLongPressVibrationMilliseconds = secondary
         }
 
-        val hapticFeedback = switch(R.string.haptic_feedback, "haptic_feedback", false)
+        val hapticOnRepeat = switch(R.string.haptic_on_repeat, "haptic_on_repeat", false)
 
         val buttonPressVibrationAmplitude: ManagedPreference.PInt
         val buttonLongPressVibrationAmplitude: ManagedPreference.PInt
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/FcitxInputMethodService.kt
@@ -126,7 +126,6 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
         prefs.keyboard.expandKeypressArea,
         prefs.advanced.disableAnimation,
         prefs.advanced.ignoreSystemWindowInsets,
-        prefs.keyboard.hapticFeedback,
     )
 
     private fun replaceInputView(theme: Theme): InputView {
@@ -928,7 +927,6 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
 
     override fun onFinishInputView(finishingInput: Boolean) {
         Timber.d("onFinishInputView: finishingInput=$finishingInput")
-        inputView?.updateSelection(0, 0)
         decorLocationUpdated = false
         inputDeviceMgr.onFinishInputView()
         currentInputConnection?.apply {
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/BaseKeyboard.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/BaseKeyboard.kt
@@ -21,7 +21,6 @@ import org.fcitx.fcitx5.android.data.InputFeedbacks
 import org.fcitx.fcitx5.android.data.prefs.AppPrefs
 import org.fcitx.fcitx5.android.data.prefs.ManagedPreference
 import org.fcitx.fcitx5.android.data.theme.Theme
-import org.fcitx.fcitx5.android.input.cursor.CursorRange
 import org.fcitx.fcitx5.android.input.keyboard.CustomGestureView.GestureType
 import org.fcitx.fcitx5.android.input.keyboard.CustomGestureView.OnGestureListener
 import org.fcitx.fcitx5.android.input.popup.PopupAction
@@ -68,7 +67,7 @@ abstract class BaseKeyboard(
 
     private val vivoKeypressWorkaround by prefs.advanced.vivoKeypressWorkaround
 
-    private val hapticFeedback by prefs.keyboard.hapticFeedback
+    private val hapticOnRepeat by prefs.keyboard.hapticOnRepeat
 
     var popupActionListener: PopupActionListener? = null
 
@@ -159,9 +158,6 @@ abstract class BaseKeyboard(
                 is ReturnKey -> InputFeedbacks.SoundEffect.Return
                 else -> InputFeedbacks.SoundEffect.Standard
             }
-            val vibration: ((View, Boolean) -> Unit)? = if (hapticFeedback) { view, extraConditions ->
-                if (selection.end > 0 && selection.start > 0 && extraConditions) InputFeedbacks.hapticFeedback(view)
-            } else null
             if (def is SpaceKey) {
                 spaceKeys.add(this)
                 swipeEnabled = spaceSwipeMoveCursor.getValue()
@@ -178,7 +174,7 @@ abstract class BaseKeyboard(
                                 val action = KeyAction.SymAction(KeySym(sym), KeyStates.Empty)
                                 repeat(count.absoluteValue) {
                                     onAction(action)
-                                    vibration?.invoke(view, selection.end >= selection.start)
+                                    if (hapticOnRepeat) InputFeedbacks.hapticFeedback(view)
                                 }
                                 true
                             }
@@ -197,7 +193,7 @@ abstract class BaseKeyboard(
                             val count = event.countX
                             if (count != 0) {
                                 onAction(KeyAction.MoveSelectionAction(count))
-                                vibration?.invoke(view, selection.end > selection.start)
+                                if (hapticOnRepeat) InputFeedbacks.hapticFeedback(view)
                                 true
                             } else false
                         }
@@ -224,10 +220,10 @@ abstract class BaseKeyboard(
                     }
                     is KeyDef.Behavior.Repeat -> {
                         repeatEnabled = true
-                        onRepeatListener = if (hapticFeedback && def is BackspaceKey) { view ->
+                        onRepeatListener = { view ->
                             onAction(it.action)
-                            vibration?.invoke(view, selection.end >= selection.start)
-                        } else { _ -> onAction(it.action) }
+                            if (hapticOnRepeat) InputFeedbacks.hapticFeedback(view)
+                        }
                     }
                     is KeyDef.Behavior.Swipe -> {
                         swipeEnabled = true
@@ -487,11 +483,6 @@ abstract class BaseKeyboard(
         return true
     }
 
-    private val selection = CursorRange()
-    fun onSelectionUpdate(start: Int, end: Int) {
-        selection.update(start, end)
-    }
-
     open fun onAttach() {
         // do nothing by default
     }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyboardWindow.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/KeyboardWindow.kt
@@ -159,10 +159,6 @@ class KeyboardWindow : InputWindow.SimpleInputWindow<KeyboardWindow>(), Essentia
         currentKeyboard?.onReturnDrawableUpdate(resourceId)
     }
 
-    override fun onSelectionUpdate(start: Int, end: Int) {
-        currentKeyboard?.onSelectionUpdate(start, end)
-    }
-
     override fun onAttached() {
         currentKeyboard?.let {
             it.keyActionListener = keyActionListener
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -283,5 +283,5 @@
     <string name="restart_fcitx_instance_confirm">Fcitx instance will be destroyed and reinitialized. Proceed?</string>
     <string name="ignore_system_window_insets">Ignore system WindowInsets</string>
     <string name="browse_user_data_dir">Browse user data directory</string>
-    <string name="haptic_feedback">Haptic feedback on key repeat</string>
+    <string name="haptic_on_repeat">Haptic feedback on key repeat</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class AppPrefs(private val sharedPreferences: SharedPreferences) {`
`83`	`83`	`buttonLongPressVibrationMilliseconds = secondary`
`84`	`84`	`}`
`85`	`85`
`86`		`- val hapticFeedback = switch(R.string.haptic_feedback, "haptic_feedback", false)`
	`86`	`+ val hapticOnRepeat = switch(R.string.haptic_on_repeat, "haptic_on_repeat", false)`
`87`	`87`
`88`	`88`	`val buttonPressVibrationAmplitude: ManagedPreference.PInt`
`89`	`89`	`val buttonLongPressVibrationAmplitude: ManagedPreference.PInt`