Replace topbar in ReaderAppBars with ReaderTopBar

app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt

@@ -33,7 +33,6 @@ import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.reader.components.ChapterNavigator
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
@@ -206,41 +205,15 @@ fun ReaderAppBars(
                 ) + fadeOut(animationSpec = readerBarsFadeAnimationSpec),
             ) {
                 // SY -->
-                Column(modifierWithInsetsPadding) {
+                Column {
                     // SY <--
-                    // TODO: Use ReaderTopBar
+                    ReaderTopBar(
-                    AppBar(
+                        modifier = Modifier
-                        modifier = /*SY --> */ Modifier /*SY <-- */
+                            .background(backgroundColor)
                             .clickable(onClick = onClickTopAppBar),
-                        backgroundColor = backgroundColor,
+                        mangaTitle = mangaTitle,
-                        title = mangaTitle,
+                        chapterTitle = chapterTitle,
-                        subtitle = chapterTitle,
                         navigateUp = navigateUp,
-                        /* SY --> actions = {
-                            AppBarActions(
-                                listOfNotNull(
-                                    AppBar.Action(
-                                        title = stringResource(
-                                            if (bookmarked) MR.strings.action_remove_bookmark else MR.strings.action_bookmark
-                                        ),
-                                        icon = if (bookmarked) Icons.Outlined.Bookmark else Icons.Outlined.BookmarkBorder,
-                                        onClick = onToggleBookmarked,
-                                    ),
-                                    onOpenInWebView?.let {
-                                        AppBar.OverflowAction(
-                                            title = stringResource(MR.strings.action_open_in_web_view),
-                                            onClick = it,
-                                        )
-                                    },
-                                    onShare?.let {
-                                        AppBar.OverflowAction(
-                                            title = stringResource(MR.strings.action_share),
-                                            onClick = it,
-                                        )
-                                    },
-                                ),
-                            )
-                        }, SY <-- */
                     )
                     // SY -->
                     ExhUtils(
@@ -258,8 +231,8 @@ fun ReaderAppBars(
                         onClickBoostPage = onClickBoostPage,
                         onClickBoostPageHelp = onClickBoostPageHelp,
                     )
-                    // SY <--
                 }
+                // SY <--
             }
 
             Spacer(modifier = Modifier.weight(1f))
@@ -276,10 +249,10 @@ fun ReaderAppBars(
                 ) + fadeOut(animationSpec = readerBarsFadeAnimationSpec),
             ) {
                 Column(
-                    modifier = modifierWithInsetsPadding,
                     verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
                 ) {
-                    if (navBarType == NavBarType.Bottom) {
+                    // SY -->
+                    if (navBarType == NavBarType.Bottom) { // <-- SY
                         ChapterNavigator(
                             isRtl = isRtl,
                             onNextChapter = onNextChapter,
@@ -315,7 +288,7 @@ fun ReaderAppBars(
                         onClickShare = onShare,
                         onClickPageLayout = onClickPageLayout,
                         onClickShiftPage = onClickShiftPage,
-                        // <-- SY
+                        // SY <--
                         modifier = Modifier
                             .fillMaxWidth()
                             .background(backgroundColor)

app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderTopBar.kt

@@ -1,27 +1,20 @@
 package eu.kanade.presentation.reader.appbars
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Bookmark
-import androidx.compose.material.icons.outlined.BookmarkBorder
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import eu.kanade.presentation.components.AppBar
-import eu.kanade.presentation.components.AppBarActions
-import kotlinx.collections.immutable.persistentListOf
-import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.i18n.stringResource
 
 @Composable
 fun ReaderTopBar(
     mangaTitle: String?,
     chapterTitle: String?,
     navigateUp: () -> Unit,
-    bookmarked: Boolean,
+    //bookmarked: Boolean,
-    onToggleBookmarked: () -> Unit,
+    //onToggleBookmarked: () -> Unit,
-    onOpenInWebView: (() -> Unit)?,
+    //onOpenInWebView: (() -> Unit)?,
-    onOpenInBrowser: (() -> Unit)?,
+    //onOpenInBrowser: (() -> Unit)?,
-    onShare: (() -> Unit)?,
+    //onShare: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     AppBar(
@@ -30,6 +23,7 @@ fun ReaderTopBar(
         title = mangaTitle,
         subtitle = chapterTitle,
         navigateUp = navigateUp,
+        /* SY ->
         actions = {
             AppBarActions(
                 actions = persistentListOf<AppBar.AppBarAction>().builder()
@@ -79,5 +73,6 @@ fun ReaderTopBar(
                     .build(),
             )
         },
+        <- SY */
     )
 }