From 845dbbfa1ebc7f12bf759968d9385b57355f3498 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 12 Feb 2021 19:49:51 -0500 Subject: [PATCH] Revert "Hide dedupe by priority" This reverts commit 1a12caa48721434d9face80cd57f88d76fd50d55. --- .../manga/merged/EditMergedSettingsHeaderAdapter.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt index 83c26a301..f66ed42bf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt @@ -42,7 +42,7 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings android.R.layout.simple_spinner_item, listOf( "No dedupe", - /*"Dedupe by priority",*/ + "Dedupe by priority", "Show source with most chapters", "Show source with highest chapter number" ) @@ -54,8 +54,8 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings when (it.chapterSortMode) { MergedMangaReference.CHAPTER_SORT_NO_DEDUPE -> 0 MergedMangaReference.CHAPTER_SORT_PRIORITY -> 1 - MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 1 - MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 2 + MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 2 + MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 3 else -> 0 } ) @@ -69,9 +69,9 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings ) { controller.mergeReference?.chapterSortMode = when (position) { 0 -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE - 99 -> MergedMangaReference.CHAPTER_SORT_PRIORITY - 1 -> MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS - 2 -> MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER + 1 -> MergedMangaReference.CHAPTER_SORT_PRIORITY + 2 -> MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS + 3 -> MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER else -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE } XLog.d(controller.mergeReference?.chapterSortMode)