feat: page navigation using prevIcon and nextIcon components

osfans · Jan 17, 2025 · 069a12f · 069a12f
1 parent 7a3232d
commit 069a12f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/popup/PagedCandidatesUi.kt b/app/src/main/java/com/osfans/trime/ime/candidates/popup/PagedCandidatesUi.kt
@@ -39,6 +39,18 @@ class PagedCandidatesUi(
         ) : UiHolder(ui)
     }
 
+    enum class ClickType {
+        CANDIDATE,
+        PREV_PAGE,
+        NEXT_PAGE,
+    }
+
+    private var clickListener: ((type: ClickType, position: Int) -> Unit)? = null
+
+    fun setOnClickListener(listener: (type: ClickType, position: Int) -> Unit) {
+        clickListener = listener
+    }
+
     val candidatesAdapter =
         object : BaseQuickAdapter<RimeProto.Candidate, UiHolder>() {
             override fun getItemCount(items: List<RimeProto.Candidate>) =
@@ -75,13 +87,22 @@ class PagedCandidatesUi(
                     is UiHolder.Candidate -> {
                         val candidate = item ?: return
                         holder.ui.update(candidate, position == menu.highlightedCandidateIndex)
+                        holder.ui.root.setOnClickListener {
+                            clickListener?.invoke(ClickType.CANDIDATE, position)
+                        }
                     }
                     is UiHolder.Pagination -> {
                         holder.ui.update(menu)
                         holder.ui.root.updateLayoutParams<FlexboxLayoutManager.LayoutParams> {
                             width = if (isHorizontal) ViewGroup.LayoutParams.WRAP_CONTENT else ViewGroup.LayoutParams.MATCH_PARENT
                             alignSelf = if (isHorizontal) AlignItems.CENTER else AlignItems.STRETCH
                         }
+                        holder.ui.prevIcon.setOnClickListener {
+                            clickListener?.invoke(ClickType.PREV_PAGE, menu.pageNumber)
+                        }
+                        holder.ui.nextIcon.setOnClickListener {
+                            clickListener?.invoke(ClickType.NEXT_PAGE, menu.pageNumber)
+                        }
                     }
                 }
             }

diff --git a/app/src/main/java/com/osfans/trime/ime/candidates/popup/PaginationUi.kt b/app/src/main/java/com/osfans/trime/ime/candidates/popup/PaginationUi.kt
@@ -38,8 +38,8 @@ class PaginationUi(
         scaleType = ImageView.ScaleType.CENTER_CROP
     }
 
-    private val prevIcon = createIcon(R.drawable.ic_baseline_arrow_left_24)
-    private val nextIcon = createIcon(R.drawable.ic_baseline_arrow_right_24)
+    val prevIcon = createIcon(R.drawable.ic_baseline_arrow_left_24)
+    val nextIcon = createIcon(R.drawable.ic_baseline_arrow_right_24)
 
     private val disabledAlpha = ctx.styledFloat(android.R.attr.disabledAlpha)
 

diff --git a/app/src/main/java/com/osfans/trime/ime/composition/CandidatesView.kt b/app/src/main/java/com/osfans/trime/ime/composition/CandidatesView.kt
@@ -6,8 +6,10 @@
 package com.osfans.trime.ime.composition
 
 import android.annotation.SuppressLint
+import android.view.KeyEvent
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.osfans.trime.core.RimeKeyMapping
 import com.osfans.trime.core.RimeProto
 import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.daemon.launchOnReady
@@ -49,8 +51,20 @@ class CandidatesView(
 
     private val candidatesUi =
         PagedCandidatesUi(ctx, theme).apply {
-            candidatesAdapter.setOnItemClickListener { _, _, position ->
-                rime.launchOnReady { it.selectPagedCandidate(position) }
+            setOnClickListener { type, position ->
+                when (type) {
+                    PagedCandidatesUi.ClickType.CANDIDATE -> {
+                        rime.launchOnReady { it.selectPagedCandidate(position) }
+                    }
+                    PagedCandidatesUi.ClickType.PREV_PAGE -> {
+                        val value = RimeKeyMapping.keyCodeToVal(KeyEvent.KEYCODE_PAGE_UP)
+                        rime.launchOnReady { it.processKey(value, 0u) }
+                    }
+                    PagedCandidatesUi.ClickType.NEXT_PAGE -> {
+                        val value = RimeKeyMapping.keyCodeToVal(KeyEvent.KEYCODE_PAGE_DOWN)
+                        rime.launchOnReady { it.processKey(value, 0u) }
+                    }
+                }
             }
         }