refactor: extract showDialog from InputView to IMS

Author: WhiredPlanck

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

@@ -5,12 +5,10 @@
 package com.osfans.trime.ime.core
 
 import android.annotation.SuppressLint
-import android.app.Dialog
 import android.graphics.Color
 import android.os.Build
 import android.view.View
 import android.view.View.OnClickListener
-import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -37,7 +35,6 @@ import com.osfans.trime.ime.keyboard.KeyboardWindow
 import com.osfans.trime.ime.preview.KeyPreviewChoreographer
 import com.osfans.trime.ime.symbol.LiquidKeyboard
 import com.osfans.trime.util.ColorUtils
-import com.osfans.trime.util.styledFloat
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import splitties.dimensions.dp
@@ -372,36 +369,8 @@ class InputView(
         broadcaster.onSelectionUpdate(start, end)
     }
 
-    private var showingDialog: Dialog? = null
-
-    fun showDialog(dialog: Dialog) {
-        showingDialog?.dismiss()
-        val windowToken = windowToken
-        check(windowToken != null) { "InputView Token is null." }
-        val window = dialog.window!!
-        window.attributes.apply {
-            token = windowToken
-            type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG
-        }
-        window.addFlags(
-            WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM or
-                WindowManager.LayoutParams.FLAG_DIM_BEHIND,
-        )
-        window.setDimAmount(themedContext.styledFloat(android.R.attr.backgroundDimAmount))
-        showingDialog =
-            dialog.apply {
-                setOnDismissListener { this@InputView.showingDialog = null }
-                show()
-            }
-    }
-
-    fun finishInput() {
-        showingDialog?.dismiss()
-    }
-
     override fun onDetachedFromWindow() {
         ViewCompat.setOnApplyWindowInsetsListener(this, null)
-        showingDialog?.dismiss()
         // cancel the notification job and clear all broadcast receivers,
         // implies that InputView should not be attached again after detached.
         baseCallbackHandler.cancelJob()

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

@@ -7,6 +7,7 @@ package com.osfans.trime.ime.core
 import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.app.AlarmManager
+import android.app.Dialog
 import android.app.PendingIntent
 import android.content.Intent
 import android.content.res.Configuration
@@ -20,6 +21,7 @@ import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
+import android.view.WindowManager
 import android.view.inputmethod.CursorAnchorInfo
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.ExtractedTextRequest
@@ -56,6 +58,7 @@ import com.osfans.trime.util.findSectionFrom
 import com.osfans.trime.util.forceShowSelf
 import com.osfans.trime.util.isNightMode
 import com.osfans.trime.util.monitorCursorAnchor
+import com.osfans.trime.util.styledFloat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
@@ -535,7 +538,6 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
             clearComposition()
         }
         InputFeedbackManager.finishInput()
-        inputView?.finishInput()
     }
 
     // 直接commit不做任何处理
@@ -934,6 +936,27 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
 
     override fun onEvaluateFullscreenMode(): Boolean = false
 
+    private var showingDialog: Dialog? = null
+
+    fun showDialog(dialog: Dialog) {
+        showingDialog?.dismiss()
+        dialog.window?.also {
+            it.attributes.apply {
+                token = decorView.windowToken
+                type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG
+            }
+            it.addFlags(
+                WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM or WindowManager.LayoutParams.FLAG_DIM_BEHIND,
+            )
+            it.setDimAmount(styledFloat(android.R.attr.backgroundDimAmount))
+        }
+        dialog.setOnDismissListener {
+            showingDialog = null
+        }
+        dialog.show()
+        showingDialog = dialog
+    }
+
     companion object {
         /** Delimiter regex to split language/locale tags. */
         private val DELIMITER_SPLITTER = """[-_]""".toRegex()

app/src/main/java/com/osfans/trime/ime/keyboard/CommonKeyboardActionListener.kt

@@ -48,7 +48,6 @@ class CommonKeyboardActionListener(
     private val context: Context,
     private val service: TrimeInputMethodService,
     private val rime: RimeSession,
-    private val inputView: InputView,
     private val liquidKeyboard: LiquidKeyboard,
     private val windowManager: BoardWindowManager,
 ) {
@@ -67,7 +66,7 @@ class CommonKeyboardActionListener(
     private fun showDialog(dialog: suspend (RimeApi) -> Dialog) {
         rime.launchOnReady { api ->
             service.lifecycleScope.launch {
-                inputView.showDialog(dialog(api))
+                service.showDialog(dialog(api))
             }
         }
     }

app/src/main/java/com/osfans/trime/ime/symbol/DbAdapter.kt

@@ -91,7 +91,7 @@ class DbAdapter(
                     }
                 }.setNegativeButton(R.string.cancel, null)
                 .create()
-        service.inputView?.showDialog(confirm)
+        service.showDialog(confirm)
     }
 
     override val showCollectButton: Boolean = type != SymbolBoardType.COLLECTION