More domain model usage

app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverKeyer.kt

@@ -6,14 +6,14 @@ import eu.kanade.domain.manga.model.MangaCover
 import eu.kanade.domain.manga.model.hasCustomCover
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.util.hasCustomCover
+import eu.kanade.tachiyomi.data.database.models.toDomainManga
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import eu.kanade.domain.manga.model.Manga as DomainManga
 
 class MangaKeyer : Keyer<Manga> {
     override fun key(data: Manga, options: Options): String {
-        return if (data.hasCustomCover()) {
+        return if (data.toDomainManga()!!.hasCustomCover()) {
             "${data.id};${data.cover_last_modified}"
         } else {
             "${data.thumbnail_url};${data.cover_last_modified}"

app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt

@@ -25,12 +25,8 @@ interface Manga : SManga {
 
     var cover_last_modified: Long
 
-    fun setChapterOrder(order: Int) {
-        setChapterFlags(order, CHAPTER_SORT_MASK)
-    }
-
     fun sortDescending(): Boolean {
-        return chapter_flags and CHAPTER_SORT_MASK == CHAPTER_SORT_DESC
+        return chapter_flags and DomainManga.CHAPTER_SORT_DIR_MASK.toInt() == DomainManga.CHAPTER_SORT_DESC.toInt()
     }
 
     fun getGenres(): List<String>? {
@@ -48,24 +44,24 @@ interface Manga : SManga {
 
     // Used to display the chapter's title one way or another
     var displayMode: Int
-        get() = chapter_flags and CHAPTER_DISPLAY_MASK
-        set(mode) = setChapterFlags(mode, CHAPTER_DISPLAY_MASK)
+        get() = chapter_flags and DomainManga.CHAPTER_DISPLAY_MASK.toInt()
+        set(mode) = setChapterFlags(mode, DomainManga.CHAPTER_DISPLAY_MASK.toInt())
 
     var readFilter: Int
-        get() = chapter_flags and CHAPTER_READ_MASK
-        set(filter) = setChapterFlags(filter, CHAPTER_READ_MASK)
+        get() = chapter_flags and DomainManga.CHAPTER_UNREAD_MASK.toInt()
+        set(filter) = setChapterFlags(filter, DomainManga.CHAPTER_UNREAD_MASK.toInt())
 
     var downloadedFilter: Int
-        get() = chapter_flags and CHAPTER_DOWNLOADED_MASK
-        set(filter) = setChapterFlags(filter, CHAPTER_DOWNLOADED_MASK)
+        get() = chapter_flags and DomainManga.CHAPTER_DOWNLOADED_MASK.toInt()
+        set(filter) = setChapterFlags(filter, DomainManga.CHAPTER_DOWNLOADED_MASK.toInt())
 
     var bookmarkedFilter: Int
-        get() = chapter_flags and CHAPTER_BOOKMARKED_MASK
-        set(filter) = setChapterFlags(filter, CHAPTER_BOOKMARKED_MASK)
+        get() = chapter_flags and DomainManga.CHAPTER_BOOKMARKED_MASK.toInt()
+        set(filter) = setChapterFlags(filter, DomainManga.CHAPTER_BOOKMARKED_MASK.toInt())
 
     var sorting: Int
-        get() = chapter_flags and CHAPTER_SORTING_MASK
-        set(sort) = setChapterFlags(sort, CHAPTER_SORTING_MASK)
+        get() = chapter_flags and DomainManga.CHAPTER_SORTING_MASK.toInt()
+        set(sort) = setChapterFlags(sort, DomainManga.CHAPTER_SORTING_MASK.toInt())
 
     var readingModeType: Int
         get() = viewer_flags and ReadingModeType.MASK
@@ -76,39 +72,6 @@ interface Manga : SManga {
         set(rotationType) = setViewerFlags(rotationType, OrientationType.MASK)
 
     companion object {
-
-        // Generic filter that does not filter anything
-        const val SHOW_ALL = 0x00000000
-
-        const val CHAPTER_SORT_DESC = 0x00000000
-        const val CHAPTER_SORT_ASC = 0x00000001
-        const val CHAPTER_SORT_MASK = 0x00000001
-
-        const val CHAPTER_SHOW_UNREAD = 0x00000002
-        const val CHAPTER_SHOW_READ = 0x00000004
-        const val CHAPTER_READ_MASK = 0x00000006
-
-        const val CHAPTER_SHOW_DOWNLOADED = 0x00000008
-        const val CHAPTER_SHOW_NOT_DOWNLOADED = 0x00000010
-        const val CHAPTER_DOWNLOADED_MASK = 0x00000018
-
-        const val CHAPTER_SHOW_BOOKMARKED = 0x00000020
-        const val CHAPTER_SHOW_NOT_BOOKMARKED = 0x00000040
-        const val CHAPTER_BOOKMARKED_MASK = 0x00000060
-
-        const val CHAPTER_SORTING_SOURCE = 0x00000000
-        const val CHAPTER_SORTING_NUMBER = 0x00000100
-        const val CHAPTER_SORTING_UPLOAD_DATE = 0x00000200
-        const val CHAPTER_SORTING_MASK = 0x00000300
-
-        const val CHAPTER_DISPLAY_NAME = 0x00000000
-        const val CHAPTER_DISPLAY_NUMBER = 0x00100000
-        const val CHAPTER_DISPLAY_MASK = 0x00100000
-
-        fun create(source: Long): Manga = MangaImpl().apply {
-            this.source = source
-        }
-
         fun create(pathUrl: String, title: String, source: Long = 0): Manga = MangaImpl().apply {
             url = pathUrl
             this.title = title

app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaCategory.kt

@@ -1,30 +0,0 @@
-package eu.kanade.tachiyomi.data.database.models
-
-import eu.kanade.domain.category.model.Category as DomainCategory
-import eu.kanade.domain.manga.model.Manga as DomainManga
-
-class MangaCategory {
-
-    var id: Long? = null
-
-    var manga_id: Long = 0
-
-    var category_id: Int = 0
-
-    companion object {
-
-        fun create(manga: DomainManga, category: DomainCategory): MangaCategory {
-            val mc = MangaCategory()
-            mc.manga_id = manga.id
-            mc.category_id = category.id.toInt()
-            return mc
-        }
-
-        fun create(manga: Manga, category: Category): MangaCategory {
-            val mc = MangaCategory()
-            mc.manga_id = manga.id!!
-            mc.category_id = category.id!!
-            return mc
-        }
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -24,6 +24,7 @@ import java.io.File
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.Locale
+import eu.kanade.domain.manga.model.Manga as DomainManga
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values
 
@@ -295,17 +296,17 @@ class PreferencesHelper(val context: Context) {
 
     fun lastSearchQuerySearchSettings() = flowPrefs.getString("last_search_query", "")
 
-    fun filterChapterByRead() = prefs.getInt(Keys.defaultChapterFilterByRead, Manga.SHOW_ALL)
+    fun filterChapterByRead() = prefs.getInt(Keys.defaultChapterFilterByRead, DomainManga.SHOW_ALL.toInt())
 
-    fun filterChapterByDownloaded() = prefs.getInt(Keys.defaultChapterFilterByDownloaded, Manga.SHOW_ALL)
+    fun filterChapterByDownloaded() = prefs.getInt(Keys.defaultChapterFilterByDownloaded, DomainManga.SHOW_ALL.toInt())
 
-    fun filterChapterByBookmarked() = prefs.getInt(Keys.defaultChapterFilterByBookmarked, Manga.SHOW_ALL)
+    fun filterChapterByBookmarked() = prefs.getInt(Keys.defaultChapterFilterByBookmarked, DomainManga.SHOW_ALL.toInt())
 
-    fun sortChapterBySourceOrNumber() = prefs.getInt(Keys.defaultChapterSortBySourceOrNumber, Manga.CHAPTER_SORTING_SOURCE)
+    fun sortChapterBySourceOrNumber() = prefs.getInt(Keys.defaultChapterSortBySourceOrNumber, DomainManga.CHAPTER_SORTING_SOURCE.toInt())
 
-    fun displayChapterByNameOrNumber() = prefs.getInt(Keys.defaultChapterDisplayByNameOrNumber, Manga.CHAPTER_DISPLAY_NAME)
+    fun displayChapterByNameOrNumber() = prefs.getInt(Keys.defaultChapterDisplayByNameOrNumber, DomainManga.CHAPTER_DISPLAY_NAME.toInt())
 
-    fun sortChapterByAscendingOrDescending() = prefs.getInt(Keys.defaultChapterSortByAscendingOrDescending, Manga.CHAPTER_SORT_DESC)
+    fun sortChapterByAscendingOrDescending() = prefs.getInt(Keys.defaultChapterSortByAscendingOrDescending, DomainManga.CHAPTER_SORT_DESC.toInt())
 
     fun incognitoMode() = flowPrefs.getBoolean("incognito_mode", false)
 
@@ -329,7 +330,7 @@ class PreferencesHelper(val context: Context) {
             putInt(Keys.defaultChapterFilterByBookmarked, manga.bookmarkedFilter)
             putInt(Keys.defaultChapterSortBySourceOrNumber, manga.sorting)
             putInt(Keys.defaultChapterDisplayByNameOrNumber, manga.displayMode)
-            putInt(Keys.defaultChapterSortByAscendingOrDescending, if (manga.sortDescending()) Manga.CHAPTER_SORT_DESC else Manga.CHAPTER_SORT_ASC)
+            putInt(Keys.defaultChapterSortByAscendingOrDescending, if (manga.sortDescending()) DomainManga.CHAPTER_SORT_DESC.toInt() else DomainManga.CHAPTER_SORT_ASC.toInt())
         }
     }
 }