From 9a577e1c693ba3b456b6d2f18540dae6ec35421c Mon Sep 17 00:00:00 2001 From: Andreas Date: Sun, 31 Jul 2022 17:17:43 +0200 Subject: [PATCH] Remove deprecated LibrarySort (#7659) * Remove deprecated LibrarySort * Apply suggestions from code review (cherry picked from commit 58acf0a8aa3aa37b5d9c63d99987a05ee2f8790f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt (cherry picked from commit 4b87831bdd125bbd7c6f2cbddcab97279d71933b) # Conflicts: # app/src/main/java/exh/EXHMigrations.kt --- .../java/eu/kanade/tachiyomi/Migrations.kt | 23 ++++---- .../tachiyomi/ui/library/LibrarySort.kt | 23 -------- app/src/main/java/exh/EXHMigrations.kt | 57 ++++++++++--------- 3 files changed, 40 insertions(+), 63 deletions(-) delete mode 100755 app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 0a90453a4..126fbeffe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.updater.AppUpdateJob import eu.kanade.tachiyomi.extension.ExtensionUpdateJob import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE -import eu.kanade.tachiyomi.ui.library.LibrarySort import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting import eu.kanade.tachiyomi.ui.reader.setting.OrientationType @@ -106,10 +105,9 @@ object Migrations { // Reset sorting preference if using removed sort by source val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0) - @Suppress("DEPRECATION") - if (oldSortingMode == LibrarySort.SOURCE) { + if (oldSortingMode == 5 /* SOURCE */) { prefs.edit { - putInt(PreferenceKeys.librarySortingMode, LibrarySort.ALPHA) + putInt(PreferenceKeys.librarySortingMode, 0 /* ALPHABETICAL */) } } } @@ -202,16 +200,15 @@ object Migrations { val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0) val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true) - @Suppress("DEPRECATION") val newSortingMode = when (oldSortingMode) { - LibrarySort.ALPHA -> SortModeSetting.ALPHABETICAL - LibrarySort.LAST_READ -> SortModeSetting.LAST_READ - LibrarySort.LAST_CHECKED -> SortModeSetting.LAST_CHECKED - LibrarySort.UNREAD -> SortModeSetting.UNREAD - LibrarySort.TOTAL -> SortModeSetting.TOTAL_CHAPTERS - LibrarySort.LATEST_CHAPTER -> SortModeSetting.LATEST_CHAPTER - LibrarySort.CHAPTER_FETCH_DATE -> SortModeSetting.DATE_FETCHED - LibrarySort.DATE_ADDED -> SortModeSetting.DATE_ADDED + 0 -> SortModeSetting.ALPHABETICAL + 1 -> SortModeSetting.LAST_READ + 2 -> SortModeSetting.LAST_CHECKED + 3 -> SortModeSetting.UNREAD + 4 -> SortModeSetting.TOTAL_CHAPTERS + 6 -> SortModeSetting.LATEST_CHAPTER + 8 -> SortModeSetting.DATE_FETCHED + 7 -> SortModeSetting.DATE_ADDED else -> SortModeSetting.ALPHABETICAL } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt deleted file mode 100755 index 98792740f..000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt +++ /dev/null @@ -1,23 +0,0 @@ -package eu.kanade.tachiyomi.ui.library - -@Deprecated("Deprecated in favor for SortModeSetting") -object LibrarySort { - - const val ALPHA = 0 - const val LAST_READ = 1 - const val LAST_CHECKED = 2 - const val UNREAD = 3 - const val TOTAL = 4 - const val LATEST_CHAPTER = 6 - const val CHAPTER_FETCH_DATE = 10 - const val DATE_ADDED = 8 - - // SY --> - const val DRAG_AND_DROP = 7 - const val TAG_LIST = 9 - - // SY <-- - - @Deprecated("Removed in favor of searching by source") - const val SOURCE = 5 -} diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index 80b1fffd8..fcf49c066 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -31,7 +31,6 @@ import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.all.Hitomi import eu.kanade.tachiyomi.source.online.all.NHentai -import eu.kanade.tachiyomi.ui.library.LibrarySort import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting @@ -308,36 +307,40 @@ object EXHMigrations { } } if (oldVersion under 20) { - val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0) - val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true) + try { + val oldSortingMode = prefs.getInt(PreferenceKeys.librarySortingMode, 0 /* ALPHABETICAL */) + val oldSortingDirection = prefs.getBoolean(PreferenceKeys.librarySortingDirection, true) - val newSortingMode = when (oldSortingMode) { - LibrarySort.ALPHA -> SortModeSetting.ALPHABETICAL - LibrarySort.LAST_READ -> SortModeSetting.LAST_READ - LibrarySort.LAST_CHECKED -> SortModeSetting.LAST_CHECKED - LibrarySort.UNREAD -> SortModeSetting.UNREAD - LibrarySort.TOTAL -> SortModeSetting.TOTAL_CHAPTERS - LibrarySort.LATEST_CHAPTER -> SortModeSetting.LATEST_CHAPTER - LibrarySort.CHAPTER_FETCH_DATE -> SortModeSetting.DATE_FETCHED - LibrarySort.DATE_ADDED -> SortModeSetting.DATE_ADDED - LibrarySort.DRAG_AND_DROP -> SortModeSetting.DRAG_AND_DROP - LibrarySort.TAG_LIST -> SortModeSetting.TAG_LIST - else -> SortModeSetting.ALPHABETICAL - } + val newSortingMode = when (oldSortingMode) { + 0 -> SortModeSetting.ALPHABETICAL + 1 -> SortModeSetting.LAST_READ + 2 -> SortModeSetting.LAST_MANGA_UPDATE + 3 -> SortModeSetting.UNREAD_COUNT + 4 -> SortModeSetting.TOTAL_CHAPTERS + 6 -> SortModeSetting.LATEST_CHAPTER + 7 -> SortModeSetting.DRAG_AND_DROP + 8 -> SortModeSetting.DATE_ADDED + 9 -> SortModeSetting.TAG_LIST + 10 -> SortModeSetting.CHAPTER_FETCH_DATE + else -> SortModeSetting.ALPHABETICAL + } - val newSortingDirection = when (oldSortingDirection) { - true -> SortDirectionSetting.ASCENDING - else -> SortDirectionSetting.DESCENDING - } + val newSortingDirection = when (oldSortingDirection) { + true -> SortDirectionSetting.ASCENDING + else -> SortDirectionSetting.DESCENDING + } - prefs.edit(commit = true) { - remove(PreferenceKeys.librarySortingMode) - remove(PreferenceKeys.librarySortingDirection) - } + prefs.edit(commit = true) { + remove(PreferenceKeys.librarySortingMode) + remove(PreferenceKeys.librarySortingDirection) + } - prefs.edit { - putString(PreferenceKeys.librarySortingMode, newSortingMode.name) - putString(PreferenceKeys.librarySortingDirection, newSortingDirection.name) + prefs.edit { + putString(PreferenceKeys.librarySortingMode, newSortingMode.name) + putString(PreferenceKeys.librarySortingDirection, newSortingDirection.name) + } + } catch (e: Exception) { + logcat(throwable = e) { "Already done migration" } } } if (oldVersion under 21) {