From 92ae67630c2783b5cb3248dc86d94df61c8ed5c7 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 14 Sep 2020 12:47:38 -0400 Subject: [PATCH] Hide dedupe by priority for release --- .../merged/EditMergedSettingsHeaderAdapter.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 bcb55a9e0..80f0e0de1 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" ) @@ -53,9 +53,9 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings 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 -> 1*/ + MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS -> 2 - 1 + MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER -> 3 - 1 else -> 0 } ) @@ -69,9 +69,9 @@ class EditMergedSettingsHeaderAdapter(private val controller: EditMergedSettings ) { controller.mergeReference?.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 + /*1 -> MergedMangaReference.CHAPTER_SORT_PRIORITY*/ + 2 - 1 -> MergedMangaReference.CHAPTER_SORT_MOST_CHAPTERS + 3 - 1 -> MergedMangaReference.CHAPTER_SORT_HIGHEST_CHAPTER_NUMBER else -> MergedMangaReference.CHAPTER_SORT_NO_DEDUPE } XLog.nst().d(controller.mergeReference?.chapterSortMode)