admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace topbar in ReaderAppBars with ReaderTopBar

Browse Source
This commit is contained in:
NGB-Was-Taken
2025-11-16 20:10:40 +05:45
parent b809ae5c6f
commit 01dc277877
2 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
+10 -37
View File
@@ -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
AppBar(
modifier = /*SY --> */ Modifier /*SY <-- */
ReaderTopBar(
modifier = Modifier
.background(backgroundColor)
.clickable(onClick = onClickTopAppBar),
backgroundColor = backgroundColor,
title = mangaTitle,
subtitle = chapterTitle,
mangaTitle = mangaTitle,
chapterTitle = 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
+7 -12
View File
@@ -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,
onToggleBookmarked: () -> Unit,
onOpenInWebView: (() -> Unit)?,
onOpenInBrowser: (() -> Unit)?,
onShare: (() -> Unit)?,
//bookmarked: Boolean,
//onToggleBookmarked: () -> Unit,
//onOpenInWebView: (() -> Unit)?,
//onOpenInBrowser: (() -> 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 */
)
}