From 8721d8c9ec05ee7a23f43093a0149df2c826252f Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 27 Mar 2021 10:53:31 -0400 Subject: [PATCH] Add tooltips to bottom reader menu items (cherry picked from commit bff73b1b404e6c39727a8bd92d24c0de72efc406) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt --- .../tachiyomi/ui/reader/ReaderActivity.kt | 59 +++++++++++++------ 1 file changed, 42 insertions(+), 17 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 16e53449e..c0f1fa59f 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 @@ -68,6 +68,7 @@ import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.defaultBar 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 @@ -449,22 +450,33 @@ class ReaderActivity : BaseRxActivity() ReaderSettingsSheet(this).show() } - /*binding.actionReaderMode.setOnClickListener { - val newReadingMode = ReadingModeType.getNextReadingMode(presenter.getMangaViewer(resolveDefault = false)) - presenter.setMangaViewer(newReadingMode.prefValue) - menuToggleToast?.cancel() - menuToggleToast = toast(newReadingMode.stringRes) + /*with(binding.actionReaderMode) { + setTooltip(R.string.viewer) + + setOnClickListener { + val newReadingMode = + ReadingModeType.getNextReadingMode(presenter.getMangaViewer(resolveDefault = false)) + presenter.setMangaViewer(newReadingMode.prefValue) + + menuToggleToast?.cancel() + menuToggleToast = toast(newReadingMode.stringRes) + } } - binding.actionRotation.setOnClickListener { - val newOrientation = OrientationType.getNextOrientation(preferences.rotation().get(), resources) + with(binding.actionRotation) { + setTooltip(R.string.pref_rotation_type) - preferences.rotation().set(newOrientation.prefValue) - setOrientation(newOrientation.flag) + setOnClickListener { + val newOrientation = + OrientationType.getNextOrientation(preferences.rotation().get(), resources) - menuToggleToast?.cancel() - menuToggleToast = toast(newOrientation.stringRes) + preferences.rotation().set(newOrientation.prefValue) + setOrientation(newOrientation.flag) + + menuToggleToast?.cancel() + menuToggleToast = toast(newOrientation.stringRes) + } } preferences.rotation().asImmediateFlow { updateRotationShortcut(it) } .onEach { @@ -473,16 +485,29 @@ class ReaderActivity : BaseRxActivity() .launchIn(lifecycleScope) */ - binding.actionSettings.setOnClickListener { - ReaderSettingsSheet(this).show() + with(binding.actionSettings) { + setTooltip(R.string.action_settings) + + setOnClickListener { + ReaderSettingsSheet(this@ReaderActivity).show() + } } // --> EH - binding.actionWebView.setOnClickListener { - openMangaInBrowser() + with(binding.actionWebView) { + setTooltip(R.string.action_open_in_web_view) + + setOnClickListener { + openMangaInBrowser() + } } - binding.actionChapterList.setOnClickListener { - chapterBottomSheet.show() + + with(binding.actionChapterList) { + setTooltip(R.string.chapters) + + setOnClickListener { + chapterBottomSheet.show() + } } binding.expandEhButton.clicks()