diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt index 2c118ef80..346f1d0f8 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -430,9 +430,7 @@ private fun MangaScreenSmallImpl( title = state.manga.title, titleAlphaProvider = { animatedTitleAlpha }, backgroundAlphaProvider = { animatedBgAlpha }, - hasFilters = state.filterActive, onBackClicked = internalOnBackPressed, - onClickFilter = onFilterClicked, onClickShare = onShareClicked, onClickDownload = onDownloadActionClicked, onClickEditCategory = onEditCategoryClicked, @@ -671,6 +669,7 @@ private fun MangaScreenSmallImpl( chapterCount = chapters.size, missingChapterCount = missingChapterCount, onClick = onFilterClicked, + hasFilters = state.filterActive, ) } @@ -806,9 +805,7 @@ private fun MangaScreenLargeImpl( title = state.manga.title, titleAlphaProvider = { if (isAnySelected) 1f else 0f }, backgroundAlphaProvider = { 1f }, - hasFilters = state.filterActive, onBackClicked = internalOnBackPressed, - onClickFilter = onFilterButtonClicked, onClickShare = onShareClicked, onClickDownload = onDownloadActionClicked, onClickEditCategory = onEditCategoryClicked, @@ -1032,6 +1029,7 @@ private fun MangaScreenLargeImpl( chapterCount = chapters.size, missingChapterCount = missingChapterCount, onClick = onFilterButtonClicked, + hasFilters = state.filterActive, ) } diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/ChapterHeader.kt b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterHeader.kt index 79d580044..8644caa83 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/ChapterHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterHeader.kt @@ -21,6 +21,7 @@ import tachiyomi.presentation.core.components.material.SecondaryItemAlpha import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.pluralStringResource import tachiyomi.presentation.core.i18n.stringResource +import tachiyomi.presentation.core.theme.active @Composable fun ChapterHeader( @@ -28,8 +29,10 @@ fun ChapterHeader( chapterCount: Int?, missingChapterCount: Int, onClick: () -> Unit, + hasFilters: Boolean, modifier: Modifier = Modifier, ) { + val filterTint = if (hasFilters) MaterialTheme.colorScheme.active else MaterialTheme.colorScheme.primary Row( modifier = modifier .fillMaxWidth() @@ -60,7 +63,7 @@ fun ChapterHeader( Icon( imageVector = Icons.Outlined.FilterList, contentDescription = null, - tint = MaterialTheme.colorScheme.primary, + tint = filterTint, ) } } diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt index 241dd59c9..89e01d943 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Download -import androidx.compose.material.icons.outlined.FilterList import androidx.compose.material.icons.outlined.FlipToBack import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.IconButton @@ -32,15 +31,12 @@ import kotlinx.collections.immutable.persistentListOf import tachiyomi.i18n.MR import tachiyomi.i18n.sy.SYMR import tachiyomi.presentation.core.i18n.stringResource -import tachiyomi.presentation.core.theme.active @Composable fun MangaToolbar( title: String, titleAlphaProvider: () -> Float, - hasFilters: Boolean, onBackClicked: () -> Unit, - onClickFilter: () -> Unit, onClickShare: (() -> Unit)?, onClickDownload: ((DownloadAction) -> Unit)?, onClickEditCategory: (() -> Unit)?, @@ -107,7 +103,6 @@ fun MangaToolbar( ) } - val filterTint = if (hasFilters) MaterialTheme.colorScheme.active else LocalContentColor.current AppBarActions( actions = persistentListOf().builder() .apply { @@ -120,14 +115,6 @@ fun MangaToolbar( ), ) } - add( - AppBar.Action( - title = stringResource(MR.strings.action_filter), - icon = Icons.Outlined.FilterList, - iconTint = filterTint, - onClick = onClickFilter, - ), - ) add( AppBar.OverflowAction( title = stringResource(MR.strings.action_webview_refresh),