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

refactor(merged-settings): Remove unused no-dedupe option (#1194)

Browse source 
* refactor(merged-settings): Remove unused no-dedupe option

* refactor(merged-settings): Remove unused no-dedupe option
This commit is contained in:
Cuong-Tran 2025-10-07 15:58:18 +07:00 committed by GitHub
parent 3a086a82ca
commit cedc79782b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt
View file

@ -56,7 +56,6 @@ class EditMergedSettingsHeaderAdapter(
android.R.layout.simple_spinner_dropdown_item,
// KMK <--
listOfNotNull(
itemView.context.stringResource(SYMR.strings.no_dedupe),
itemView.context.stringResource(SYMR.strings.dedupe_priority),
itemView.context.stringResource(SYMR.strings.dedupe_most_chapters),
itemView.context.stringResource(SYMR.strings.dedupe_highest_chapter),
@ -69,10 +68,9 @@ class EditMergedSettingsHeaderAdapter(
state.mergeReference?.let {
binding.dedupeModeSpinner.setSelection(
when (it.chapterSortMode) {
MergedMangaReference.CHAPTER_SORT_NO_DEDUPE -> 0
MergedMangaReference.CHAPTER_SORT_PRIORITY -> 1
MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 2
MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 3
MergedMangaReference.CHAPTER_SORT_PRIORITY -> 0
MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 1
MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 2
else -> 0
},
)
@ -87,11 +85,10 @@ class EditMergedSettingsHeaderAdapter(
) {
state.mergeReference = state.mergeReference?.copy(
chapterSortMode = when (position) {
0 -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE
1 -> MergedMangaReference.CHAPTER_SORT_PRIORITY
2 -> MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS
3 -> MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER
else -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE
0 -> MergedMangaReference.CHAPTER_SORT_PRIORITY
1 -> MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS
2 -> MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER
else -> MergedMangaReference.CHAPTER_SORT_NONE
},
)
xLogD(state.mergeReference?.chapterSortMode)
@ -103,7 +100,7 @@ class EditMergedSettingsHeaderAdapter(
override fun onNothingSelected(parent: AdapterView<*>?) {
state.mergeReference = state.mergeReference?.copy(
chapterSortMode = MergedMangaReference.CHAPTER_SORT_NO_DEDUPE,
chapterSortMode = MergedMangaReference.CHAPTER_SORT_NONE,
)
}
}
@ -172,7 +169,7 @@ class EditMergedSettingsHeaderAdapter(
}
state.mergeReference = state.mergeReference?.copy(
chapterSortMode = when (isChecked) {
true -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE
true -> MergedMangaReference.CHAPTER_SORT_PRIORITY
false -> MergedMangaReference.CHAPTER_SORT_NONE
},
)

2
domain/src/main/java/tachiyomi/domain/chapter/interactor/GetMergedChaptersByMangaId.kt
View file

@ -69,7 +69,7 @@ class GetMergedChaptersByMangaId(
chapterList: List<Chapter>,
): List<Chapter> {
return when (mangaReferences.firstOrNull { it.mangaSourceId == MERGED_SOURCE_ID }?.chapterSortMode) {
MergedMangaReference.CHAPTER_SORT_NO_DEDUPE, MergedMangaReference.CHAPTER_SORT_NONE -> chapterList
MergedMangaReference.CHAPTER_SORT_NONE -> chapterList
MergedMangaReference.CHAPTER_SORT_PRIORITY -> dedupeByPriority(mangaReferences, chapterList)
MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> {
findSourceWithMostChapters(chapterList)?.let { mangaId ->

7
domain/src/main/java/tachiyomi/domain/manga/model/MergedMangaReference.kt
View file

@ -36,9 +36,8 @@ data class MergedMangaReference(
) {
companion object {
const val CHAPTER_SORT_NONE = 0
const val CHAPTER_SORT_NO_DEDUPE = 1
const val CHAPTER_SORT_PRIORITY = 2
const val CHAPTER_SORT_MOST_CHAPTERS = 3
const val CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER = 4
const val CHAPTER_SORT_PRIORITY = 1
const val CHAPTER_SORT_MOST_CHAPTERS = 2
const val CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER = 3
}
}