mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-27 19:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix EH version/chapter sorting shenanigans

Browse Source
This commit is contained in:
NerdNumber9
2019-08-04 00:15:17 -04:00
parent 9abdfeac77
commit 024c76d480
6 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
View File

@ -198,6 +198,4 @@ object PreferenceKeys {
const val eh_aggressivePageLoading = "eh_aggressive_page_loading" const val eh_aggressivePageLoading = "eh_aggressive_page_loading"
const val eh_hl_useHighQualityThumbs = "eh_hl_hq_thumbs" const val eh_hl_useHighQualityThumbs = "eh_hl_hq_thumbs"
const val eh_forceSortEhVersionsAsc = "eh_force_sort_eh_versions_asc"
} }

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

@ -271,6 +271,4 @@ class PreferencesHelper(val context: Context) {
fun eh_aggressivePageLoading() = rxPrefs.getBoolean(Keys.eh_aggressivePageLoading, false) fun eh_aggressivePageLoading() = rxPrefs.getBoolean(Keys.eh_aggressivePageLoading, false)
fun eh_hl_useHighQualityThumbs() = rxPrefs.getBoolean(Keys.eh_hl_useHighQualityThumbs, false) fun eh_hl_useHighQualityThumbs() = rxPrefs.getBoolean(Keys.eh_hl_useHighQualityThumbs, false)
fun eh_forceSortEhVersionsAsc() = rxPrefs.getBoolean(Keys.eh_forceSortEhVersionsAsc, true)
} }

4
app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
View File

@ -185,7 +185,7 @@ class EHentai(override val id: Long,
}!!.nextElementSibling().text()).time }!!.nextElementSibling().text()).time
} }
// Build and append the rest of the galleries // Build and append the rest of the galleries
listOf(self) + newDisplay.mapIndexed { index, newGallery -> newDisplay.mapIndexed { index, newGallery ->
val link = newGallery.attr("href") val link = newGallery.attr("href")
val name = newGallery.text() val name = newGallery.text()
val posted = (newGallery.nextSibling() as TextNode).text().removePrefix(", added ") val posted = (newGallery.nextSibling() as TextNode).text().removePrefix(", added ")
@ -195,7 +195,7 @@ class EHentai(override val id: Long,
this.chapter_number = index + 2f this.chapter_number = index + 2f
this.date_upload = EX_DATE_FORMAT.parse(posted).time this.date_upload = EX_DATE_FORMAT.parse(posted).time
} }
} }.reversed() + self
}.toObservable() }.toObservable()
} }

9
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
View File

@ -146,8 +146,6 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
val menuFilterUnread = menu.findItem(R.id.action_filter_unread) val menuFilterUnread = menu.findItem(R.id.action_filter_unread)
val menuFilterDownloaded = menu.findItem(R.id.action_filter_downloaded) val menuFilterDownloaded = menu.findItem(R.id.action_filter_downloaded)
val menuFilterBookmarked = menu.findItem(R.id.action_filter_bookmarked) val menuFilterBookmarked = menu.findItem(R.id.action_filter_bookmarked)
val menuSort = menu.findItem(R.id.action_sort)
val menuSortingMode = menu.findItem(R.id.action_sorting_mode)
// Set correct checkbox values. // Set correct checkbox values.
menuFilterRead.isChecked = presenter.onlyRead() menuFilterRead.isChecked = presenter.onlyRead()
@ -155,10 +153,6 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
menuFilterDownloaded.isChecked = presenter.onlyDownloaded() menuFilterDownloaded.isChecked = presenter.onlyDownloaded()
menuFilterBookmarked.isChecked = presenter.onlyBookmarked() menuFilterBookmarked.isChecked = presenter.onlyBookmarked()
val showSortOptions = !presenter.isSortingForced()
menuSort.isVisible = showSortOptions
menuSortingMode.isVisible = showSortOptions
if (presenter.onlyRead()) if (presenter.onlyRead())
//Disable unread filter option if read filter is enabled. //Disable unread filter option if read filter is enabled.
menuFilterUnread.isEnabled = false menuFilterUnread.isEnabled = false
@ -419,8 +413,7 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
private fun markPreviousAsRead(chapter: ChapterItem) { private fun markPreviousAsRead(chapter: ChapterItem) {
val adapter = adapter ?: return val adapter = adapter ?: return
val chapters = if (presenter.sortDescending() val chapters = if (presenter.sortDescending()) adapter.items.reversed() else adapter.items
|| presenter.isSortingForced()) adapter.items.reversed() else adapter.items
val chapterPos = chapters.indexOf(chapter) val chapterPos = chapters.indexOf(chapter)
if (chapterPos != -1) { if (chapterPos != -1) {
markAsRead(chapters.take(chapterPos)) markAsRead(chapters.take(chapterPos))

6
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
View File

@ -447,10 +447,6 @@ class ChaptersPresenter(
* Whether the sorting method is descending or ascending. * Whether the sorting method is descending or ascending.
*/ */
fun sortDescending(): Boolean { fun sortDescending(): Boolean {
return !isSortingForced() && manga.sortDescending() return manga.sortDescending()
} }
fun isSortingForced() = source.isEhBasedSource()
&& preferences.eh_forceSortEhVersionsAsc().getOrDefault()
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
View File

@ -157,12 +157,6 @@ class SettingsEhController : SettingsController() {
onChange { preferences.imageQuality().reconfigure() } onChange { preferences.imageQuality().reconfigure() }
}.dependency = PreferenceKeys.eh_enableExHentai }.dependency = PreferenceKeys.eh_enableExHentai
switchPreference {
title = "Force ascending sort on gallery versions"
key = PreferenceKeys.eh_forceSortEhVersionsAsc
defaultValue = true
}
preferenceCategory { preferenceCategory {
title = "Favorites sync" title = "Favorites sync"