fix: app would crash on clipboard entry editing

Author: WhiredPlanck

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

@@ -8,8 +8,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.blankj.utilcode.util.ScreenUtils
-import com.blankj.utilcode.util.SizeUtils
 import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexWrap
 import com.google.android.flexbox.FlexboxLayoutManager
@@ -27,6 +25,7 @@ import com.osfans.trime.ime.enums.KeyCommandType
 import com.osfans.trime.ime.enums.SymbolKeyboardType
 import com.osfans.trime.ime.text.TextInputManager
 import com.osfans.trime.ui.main.LiquidKeyboardEditActivity
+import com.osfans.trime.util.ShortcutUtils
 import kotlinx.coroutines.launch
 import splitties.dimensions.dp
 import timber.log.Timber
@@ -40,8 +39,8 @@ class LiquidKeyboard(
     private val symbolHistory = SymbolHistory(180)
     private var adapterType: AdapterType = AdapterType.INIT
     private val simpleAdapter by lazy {
-        val itemWidth = SizeUtils.dp2px(theme.liquid.getFloat("single_width"))
-        val columnCount = ScreenUtils.getAppScreenWidth() / itemWidth
+        val itemWidth = context.dp(theme.liquid.getInt("single_width"))
+        val columnCount = context.resources.displayMetrics.widthPixels / itemWidth
         SimpleAdapter(theme, columnCount).apply {
             setHasStableIds(true)
         }
@@ -216,7 +215,7 @@ class LiquidKeyboard(
                     }
 
                     override suspend fun onEdit(bean: DatabaseBean) {
-                        bean.text?.let { launchLiquidKeyboardEditText(context, type, bean.id, it) }
+                        bean.text?.let { ShortcutUtils.launchLiquidKeyboardEdit(context, type, bean.id, it) }
                     }
 
                     // FIXME: 这个方法可能实现得比较粗糙，需要日后改进

app/src/main/java/com/osfans/trime/ui/main/LiquidKeyboardEditActivity.kt

@@ -1,10 +1,10 @@
 package com.osfans.trime.ui.main
 
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.widget.EditText
-import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.osfans.trime.data.db.ClipboardHelper
 import com.osfans.trime.data.db.CollectionHelper
@@ -15,7 +15,7 @@ import com.osfans.trime.ime.enums.SymbolKeyboardType
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
-class LiquidKeyboardEditActivity : AppCompatActivity() {
+class LiquidKeyboardEditActivity : Activity() {
     private val service: TrimeInputMethodService = TrimeInputMethodService.getService()
     private var id: Int? = null
     private lateinit var editText: EditText

app/src/main/java/com/osfans/trime/util/ShortcutUtils.kt

@@ -18,6 +18,8 @@ import com.osfans.trime.core.Rime
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.ime.core.RimeWrapper
 import com.osfans.trime.ime.core.TrimeInputMethodService
+import com.osfans.trime.ime.enums.SymbolKeyboardType
+import com.osfans.trime.ui.main.LiquidKeyboardEditActivity
 import com.osfans.trime.ui.main.LogActivity
 import com.osfans.trime.ui.main.PrefMainActivity
 import kotlinx.coroutines.CoroutineScope
@@ -182,4 +184,20 @@ object ShortcutUtils {
             Intent(context, LogActivity::class.java),
         )
     }
+
+    fun launchLiquidKeyboardEdit(
+        context: Context,
+        type: SymbolKeyboardType,
+        id: Int,
+        text: String,
+    ) {
+        context.startActivity(
+            Intent(context, LiquidKeyboardEditActivity::class.java).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                putExtra(LiquidKeyboardEditActivity.DB_BEAN_ID, id)
+                putExtra(LiquidKeyboardEditActivity.DB_BEAN_TEXT, text)
+                putExtra(LiquidKeyboardEditActivity.LIQUID_KEYBOARD_TYPE, type.name)
+            },
+        )
+    }
 }