javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases 5 Wiki Activity

Use tristate checkboxes for chapters list filters

Browse Source
This commit is contained in:
arkon
2020-09-27 18:13:20 -04:00
parent 2eab43a669
commit fb3756420b
8 changed files with 111 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
+61 -38
View File
@@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.util.prepUpdateCover
import eu.kanade.tachiyomi.util.removeCovers
import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
import eu.kanade.tachiyomi.util.updateCoverLastModified
import eu.kanade.tachiyomi.widget.ExtendedNavigationView.Item.TriStateGroup.State
import rx.Observable
import rx.Subscription
import rx.android.schedulers.AndroidSchedulers
@@ -368,17 +369,28 @@ class MangaPresenter(
*/
private fun applyChapterFilters(chapters: List<ChapterItem>): Observable<List<ChapterItem>> {
var observable = Observable.from(chapters).subscribeOn(Schedulers.io())
if (onlyUnread()) {
val unreadFilter = onlyUnread()
if (unreadFilter == State.INCLUDE) {
observable = observable.filter { !it.read }
} else if (onlyRead()) {
} else if (unreadFilter == State.EXCLUDE) {
observable = observable.filter { it.read }
}
if (onlyDownloaded()) {
val downloadedFilter = onlyDownloaded()
if (downloadedFilter == State.INCLUDE) {
observable = observable.filter { it.isDownloaded || it.manga.isLocal() }
} else if (downloadedFilter == State.EXCLUDE) {
observable = observable.filter { !it.isDownloaded && !it.manga.isLocal() }
}
if (onlyBookmarked()) {
val bookmarkedFilter = onlyBookmarked()
if (bookmarkedFilter == State.INCLUDE) {
observable = observable.filter { it.bookmark }
} else if (bookmarkedFilter == State.EXCLUDE) {
observable = observable.filter { !it.bookmark }
}
val sortFunction: (Chapter, Chapter) -> Int = when (manga.sorting) {
Manga.SORTING_SOURCE -> when (sortDescending()) {
true -> { c1, c2 -> c1.source_order.compareTo(c2.source_order) }
@@ -394,6 +406,7 @@ class MangaPresenter(
}
else -> throw NotImplementedError("Unimplemented sorting method")
}
return observable.toSortedList(sortFunction)
}
@@ -412,7 +425,7 @@ class MangaPresenter(
}
// Force UI update if downloaded filter active and download finished.
if (onlyDownloaded() && download.status == Download.DOWNLOADED) {
if (onlyDownloaded() != State.IGNORE && download.status == Download.DOWNLOADED) {
refreshChapters()
}
}
@@ -477,7 +490,7 @@ class MangaPresenter(
fun deleteChapters(chapters: List<ChapterItem>) {
Observable.just(chapters)
.doOnNext { deleteChaptersInternal(chapters) }
.doOnNext { if (onlyDownloaded()) refreshChapters() }
.doOnNext { if (onlyDownloaded() != State.IGNORE) refreshChapters() }
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribeFirst(
@@ -518,40 +531,42 @@ class MangaPresenter(
/**
* Sets the read filter and requests an UI update.
* @param onlyUnread whether to display only unread chapters or all chapters.
* @param state whether to display only unread chapters or all chapters.
*/
fun setUnreadFilter(onlyUnread: Boolean) {
manga.readFilter = if (onlyUnread) Manga.SHOW_UNREAD else Manga.SHOW_ALL
db.updateFlags(manga).executeAsBlocking()
refreshChapters()
}
/**
* Sets the read filter and requests an UI update.
* @param onlyRead whether to display only read chapters or all chapters.
*/
fun setReadFilter(onlyRead: Boolean) {
manga.readFilter = if (onlyRead) Manga.SHOW_READ else Manga.SHOW_ALL
fun setUnreadFilter(state: State) {
manga.readFilter = when (state) {
State.IGNORE -> Manga.SHOW_ALL
State.INCLUDE -> Manga.SHOW_UNREAD
State.EXCLUDE -> Manga.SHOW_READ
}
db.updateFlags(manga).executeAsBlocking()
refreshChapters()
}
/**
* Sets the download filter and requests an UI update.
* @param onlyDownloaded whether to display only downloaded chapters or all chapters.
* @param state whether to display only downloaded chapters or all chapters.
*/
fun setDownloadedFilter(onlyDownloaded: Boolean) {
manga.downloadedFilter = if (onlyDownloaded) Manga.SHOW_DOWNLOADED else Manga.SHOW_ALL
fun setDownloadedFilter(state: State) {
manga.downloadedFilter = when (state) {
State.IGNORE -> Manga.SHOW_ALL
State.INCLUDE -> Manga.SHOW_DOWNLOADED
State.EXCLUDE -> Manga.SHOW_NOT_DOWNLOADED
}
db.updateFlags(manga).executeAsBlocking()
refreshChapters()
}
/**
* Sets the bookmark filter and requests an UI update.
* @param onlyBookmarked whether to display only bookmarked chapters or all chapters.
* @param state whether to display only bookmarked chapters or all chapters.
*/
fun setBookmarkedFilter(onlyBookmarked: Boolean) {
manga.bookmarkedFilter = if (onlyBookmarked) Manga.SHOW_BOOKMARKED else Manga.SHOW_ALL
fun setBookmarkedFilter(state: State) {
manga.bookmarkedFilter = when (state) {
State.IGNORE -> Manga.SHOW_ALL
State.INCLUDE -> Manga.SHOW_BOOKMARKED
State.EXCLUDE -> Manga.SHOW_NOT_BOOKMARKED
}
db.updateFlags(manga).executeAsBlocking()
refreshChapters()
}
@@ -585,29 +600,37 @@ class MangaPresenter(
/**
* Whether the display only downloaded filter is enabled.
*/
fun onlyDownloaded(): Boolean {
return forceDownloaded() || manga.downloadedFilter == Manga.SHOW_DOWNLOADED
fun onlyDownloaded(): State {
if (forceDownloaded()) {
return State.INCLUDE
}
return when (manga.downloadedFilter) {
Manga.SHOW_DOWNLOADED -> State.INCLUDE
Manga.SHOW_NOT_DOWNLOADED -> State.EXCLUDE
else -> State.IGNORE
}
}
/**
* Whether the display only downloaded filter is enabled.
*/
fun onlyBookmarked(): Boolean {
return manga.bookmarkedFilter == Manga.SHOW_BOOKMARKED
fun onlyBookmarked(): State {
return when (manga.bookmarkedFilter) {
Manga.SHOW_BOOKMARKED -> State.INCLUDE
Manga.SHOW_NOT_BOOKMARKED -> State.EXCLUDE
else -> State.IGNORE
}
}
/**
* Whether the display only unread filter is enabled.
*/
fun onlyUnread(): Boolean {
return manga.readFilter == Manga.SHOW_UNREAD
}
/**
* Whether the display only read filter is enabled.
*/
fun onlyRead(): Boolean {
return manga.readFilter == Manga.SHOW_READ
fun onlyUnread(): State {
return when (manga.readFilter) {
Manga.SHOW_UNREAD -> State.INCLUDE
Manga.SHOW_READ -> State.EXCLUDE
else -> State.IGNORE
}
}
/**
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
+25 -17
View File
@@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.ui.manga.MangaPresenter
import eu.kanade.tachiyomi.util.view.popupMenu
import eu.kanade.tachiyomi.widget.ExtendedNavigationView
import eu.kanade.tachiyomi.widget.ExtendedNavigationView.Item.TriStateGroup.State
import eu.kanade.tachiyomi.widget.TabbedBottomSheetDialog
class ChaptersSettingsSheet(
@@ -81,36 +82,43 @@ class ChaptersSettingsSheet(
* Returns true if there's at least one filter from [FilterGroup] active.
*/
fun hasActiveFilters(): Boolean {
return filterGroup.items.any { it.checked }
return filterGroup.items.any { it.state != State.IGNORE.value }
}
inner class FilterGroup : Group {
private val read = Item.CheckboxGroup(R.string.action_filter_read, this)
private val unread = Item.CheckboxGroup(R.string.action_filter_unread, this)
private val downloaded = Item.CheckboxGroup(R.string.action_filter_downloaded, this)
private val bookmarked = Item.CheckboxGroup(R.string.action_filter_bookmarked, this)
private val unread = Item.TriStateGroup(R.string.action_filter_unread, this)
private val downloaded = Item.TriStateGroup(R.string.action_filter_downloaded, this)
private val bookmarked = Item.TriStateGroup(R.string.action_filter_bookmarked, this)
override val header = null
override val items = listOf(read, unread, downloaded, bookmarked)
override val items = listOf(unread, downloaded, bookmarked)
override val footer = null
override fun initModels() {
read.checked = presenter.onlyRead()
unread.checked = presenter.onlyUnread()
downloaded.checked = presenter.onlyDownloaded()
downloaded.enabled = !presenter.forceDownloaded()
bookmarked.checked = presenter.onlyBookmarked()
if (presenter.forceDownloaded()) {
downloaded.state = State.INCLUDE.value
downloaded.enabled = false
} else {
downloaded.state = presenter.onlyDownloaded().value
}
unread.state = presenter.onlyUnread().value
bookmarked.state = presenter.onlyBookmarked().value
}
override fun onItemClicked(item: Item) {
item as Item.CheckboxGroup
item.checked = !item.checked
item as Item.TriStateGroup
val newState = when (item.state) {
State.IGNORE.value -> State.INCLUDE
State.INCLUDE.value -> State.EXCLUDE
State.EXCLUDE.value -> State.IGNORE
else -> throw Exception("Unknown State")
}
item.state = newState.value
when (item) {
read -> presenter.setReadFilter(item.checked)
unread -> presenter.setUnreadFilter(item.checked)
downloaded -> presenter.setDownloadedFilter(item.checked)
bookmarked -> presenter.setBookmarkedFilter(item.checked)
downloaded -> presenter.setDownloadedFilter(newState)
unread -> presenter.setUnreadFilter(newState)
bookmarked -> presenter.setBookmarkedFilter(newState)
}
initModels()