Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup grouping code

Browse Source
This commit is contained in:
Jobobby04 2022-11-02 21:01:43 -04:00
parent e943b4ed09
commit 8facc5346f
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -233,9 +233,6 @@ class LibraryController(
settingsSheet = LibrarySettingsSheet(router) { group -> settingsSheet = LibrarySettingsSheet(router) { group ->
when (group) { when (group) {
is LibrarySettingsSheet.Filter.FilterGroup -> onFilterChanged() is LibrarySettingsSheet.Filter.FilterGroup -> onFilterChanged()
// SY -->
is LibrarySettingsSheet.Grouping.InternalGroup -> onGroupChanged()
// SY <--
else -> {} // Handled via different mechanisms else -> {} // Handled via different mechanisms
} }
} }
@ -267,14 +264,6 @@ class LibraryController(
} }
} }
// SY -->
private fun onGroupChanged() {
viewScope.launchUI {
presenter.requestGroupUpdate()
}
}
// SY <--
fun search(query: String) { fun search(query: String) {
presenter.searchQuery = query presenter.searchQuery = query
} }

16
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -169,11 +169,6 @@ class LibraryPresenter(
private val _filterChanges: Channel<Unit> = Channel(Int.MAX_VALUE) private val _filterChanges: Channel<Unit> = Channel(Int.MAX_VALUE)
private val filterChanges = _filterChanges.receiveAsFlow().onStart { emit(Unit) } private val filterChanges = _filterChanges.receiveAsFlow().onStart { emit(Unit) }
// SY -->
private val _groupChanges: Channel<Unit> = Channel(Int.MAX_VALUE)
private val groupChanges = _groupChanges.receiveAsFlow().onStart { emit(Unit) }
// SY <--
private var librarySubscription: Job? = null private var librarySubscription: Job? = null
// SY --> // SY -->
@ -218,7 +213,7 @@ class LibraryPresenter(
getTracksPerManga.subscribe(), getTracksPerManga.subscribe(),
filterChanges, filterChanges,
// SY --> // SY -->
groupChanges, libraryPreferences.groupLibraryBy().changes(),
libraryPreferences.librarySortingMode().changes(), libraryPreferences.librarySortingMode().changes(),
// SY <-- // SY <--
) { library, tracks, _, _, _ -> ) { library, tracks, _, _, _ ->
@ -566,15 +561,6 @@ class LibraryPresenter(
_filterChanges.send(Unit) _filterChanges.send(Unit)
} }
// SY -->
/**
* Requests the library to be grouped.
*/
suspend fun requestGroupUpdate() = withIOContext {
_groupChanges.send(Unit)
}
// SY <--
/** /**
* Called when a manga is opened. * Called when a manga is opened.
*/ */