diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 968b230d3..5dd124399 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -21,6 +21,8 @@ object PreferenceKeys { const val showPageNumber = "pref_show_page_number_key" + const val showReadingMode = "pref_show_reading_mode" + const val trueColor = "pref_true_color_key" const val fullscreen = "fullscreen" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index 8cbc07ecf..eee41129d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -83,6 +83,8 @@ class PreferencesHelper(val context: Context) { fun showPageNumber() = flowPrefs.getBoolean(Keys.showPageNumber, true) + fun showReadingMode() = prefs.getBoolean(Keys.showReadingMode, true) + fun trueColor() = flowPrefs.getBoolean(Keys.trueColor, false) fun fullscreen() = flowPrefs.getBoolean(Keys.fullscreen, true) 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 022c2f666..881c808a5 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 @@ -647,19 +647,24 @@ class ReaderActivity : BaseRxActivity() viewer = newViewer binding.viewerContainer.addView(newViewer.getView()) + val defaultReaderType = manga.defaultReaderType() + if (preferences.eh_useAutoWebtoon().get() && manga.viewer == 0 && defaultReaderType != null && defaultReaderType == WEBTOON) { + binding.root.snack(resources.getString(R.string.eh_auto_webtoon_snack), Snackbar.LENGTH_LONG) + } else if (preferences.showReadingMode()) { + showReadingModeSnackbar(presenter.getMangaViewer()) + } + binding.toolbar.title = manga.title binding.pageSeekbar.isRTL = newViewer is R2LPagerViewer binding.pleaseWait.visible() binding.pleaseWait.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in_long)) + } - if (preferences.eh_useAutoWebtoon().get()) { - val defaultReaderType = manga.defaultReaderType() - if (manga.viewer == 0 && defaultReaderType != null && defaultReaderType == WEBTOON) { - binding.readerLayout.snack(resources.getString(R.string.eh_auto_webtoon_snack), Snackbar.LENGTH_LONG) {} - } - } + private fun showReadingModeSnackbar(mode: Int) { + val strings = resources.getStringArray(R.array.viewers_selector) + binding.root.snack(strings[mode], Snackbar.LENGTH_SHORT) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt index bc1602b44..8e62031ee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt @@ -74,6 +74,12 @@ class SettingsReaderController : SettingsController() { titleRes = R.string.pref_show_page_number defaultValue = true } + switchPreference { + key = Keys.showReadingMode + titleRes = R.string.pref_show_reading_mode + summaryRes = R.string.pref_show_reading_mode_summary + defaultValue = true + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { switchPreference { key = Keys.trueColor diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt index 8fc918f23..a4d5f3cc7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt @@ -33,7 +33,7 @@ fun View.getCoordinates() = Point((left + right) / 2, (top + bottom) / 2) * @param length the duration of the snack. * @param f a function to execute in the snack, allowing for example to define a custom action. */ -inline fun View.snack(message: String, length: Int = Snackbar.LENGTH_LONG, f: Snackbar.() -> Unit): Snackbar { +inline fun View.snack(message: String, length: Int = Snackbar.LENGTH_LONG, f: Snackbar.() -> Unit = {}): Snackbar { val snack = Snackbar.make(this, message, length) val textView: TextView = snack.view.findViewById(com.google.android.material.R.id.snackbar_text) textView.setTextColor(Color.WHITE) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd6b43dfd..b6dd979ff 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -231,6 +231,8 @@ Animate page transitions Double tap animation speed Show page number + Show reading mode + Briefly show current mode when reader is opened 32-bit color Reduces banding, but impacts performance Crop borders