From 07af2920ffbe6060cceab50b8860f36bf3a4a9b3 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 5 Nov 2023 11:52:05 -0500 Subject: [PATCH] Group mode dialogs together in bottom reader bar (cherry picked from commit 3a8aa3e8cd7b725ee73b7fe67d0b1c3111af977b) # Conflicts: # app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt --- .../reader/appbars/BottomReaderBar.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 f776ba2be..bba0174b3 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 @@ -92,6 +92,15 @@ fun BottomReaderBar( } } + if (ReaderBottomButton.Rotation.isIn(enabledButtons)) { + IconButton(onClick = onClickOrientation) { + Icon( + painter = painterResource(orientation.iconRes), + contentDescription = stringResource(R.string.pref_rotation_type), + ) + } + } + val cropBorders = when (readingMode) { ReadingMode.WEBTOON -> ReaderBottomButton.CropBordersWebtoon ReadingMode.CONTINUOUS_VERTICAL -> ReaderBottomButton.CropBordersContinuesVertical @@ -106,15 +115,6 @@ fun BottomReaderBar( } } - if (ReaderBottomButton.Rotation.isIn(enabledButtons)) { - IconButton(onClick = onClickOrientation) { - Icon( - painter = painterResource(orientation.iconRes), - contentDescription = stringResource(R.string.pref_rotation_type), - ) - } - } - if ( !dualPageSplitEnabled && ReaderBottomButton.PageLayout.isIn(enabledButtons) &&