refactor: use CandidateModule instead and add `SuggestionCandidateM…

…odule` to receive event
osfans · Jan 14, 2025 · d0cc2e9 · d0cc2e9
1 parent 151f5c7
commit d0cc2e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 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
@@ -21,9 +21,10 @@ import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.ime.bar.ui.AlwaysUi
 import com.osfans.trime.ime.bar.ui.CandidateUi
+import com.osfans.trime.ime.bar.ui.SuggestionUi
 import com.osfans.trime.ime.bar.ui.TabUi
 import com.osfans.trime.ime.broadcast.InputBroadcastReceiver
-import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
+import com.osfans.trime.ime.candidates.CandidateModule
 import com.osfans.trime.ime.candidates.unrolled.window.FlexboxUnrolledCandidateWindow
 import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ime.dependency.InputScope
@@ -44,9 +45,9 @@ class QuickBar(
     private val rime: RimeSession,
     private val theme: Theme,
     private val windowManager: BoardWindowManager,
-    lazyCompactCandidate: Lazy<CompactCandidateModule>,
+    lazyCandidate: Lazy<CandidateModule>,
 ) : InputBroadcastReceiver {
-    private val compactCandidate by lazyCompactCandidate
+    private val candidate by lazyCandidate
 
     private val prefs = AppPrefs.defaultInstance()
 
@@ -93,7 +94,7 @@ class QuickBar(
     }
 
     private val candidateUi by lazy {
-        CandidateUi(context, compactCandidate.view)
+        CandidateUi(context, candidate.compactCandidateModule.view)
     }
 
     private val tabUi by lazy {
@@ -125,7 +126,7 @@ class QuickBar(
     private fun setUnrollButtonToAttach() {
         candidateUi.unrollButton.setOnClickListener {
             windowManager.attachWindow(
-                FlexboxUnrolledCandidateWindow(context, service, rime, theme, this, windowManager, compactCandidate),
+                FlexboxUnrolledCandidateWindow(context, service, rime, theme, this, windowManager, candidate.compactCandidateModule),
             )
         }
         candidateUi.unrollButton.setIcon(R.drawable.ic_baseline_expand_more_24)

diff --git a/app/src/main/java/com/osfans/trime/ime/core/InputView.kt b/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
@@ -25,6 +25,7 @@ import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.ime.bar.QuickBar
 import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
+import com.osfans.trime.ime.candidates.suggestion.SuggestionCandidateModule
 import com.osfans.trime.ime.composition.PreeditModule
 import com.osfans.trime.ime.dependency.InputComponent
 import com.osfans.trime.ime.dependency.create
@@ -101,7 +102,8 @@ class InputView(
     private val preedit: PreeditModule = inputComponent.preedit
     private val keyboardWindow: KeyboardWindow = inputComponent.keyboardWindow
     private val liquidKeyboard: LiquidKeyboard = inputComponent.liquidKeyboard
-    private val compactCandidate: CompactCandidateModule = inputComponent.compactCandidate
+    private val compactCandidate: CompactCandidateModule = inputComponent.candidate.compactCandidateModule
+    private val suggestionCandidate: SuggestionCandidateModule = inputComponent.candidate.suggestionCandidateModule
     private val preview: KeyPreviewChoreographer = inputComponent.preview
 
     private fun addBroadcastReceivers() {
@@ -110,6 +112,7 @@ class InputView(
         broadcaster.addReceiver(keyboardWindow)
         broadcaster.addReceiver(liquidKeyboard)
         broadcaster.addReceiver(compactCandidate)
+        broadcaster.addReceiver(suggestionCandidate)
     }
 
     private val keyboardSidePadding = theme.generalStyle.keyboardPadding

diff --git a/app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt b/app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt
@@ -10,7 +10,7 @@ import com.osfans.trime.data.theme.Theme
 import com.osfans.trime.ime.bar.QuickBar
 import com.osfans.trime.ime.broadcast.EnterKeyLabelModule
 import com.osfans.trime.ime.broadcast.InputBroadcaster
-import com.osfans.trime.ime.candidates.compact.CompactCandidateModule
+import com.osfans.trime.ime.candidates.CandidateModule
 import com.osfans.trime.ime.composition.PreeditModule
 import com.osfans.trime.ime.core.InputView
 import com.osfans.trime.ime.core.TrimeInputMethodService
@@ -40,5 +40,5 @@ abstract class InputComponent(
     abstract val preview: KeyPreviewChoreographer
     abstract val keyboardWindow: KeyboardWindow
     abstract val liquidKeyboard: LiquidKeyboard
-    abstract val compactCandidate: CompactCandidateModule
+    abstract val candidate: CandidateModule
 }