From 9d9dbea48dee202c73d40728d41b68d3acf03f96 Mon Sep 17 00:00:00 2001 From: Cuong-Tran <16017808+cuong-tran@users.noreply.github.com> Date: Fri, 20 Feb 2026 21:22:05 +0700 Subject: [PATCH] Remove redundant `userSelected` from selection methods (#2976) (cherry picked from commit 9867c160f781b52cd297f7b1202cc6963b375df0) # Conflicts: # app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt --- .../java/eu/kanade/presentation/manga/MangaScreen.kt | 12 ++++++------ .../eu/kanade/presentation/updates/UpdatesScreen.kt | 2 +- .../eu/kanade/presentation/updates/UpdatesUiItem.kt | 6 +++--- .../eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt | 5 ++--- .../tachiyomi/ui/updates/UpdatesScreenModel.kt | 5 ++--- 5 files changed, 14 insertions(+), 16 deletions(-) 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 5a5d9d18e..c2242351b 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -165,7 +165,7 @@ fun MangaScreen( onChapterSwipe: (ChapterList.Item, LibraryPreferences.ChapterSwipeAction) -> Unit, // Chapter selection - onChapterSelected: (ChapterList.Item, Boolean, Boolean, Boolean) -> Unit, + onChapterSelected: (ChapterList.Item, Boolean, Boolean) -> Unit, onAllChapterSelected: (Boolean) -> Unit, onInvertSelection: () -> Unit, ) { @@ -329,7 +329,7 @@ private fun MangaScreenSmallImpl( onChapterSwipe: (ChapterList.Item, LibraryPreferences.ChapterSwipeAction) -> Unit, // Chapter selection - onChapterSelected: (ChapterList.Item, Boolean, Boolean, Boolean) -> Unit, + onChapterSelected: (ChapterList.Item, Boolean, Boolean) -> Unit, onAllChapterSelected: (Boolean) -> Unit, onInvertSelection: () -> Unit, ) { @@ -650,7 +650,7 @@ fun MangaScreenLargeImpl( onChapterSwipe: (ChapterList.Item, LibraryPreferences.ChapterSwipeAction) -> Unit, // Chapter selection - onChapterSelected: (ChapterList.Item, Boolean, Boolean, Boolean) -> Unit, + onChapterSelected: (ChapterList.Item, Boolean, Boolean) -> Unit, onAllChapterSelected: (Boolean) -> Unit, onInvertSelection: () -> Unit, ) { @@ -947,7 +947,7 @@ private fun LazyListScope.sharedChapterItems( // SY <-- onChapterClicked: (Chapter) -> Unit, onDownloadChapter: ((List, ChapterDownloadAction) -> Unit)?, - onChapterSelected: (ChapterList.Item, Boolean, Boolean, Boolean) -> Unit, + onChapterSelected: (ChapterList.Item, Boolean, Boolean) -> Unit, onChapterSwipe: (ChapterList.Item, LibraryPreferences.ChapterSwipeAction) -> Unit, ) { items( @@ -1014,14 +1014,14 @@ private fun LazyListScope.sharedChapterItems( chapterSwipeStartAction = chapterSwipeStartAction, chapterSwipeEndAction = chapterSwipeEndAction, onLongClick = { - onChapterSelected(item, !item.selected, true, true) + onChapterSelected(item, !item.selected, true) haptic.performHapticFeedback(HapticFeedbackType.LongPress) }, onClick = { onChapterItemClick( chapterItem = item, isAnyChapterSelected = isAnyChapterSelected, - onToggleSelection = { onChapterSelected(item, !item.selected, true, false) }, + onToggleSelection = { onChapterSelected(item, !item.selected, false) }, onChapterClicked = onChapterClicked, ) }, diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt index eae69bd99..3d4c0cd8b 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt @@ -61,7 +61,7 @@ fun UpdateScreen( onMultiBookmarkClicked: (List, bookmark: Boolean) -> Unit, onMultiMarkAsReadClicked: (List, read: Boolean) -> Unit, onMultiDeleteClicked: (List) -> Unit, - onUpdateSelected: (UpdatesItem, Boolean, Boolean, Boolean) -> Unit, + onUpdateSelected: (UpdatesItem, Boolean, Boolean) -> Unit, onOpenChapter: (UpdatesItem) -> Unit, onFilterClicked: () -> Unit, hasActiveFilters: Boolean, diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt index 235b00ba8..3273d0845 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt @@ -72,7 +72,7 @@ internal fun LazyListScope.updatesUiItems( // SY --> preserveReadingPosition: Boolean, // SY <-- - onUpdateSelected: (UpdatesItem, Boolean, Boolean, Boolean) -> Unit, + onUpdateSelected: (UpdatesItem, Boolean, Boolean) -> Unit, onClickCover: (UpdatesItem) -> Unit, onClickUpdate: (UpdatesItem) -> Unit, onDownloadChapter: (List, ChapterDownloadAction) -> Unit, @@ -120,11 +120,11 @@ internal fun LazyListScope.updatesUiItems( ) }, onLongClick = { - onUpdateSelected(updatesItem, !updatesItem.selected, true, true) + onUpdateSelected(updatesItem, !updatesItem.selected, true) }, onClick = { when { - selectionMode -> onUpdateSelected(updatesItem, !updatesItem.selected, true, false) + selectionMode -> onUpdateSelected(updatesItem, !updatesItem.selected, false) else -> onClickUpdate(updatesItem) } }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt index 00071ab74..8da38535f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt @@ -1487,7 +1487,6 @@ class MangaScreenModel( fun toggleSelection( item: ChapterList.Item, selected: Boolean, - userSelected: Boolean = false, fromLongPress: Boolean = false, ) { updateSuccessState { successState -> @@ -1502,7 +1501,7 @@ class MangaScreenModel( set(selectedIndex, selectedItem.copy(selected = selected)) selectedChapterIds.addOrRemove(item.id, selected) - if (selected && userSelected && fromLongPress) { + if (selected && fromLongPress) { if (firstSelection) { selectedPositions[0] = selectedIndex selectedPositions[1] = selectedIndex @@ -1528,7 +1527,7 @@ class MangaScreenModel( } } } - } else if (userSelected && !fromLongPress) { + } else if (!fromLongPress) { if (!selected) { if (selectedIndex == selectedPositions[0]) { selectedPositions[0] = indexOfFirst { it.selected } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt index 0e1122f56..4954672b5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt @@ -337,7 +337,6 @@ class UpdatesScreenModel( fun toggleSelection( item: UpdatesItem, selected: Boolean, - userSelected: Boolean = false, fromLongPress: Boolean = false, ) { mutableState.update { state -> @@ -352,7 +351,7 @@ class UpdatesScreenModel( set(selectedIndex, selectedItem.copy(selected = selected)) selectedChapterIds.addOrRemove(item.update.chapterId, selected) - if (selected && userSelected && fromLongPress) { + if (selected && fromLongPress) { if (firstSelection) { selectedPositions[0] = selectedIndex selectedPositions[1] = selectedIndex @@ -378,7 +377,7 @@ class UpdatesScreenModel( } } } - } else if (userSelected && !fromLongPress) { + } else if (!fromLongPress) { if (!selected) { if (selectedIndex == selectedPositions[0]) { selectedPositions[0] = indexOfFirst { it.selected }