Minor cleanup

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -22,7 +22,7 @@ import java.util.Locale
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values
 
-fun <T> Preference<T>.asImmediateFlow(block: (value: T) -> Unit): Flow<T> {
+fun <T> Preference<T>.asImmediateFlow(block: (T) -> Unit): Flow<T> {
     block(get())
     return asFlow()
         .onEach { block(it) }

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -43,6 +43,7 @@ import eu.kanade.tachiyomi.ui.recent.history.HistoryController
 import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
+import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import timber.log.Timber
@@ -301,11 +302,8 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
 
     private suspend fun resetExitConfirmation() {
         isConfirmingExit = true
-        val toast = Toast.makeText(this, R.string.confirm_exit, Toast.LENGTH_LONG)
+        val toast = toast(R.string.confirm_exit, Toast.LENGTH_LONG)
-        toast.show()
-
         delay(2000)
-
         toast.cancel()
         isConfirmingExit = false
     }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -551,9 +551,8 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
     private fun showReadingModeToast(mode: Int) {
         val strings = resources.getStringArray(R.array.viewers_selector)
         readingModeToast?.cancel()
-        readingModeToast = Toast.makeText(this, strings[mode], Toast.LENGTH_SHORT).also {
+        readingModeToast = toast(strings[mode]) {
             it.setGravity(Gravity.CENTER_VERTICAL or Gravity.CENTER_HORIZONTAL, 0, 0)
-            it.show()
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -42,8 +42,8 @@ import kotlin.math.roundToInt
  * @param resource the text resource.
  * @param duration the duration of the toast. Defaults to short.
  */
-fun Context.toast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT): Toast {
+fun Context.toast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT, block: (Toast) -> Unit = {}): Toast {
-    return Toast.makeText(this, resource, duration).also { it.show() }
+    return toast(getString(resource), duration, block)
 }
 
 /**
@@ -52,8 +52,11 @@ fun Context.toast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT):
  * @param text the text to display.
  * @param duration the duration of the toast. Defaults to short.
  */
-fun Context.toast(text: String?, duration: Int = Toast.LENGTH_SHORT): Toast {
+fun Context.toast(text: String?, duration: Int = Toast.LENGTH_SHORT, block: (Toast) -> Unit = {}): Toast {
-    return Toast.makeText(this, text.orEmpty(), duration).also { it.show() }
+    return Toast.makeText(this, text.orEmpty(), duration).also {
+        block(it)
+        it.show()
+    }
 }
 
 /**

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

@@ -253,7 +253,7 @@
       <!-- Reader section -->
     <string name="pref_fullscreen">Fullscreen</string>
     <string name="pref_show_navigation_mode">Show navigation layout overlay</string>
-    <string name="pref_show_navigation_mode_summary">Briefly show tap zones when reader is opened</string>
+    <string name="pref_show_navigation_mode_summary">Show tap zones when reader is opened</string>
     <string name="pref_dual_page_split">Dual page split</string>
     <string name="pref_dual_page_invert">Invert dual page split placement</string>
     <string name="pref_dual_page_invert_summary">If the placement of the dual page split doesn\'t match reading direction</string>