Cleanup migrate manga dialog and related code (#2156)

(cherry picked from commit 2b126f1ff56b63e470b48a04149e28c609f01148)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreenDialogScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryScreenModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt

core/common/src/main/kotlin/tachiyomi/core/common/preference/AndroidPreference.kt

@@ -171,13 +171,13 @@ sealed class AndroidPreference<T>(
         }
     }
 
-    class Object<T>(
+    class ObjectAsString<T>(
         preferences: SharedPreferences,
         keyFlow: Flow<String?>,
         key: String,
         defaultValue: T,
-        val serializer: (T) -> String,
-        val deserializer: (String) -> T,
+        private val serializer: (T) -> String,
+        private val deserializer: (String) -> T,
     ) : AndroidPreference<T>(preferences, keyFlow, key, defaultValue) {
         override fun read(preferences: SharedPreferences, key: String, defaultValue: T): T {
             return try {
@@ -191,4 +191,25 @@ sealed class AndroidPreference<T>(
             putString(key, serializer(value))
         }
     }
+
+    class ObjectAsInt<T>(
+        preferences: SharedPreferences,
+        keyFlow: Flow<String?>,
+        key: String,
+        defaultValue: T,
+        private val serializer: (T) -> Int,
+        private val deserializer: (Int) -> T,
+    ) : AndroidPreference<T>(preferences, keyFlow, key, defaultValue) {
+        override fun read(preferences: SharedPreferences, key: String, defaultValue: T): T {
+            return try {
+                if (preferences.contains(key)) preferences.getInt(key, 0).let(deserializer) else defaultValue
+            } catch (e: Exception) {
+                defaultValue
+            }
+        }
+
+        override fun write(key: String, value: T): Editor.() -> Unit = {
+            putInt(key, serializer(value))
+        }
+    }
 }

core/common/src/main/kotlin/tachiyomi/core/common/preference/AndroidPreferenceStore.kt

@@ -9,7 +9,8 @@ import tachiyomi.core.common.preference.AndroidPreference.BooleanPrimitive
 import tachiyomi.core.common.preference.AndroidPreference.FloatPrimitive
 import tachiyomi.core.common.preference.AndroidPreference.IntPrimitive
 import tachiyomi.core.common.preference.AndroidPreference.LongPrimitive
-import tachiyomi.core.common.preference.AndroidPreference.Object
+import tachiyomi.core.common.preference.AndroidPreference.ObjectAsInt
+import tachiyomi.core.common.preference.AndroidPreference.ObjectAsString
 import tachiyomi.core.common.preference.AndroidPreference.StringPrimitive
 import tachiyomi.core.common.preference.AndroidPreference.StringSetPrimitive
 
@@ -44,13 +45,29 @@ class AndroidPreferenceStore(
         return StringSetPrimitive(sharedPreferences, keyFlow, key, defaultValue)
     }
 
-    override fun <T> getObject(
+    override fun <T> getObjectFromString(
         key: String,
         defaultValue: T,
         serializer: (T) -> String,
         deserializer: (String) -> T,
     ): Preference<T> {
-        return Object(
+        return ObjectAsString(
+            preferences = sharedPreferences,
+            keyFlow = keyFlow,
+            key = key,
+            defaultValue = defaultValue,
+            serializer = serializer,
+            deserializer = deserializer,
+        )
+    }
+
+    override fun <T> getObjectFromInt(
+        key: String,
+        defaultValue: T,
+        serializer: (T) -> Int,
+        deserializer: (Int) -> T,
+    ): Preference<T> {
+        return ObjectAsInt(
             preferences = sharedPreferences,
             keyFlow = keyFlow,
             key = key,

core/common/src/main/kotlin/tachiyomi/core/common/preference/InMemoryPreferenceStore.kt

@@ -52,7 +52,7 @@ class InMemoryPreferenceStore(
     }
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T> getObject(
+    override fun <T> getObjectFromString(
         key: String,
         defaultValue: T,
         serializer: (T) -> String,
@@ -63,6 +63,18 @@ class InMemoryPreferenceStore(
         return if (data == null) default else InMemoryPreference(key, data, defaultValue)
     }
 
+    @Suppress("UNCHECKED_CAST")
+    override fun <T> getObjectFromInt(
+        key: String,
+        defaultValue: T,
+        serializer: (T) -> Int,
+        deserializer: (Int) -> T,
+    ): Preference<T> {
+        val default = InMemoryPreference(key, null, defaultValue)
+        val data: T? = preferences[key]?.get() as? T
+        return if (data == null) default else InMemoryPreference(key, data, defaultValue)
+    }
+
     override fun getAll(): Map<String, *> {
         return preferences
     }

core/common/src/main/kotlin/tachiyomi/core/common/preference/PreferenceStore.kt

@@ -14,13 +14,20 @@ interface PreferenceStore {
 
     fun getStringSet(key: String, defaultValue: Set<String> = emptySet()): Preference<Set<String>>
 
-    fun <T> getObject(
+    fun <T> getObjectFromString(
         key: String,
         defaultValue: T,
         serializer: (T) -> String,
         deserializer: (String) -> T,
     ): Preference<T>
 
+    fun <T> getObjectFromInt(
+        key: String,
+        defaultValue: T,
+        serializer: (T) -> Int,
+        deserializer: (Int) -> T,
+    ): Preference<T>
+
     fun getAll(): Map<String, *>
 }
 
@@ -28,7 +35,7 @@ fun PreferenceStore.getLongArray(
     key: String,
     defaultValue: List<Long>,
 ): Preference<List<Long>> {
-    return getObject(
+    return getObjectFromString(
         key = key,
         defaultValue = defaultValue,
         serializer = { it.joinToString(",") },
@@ -40,7 +47,7 @@ inline fun <reified T : Enum<T>> PreferenceStore.getEnum(
     key: String,
     defaultValue: T,
 ): Preference<T> {
-    return getObject(
+    return getObjectFromString(
         key = key,
         defaultValue = defaultValue,
         serializer = { it.name },