Disable ChapterHeader & ChapterDownloadIndicator click when in selection mode (#8350)

* Disable `ChapterHeader` click when in selection mode

* Disable `ChapterDownloadIndicator` click when in selection mode

* Review changes

* Merge remote-tracking branch 'origin/master' into patch-7

* Merge remote-tracking branch 'origin/master' into patch-7

* Revert back to old implementation
This commit is contained in:
zbue
2022-10-31 10:57:56 +08:00
committed by GitHub
parent 33e90d6449
commit 8dce7b3e9e
5 changed files with 40 additions and 4 deletions

View File

@@ -354,6 +354,7 @@ private fun MangaScreenSmallImpl(
contentType = MangaScreenItem.CHAPTER_HEADER,
) {
ChapterHeader(
enabled = chapters.fastAll { !it.selected },
chapterCount = chapters.size,
onClick = onFilterClicked,
)
@@ -553,6 +554,7 @@ fun MangaScreenLargeImpl(
contentType = MangaScreenItem.CHAPTER_HEADER,
) {
ChapterHeader(
enabled = chapters.fastAll { !it.selected },
chapterCount = chapters.size,
onClick = onFilterButtonClicked,
)
@@ -634,6 +636,7 @@ private fun LazyListScope.sharedChapterItems(
read = chapterItem.chapter.read,
bookmark = chapterItem.chapter.bookmark,
selected = chapterItem.selected,
downloadIndicatorEnabled = chapters.fastAll { !it.selected },
downloadStateProvider = { chapterItem.downloadState },
downloadProgressProvider = { chapterItem.downloadProgress },
onLongClick = {

View File

@@ -16,13 +16,17 @@ import eu.kanade.tachiyomi.R
@Composable
fun ChapterHeader(
enabled: Boolean,
chapterCount: Int?,
onClick: () -> Unit,
) {
Row(
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = onClick)
.clickable(
enabled = enabled,
onClick = onClick,
)
.padding(horizontal = 16.dp, vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically,
) {

View File

@@ -46,6 +46,7 @@ fun MangaChapterListItem(
read: Boolean,
bookmark: Boolean,
selected: Boolean,
downloadIndicatorEnabled: Boolean,
downloadStateProvider: () -> Download.State,
downloadProgressProvider: () -> Int,
onLongClick: () -> Unit,
@@ -129,6 +130,7 @@ fun MangaChapterListItem(
// Download view
if (onDownloadClick != null) {
ChapterDownloadIndicator(
enabled = downloadIndicatorEnabled,
modifier = Modifier.padding(start = 4.dp),
downloadStateProvider = downloadStateProvider,
downloadProgressProvider = downloadProgressProvider,