Tweak flag classes for Library (#7829)

* Tweak flag classes for Library

- Add interface for Flag and Mask
- Merge Sort Type and Direction into one class
- Use custom serializers for preferences
  - Mainly to not break the old

* Review changes

app/src/main/java/eu/kanade/domain/category/interactor/CreateCategoryWithName.kt

@@ -16,9 +16,10 @@ class CreateCategoryWithName(
 
     private val initialFlags: Long
         get() {
+            val sort = preferences.librarySortingMode().get()
             return preferences.libraryDisplayMode().get().flag or
-                preferences.librarySortingMode().get().flag or
-                preferences.librarySortingAscending().get().flag
+                sort.type.flag or
+                sort.direction.flag
         }
 
     suspend fun await(name: String): Result = withContext(NonCancellable) {

app/src/main/java/eu/kanade/domain/category/interactor/ResetCategoryFlags.kt

@@ -2,9 +2,7 @@ package eu.kanade.domain.category.interactor
 
 import eu.kanade.domain.category.repository.CategoryRepository
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
-import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
-import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
+import eu.kanade.tachiyomi.ui.library.setting.plus
 
 class ResetCategoryFlags(
     private val preferences: PreferencesHelper,
@@ -14,12 +12,6 @@ class ResetCategoryFlags(
     suspend fun await() {
         val display = preferences.libraryDisplayMode().get()
         val sort = preferences.librarySortingMode().get()
-        val sortDirection = preferences.librarySortingAscending().get()
-
-        var flags = 0L
-        flags = flags and DisplayModeSetting.MASK.inv() or (display.flag and DisplayModeSetting.MASK)
-        flags = flags and SortModeSetting.MASK.inv() or (sort.flag and SortModeSetting.MASK)
-        flags = flags and SortDirectionSetting.MASK.inv() or (sortDirection.flag and SortDirectionSetting.MASK)
-        categoryRepository.updateAllFlags(flags)
+        categoryRepository.updateAllFlags(display + sort.type + sort.direction)
     }
 }

app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt

@@ -4,15 +4,17 @@ import eu.kanade.domain.category.model.Category
 import eu.kanade.domain.category.model.CategoryUpdate
 import eu.kanade.domain.category.repository.CategoryRepository
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
+import eu.kanade.tachiyomi.ui.library.setting.LibraryDisplayMode
+import eu.kanade.tachiyomi.ui.library.setting.plus
 
 class SetDisplayModeForCategory(
     private val preferences: PreferencesHelper,
     private val categoryRepository: CategoryRepository,
 ) {
 
-    suspend fun await(category: Category, displayModeSetting: DisplayModeSetting) {
-        val flags = category.flags and DisplayModeSetting.MASK.inv() or (displayModeSetting.flag and DisplayModeSetting.MASK)
+    suspend fun await(categoryId: Long, display: LibraryDisplayMode) {
+        val category = categoryRepository.get(categoryId) ?: return
+        val flags = category.flags + display
         if (preferences.categorizedDisplaySettings().get()) {
             categoryRepository.updatePartial(
                 CategoryUpdate(
@@ -21,8 +23,12 @@ class SetDisplayModeForCategory(
                 ),
             )
         } else {
-            preferences.libraryDisplayMode().set(displayModeSetting)
+            preferences.libraryDisplayMode().set(display)
             categoryRepository.updateAllFlags(flags)
         }
     }
+
+    suspend fun await(category: Category, display: LibraryDisplayMode) {
+        await(category.id, display)
+    }
 }

app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt

@@ -4,17 +4,17 @@ import eu.kanade.domain.category.model.Category
 import eu.kanade.domain.category.model.CategoryUpdate
 import eu.kanade.domain.category.repository.CategoryRepository
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
-import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
+import eu.kanade.tachiyomi.ui.library.setting.LibrarySort
+import eu.kanade.tachiyomi.ui.library.setting.plus
 
 class SetSortModeForCategory(
     private val preferences: PreferencesHelper,
     private val categoryRepository: CategoryRepository,
 ) {
 
-    suspend fun await(category: Category, sortModeSetting: SortModeSetting, sortDirectionSetting: SortDirectionSetting) {
-        var flags = category.flags and SortModeSetting.MASK.inv() or (sortModeSetting.flag and SortModeSetting.MASK)
-        flags = flags and SortDirectionSetting.MASK.inv() or (sortDirectionSetting.flag and SortDirectionSetting.MASK)
+    suspend fun await(categoryId: Long, type: LibrarySort.Type, direction: LibrarySort.Direction) {
+        val category = categoryRepository.get(categoryId) ?: return
+        val flags = category.flags + type + direction
         if (preferences.categorizedDisplaySettings().get()) {
             categoryRepository.updatePartial(
                 CategoryUpdate(
@@ -23,9 +23,12 @@ class SetSortModeForCategory(
                 ),
             )
         } else {
-            preferences.librarySortingMode().set(sortModeSetting)
-            preferences.librarySortingAscending().set(sortDirectionSetting)
+            preferences.librarySortingMode().set(LibrarySort(type, direction))
             categoryRepository.updateAllFlags(flags)
         }
     }
+
+    suspend fun await(category: Category, type: LibrarySort.Type, direction: LibrarySort.Direction) {
+        await(category.id, type, direction)
+    }
 }

app/src/main/java/eu/kanade/domain/category/model/Category.kt

@@ -1,8 +1,5 @@
 package eu.kanade.domain.category.model
 
-import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
-import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
-import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
 import java.io.Serializable
 
 data class Category(
@@ -14,15 +11,6 @@ data class Category(
 
     val isSystemCategory: Boolean = id == UNCATEGORIZED_ID
 
-    val displayMode: Long
-        get() = flags and DisplayModeSetting.MASK
-
-    val sortMode: Long
-        get() = flags and SortModeSetting.MASK
-
-    val sortDirection: Long
-        get() = flags and SortDirectionSetting.MASK
-
     companion object {
 
         const val UNCATEGORIZED_ID = 0L

app/src/main/java/eu/kanade/domain/category/repository/CategoryRepository.kt

@@ -6,6 +6,8 @@ import kotlinx.coroutines.flow.Flow
 
 interface CategoryRepository {
 
+    suspend fun get(id: Long): Category?
+
     suspend fun getAll(): List<Category>
 
     fun getAllAsFlow(): Flow<List<Category>>