refactor: rename CandidateListItem to CandidateItem

osfans · Aug 30, 2024 · 54de655 · 54de655
1 parent f5879c3
commit 54de655
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/app/src/main/java/com/osfans/trime/core/Rime.kt b/app/src/main/java/com/osfans/trime/core/Rime.kt
@@ -123,7 +123,7 @@ class Rime : RimeApi, RimeLifecycleOwner {
     override suspend fun getCandidates(
         startIndex: Int,
         limit: Int,
-    ): Array<CandidateListItem> =
+    ): Array<CandidateItem> =
         withRimeContext {
             getRimeCandidates(startIndex, limit) ?: emptyArray()
         }
@@ -475,7 +475,7 @@ class Rime : RimeApi, RimeLifecycleOwner {
         external fun getRimeCandidates(
             startIndex: Int,
             limit: Int,
-        ): Array<CandidateListItem>?
+        ): Array<CandidateItem>?
 
         /** call from rime_jni */
         @JvmStatic

diff --git a/app/src/main/java/com/osfans/trime/core/RimeApi.kt b/app/src/main/java/com/osfans/trime/core/RimeApi.kt
@@ -51,5 +51,5 @@ interface RimeApi {
     suspend fun getCandidates(
         startIndex: Int,
         limit: Int,
-    ): Array<CandidateListItem>
+    ): Array<CandidateItem>
 }
diff --git a/app/src/main/java/com/osfans/trime/core/Structs.kt b/app/src/main/java/com/osfans/trime/core/Structs.kt
@@ -9,7 +9,7 @@ data class SchemaItem(
     val name: String = "",
 )
 
-data class CandidateListItem(
+data class CandidateItem(
     val comment: String,
     val text: String,
 )
diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/CandidateAdapter.kt b/app/src/main/java/com/osfans/trime/ime/symbol/CandidateAdapter.kt
@@ -15,7 +15,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter4.BaseQuickAdapter
-import com.osfans.trime.core.CandidateListItem
+import com.osfans.trime.core.CandidateItem
 import com.osfans.trime.core.Rime
 import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.FontManager
@@ -28,7 +28,7 @@ import splitties.views.dsl.constraintlayout.centerHorizontally
 import splitties.views.dsl.constraintlayout.topOfParent
 
 // 显示长度不固定，字体大小正常的内容。用于类型 CANDIDATE, VAR_LENGTH
-class CandidateAdapter(private val theme: Theme) : BaseQuickAdapter<CandidateListItem, CandidateAdapter.ViewHolder>() {
+class CandidateAdapter(private val theme: Theme) : BaseQuickAdapter<CandidateItem, CandidateAdapter.ViewHolder>() {
     enum class CommentPosition {
         UNKNOWN,
         TOP,
@@ -119,7 +119,7 @@ class CandidateAdapter(private val theme: Theme) : BaseQuickAdapter<CandidateLis
     override fun onBindViewHolder(
         holder: ViewHolder,
         position: Int,
-        item: CandidateListItem?,
+        item: CandidateItem?,
     ) {
         item?.run {
             holder.candidate.text = text

diff --git a/app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.kt b/app/src/main/java/com/osfans/trime/ime/symbol/LiquidKeyboard.kt
@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.chad.library.adapter4.util.setOnDebouncedItemClick
 import com.google.android.flexbox.FlexboxLayoutManager
-import com.osfans.trime.core.CandidateListItem
+import com.osfans.trime.core.CandidateItem
 import com.osfans.trime.core.Rime
 import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.data.SymbolHistory
@@ -169,7 +169,7 @@ class LiquidKeyboard(
                 val items =
                     data.map {
                         val text = if (tag.type == SymbolBoardType.SYMBOL) it.label else it.text
-                        CandidateListItem("", text)
+                        CandidateItem("", text)
                     }
                 initVarLengthKeys(items)
             }
@@ -216,7 +216,7 @@ class LiquidKeyboard(
         }
     }
 
-    private fun initVarLengthKeys(data: List<CandidateListItem>) {
+    private fun initVarLengthKeys(data: List<CandidateItem>) {
         if (onAdapterChange(varLengthAdapter)) {
             // 设置布局管理器
             keyboardView.apply {

diff --git a/app/src/main/jni/librime_jni/jni-utils.h b/app/src/main/jni/librime_jni/jni-utils.h
@@ -145,8 +145,8 @@ class GlobalRefSingleton {
   jclass Rime;
   jmethodID HandleRimeNotification;
 
-  jclass CandidateListItem;
-  jmethodID CandidateListItemInit;
+  jclass CandidateItem;
+  jmethodID CandidateItemInit;
 
   jclass CandidateProto;
   jmethodID CandidateProtoInit;
@@ -212,10 +212,10 @@ class GlobalRefSingleton {
         env->GetStaticMethodID(Rime, "handleRimeNotification",
                                "(Ljava/lang/String;Ljava/lang/String;)V");
 
-    CandidateListItem = reinterpret_cast<jclass>(env->NewGlobalRef(
-        env->FindClass("com/osfans/trime/core/CandidateListItem")));
-    CandidateListItemInit = env->GetMethodID(
-        CandidateListItem, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
+    CandidateItem = reinterpret_cast<jclass>(env->NewGlobalRef(
+        env->FindClass("com/osfans/trime/core/CandidateItem")));
+    CandidateItemInit = env->GetMethodID(
+        CandidateItem, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
 
     CandidateProto = reinterpret_cast<jclass>(env->NewGlobalRef(
         env->FindClass("com/osfans/trime/core/RimeProto$Candidate")));

diff --git a/app/src/main/jni/librime_jni/rime_jni.cc b/app/src/main/jni/librime_jni/rime_jni.cc
@@ -548,11 +548,11 @@ Java_com_osfans_trime_core_Rime_getRimeCandidates(JNIEnv *env, jclass clazz,
   auto candidates = Rime::Instance().getCandidates(start_index, limit);
   int size = static_cast<int>(candidates.size());
   jobjectArray array =
-      env->NewObjectArray(size, GlobalRef->CandidateListItem, nullptr);
+      env->NewObjectArray(size, GlobalRef->CandidateItem, nullptr);
   for (int i = 0; i < size; i++) {
     auto &candidate = candidates[i];
-    auto item = JRef<>(env, env->NewObject(GlobalRef->CandidateListItem,
-                                           GlobalRef->CandidateListItemInit,
+    auto item = JRef<>(env, env->NewObject(GlobalRef->CandidateItem,
+                                           GlobalRef->CandidateItemInit,
                                            *JString(env, candidate.second),
                                            *JString(env, candidate.first)));
     env->SetObjectArrayElement(array, i, item);