refactor: use rime dedicate api to change candidate page

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/core/Rime.kt

@@ -127,6 +127,11 @@ class Rime :
             deleteRimeCandidateOnCurrentPage(idx).also { if (it) requireResponse() }
         }
 
+    override suspend fun changeCandidatePage(backward: Boolean): Boolean =
+        withRimeContext {
+            changeRimeCandidatePage(backward).also { if (it) requireResponse() }
+        }
+
     override suspend fun moveCursorPos(position: Int) =
         withRimeContext {
             setRimeCaretPos(position)
@@ -373,6 +378,9 @@ class Rime :
         @JvmStatic
         external fun forgetRimeCandidate(index: Int): Boolean
 
+        @JvmStatic
+        external fun changeRimeCandidatePage(backward: Boolean): Boolean
+
         @JvmStatic
         external fun getAvailableRimeSchemaList(): Array<SchemaItem>
 

app/src/main/java/com/osfans/trime/core/RimeApi.kt

@@ -41,6 +41,8 @@ interface RimeApi {
 
     suspend fun deletedPagedCandidate(idx: Int): Boolean
 
+    suspend fun changeCandidatePage(backward: Boolean): Boolean
+
     suspend fun moveCursorPos(position: Int)
 
     suspend fun availableSchemata(): Array<SchemaItem>

app/src/main/java/com/osfans/trime/ime/composition/CandidatesView.kt

@@ -6,10 +6,8 @@
 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
@@ -57,12 +55,10 @@ class CandidatesView(
                         rime.launchOnReady { it.selectPagedCandidate(position) }
                     }
                     PagedCandidatesUi.ClickType.PREV_PAGE -> {
-                        val value = RimeKeyMapping.keyCodeToVal(KeyEvent.KEYCODE_PAGE_UP)
-                        rime.launchOnReady { it.processKey(value, 0u) }
+                        rime.launchOnReady { it.changeCandidatePage(true) }
                     }
                     PagedCandidatesUi.ClickType.NEXT_PAGE -> {
-                        val value = RimeKeyMapping.keyCodeToVal(KeyEvent.KEYCODE_PAGE_DOWN)
-                        rime.launchOnReady { it.processKey(value, 0u) }
+                        rime.launchOnReady { it.changeCandidatePage(false) }
                     }
                 }
             }

app/src/main/jni/librime_jni/rime_jni.cc

@@ -118,6 +118,10 @@ class Rime {
     return rime->delete_candidate(session, index);
   }
 
+  bool changePage(bool backward) {
+    return rime->change_page(session, backward);
+  }
+
   using CandidateItem = std::pair<std::string, std::string>;
   using CandidateList = std::vector<CandidateItem>;
 
@@ -415,6 +419,13 @@ Java_com_osfans_trime_core_Rime_forgetRimeCandidate(JNIEnv *env,
   return Rime::Instance().forgetCandidate(index);
 }
 
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_osfans_trime_core_Rime_changeRimeCandidatePage(JNIEnv *env,
+                                                        jclass clazz,
+                                                        jboolean backward) {
+  return Rime::Instance().changePage(backward);
+}
+
 extern "C" JNIEXPORT jobjectArray JNICALL
 Java_com_osfans_trime_core_Rime_getRimeCandidates(JNIEnv *env, jclass clazz,
                                                   jint start_index,