copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Revert "remove duplicate chapter's filter icon"

Browse source 
This reverts commit 70ef686f34.
This commit is contained in:
Cuong-Tran 2024-07-10 14:33:40 +07:00 committed by Tran M. Cuong
parent 7ca0e02bee
commit de4da5e829
3 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
View file

@ -447,7 +447,9 @@ private fun MangaScreenSmallImpl(
title = state.manga.title,
titleAlphaProvider = { animatedTitleAlpha },
backgroundAlphaProvider = { animatedBgAlpha },
hasFilters = state.filterActive,
onBackClicked = internalOnBackPressed,
onClickFilter = onFilterClicked,
onClickShare = onShareClicked,
onClickDownload = onDownloadActionClicked,
onClickEditCategory = onEditCategoryClicked,
@ -705,9 +707,6 @@ private fun MangaScreenSmallImpl(
chapterCount = chapters.size,
missingChapterCount = missingChapterCount,
onClick = onFilterClicked,
// KMK -->
hasFilters = state.filterActive,
// KMK <--
)
}
@ -846,7 +845,9 @@ 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,
@ -1088,9 +1089,6 @@ private fun MangaScreenLargeImpl(
chapterCount = chapters.size,
missingChapterCount = missingChapterCount,
onClick = onFilterButtonClicked,
// KMK -->
hasFilters = state.filterActive,
// KMK <--
)
}

17
app/src/main/java/eu/kanade/presentation/manga/components/ChapterHeader.kt
View file

@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.FilterList
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@ -21,7 +18,6 @@ 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(
@ -29,13 +25,8 @@ fun ChapterHeader(
chapterCount: Int?,
missingChapterCount: Int,
onClick: () -> Unit,
// KMK -->
hasFilters: Boolean,
// KMK <--
modifier: Modifier = Modifier,
) {
// KMK -->
val filterTint = if (hasFilters) MaterialTheme.colorScheme.active else MaterialTheme.colorScheme.primary
Row(
// KMK <--
modifier = modifier
@ -65,14 +56,6 @@ fun ChapterHeader(
MissingChaptersWarning(missingChapterCount)
}
// KMK -->
Icon(
imageVector = Icons.Outlined.FilterList,
contentDescription = null,
tint = filterTint,
)
// KMK <--
}
}

13
app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
View file

@ -6,6 +6,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Home
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
@ -38,6 +39,7 @@ 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
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@ -45,7 +47,9 @@ import uy.kohesive.injekt.api.get
fun MangaToolbar(
title: String,
titleAlphaProvider: () -> Float,
hasFilters: Boolean,
onBackClicked: () -> Unit,
onClickFilter: () -> Unit,
onClickShare: (() -> Unit)?,
onClickDownload: ((DownloadAction) -> Unit)?,
onClickEditCategory: (() -> Unit)?,
@ -134,6 +138,7 @@ fun MangaToolbar(
)
}
val filterTint = if (hasFilters) MaterialTheme.colorScheme.active else LocalContentColor.current
AppBarActions(
actions = persistentListOf<AppBar.AppBarAction>().builder()
.apply {
@ -146,6 +151,14 @@ 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),