refactor: use custom toast utils

osfans · Jun 14, 2024 · e6204b8 · e6204b8
1 parent 9e7ae97
commit e6204b8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 33 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/broadcast/IntentReceiver.kt b/app/src/main/java/com/osfans/trime/ime/broadcast/IntentReceiver.kt
@@ -13,12 +13,13 @@ import android.content.IntentFilter
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.PowerManager.PARTIAL_WAKE_LOCK
+import android.widget.Toast
 import androidx.core.content.ContextCompat
-import com.blankj.utilcode.util.ToastUtils
 import com.osfans.trime.R
 import com.osfans.trime.core.Rime
 import com.osfans.trime.daemon.RimeDaemon
 import com.osfans.trime.data.AppPrefs
+import com.osfans.trime.util.toast
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
@@ -44,7 +45,7 @@ class IntentReceiver : BroadcastReceiver(), CoroutineScope by MainScope() {
                     withContext(Dispatchers.IO) {
                         RimeDaemon.restartRime(true)
                     }
-                    ToastUtils.showLong(R.string.deploy_finish)
+                    context.toast(R.string.deploy_finish, Toast.LENGTH_LONG)
                 }
             COMMAND_SYNC ->
                 launch {

diff --git a/app/src/main/java/com/osfans/trime/ime/core/Speech.kt b/app/src/main/java/com/osfans/trime/ime/core/Speech.kt
@@ -12,29 +12,23 @@ import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
 import androidx.annotation.StringRes
-import com.blankj.utilcode.util.ToastUtils
 import com.osfans.trime.R
 import com.osfans.trime.data.opencc.OpenCCDictManager
 import com.osfans.trime.data.theme.ThemeManager
+import com.osfans.trime.util.toast
 import timber.log.Timber
 import java.util.Arrays
 
 /** [語音輸入][RecognitionListener]  */
-class Speech(context: Context) : RecognitionListener {
-    private val speechRecognizer: SpeechRecognizer?
-    private val recognizerIntent: Intent
-
-    init {
-        speechRecognizer = SpeechRecognizer.createSpeechRecognizer(context)
-        speechRecognizer.setRecognitionListener(this)
-        recognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-        recognizerIntent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 1)
-        // recognizerIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE, "en");
-        // recognizerIntent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, context.getPackageName());
-        // recognizerIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
-        // RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);
-        // recognizerIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, "開始語音");
-    }
+class Speech(private val context: Context) : RecognitionListener {
+    private val speechRecognizer =
+        SpeechRecognizer.createSpeechRecognizer(context).apply {
+            setRecognitionListener(this@Speech)
+        }
+    private val recognizerIntent: Intent =
+        Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
+            putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 1)
+        }
 
     fun startListening() {
         speechRecognizer?.startListening(recognizerIntent)
@@ -57,7 +51,7 @@ class Speech(context: Context) : RecognitionListener {
             speechRecognizer.stopListening()
             speechRecognizer.destroy()
         }
-        ToastUtils.showShort(getErrorText(errorCode))
+        context.toast(getErrorText(errorCode))
     }
 
     override fun onEvent(
@@ -73,7 +67,7 @@ class Speech(context: Context) : RecognitionListener {
 
     override fun onReadyForSpeech(arg0: Bundle) {
         Timber.i("onReadyForSpeech")
-        ToastUtils.showShort("請開始說話：")
+        context.toast("請開始說話：")
     }
 
     override fun onResults(results: Bundle) {

diff --git a/app/src/main/java/com/osfans/trime/ui/fragments/AboutFragment.kt b/app/src/main/java/com/osfans/trime/ui/fragments/AboutFragment.kt
@@ -8,11 +8,11 @@ import android.content.ClipData
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.widget.Toast
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import androidx.preference.Preference
 import androidx.preference.get
-import com.blankj.utilcode.util.ToastUtils
 import com.osfans.trime.R
 import com.osfans.trime.core.Rime
 import com.osfans.trime.data.opencc.OpenCCDictManager
@@ -21,6 +21,7 @@ import com.osfans.trime.ui.main.MainViewModel
 import com.osfans.trime.util.Const
 import com.osfans.trime.util.formatDateTime
 import com.osfans.trime.util.thirdPartySummary
+import com.osfans.trime.util.toast
 import splitties.systemservices.clipboardManager
 
 class AboutFragment : PaddingPreferenceFragment() {
@@ -53,7 +54,7 @@ class AboutFragment : PaddingPreferenceFragment() {
                 setOnPreferenceClickListener {
                     val info = ClipData.newPlainText("BuildInfo", summary)
                     clipboardManager.setPrimaryClip(info)
-                    ToastUtils.showLong(R.string.copy_done)
+                    context.toast(R.string.copy_done, Toast.LENGTH_LONG)
                     true
                 }
             }

diff --git a/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt b/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt
@@ -20,7 +20,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.SwitchPreferenceCompat
 import androidx.preference.get
-import com.blankj.utilcode.util.ToastUtils
 import com.blankj.utilcode.util.UriUtils
 import com.osfans.trime.R
 import com.osfans.trime.core.Rime
@@ -34,6 +33,7 @@ import com.osfans.trime.util.ResourceUtils
 import com.osfans.trime.util.appContext
 import com.osfans.trime.util.formatDateTime
 import com.osfans.trime.util.rimeActionWithResultDialog
+import com.osfans.trime.util.toast
 import com.osfans.trime.util.withLoadingDialog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -219,9 +219,7 @@ class ProfileFragment :
                                                 .fold({ acc and true }, { acc and false })
                                         }
                             }
-                            ToastUtils.showShort(
-                                if (res) R.string.reset_success else R.string.reset_failure,
-                            )
+                            context.toast((if (res) R.string.reset_success else R.string.reset_failure))
                         }
                     }.show()
                 true

