From 3e473e569846b163f4044c9d00a658455402b650 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Tue, 15 Oct 2024 03:51:11 +0600 Subject: [PATCH] Reorder reader menu overflow items (cherry picked from commit 788235feeca241228eac0561339dd07b5ea0b77d) --- .../reader/appbars/BottomReaderBar.kt | 22 ++++++++----------- .../reader/appbars/ReaderAppBars.kt | 22 +++++++++---------- .../tachiyomi/ui/reader/ReaderActivity.kt | 14 ++++++------ .../ui/reader/setting/ReaderBottomButton.kt | 6 +---- 4 files changed, 27 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt index d29161756..281b09040 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt @@ -47,10 +47,8 @@ fun BottomReaderBar( dualPageSplitEnabled: Boolean, doublePages: Boolean, onClickChapterList: () -> Unit, - // KMK --> - onClickBrowser: (() -> Unit)?, - // KMK <-- onClickWebView: (() -> Unit)?, + onClickBrowser: (() -> Unit)?, onClickShare: (() -> Unit)?, onClickPageLayout: () -> Unit, onClickShiftPage: () -> Unit, @@ -80,25 +78,23 @@ fun BottomReaderBar( } } - // KMK --> - if (ReaderBottomButton.Browser.isIn(enabledButtons) && onClickBrowser != null) { - IconButton(onClick = onClickBrowser) { + if (ReaderBottomButton.WebView.isIn(enabledButtons) && onClickWebView != null) { + IconButton(onClick = onClickWebView) { Icon( - imageVector = Icons.Outlined.Explore, - contentDescription = stringResource(MR.strings.action_open_in_browser), + imageVector = Icons.Outlined.Public, + contentDescription = stringResource(MR.strings.action_open_in_web_view), // KMK --> tint = iconColor, // KMK <-- ) } } - // KMK <-- - if (ReaderBottomButton.WebView.isIn(enabledButtons) && onClickWebView != null) { - IconButton(onClick = onClickWebView) { + if (ReaderBottomButton.Browser.isIn(enabledButtons) && onClickBrowser != null) { + IconButton(onClick = onClickBrowser) { Icon( - imageVector = Icons.Outlined.Public, - contentDescription = stringResource(MR.strings.action_open_in_web_view), + imageVector = Icons.Outlined.Explore, + contentDescription = stringResource(MR.strings.action_open_in_browser), // KMK --> tint = iconColor, // KMK <-- diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt index a983f7644..d4155cb3c 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt @@ -73,8 +73,8 @@ fun ReaderAppBars( onClickTopAppBar: () -> Unit, // bookmarked: Boolean, // onToggleBookmarked: () -> Unit, - onOpenInBrowser: (() -> Unit)?, onOpenInWebView: (() -> Unit)?, + onOpenInBrowser: (() -> Unit)?, onShare: (() -> Unit)?, viewer: Viewer?, @@ -235,14 +235,6 @@ fun ReaderAppBars( onClick = onToggleBookmarked, ), ) - onOpenInBrowser?.let { - add( - AppBar.OverflowAction( - title = stringResource(MR.strings.action_open_in_browser), - onClick = it, - ), - ) - } onOpenInWebView?.let { add( AppBar.OverflowAction( @@ -251,6 +243,14 @@ fun ReaderAppBars( ), ) } + onOpenInBrowser?.let { + add( + AppBar.OverflowAction( + title = stringResource(MR.strings.action_open_in_browser), + onClick = it, + ), + ) + } onShare?.let { add( AppBar.OverflowAction( @@ -334,10 +334,8 @@ fun ReaderAppBars( dualPageSplitEnabled = dualPageSplitEnabled, doublePages = doublePages, onClickChapterList = onClickChapterList, - // KMK --> - onClickBrowser = onOpenInBrowser, - // KMK <-- onClickWebView = onOpenInWebView, + onClickBrowser = onOpenInBrowser, onClickShare = onShare, onClickPageLayout = onClickPageLayout, onClickShiftPage = onClickShiftPage, 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 78d296d15..eab2206f3 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 @@ -519,8 +519,8 @@ class ReaderActivity : BaseActivity() { onClickTopAppBar = ::openMangaScreen, // bookmarked = state.bookmarked, // onToggleBookmarked = viewModel::toggleChapterBookmark, - onOpenInBrowser = ::openChapterInBrowser.takeIf { isHttpSource }, onOpenInWebView = ::openChapterInWebView.takeIf { isHttpSource }, + onOpenInBrowser = ::openChapterInBrowser.takeIf { isHttpSource }, onShare = ::shareChapter.takeIf { isHttpSource }, viewer = state.viewer, @@ -1034,12 +1034,6 @@ class ReaderActivity : BaseActivity() { } } - private fun openChapterInBrowser() { - assistUrl?.let { - openInBrowser(it.toUri(), forceDefaultBrowser = false) - } - } - private fun openChapterInWebView() { val manga = viewModel.manga ?: return val source = viewModel.getSource() ?: return @@ -1049,6 +1043,12 @@ class ReaderActivity : BaseActivity() { } } + private fun openChapterInBrowser() { + assistUrl?.let { + openInBrowser(it.toUri(), forceDefaultBrowser = false) + } + } + private fun shareChapter() { assistUrl?.let { val intent = it.toUri().toShareIntent(this, type = "text/plain") diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt index f5978b69c..b6c1b76d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderBottomButton.kt @@ -6,12 +6,8 @@ import tachiyomi.i18n.sy.SYMR enum class ReaderBottomButton(val value: String, val stringRes: StringResource) { ViewChapters("vc", MR.strings.action_view_chapters), - - // KMK --> - Browser("br", MR.strings.action_open_in_browser), - // KMK <-- - WebView("wb", MR.strings.action_open_in_web_view), + Browser("br", MR.strings.action_open_in_browser), Share("sh", MR.strings.action_share), ReadingMode("rm", MR.strings.viewer), Rotation("rot", MR.strings.rotation_type),