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 5888ec74f..a35a0abaf 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 @@ -11,6 +11,7 @@ import android.graphics.Bitmap import android.graphics.Color import android.os.Build import android.os.Bundle +import android.view.Gravity import android.view.KeyEvent import android.view.Menu import android.view.MotionEvent @@ -28,7 +29,6 @@ import androidx.core.view.setPadding import androidx.lifecycle.lifecycleScope import com.afollestad.materialdialogs.MaterialDialog 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 @@ -71,7 +71,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 exh.log.xLogE @@ -159,6 +158,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. */ @@ -239,6 +240,8 @@ class ReaderActivity : BaseRxActivity() chapterBottomSheet.adapter = null // SY <-- config = null + menuToggleToast?.cancel() + readingModeToast?.cancel() progressDialog?.dismiss() progressDialog = null // SY --> @@ -885,10 +888,14 @@ class ReaderActivity : BaseRxActivity() // SY --> val defaultReaderType = manga.defaultReaderType(manga.mangaType(sourceName = sourceManager.getOrStub(manga.source).name)) if (preferences.useAutoWebtoon().get() && manga.viewer == 0 && defaultReaderType != null && defaultReaderType == ReadingModeType.WEBTOON.prefValue) { - binding.root.snack(resources.getString(R.string.eh_auto_webtoon_snack), Snackbar.LENGTH_LONG) + readingModeToast?.cancel() + readingModeToast = Toast.makeText(this, resources.getString(R.string.eh_auto_webtoon_snack), Toast.LENGTH_SHORT).also { + it.setGravity(Gravity.CENTER_VERTICAL or Gravity.CENTER_HORIZONTAL, 0, 0) + it.show() + } } else if (preferences.showReadingMode()) { // SY <-- - showReadingModeSnackbar(presenter.getMangaViewer()) + showReadingModeToast(presenter.getMangaViewer()) } // SY --> @@ -940,9 +947,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() + } } /**