mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-13 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

MangaScreen: Save selection state (#7560)

Browse Source
This commit is contained in:
Ivan Iskandar
2022-07-19 03:42:46 +07:00
committed by GitHub
parent 473dc688f0
commit 00519e3b93
3 changed files with 145 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
View File

@@ -142,6 +142,9 @@ class MangaController :
onMultiMarkAsReadClicked = presenter::markChaptersRead,
onMarkPreviousAsReadClicked = presenter::markPreviousChapterRead,
onMultiDeleteClicked = this::deleteChaptersWithConfirmation,
onChapterSelected = presenter::toggleSelection,
onAllChapterSelected = presenter::toggleAllSelection,
onInvertSelection = presenter::invertSelection,
)
} else {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {

96
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@@ -140,6 +140,8 @@ class MangaPresenter(
val processedChapters: Sequence<ChapterItem>?
get() = successState?.processedChapters
private val selectedPositions: Array<Int> = arrayOf(-1, -1) // first and last selected index in list
/**
* Helper function to update the UI state only if it's currently in success state
*/
@@ -583,6 +585,7 @@ class MangaPresenter(
values = chapters.toTypedArray(),
)
}
toggleAllSelection(false)
}
/**
@@ -592,6 +595,7 @@ class MangaPresenter(
fun downloadChapters(chapters: List<DomainChapter>) {
val manga = successState?.manga ?: return
downloadManager.downloadChapters(manga, chapters.map { it.toDbChapter() })
toggleAllSelection(false)
}
/**
@@ -605,6 +609,7 @@ class MangaPresenter(
.map { ChapterUpdate(id = it.id, bookmark = bookmarked) }
.let { updateChapter.awaitAll(it) }
}
toggleAllSelection(false)
}
/**
@@ -627,12 +632,16 @@ class MangaPresenter(
deletedChapters.forEach {
val index = indexOf(it)
val toAdd = removeAt(index)
.copy(downloadState = Download.State.NOT_DOWNLOADED, downloadProgress = 0)
.copy(
downloadState = Download.State.NOT_DOWNLOADED,
downloadProgress = 0,
)
add(index, toAdd)
}
}
successState.copy(chapters = newChapters)
}
toggleAllSelection(false)
} catch (e: Throwable) {
logcat(LogPriority.ERROR, e)
}
@@ -725,6 +734,89 @@ class MangaPresenter(
}
}
fun toggleSelection(
item: ChapterItem,
selected: Boolean,
userSelected: Boolean = false,
fromLongPress: Boolean = false,
) {
updateSuccessState { successState ->
val modifiedIndex = successState.chapters.indexOfFirst { it.chapter.id == item.chapter.id }
if (modifiedIndex < 0) return@updateSuccessState successState
val oldItem = successState.chapters[modifiedIndex]
if ((oldItem.selected && selected) || (!oldItem.selected && !selected)) return@updateSuccessState successState
val newChapters = successState.chapters.toMutableList().apply {
val firstSelection = none { it.selected }
var newItem = removeAt(modifiedIndex)
add(modifiedIndex, newItem.copy(selected = selected))
if (selected && userSelected && fromLongPress) {
if (firstSelection) {
selectedPositions[0] = modifiedIndex
selectedPositions[1] = modifiedIndex
} else {
// Try to select the items in-between when possible
val range: IntRange
if (modifiedIndex < selectedPositions[0]) {
range = modifiedIndex + 1 until selectedPositions[0]
selectedPositions[0] = modifiedIndex
} else if (modifiedIndex > selectedPositions[1]) {
range = (selectedPositions[1] + 1) until modifiedIndex
selectedPositions[1] = modifiedIndex
} else {
// Just select itself
range = IntRange.EMPTY
}
range.forEach {
newItem = removeAt(it)
add(it, newItem.copy(selected = true))
}
}
} else if (userSelected && !fromLongPress) {
if (!selected) {
if (modifiedIndex == selectedPositions[0]) {
selectedPositions[0] = indexOfFirst { it.selected }
} else if (modifiedIndex == selectedPositions[1]) {
selectedPositions[1] = indexOfLast { it.selected }
}
} else {
if (modifiedIndex < selectedPositions[0]) {
selectedPositions[0] = modifiedIndex
} else if (modifiedIndex > selectedPositions[1]) {
selectedPositions[1] = modifiedIndex
}
}
}
}
successState.copy(chapters = newChapters)
}
}
fun toggleAllSelection(selected: Boolean) {
updateSuccessState { successState ->
val newChapters = successState.chapters.map {
it.copy(selected = selected)
}
selectedPositions[0] = -1
selectedPositions[1] = -1
successState.copy(chapters = newChapters)
}
}
fun invertSelection() {
updateSuccessState { successState ->
val newChapters = successState.chapters.map {
it.copy(selected = !it.selected)
}
selectedPositions[0] = -1
selectedPositions[1] = -1
successState.copy(chapters = newChapters)
}
}
// Chapters list - end
// Track sheet - start
@@ -962,6 +1054,8 @@ data class ChapterItem(
val chapterTitleString: String,
val dateUploadString: String?,
val readProgressString: String?,
val selected: Boolean = false,
) {
val isDownloaded = downloadState == Download.State.DOWNLOADED
}