From efd2a0cb7babf71a5cdc5fb2df5498c986bf4b26 Mon Sep 17 00:00:00 2001 From: Tooster Date: Sat, 3 Apr 2021 16:07:49 +0200 Subject: [PATCH] Replace reading mode snackbar with toast (#4752) --- .../tachiyomi/ui/reader/ReaderActivity.kt | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 696ee3f44..947d5b68d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -10,12 +10,7 @@ import android.graphics.Bitmap import android.graphics.Color import android.os.Build import android.os.Bundle -import android.view.KeyEvent -import android.view.Menu -import android.view.MenuItem -import android.view.MotionEvent -import android.view.View -import android.view.WindowManager +import android.view.* import android.view.animation.Animation import android.view.animation.AnimationUtils import android.widget.SeekBar @@ -26,7 +21,6 @@ import androidx.core.view.isVisible import androidx.core.view.setPadding import androidx.lifecycle.lifecycleScope import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView -import com.google.android.material.snackbar.Snackbar import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga @@ -62,7 +56,6 @@ import eu.kanade.tachiyomi.util.view.hideBar import eu.kanade.tachiyomi.util.view.isDefaultBar import eu.kanade.tachiyomi.util.view.setTooltip import eu.kanade.tachiyomi.util.view.showBar -import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.widget.SimpleAnimationListener import eu.kanade.tachiyomi.widget.SimpleSeekBarListener import kotlinx.coroutines.delay @@ -127,6 +120,8 @@ class ReaderActivity : BaseRxActivity() private var menuToggleToast: Toast? = null + private var readingModeToast: Toast? = null + /** * Called when the activity is created. Initializes the presenter and configuration. */ @@ -175,6 +170,8 @@ class ReaderActivity : BaseRxActivity() viewer?.destroy() viewer = null config = null + menuToggleToast?.cancel() + readingModeToast?.cancel() progressDialog?.dismiss() progressDialog = null } @@ -533,7 +530,7 @@ class ReaderActivity : BaseRxActivity() binding.viewerContainer.addView(newViewer.getView()) if (preferences.showReadingMode()) { - showReadingModeSnackbar(presenter.getMangaViewer()) + showReadingModeToast(presenter.getMangaViewer()) } binding.toolbar.title = manga.title @@ -551,9 +548,13 @@ class ReaderActivity : BaseRxActivity() binding.pleaseWait.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in_long)) } - private fun showReadingModeSnackbar(mode: Int) { + private fun showReadingModeToast(mode: Int) { val strings = resources.getStringArray(R.array.viewers_selector) - binding.root.snack(strings[mode], Snackbar.LENGTH_SHORT) + readingModeToast?.cancel() + readingModeToast = Toast.makeText(this, strings[mode], Toast.LENGTH_SHORT).also { + it.setGravity(Gravity.CENTER_VERTICAL or Gravity.CENTER_HORIZONTAL, 0, 0) + it.show() + } } /**