Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Hide dedupe by priority for release"

Browse Source 
This reverts commit 92ae67630c2783b5cb3248dc86d94df61c8ed5c7.
This commit is contained in:
Jobobby04 2020-09-15 13:28:58 -04:00
parent d05ea94d78
commit c69972f83a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt
View File

@ -42,7 +42,7 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings
android.R.layout.simple_spinner_item, android.R.layout.simple_spinner_item,
listOf( listOf(
"No dedupe", "No dedupe",
/*"Dedupe by priority",*/ "Dedupe by priority",
"Show source with most chapters", "Show source with most chapters",
"Show source with highest chapter number" "Show source with highest chapter number"
) )
@ -53,9 +53,9 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings
binding.dedupeModeSpinner.setSelection( binding.dedupeModeSpinner.setSelection(
when (it.chapterSortMode) { when (it.chapterSortMode) {
MergedMangaReference.CHAPTER_SORT_NO_DEDUPE -> 0 MergedMangaReference.CHAPTER_SORT_NO_DEDUPE -> 0
/*MergedMangaReference.CHAPTER_SORT_PRIORITY -> 1*/ MergedMangaReference.CHAPTER_SORT_PRIORITY -> 1
MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 2 - 1 MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 2
MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 3 - 1 MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 3
else -> 0 else -> 0
} }
) )
@ -69,9 +69,9 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings
) { ) {
controller.mergeReference?.chapterSortMode = when (position) { controller.mergeReference?.chapterSortMode = when (position) {
0 -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE 0 -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE
/*1 -> MergedMangaReference.CHAPTER_SORT_PRIORITY*/ 1 -> MergedMangaReference.CHAPTER_SORT_PRIORITY
2 - 1 -> MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS 2 -> MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS
3 - 1 -> MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER 3 -> MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER
else -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE else -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE
} }
XLog.nst().d(controller.mergeReference?.chapterSortMode) XLog.nst().d(controller.mergeReference?.chapterSortMode)