diff --git a/app/src/main/java/com/osfans/trime/util/DialogUtils.kt b/app/src/main/java/com/osfans/trime/util/DialogUtils.kt
@@ -8,9 +8,9 @@ import android.app.AlertDialog
 import android.content.ClipData
 import android.content.Context
 import android.view.ViewGroup.MarginLayoutParams
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.lifecycle.LifecycleCoroutineScope
-import com.blankj.utilcode.util.ToastUtils
 import com.osfans.trime.R
 import com.osfans.trime.ui.components.log.LogView
 import kotlinx.coroutines.Dispatchers
@@ -108,7 +108,7 @@ suspend fun Context.briefResultLogDialog(
             .setPositiveButton(R.string.setup__skip_hint_yes, null)
             .show()
     } else {
-        ToastUtils.showShort(R.string.setup__done)
+        toast(R.string.setup__done)
     }
 }
 
@@ -129,7 +129,7 @@ suspend fun Context.rimeActionWithResultDialog(
         if (result) {
             briefResultLogDialog(tag, priority, thresholds)
         } else {
-            ToastUtils.showLong("Failed")
+            toast("Failed", Toast.LENGTH_LONG)
         }
     }
 }
diff --git a/app/src/main/java/com/osfans/trime/util/Utils.kt b/app/src/main/java/com/osfans/trime/util/Utils.kt
@@ -18,7 +18,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import androidx.recyclerview.widget.RecyclerView
-import com.blankj.utilcode.util.ToastUtils
 import com.hjq.permissions.OnPermissionCallback
 import com.hjq.permissions.Permission
 import com.hjq.permissions.XXPermissions
@@ -122,7 +121,7 @@ fun Context.requestExternalStoragePermission() {
                     all: Boolean,
                 ) {
                     if (all) {
-                        ToastUtils.showShort(R.string.external_storage_permission_granted)
+                        toast(R.string.external_storage_permission_granted)
                     }
                 }
 
@@ -131,13 +130,13 @@ fun Context.requestExternalStoragePermission() {
                     never: Boolean,
                 ) {
                     if (never) {
-                        ToastUtils.showShort(R.string.external_storage_permission_denied)
+                        toast(R.string.external_storage_permission_denied)
                         XXPermissions.startPermissionActivity(
                             this@requestExternalStoragePermission,
                             permissions,
                         )
                     } else {
-                        ToastUtils.showShort(R.string.external_storage_permission_denied)
+                        toast(R.string.external_storage_permission_denied)
                     }
                 }
             },