refactor: improve touch event receiving of stock PreeditUi

Author: WhiredPlanck

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

@@ -6,6 +6,7 @@
 package com.osfans.trime.ime.composition
 
 import android.annotation.SuppressLint
+import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.osfans.trime.core.RimeProto
@@ -77,6 +78,7 @@ class CandidatesView(
     private fun updateUi() {
         if (evaluateVisibility()) {
             preeditUi.update(inputComposition)
+            preeditUi.root.visibility = if (preeditUi.visible) View.VISIBLE else View.INVISIBLE
             // if CandidatesView can be shown, rime engine is ready most of the time,
             // so it should be safety to get option immediately
             val isHorizontalLayout = rime.run { getRuntimeOption("_horizontal") }

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

@@ -5,25 +5,26 @@
 
 package com.osfans.trime.ime.composition
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Outline
 import android.graphics.Rect
 import android.view.Gravity
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewOutlineProvider
-import android.view.WindowManager
 import android.widget.PopupWindow
 import com.osfans.trime.core.RimeProto
 import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.daemon.launchOnReady
 import com.osfans.trime.data.prefs.AppPrefs
 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.broadcast.InputBroadcastReceiver
 import com.osfans.trime.ime.candidates.popup.PopupCandidatesMode
 import com.osfans.trime.ime.dependency.InputScope
 import me.tatarka.inject.annotations.Inject
+import splitties.dimensions.dp
 import splitties.views.backgroundColor
 
 @InputScope
@@ -32,7 +33,6 @@ class PreeditModule(
     context: Context,
     theme: Theme,
     rime: RimeSession,
-    private val bar: QuickBar,
 ) : InputBroadcastReceiver {
     private val textBackColor = ColorManager.getColor("text_back_color")
 
@@ -42,7 +42,7 @@ class PreeditModule(
                 view: View,
                 outline: Outline,
             ) {
-                val radius = theme.generalStyle.layout.roundCorner
+                val radius = context.dp(theme.generalStyle.layout.roundCorner)
                 val width = view.width
                 val height = view.height
                 val rect = Rect(-radius.toInt(), 0, width, (height + radius).toInt())
@@ -57,17 +57,42 @@ class PreeditModule(
             root.alpha = theme.generalStyle.layout.alpha / 255f
             root.outlineProvider = topLeftCornerRadiusOutlineProvider
             root.clipToOutline = true
+            root.visibility = View.INVISIBLE
             preedit.setOnCursorMoveListener { position ->
                 rime.launchOnReady { it.moveCursorPos(position) }
             }
         }
 
-    private val window =
-        PopupWindow(ui.root).apply {
-            width = WindowManager.LayoutParams.WRAP_CONTENT
-            height = WindowManager.LayoutParams.WRAP_CONTENT
-            animationStyle = 0
+    private val touchEventReceiverWindow =
+        PopupWindow(
+            object : View(context) {
+                @SuppressLint("ClickableViewAccessibility")
+                override fun onTouchEvent(event: MotionEvent): Boolean = ui.preedit.onTouchEvent(event)
+            },
+        )
+
+    private var isWindowShowing = false
+
+    private fun showWindow() {
+        isWindowShowing = true
+        val (left, top) = intArrayOf(0, 0).also { ui.preedit.getLocationInWindow(it) }
+        val width = ui.preedit.width
+        val height = ui.preedit.height
+        if (touchEventReceiverWindow.isShowing) {
+            touchEventReceiverWindow.update(left, top, width, height)
+        } else {
+            touchEventReceiverWindow.width = width
+            touchEventReceiverWindow.height = height
+            touchEventReceiverWindow.showAtLocation(ui.root, Gravity.NO_GRAVITY, left, top)
+        }
+    }
+
+    private fun dismissWindow() {
+        if (isWindowShowing) {
+            isWindowShowing = false
+            touchEventReceiverWindow.dismiss()
         }
+    }
 
     private val candidatesMode by AppPrefs.defaultInstance().candidates.mode
 
@@ -76,18 +101,11 @@ class PreeditModule(
         if (candidatesMode == PopupCandidatesMode.ALWAYS_SHOW) return
 
         ui.update(ctx.composition)
+        ui.root.visibility = if (ui.visible) View.VISIBLE else View.INVISIBLE
         if (ctx.composition.length > 0) {
-            val (x, y) = intArrayOf(0, 0).also { bar.view.getLocationInWindow(it) }
-            window.showAtLocation(bar.view, Gravity.START or Gravity.TOP, x, y)
-            ui.root.post {
-                window.update(x, y - ui.root.height, -1, -1)
-            }
+            showWindow()
         } else {
-            window.dismiss()
+            dismissWindow()
         }
     }
-
-    fun onDetached() {
-        window.dismiss()
-    }
 }

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

@@ -63,6 +63,9 @@ open class PreeditUi(
             }
         }
 
+    var visible = false
+        private set
+
     private fun updateTextView(
         str: CharSequence,
         visible: Boolean,
@@ -79,6 +82,8 @@ open class PreeditUi(
         val string = inputComposition.toSpannedString()
         val cursorPos = inputComposition.cursorPos
         val hasPreedit = inputComposition.length > 0
+        visible = hasPreedit
+        if (!visible) return
         val stringWithCursor =
             if (cursorPos == 0 || cursorPos == string.length) {
                 string

app/src/main/java/com/osfans/trime/ime/core/InputView.kt

@@ -246,6 +246,14 @@ class InputView(
 
         updateKeyboardSize()
 
+        add(
+            preedit.ui.root,
+            lParams(matchParent, wrapContent) {
+                above(keyboardView)
+                centerHorizontally()
+            },
+        )
+
         add(
             keyboardView,
             lParams(matchParent, wrapContent) {
@@ -377,7 +385,6 @@ class InputView(
         // implies that InputView should not be attached again after detached.
         baseMessageHandler.cancelJob()
         updateWindowViewHeightJob.cancel()
-        preedit.onDetached()
         preview.root.removeAllViews()
         broadcaster.clear()
         super.onDetachedFromWindow()