From 1fd8021e98311ecd8aafc2c9786c5def8c6a14ff Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 16 Jan 2023 22:40:10 -0500 Subject: [PATCH] Hide WebView menu item in reader if local Closes #8932 (cherry picked from commit 1a4dad72a9e7e5eb5326f5846c50698fe2bb6673) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt --- .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 d99796be2..6aae0cd64 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 @@ -61,6 +61,7 @@ import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.databinding.ReaderActivityBinding import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.model.Page +import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.activity.BaseActivity import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.reader.ReaderViewModel.SetAsCoverResult.AddToLibraryFirst @@ -402,7 +403,8 @@ class ReaderActivity : BaseActivity() { /*val isChapterBookmarked = viewModel.getCurrentChapter()?.chapter?.bookmark ?: false menu.findItem(R.id.action_bookmark).isVisible = !isChapterBookmarked - menu.findItem(R.id.action_remove_bookmark).isVisible = isChapterBookmarked*/ + menu.findItem(R.id.action_remove_bookmark).isVisible = isChapterBookmarked + menu.findItem(R.id.action_open_in_web_view).isVisible = viewModel.getSource() is HttpSource*/ return true } @@ -939,7 +941,7 @@ class ReaderActivity : BaseActivity() { } } actionWebView.isVisible = - ReaderBottomButton.WebView.isIn(enabledButtons) + ReaderBottomButton.WebView.isIn(enabledButtons) && viewModel.getSource() is HttpSource actionChapterList.isVisible = ReaderBottomButton.ViewChapters.isIn(enabledButtons) shiftPageButton.isVisible = (viewer as? PagerViewer)?.config?.doublePages ?: false