Modify default name

MOldtime · MOldtime · commit 0dd60b3914d4 · 2024-12-11T08:58:03.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 moreVibration = switch(R.string.more_vibration, "more_vibration", false)
+        val hapticFeedback = switch(R.string.haptic_feedback, "haptic_feedback", 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,7 @@ class FcitxInputMethodService : LifecycleInputMethodService() {
         prefs.keyboard.expandKeypressArea,
         prefs.advanced.disableAnimation,
         prefs.advanced.ignoreSystemWindowInsets,
-        prefs.keyboard.moreVibration,
+        prefs.keyboard.hapticFeedback,
     )
 
     private fun replaceInputView(theme: Theme): InputView {
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
@@ -67,7 +67,7 @@ abstract class BaseKeyboard(
 
     private val vivoKeypressWorkaround by prefs.advanced.vivoKeypressWorkaround
 
-    private val moreVibration by prefs.keyboard.moreVibration
+    private val hapticFeedback by prefs.keyboard.hapticFeedback
 
     var popupActionListener: PopupActionListener? = null
 
@@ -158,7 +158,7 @@ abstract class BaseKeyboard(
                 is ReturnKey -> InputFeedbacks.SoundEffect.Return
                 else -> InputFeedbacks.SoundEffect.Standard
             }
-            val vibration: ((view: View) -> Unit)? = if (moreVibration) { view ->
+            val vibration: ((view: View) -> Unit)? = if (hapticFeedback) { view ->
                 InputFeedbacks.hapticFeedback(view)
             } else null
             if (def is SpaceKey) {
@@ -223,7 +223,7 @@ abstract class BaseKeyboard(
                     }
                     is KeyDef.Behavior.Repeat -> {
                         repeatEnabled = true
-                        onRepeatListener = if (moreVibration && def is BackspaceKey) { view ->
+                        onRepeatListener = if (hapticFeedback && def is BackspaceKey) { view ->
                             onAction(it.action)
                             InputFeedbacks.hapticFeedback(view)
                         } else { _ -> onAction(it.action) }
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="more_vibration">More vibration</string>
+    <string name="haptic_feedback">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 moreVibration = switch(R.string.more_vibration, "more_vibration", false)`
	`86`	`+ val hapticFeedback = switch(R.string.haptic_feedback, "haptic_feedback", false)`
`87`	`87`
`88`	`88`	`val buttonPressVibrationAmplitude: ManagedPreference.PInt`
`89`	`89`	`val buttonLongPressVibrationAmplitude: ManagedPreference.PInt`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ class FcitxInputMethodService : LifecycleInputMethodService() {`
`126`	`126`	`prefs.keyboard.expandKeypressArea,`
`127`	`127`	`prefs.advanced.disableAnimation,`
`128`	`128`	`prefs.advanced.ignoreSystemWindowInsets,`
`129`		`- prefs.keyboard.moreVibration,`
	`129`	`+ prefs.keyboard.hapticFeedback,`
`130`	`130`	`)`
`131`	`131`
`132`	`132`	`private fun replaceInputView(theme: Theme): InputView {`