Merge branch 'osfans:develop' into develop

Author: FlyingpigNZ

app/src/main/java/com/osfans/trime/core/Rime.kt

@@ -9,6 +9,7 @@ import com.osfans.trime.data.opencc.OpenCCDictManager
 import com.osfans.trime.data.prefs.AppPrefs
 import com.osfans.trime.data.schema.SchemaManager
 import com.osfans.trime.util.appContext
+import com.osfans.trime.util.isAsciiPrintable
 import com.osfans.trime.util.isStorageAvailable
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -214,15 +215,9 @@ class Rime : RimeApi, RimeLifecycleOwner {
             }
         }
 
-        private fun isValidText(text: CharSequence?): Boolean {
-            if (text.isNullOrEmpty()) return false
-            val ch = text.toString().codePointAt(0)
-            return ch in 0x20..0x7f
-        }
-
         @JvmStatic
         fun simulateKeySequence(sequence: CharSequence): Boolean {
-            if (!isValidText(sequence)) return false
+            if (!sequence.first().isAsciiPrintable()) return false
             Timber.d("simulateKeySequence: $sequence")
             return simulateRimeKeySequence(
                 sequence.toString().replace("{}", "{braceleft}{braceright}"),

app/src/main/java/com/osfans/trime/data/db/ClipboardHelper.kt

@@ -8,9 +8,9 @@ import android.content.ClipboardManager
 import android.content.Context
 import androidx.room.Room
 import com.osfans.trime.data.prefs.AppPrefs
-import com.osfans.trime.util.StringUtils.matches
-import com.osfans.trime.util.StringUtils.removeAll
 import com.osfans.trime.util.WeakHashSet
+import com.osfans.trime.util.matchesAny
+import com.osfans.trime.util.removeRegexSet
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -62,10 +62,14 @@ object ClipboardHelper :
     private val limit get() = AppPrefs.defaultInstance().clipboard.clipboardLimit
     private val compare get() =
         AppPrefs.defaultInstance().clipboard.clipboardCompareRules
-            .trim().split('\n')
+            .split('\n')
+            .map { Regex(it.trim()) }
+            .toHashSet()
     private val output get() =
         AppPrefs.defaultInstance().clipboard.clipboardOutputRules
-            .trim().split('\n')
+            .split('\n')
+            .map { Regex(it) }
+            .toHashSet()
 
     var lastBean: DatabaseBean? = null
 
@@ -118,10 +122,10 @@ object ClipboardHelper :
             ?.let { DatabaseBean.fromClipData(it) }
             ?.takeIf {
                 it.text!!.isNotBlank() &&
-                    !it.text.matches(output.toTypedArray())
+                    !it.text.matchesAny(output)
             }
             ?.let { b ->
-                if (b.text!!.removeAll(compare.toTypedArray()).isEmpty()) return
+                if (b.text?.removeRegexSet(compare)?.isEmpty() == true) return
                 Timber.d("Accept clipboard $b")
                 launch {
                     mutex.withLock {

app/src/main/java/com/osfans/trime/data/db/DraftHelper.kt

@@ -8,7 +8,7 @@ import android.content.Context
 import androidx.room.Room
 import com.osfans.trime.data.prefs.AppPrefs
 import com.osfans.trime.ime.core.TrimeInputMethodService
-import com.osfans.trime.util.StringUtils.matches
+import com.osfans.trime.util.matchesAny
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -33,7 +33,9 @@ object DraftHelper : CoroutineScope by CoroutineScope(SupervisorJob() + Dispatch
     private val limit get() = AppPrefs.defaultInstance().clipboard.draftLimit
     private val output get() =
         AppPrefs.defaultInstance().clipboard.draftOutputRules
-            .trim().split('n')
+            .split('\n')
+            .map { Regex(it) }
+            .toHashSet()
 
     var lastBean: DatabaseBean? = null
 
@@ -81,7 +83,7 @@ object DraftHelper : CoroutineScope by CoroutineScope(SupervisorJob() + Dispatch
             ?.let { DatabaseBean.fromInputConnection(it) }
             ?.takeIf {
                 it.text!!.isNotBlank() &&
-                    !it.text.matches(output.toTypedArray())
+                    !it.text.matchesAny(output)
             }
             ?.let { b ->
                 Timber.d("Accept $b")

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

@@ -58,8 +58,8 @@ import com.osfans.trime.ime.text.Candidate
 import com.osfans.trime.ime.text.TextInputManager
 import com.osfans.trime.util.ShortcutUtils
 import com.osfans.trime.util.ShortcutUtils.openCategory
-import com.osfans.trime.util.StringUtils
 import com.osfans.trime.util.WeakHashSet
+import com.osfans.trime.util.findSectionFrom
 import com.osfans.trime.util.isNightMode
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -1049,7 +1049,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                     etr.token = 0
                     val et = ic.getExtractedText(etr, 0)
                     if (et != null) {
-                        val moveTo = StringUtils.findSectionAfter(et.text, et.startOffset + et.selectionEnd)
+                        val moveTo = et.text.findSectionFrom(et.startOffset + et.selectionEnd)
                         ic.setSelection(moveTo, moveTo)
                         return true
                     }
@@ -1062,7 +1062,7 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
                     etr.token = 0
                     val et = ic.getExtractedText(etr, 0)
                     if (et != null) {
-                        val moveTo = StringUtils.findSectionBefore(et.text, et.startOffset + et.selectionStart)
+                        val moveTo = et.text.findSectionFrom(et.startOffset + et.selectionStart, true)
                         ic.setSelection(moveTo, moveTo)
                         return true
                     }

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

@@ -164,7 +164,7 @@ class Keyboard() {
         mLabelTransform = obtainString(keyboardConfig, "label_transform", "none")
         asciiMode = obtainInt(keyboardConfig, "ascii_mode", 1) == 1
         currentAsciiMode = asciiMode
-        if (asciiMode) asciiKeyboard = obtainString(keyboardConfig, "ascii_keyboard", "")
+        if (!asciiMode) asciiKeyboard = obtainString(keyboardConfig, "ascii_keyboard", "")
         resetAsciiMode = obtainBoolean(keyboardConfig, "reset_ascii_mode", true)
         landscapeKeyboard = obtainString(keyboardConfig, "landscape_keyboard", "")
         mLandscapePercent =

app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt

@@ -35,7 +35,7 @@ import com.osfans.trime.ui.main.settings.ColorPickerDialog
 import com.osfans.trime.ui.main.settings.KeySoundEffectPickerDialog
 import com.osfans.trime.ui.main.settings.ThemePickerDialog
 import com.osfans.trime.util.ShortcutUtils
-import com.osfans.trime.util.startsWithAsciiChar
+import com.osfans.trime.util.isAsciiPrintable
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -461,7 +461,7 @@ class TextInputManager(
 
     override fun onText(text: CharSequence?) {
         text ?: return
-        if (!text.startsWithAsciiChar() && Rime.isComposing) {
+        if (!text.first().isAsciiPrintable() && Rime.isComposing) {
             Rime.commitComposition()
             trime.commitRimeText()
         }

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

@@ -0,0 +1,4 @@
+package com.osfans.trime.util
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun Char.isAsciiPrintable(): Boolean = code in 32 until 127

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

@@ -0,0 +1,8 @@
+package com.osfans.trime.util
+
+fun String.removeRegexSet(regexSet: Set<Regex>): String {
+    regexSet.forEach { replace(it, String.EMPTY) }
+    return this
+}
+
+fun String.matchesAny(regexSet: Set<Regex>): Boolean = regexSet.any { it.matches(this) }

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

@@ -0,0 +1,20 @@
+package com.osfans.trime.util
+
+val String.Companion.EMPTY: String
+    get() = ""
+
+private const val SECTION_DIVIDER = ",.?!~:，。：～？！…\t\r\n\\/"
+
+fun CharSequence.findSectionFrom(
+    start: Int,
+    forward: Boolean = false,
+): Int {
+    if (start !in 0..lastIndex) return -1
+    return if (forward) {
+        val subSequence = subSequence(0, start)
+        subSequence.indexOfLast { SECTION_DIVIDER.contains(it) }
+    } else {
+        val subSequence = subSequence(start, length)
+        start + subSequence.indexOfFirst { SECTION_DIVIDER.contains(it) }
+    }
+}