feat(clipboard): return after pasting

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/data/prefs/AppPrefs.kt

@@ -247,6 +247,7 @@ class AppPrefs(
             const val CLIPBOARD_OUTPUT_RULES = "clipboard_clipboard_output"
             const val CLIPBOARD_SUGGESTION = "clipboard_suggestion"
             const val CLIPBOARD_SUGGESTION_TIMEOUT = "clipboard_suggestion_timeout"
+            const val CLIPBOARD_RETURN_AFTER_PASTE = "clipboard_return_after_paste"
         }
         val clipboardListening = switch(R.string.clipboard_listening, CLIPBOARD_LISTENING, true)
         val clipboardLimit = int(
@@ -279,6 +280,11 @@ class AppPrefs(
             100,
             "s",
         ) { clipboardListening.getValue() && clipboardSuggestion.getValue() }
+        val clipboardReturnAfterPaste = switch(
+            R.string.clipboard_return_after_paste,
+            CLIPBOARD_RETURN_AFTER_PASTE,
+            true,
+        ) { clipboardListening.getValue() }
     }
 
     /**

app/src/main/java/com/osfans/trime/ime/clipboard/ClipboardWindow.kt

@@ -16,6 +16,7 @@ import com.osfans.trime.R
 import com.osfans.trime.data.db.ClipboardHelper
 import com.osfans.trime.data.db.CollectionHelper
 import com.osfans.trime.data.db.DatabaseBean
+import com.osfans.trime.data.prefs.AppPrefs
 import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.FontManager
 import com.osfans.trime.data.theme.Theme
@@ -41,6 +42,9 @@ class ClipboardWindow(
     private lateinit var clipboardLayout: ClipboardLayout
     private lateinit var clipboardPagesAdapter: ClipboardPagesAdapter
 
+    private val prefs = AppPrefs.defaultInstance().clipboard
+    private val clipboardReturnAfterPaste by prefs.clipboardReturnAfterPaste
+
     private val clipboardBeansPager by lazy {
         Pager(PagingConfig(pageSize = 16)) { ClipboardHelper.allBeans() }
     }
@@ -55,6 +59,9 @@ class ClipboardWindow(
             override fun onPaste(bean: DatabaseBean) {
                 val text = bean.text ?: return
                 service.commitText(text)
+                if (clipboardReturnAfterPaste) {
+                    windowManager.attachWindow(KeyboardWindow)
+                }
             }
 
             override fun onPin(id: Int) {
@@ -88,6 +95,9 @@ class ClipboardWindow(
             override fun onPaste(bean: DatabaseBean) {
                 val text = bean.text ?: return
                 service.commitText(text)
+                if (clipboardReturnAfterPaste) {
+                    windowManager.attachWindow(KeyboardWindow)
+                }
             }
 
             override fun onEdit(id: Int) {

app/src/main/res/values-zh-rCN/strings.xml

@@ -234,4 +234,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <string name="backup">备份</string>
     <string name="restore">还原</string>
     <string name="clipboard_listening">记录剪贴板历史</string>
+    <string name="clipboard_return_after_paste">粘贴后返回</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -235,4 +235,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <string name="backup">備份</string>
     <string name="restore">還原</string>
     <string name="clipboard_listening">監聽剪貼簿</string>
+    <string name="clipboard_return_after_paste">貼上後返回</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -235,4 +235,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <string name="backup">Backup</string>
     <string name="restore">Restore</string>
     <string name="clipboard_listening">Clipboard listening</string>
+    <string name="clipboard_return_after_paste">Return after pasting</string>
 </resources>