Skip to content

Commit e6204b8

Browse files
WhiredPlanckWhiredPlanck
committed
refactor: use custom toast utils
1 parent 9e7ae97 commit e6204b8

File tree

6 files changed

+26
-33
lines changed

6 files changed

+26
-33
lines changed

‎app/src/main/java/com/osfans/trime/ime/broadcast/IntentReceiver.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ import android.content.IntentFilter
1313
import android.os.Build.VERSION
1414
import android.os.Build.VERSION_CODES
1515
import android.os.PowerManager.PARTIAL_WAKE_LOCK
16+
import android.widget.Toast
1617
import androidx.core.content.ContextCompat
17-
import com.blankj.utilcode.util.ToastUtils
1818
import com.osfans.trime.R
1919
import com.osfans.trime.core.Rime
2020
import com.osfans.trime.daemon.RimeDaemon
2121
import com.osfans.trime.data.AppPrefs
22+
import com.osfans.trime.util.toast
2223
import kotlinx.coroutines.CoroutineScope
2324
import kotlinx.coroutines.Dispatchers
2425
import kotlinx.coroutines.MainScope
@@ -44,7 +45,7 @@ class IntentReceiver : BroadcastReceiver(), CoroutineScope by MainScope() {
4445
withContext(Dispatchers.IO) {
4546
RimeDaemon.restartRime(true)
4647
}
47-
ToastUtils.showLong(R.string.deploy_finish)
48+
context.toast(R.string.deploy_finish, Toast.LENGTH_LONG)
4849
}
4950
COMMAND_SYNC ->
5051
launch {

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

+12-18
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,23 @@ import android.speech.RecognitionListener
1212
import android.speech.RecognizerIntent
1313
import android.speech.SpeechRecognizer
1414
import androidx.annotation.StringRes
15-
import com.blankj.utilcode.util.ToastUtils
1615
import com.osfans.trime.R
1716
import com.osfans.trime.data.opencc.OpenCCDictManager
1817
import com.osfans.trime.data.theme.ThemeManager
18+
import com.osfans.trime.util.toast
1919
import timber.log.Timber
2020
import java.util.Arrays
2121

2222
/** [語音輸入][RecognitionListener] */
23-
class Speech(context: Context) : RecognitionListener {
24-
private val speechRecognizer: SpeechRecognizer?
25-
private val recognizerIntent: Intent
26-
27-
init {
28-
speechRecognizer = SpeechRecognizer.createSpeechRecognizer(context)
29-
speechRecognizer.setRecognitionListener(this)
30-
recognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
31-
recognizerIntent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 1)
32-
// recognizerIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE, "en");
33-
// recognizerIntent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, context.getPackageName());
34-
// recognizerIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
35-
// RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);
36-
// recognizerIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, "開始語音");
37-
}
23+
class Speech(private val context: Context) : RecognitionListener {
24+
private val speechRecognizer =
25+
SpeechRecognizer.createSpeechRecognizer(context).apply {
26+
setRecognitionListener(this@Speech)
27+
}
28+
private val recognizerIntent: Intent =
29+
Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
30+
putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 1)
31+
}
3832

3933
fun startListening() {
4034
speechRecognizer?.startListening(recognizerIntent)
@@ -57,7 +51,7 @@ class Speech(context: Context) : RecognitionListener {
5751
speechRecognizer.stopListening()
5852
speechRecognizer.destroy()
5953
}
60-
ToastUtils.showShort(getErrorText(errorCode))
54+
context.toast(getErrorText(errorCode))
6155
}
6256

