fix: LiquidKeyboardEditActivity didn't follow the night mode

osfans · Apr 30, 2024 · 335464d · 335464d
1 parent 7df876a
commit 335464d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -73,7 +73,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
             android:label="@string/edit"
             android:launchMode="singleInstance"
             android:taskAffinity=".ui.main.LiquidKeyboardEditActivity"
-            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"
+            android:theme="@style/Theme.DialogTheme"
             android:windowSoftInputMode="stateAlwaysVisible|adjustPan" />
 
         <!-- Using an activity alias to disable/enable the app icon in the launcher -->

diff --git a/app/src/main/java/com/osfans/trime/ui/main/LiquidKeyboardEditActivity.kt b/app/src/main/java/com/osfans/trime/ui/main/LiquidKeyboardEditActivity.kt
@@ -9,18 +9,18 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.widget.EditText
-import androidx.lifecycle.lifecycleScope
 import com.osfans.trime.data.db.ClipboardHelper
 import com.osfans.trime.data.db.CollectionHelper
 import com.osfans.trime.data.db.DraftHelper
 import com.osfans.trime.databinding.ActivityLiquidKeyboardEditBinding
-import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ime.symbol.SymbolBoardType
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
 class LiquidKeyboardEditActivity : Activity() {
-    private val service: TrimeInputMethodService = TrimeInputMethodService.getService()
+    private val scope: CoroutineScope = MainScope()
     private var id: Int? = null
     private lateinit var editText: EditText
     private var type: SymbolBoardType? = null
@@ -61,19 +61,19 @@ class LiquidKeyboardEditActivity : Activity() {
         val newText = editText.text.toString()
         when (type) {
             SymbolBoardType.CLIPBOARD -> {
-                service.lifecycleScope.launch {
+                scope.launch {
                     ClipboardHelper.updateText(id!!, newText)
                 }
             }
 
             SymbolBoardType.COLLECTION -> {
-                service.lifecycleScope.launch {
+                scope.launch {
                     CollectionHelper.updateText(id!!, newText)
                 }
             }
 
             SymbolBoardType.DRAFT -> {
-                service.lifecycleScope.launch {
+                scope.launch {
                     DraftHelper.updateText(id!!, newText)
                 }
             }

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog" />
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -21,4 +21,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
         <item name="colorOnSurface">@color/colorOnSurface</item>
         <item name="colorOnError">@color/colorOnError</item>
     </style>
+
+    <style name="Theme.DialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />
 </resources>