fix: no vibrate effect for candidates

osfans · Feb 15, 2025 · 5f9947a · 5f9947a
1 parent e738158
commit 5f9947a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt b/app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt
@@ -29,6 +29,7 @@ import com.osfans.trime.ime.candidates.popup.PopupCandidatesMode
 import com.osfans.trime.ime.candidates.unrolled.window.FlexboxUnrolledCandidateWindow
 import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ime.dependency.InputScope
+import com.osfans.trime.ime.keyboard.InputFeedbackManager
 import com.osfans.trime.ime.keyboard.KeyboardWindow
 import com.osfans.trime.ime.window.BoardWindow
 import com.osfans.trime.ime.window.BoardWindowManager
@@ -139,7 +140,8 @@ class QuickBar(
         }
 
     private fun setUnrollButtonToAttach() {
-        candidateUi.unrollButton.setOnClickListener {
+        candidateUi.unrollButton.setOnClickListener { view ->
+            InputFeedbackManager.keyPressVibrate(view)
             windowManager.attachWindow(
                 FlexboxUnrolledCandidateWindow(context, service, rime, theme, this, windowManager, candidate.compactCandidateModule),
             )
@@ -148,7 +150,8 @@ class QuickBar(
     }
 
     private fun setUnrollButtonToDetach() {
-        candidateUi.unrollButton.setOnClickListener {
+        candidateUi.unrollButton.setOnClickListener { view ->
+            InputFeedbackManager.keyPressVibrate(view)
             windowManager.attachWindow(KeyboardWindow)
         }
         candidateUi.unrollButton.setIcon(R.drawable.ic_baseline_expand_less_24)

diff --git a/app/src/main/java/com/osfans/trime/ime/bar/ui/always/switches/SwitchesUi.kt b/app/src/main/java/com/osfans/trime/ime/bar/ui/always/switches/SwitchesUi.kt
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import com.chad.library.adapter4.util.setOnDebouncedItemClick
 import com.osfans.trime.data.schema.Schema
 import com.osfans.trime.data.theme.Theme
+import com.osfans.trime.ime.keyboard.InputFeedbackManager
 import com.osfans.trime.ime.symbol.SpacesItemDecoration
 import splitties.dimensions.dp
 import splitties.views.dsl.core.Ui
@@ -42,7 +43,8 @@ class SwitchesUi(
         listener: (Schema.Switch) -> Unit,
         debounceTime: Long = 300L,
     ) {
-        switchesAdapter.setOnDebouncedItemClick(debounceTime) { adapter, _, position ->
+        switchesAdapter.setOnDebouncedItemClick(debounceTime) { adapter, view, position ->
+            InputFeedbackManager.keyPressVibrate(view)
             (adapter as? SwitchesAdapter)?.items?.getOrNull(position)?.let(listener)
         }
     }

diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateModule.kt b/app/src/main/java/com/osfans/trime/ime/candidates/compact/CompactCandidateModule.kt
@@ -67,8 +67,11 @@ class CompactCandidateModule(
 
     val adapter by lazy {
         CompactCandidateViewAdapter(theme).apply {
-            setOnItemClickListener { _, _, position ->
-                rime.launchOnReady { it.selectCandidate(previous + position) }
+            setOnItemClickListener { _, view, position ->
+                rime.launchOnReady {
+                    InputFeedbackManager.keyPressVibrate(view)
+                    it.selectCandidate(previous + position)
+                }
             }
             setOnItemLongClickListener { _, view, position ->
                 showCandidateAction(previous + position, items[position].text, view)

diff --git a/.../main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt b/.../main/java/com/osfans/trime/ime/candidates/unrolled/window/BaseUnrolledCandidateWindow.kt
@@ -27,6 +27,7 @@ import com.osfans.trime.ime.candidates.unrolled.CandidatesPagingSource
 import com.osfans.trime.ime.candidates.unrolled.PagingCandidateViewAdapter
 import com.osfans.trime.ime.candidates.unrolled.UnrolledCandidateLayout
 import com.osfans.trime.ime.core.TrimeInputMethodService
+import com.osfans.trime.ime.keyboard.InputFeedbackManager
 import com.osfans.trime.ime.keyboard.KeyboardWindow
 import com.osfans.trime.ime.window.BoardWindow
 import com.osfans.trime.ime.window.BoardWindowManager
@@ -107,8 +108,11 @@ abstract class BaseUnrolledCandidateWindow(
 
     fun bindCandidateUiViewHolder(holder: CandidateViewHolder) {
         holder.itemView.run {
-            setOnClickListener {
-                rime.launchOnReady { it.selectCandidate(holder.idx) }
+            setOnClickListener { view ->
+                rime.launchOnReady {
+                    InputFeedbackManager.keyPressVibrate(view)
+                    it.selectCandidate(holder.idx)
+                }
             }
             setOnLongClickListener { view ->
                 compactCandidate.showCandidateAction(holder.idx, holder.text, view)