6357
override fun onEvent(
@@ -73,7 +67,7 @@ class Speech(context: Context) : RecognitionListener {
7367

7468
override fun onReadyForSpeech(arg0: Bundle) {
7569
Timber.i("onReadyForSpeech")
76-
ToastUtils.showShort("請開始說話：")
70+
context.toast("請開始說話：")
7771
}
7872

7973
override fun onResults(results: Bundle) {

‎app/src/main/java/com/osfans/trime/ui/fragments/AboutFragment.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import android.content.ClipData
88
import android.content.Intent
99
import android.net.Uri
1010
import android.os.Bundle
11+
import android.widget.Toast
1112
import androidx.fragment.app.activityViewModels
1213
import androidx.navigation.fragment.findNavController
1314
import androidx.preference.Preference
1415
import androidx.preference.get
15-
import com.blankj.utilcode.util.ToastUtils
1616
import com.osfans.trime.R
1717
import com.osfans.trime.core.Rime
1818
import com.osfans.trime.data.opencc.OpenCCDictManager
@@ -21,6 +21,7 @@ import com.osfans.trime.ui.main.MainViewModel
2121
import com.osfans.trime.util.Const
2222
import com.osfans.trime.util.formatDateTime
2323
import com.osfans.trime.util.thirdPartySummary
24+
import com.osfans.trime.util.toast
2425
import splitties.systemservices.clipboardManager
2526

2627
class AboutFragment : PaddingPreferenceFragment() {
@@ -53,7 +54,7 @@ class AboutFragment : PaddingPreferenceFragment() {
5354
setOnPreferenceClickListener {
5455
val info = ClipData.newPlainText("BuildInfo", summary)
5556
clipboardManager.setPrimaryClip(info)
56-
ToastUtils.showLong(R.string.copy_done)
57+
context.toast(R.string.copy_done, Toast.LENGTH_LONG)
5758
true
5859
}
5960
}

‎app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.lifecycle.lifecycleScope
2020
import androidx.preference.Preference
2121
import androidx.preference.SwitchPreferenceCompat
2222
import androidx.preference.get
23-
import com.blankj.utilcode.util.ToastUtils
2423
import com.blankj.utilcode.util.UriUtils
2524
import com.osfans.trime.R
2625
import com.osfans.trime.core.Rime
@@ -34,6 +33,7 @@ import com.osfans.trime.util.ResourceUtils
3433
import com.osfans.trime.util.appContext
3534
import com.osfans.trime.util.formatDateTime
3635
import com.osfans.trime.util.rimeActionWithResultDialog
36+
import com.osfans.trime.util.toast
3737
import com.osfans.trime.util.withLoadingDialog
3838
import kotlinx.coroutines.Dispatchers
3939
import kotlinx.coroutines.launch
@@ -219,9 +219,7 @@ class ProfileFragment :
219219
.fold({ acc and true }, { acc and false })
220220
}
221221
}
222-
ToastUtils.showShort(
223-
if (res) R.string.reset_success else R.string.reset_failure,
224-
)
222+
context.toast((if (res) R.string.reset_success else R.string.reset_failure))
225223
}
226224
}.show()
227225
true

‎app/src/main/java/com/osfans/trime/util/DialogUtils.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import android.app.AlertDialog
88
import android.content.ClipData
99
import android.content.Context
1010
import android.view.ViewGroup.MarginLayoutParams
11+
import android.widget.Toast
1112
import androidx.annotation.StringRes
1213
import androidx.lifecycle.LifecycleCoroutineScope
13-
import com.blankj.utilcode.util.ToastUtils
1414
import com.osfans.trime.R
1515
import com.osfans.trime.ui.components.log.LogView
1616
import kotlinx.coroutines.Dispatchers
@@ -108,7 +108,7 @@ suspend fun Context.briefResultLogDialog(
108108
.setPositiveButton(R.string.setup__skip_hint_yes, null)
109109
.show()
110110
} else {
111-
ToastUtils.showShort(R.string.setup__done)
111+
toast(R.string.setup__done)
112112
}
113113
}
114114

@@ -129,7 +129,7 @@ suspend fun Context.rimeActionWithResultDialog(
129129
if (result) {
130130
briefResultLogDialog(tag, priority, thresholds)
131131
} else {
132-
ToastUtils.showLong("Failed")
132+
toast("Failed", Toast.LENGTH_LONG)
133133
}
134134
}
135135
}

‎app/src/main/java/com/osfans/trime/util/Utils.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import androidx.core.view.WindowInsetsCompat
1818
import androidx.fragment.app.Fragment
1919
import androidx.preference.Preference
2020
import androidx.recyclerview.widget.RecyclerView
21-
import com.blankj.utilcode.util.ToastUtils
2221
import com.hjq.permissions.OnPermissionCallback
2322
import com.hjq.permissions.Permission
2423
import com.hjq.permissions.XXPermissions
@@ -122,7 +121,7 @@ fun Context.requestExternalStoragePermission() {
122121
all: Boolean,
123122
) {
124123
if (all) {
125-
ToastUtils.showShort(R.string.external_storage_permission_granted)
124+
toast(R.string.external_storage_permission_granted)
126125
}
127126
}
128127

@@ -131,13 +130,13 @@ fun Context.requestExternalStoragePermission() {
131130
never: Boolean,
132131
) {
133132
if (never) {
134-
ToastUtils.showShort(R.string.external_storage_permission_denied)
133+
toast(R.string.external_storage_permission_denied)
135134
XXPermissions.startPermissionActivity(
136135
this@requestExternalStoragePermission,
137136
permissions,
138137
)
139138
} else {
140-
ToastUtils.showShort(R.string.external_storage_permission_denied)
139+
toast(R.string.external_storage_permission_denied)
141140
}
142141
}
143142
},

0 commit comments

Comments
 (0)