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 19bda87a0..d50a5919b 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 @@ -17,6 +17,9 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Bookmark +import androidx.compose.material.icons.outlined.BookmarkBorder import androidx.compose.material3.MaterialTheme import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable @@ -28,13 +31,17 @@ 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.components.AppBarActions import eu.kanade.presentation.reader.components.ChapterNavigator import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode import eu.kanade.tachiyomi.ui.reader.viewer.Viewer import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer import kotlinx.collections.immutable.ImmutableSet +import kotlinx.collections.immutable.persistentListOf +import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.i18n.stringResource private val animationSpec = tween(200) @@ -71,8 +78,8 @@ fun ReaderAppBars( chapterTitle: String?, navigateUp: () -> Unit, onClickTopAppBar: () -> Unit, - // bookmarked: Boolean, - // onToggleBookmarked: () -> Unit, + bookmarked: Boolean, + onToggleBookmarked: () -> Unit, onOpenInWebView: (() -> Unit)?, onOpenInBrowser: (() -> Unit)?, onShare: (() -> Unit)?, @@ -213,7 +220,6 @@ fun ReaderAppBars( title = mangaTitle, subtitle = chapterTitle, navigateUp = navigateUp, - /* SY --> actions = { AppBarActions( actions = persistentListOf().builder() @@ -235,6 +241,7 @@ fun ReaderAppBars( onClick = onToggleBookmarked, ), ) + /* SY --> onOpenInWebView?.let { add( AppBar.OverflowAction( @@ -259,11 +266,11 @@ fun ReaderAppBars( ), ) } + SY <-- */ } .build(), ) }, - SY <-- */ ) // SY --> ExhUtils( 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 b5f974dd2..efeb3b4bf 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 @@ -530,8 +530,8 @@ class ReaderActivity : BaseActivity() { chapterTitle = state.currentChapter?.chapter?.name, navigateUp = onBackPressedDispatcher::onBackPressed, onClickTopAppBar = ::openMangaScreen, - // bookmarked = state.bookmarked, - // onToggleBookmarked = viewModel::toggleChapterBookmark, + bookmarked = state.bookmarked, + onToggleBookmarked = viewModel::toggleChapterBookmark, onOpenInWebView = ::openChapterInWebView.takeIf { isHttpSource }, onOpenInBrowser = ::openChapterInBrowser.takeIf { isHttpSource }, onShare = ::shareChapter.takeIf { isHttpSource },