Remove per-category display mode

There seems to be little value in this feature, and juggling flag masks is annoying. Per-category sorting is still a thing, but could be refactored away from the flag in the feature. (cherry picked from commit 405a75438a61770a12292cc87c0fa36e16668124) # Conflicts: # app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt # domain/src/main/java/tachiyomi/domain/category/interactor/SetDisplayModeForCategory.kt # domain/src/main/java/tachiyomi/domain/category/interactor/SetSortModeForCategory.kt
2023-06-04 16:59:21 -04:00
parent ff9b7a1325
commit 23170b6f03
14 changed files with 60 additions and 117 deletions
@@ -31,7 +31,7 @@ import tachiyomi.domain.category.interactor.GetCategories
 import tachiyomi.domain.category.interactor.RenameCategory
 import tachiyomi.domain.category.interactor.ReorderCategory
 import tachiyomi.domain.category.interactor.ResetCategoryFlags
-import tachiyomi.domain.category.interactor.SetDisplayModeForCategory
+import tachiyomi.domain.category.interactor.SetDisplayMode
 import tachiyomi.domain.category.interactor.SetMangaCategories
 import tachiyomi.domain.category.interactor.SetSortModeForCategory
 import tachiyomi.domain.category.interactor.UpdateCategory
@@ -82,7 +82,7 @@ class DomainModule : InjektModule {
        addSingletonFactory<CategoryRepository> { CategoryRepositoryImpl(get()) }
        addFactory { GetCategories(get()) }
        addFactory { ResetCategoryFlags(get(), get()) }
-        addFactory { SetDisplayModeForCategory(get(), get()) }
+        addFactory { SetDisplayMode(get()) }
        addFactory { SetSortModeForCategory(get(), get()) }
        addFactory { CreateCategoryWithName(get(), get()) }
        addFactory { RenameCategory(get()) }
@@ -34,7 +34,6 @@ import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.library.model.LibraryGroup
 import tachiyomi.domain.library.model.LibrarySort
-import tachiyomi.domain.library.model.display
 import tachiyomi.domain.library.model.sort
 import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.domain.manga.model.TriStateFilter
@@ -49,7 +48,7 @@ import tachiyomi.presentation.core.components.SortItem
 fun LibrarySettingsDialog(
    onDismissRequest: () -> Unit,
    screenModel: LibrarySettingsScreenModel,
-    category: Category,
+    category: Category?,
    // SY -->
    hasCategories: Boolean,
    // SY <--
@@ -79,7 +78,6 @@ fun LibrarySettingsDialog(
                    screenModel = screenModel,
                )
                2 -> DisplayPage(
-                    category = category,
                    screenModel = screenModel,
                )
                // SY -->
@@ -172,7 +170,7 @@ private fun ColumnScope.FilterPage(

@Composable
 private fun ColumnScope.SortPage(
-    category: Category,
+    category: Category?,
    screenModel: LibrarySettingsScreenModel,
 ) {
    // SY -->
@@ -225,7 +223,6 @@ private fun ColumnScope.SortPage(

@Composable
 private fun ColumnScope.DisplayPage(
-    category: Category,
    screenModel: LibrarySettingsScreenModel,
 ) {
    // SY -->
@@ -233,6 +230,7 @@ private fun ColumnScope.DisplayPage(
    // SY <--

    HeadingItem(R.string.action_display_mode)
+    val displayMode by screenModel.libraryPreferences.libraryDisplayMode().collectAsState()
    listOf(
        R.string.action_display_grid to LibraryDisplayMode.CompactGrid,
        R.string.action_display_comfortable_grid to LibraryDisplayMode.ComfortableGrid,
@@ -241,18 +239,12 @@ private fun ColumnScope.DisplayPage(
    ).map { (titleRes, mode) ->
        RadioItem(
            label = stringResource(titleRes),
-            // SY -->
-            selected = if (screenModel.grouping == LibraryGroup.BY_DEFAULT) {
-                category.display
-            } else {
-                globalDisplayMode
-            } == mode,
-            // SY <--
-            onClick = { screenModel.setDisplayMode(category, mode) },
+            selected = displayMode == mode,
+            onClick = { screenModel.setDisplayMode(mode) },
        )
    }

-    if (category.display != LibraryDisplayMode.List) {
+    if (displayMode != LibraryDisplayMode.List) {
        Row(
            modifier = Modifier
                .fillMaxWidth()
@@ -42,7 +42,7 @@ fun LibraryContent(
    onRefresh: (Category?) -> Boolean,
    onGlobalSearchClicked: () -> Unit,
    getNumberOfMangaForCategory: (Category) -> Int?,
-    getDisplayModeForPage: @Composable (Int) -> LibraryDisplayMode,
+    getDisplayMode: (Int) -> PreferenceMutableState<LibraryDisplayMode>,
    getColumnsForOrientation: (Boolean) -> PreferenceMutableState<Int>,
    getLibraryForPage: (Int) -> List<LibraryItem>,
 ) {
@@ -104,7 +104,7 @@ fun LibraryContent(
                selectedManga = selection,
                searchQuery = searchQuery,
                onGlobalSearchClicked = onGlobalSearchClicked,
-                getDisplayModeForPage = getDisplayModeForPage,
+                getDisplayMode = getDisplayMode,
                getColumnsForOrientation = getColumnsForOrientation,
                getLibraryForPage = getLibraryForPage,
                onClickManga = onClickManga,
@@ -34,7 +34,7 @@ fun LibraryPager(
    selectedManga: List<LibraryManga>,
    searchQuery: String?,
    onGlobalSearchClicked: () -> Unit,
-    getDisplayModeForPage: @Composable (Int) -> LibraryDisplayMode,
+    getDisplayMode: (Int) -> PreferenceMutableState<LibraryDisplayMode>,
    getColumnsForOrientation: (Boolean) -> PreferenceMutableState<Int>,
    getLibraryForPage: (Int) -> List<LibraryItem>,
    onClickManga: (LibraryManga) -> Unit,
@@ -62,7 +62,7 @@ fun LibraryPager(
            return@HorizontalPager
        }

-        val displayMode = getDisplayModeForPage(page)
+        val displayMode by getDisplayMode(page)
        val columns by if (displayMode != LibraryDisplayMode.List) {
            val configuration = LocalConfiguration.current
            val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
@@ -165,20 +165,19 @@ class LibraryScreenModel(
                combine(
                    getTrackingFilterFlow(),
                    downloadCache.changes,
-                ) { a, b -> a to b },
+                    ::Pair,
+                ),
                // SY -->
                combine(
                    state.map { it.groupType }.distinctUntilChanged(),
-                    libraryPreferences.libraryDisplayMode().changes(),
                    libraryPreferences.librarySortingMode().changes(),
-                ) { a, b, c ->
-                    Triple(a, b, c)
-                },
+                    ::Pair,
+                ),
                // SY <--
-            ) { searchQuery, library, tracks, (loggedInTrackServices, _), (groupType, displayMode, sort) ->
+            ) { searchQuery, library, tracks, (loggedInTrackServices, _), (groupType, sort) ->
                library
                    // SY -->
-                    .applyGrouping(groupType, displayMode)
+                    .applyGrouping(groupType)
                    // SY <--
                    .applyFilters(tracks, loggedInTrackServices)
                    .applySort(/* SY --> */sort.takeIf { groupType != LibraryGroup.BY_DEFAULT } /* SY <-- */)
@@ -523,7 +522,7 @@ class LibraryScreenModel(
    }

    // SY -->
-    private fun LibraryMap.applyGrouping(groupType: Int, displayMode: LibraryDisplayMode): LibraryMap {
+    private fun LibraryMap.applyGrouping(groupType: Int): LibraryMap {
        val items = when (groupType) {
            LibraryGroup.BY_DEFAULT -> this
            LibraryGroup.UNGROUPED -> {
@@ -532,7 +531,7 @@ class LibraryScreenModel(
                        0,
                        preferences.context.getString(R.string.ungrouped),
                        0,
-                        displayMode.flag,
+                        0,
                    ) to
                        values.flatten().distinctBy { it.libraryManga.manga.id },
                )
@@ -541,7 +540,6 @@ class LibraryScreenModel(
                getGroupedMangaItems(
                    groupType = groupType,
                    libraryManga = this.values.flatten().distinctBy { it.libraryManga.manga.id },
-                    displayMode = displayMode,
                )
            }
        }
@@ -787,6 +785,10 @@ class LibraryScreenModel(
        }
    }

+    fun getDisplayMode(): PreferenceMutableState<LibraryDisplayMode> {
+        return libraryPreferences.libraryDisplayMode().asState(coroutineScope)
+    }
+
    fun getColumnsPreferenceForCurrentOrientation(isLandscape: Boolean): PreferenceMutableState<Int> {
        return (if (isLandscape) libraryPreferences.landscapeColumns() else libraryPreferences.portraitColumns()).asState(coroutineScope)
    }
@@ -1118,7 +1120,6 @@ class LibraryScreenModel(
    private fun getGroupedMangaItems(
        groupType: Int,
        libraryManga: List<LibraryItem>,
-        displayMode: LibraryDisplayMode,
    ): LibraryMap {
        val context = preferences.context
        return when (groupType) {
@@ -1138,7 +1139,7 @@ class LibraryScreenModel(
                            .let { it ?: TrackStatus.OTHER }
                            .let { context.getString(it.res) },
                        order = TrackStatus.values().indexOfFirst { it.int == id }.takeUnless { it == -1 }?.toLong() ?: TrackStatus.OTHER.ordinal.toLong(),
-                        flags = displayMode.flag,
+                        flags = 0,
                    )
                }
            }
@@ -1163,7 +1164,7 @@ class LibraryScreenModel(
                            source.name.ifBlank { source.id.toString() }
                        },
                        order = sources.indexOf(it.key).takeUnless { it == -1 }?.toLong() ?: Long.MAX_VALUE,
-                        flags = displayMode.flag,
+                        flags = 0,
                    )
                }
            }
@@ -1191,7 +1192,7 @@ class LibraryScreenModel(
                            SManga.COMPLETED.toLong() -> 6
                            else -> 7
                        },
-                        flags = displayMode.flag,
+                        flags = 0,
                    )
                }
            }
@@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.util.preference.toggle
 import tachiyomi.core.preference.Preference
 import tachiyomi.core.preference.getAndSet
 import tachiyomi.core.util.lang.launchIO
-import tachiyomi.domain.category.interactor.SetDisplayModeForCategory
+import tachiyomi.domain.category.interactor.SetDisplayMode
 import tachiyomi.domain.category.interactor.SetSortModeForCategory
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.library.model.LibraryDisplayMode
@@ -23,7 +23,7 @@ import uy.kohesive.injekt.api.get
 class LibrarySettingsScreenModel(
    val preferences: BasePreferences = Injekt.get(),
    val libraryPreferences: LibraryPreferences = Injekt.get(),
-    private val setDisplayModeForCategory: SetDisplayModeForCategory = Injekt.get(),
+    private val setDisplayMode: SetDisplayMode = Injekt.get(),
    private val setSortModeForCategory: SetSortModeForCategory = Injekt.get(),
    private val trackManager: TrackManager = Injekt.get(),
 ) : ScreenModel {
@@ -49,13 +49,11 @@ class LibrarySettingsScreenModel(
        toggleFilter { libraryPreferences.filterTracking(id) }
    }

-    fun setDisplayMode(category: Category, mode: LibraryDisplayMode) {
-        coroutineScope.launchIO {
-            setDisplayModeForCategory.await(category, mode)
-        }
+    fun setDisplayMode(mode: LibraryDisplayMode) {
+        setDisplayMode.await(mode)
    }

-    fun setSort(category: Category, mode: LibrarySort.Type, direction: LibrarySort.Direction) {
+    fun setSort(category: Category?, mode: LibrarySort.Type, direction: LibrarySort.Direction) {
        coroutineScope.launchIO {
            setSortModeForCategory.await(category, mode, direction)
        }
@@ -60,7 +60,6 @@ import tachiyomi.domain.UnsortedPreferences
 import tachiyomi.domain.category.model.Category
 import tachiyomi.domain.library.model.LibraryGroup
 import tachiyomi.domain.library.model.LibraryManga
-import tachiyomi.domain.library.model.display
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.screens.EmptyScreen
@@ -242,7 +241,7 @@ object LibraryTab : Tab {
                            navigator.push(GlobalSearchScreen(screenModel.state.value.searchQuery ?: ""))
                        },
                        getNumberOfMangaForCategory = { state.getMangaCountForCategory(it) },
-                        getDisplayModeForPage = { state.categories[it.coerceAtMost(state.categories.lastIndex)].display },
+                        getDisplayMode = { screenModel.getDisplayMode() },
                        getColumnsForOrientation = { screenModel.getColumnsPreferenceForCurrentOrientation(it) },
                    ) { state.getLibraryItemsByPage(it) }
                }