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

Respect manga chapter order for reader chapter list, as well as fix page progress updating

Browse Source
This commit is contained in:
Jobobby04 2020-08-25 00:12:07 -04:00
parent eafe3a62e4
commit d97805e38b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -301,11 +301,11 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
/*R.id.action_bookmark -> { /*R.id.action_bookmark -> {
presenter.bookmarkCurrentChapter(true) presenter.bookmarkCurrentChapter(true)
invalidateOptionsMenu() invalidateOptionsMenu()
}*/ }
R.id.action_remove_bookmark -> { R.id.action_remove_bookmark -> {
presenter.bookmarkCurrentChapter(false) presenter.bookmarkCurrentChapter(false)
invalidateOptionsMenu() invalidateOptionsMenu()
} }*/
R.id.action_settings -> ReaderSettingsSheet(this).show() R.id.action_settings -> ReaderSettingsSheet(this).show()
R.id.action_custom_filter -> { R.id.action_custom_filter -> {
val sheet = ReaderColorFilterSheet(this) val sheet = ReaderColorFilterSheet(this)

13
app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
View File

@ -1,5 +1,6 @@
package eu.kanade.tachiyomi.ui.reader.chapter package eu.kanade.tachiyomi.ui.reader.chapter
import android.annotation.SuppressLint
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.SeekBar import android.widget.SeekBar
@ -10,6 +11,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
import com.mikepenz.fastadapter.FastAdapter import com.mikepenz.fastadapter.FastAdapter
import com.mikepenz.fastadapter.adapters.ItemAdapter import com.mikepenz.fastadapter.adapters.ItemAdapter
import com.mikepenz.fastadapter.listeners.ClickEventHook import com.mikepenz.fastadapter.listeners.ClickEventHook
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.databinding.ReaderChaptersSheetBinding import eu.kanade.tachiyomi.databinding.ReaderChaptersSheetBinding
import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.ui.reader.ReaderPresenter import eu.kanade.tachiyomi.ui.reader.ReaderPresenter
@ -81,8 +83,10 @@ class ReaderChapterSheet(private val activity: ReaderActivity) : BottomSheetDial
.launchIn(activity.scope) .launchIn(activity.scope)
binding.pageSeekbar.setOnSeekBarChangeListener(object : SimpleSeekBarListener() { binding.pageSeekbar.setOnSeekBarChangeListener(object : SimpleSeekBarListener() {
@SuppressLint("SetTextI18n")
override fun onProgressChanged(seekBar: SeekBar, value: Int, fromUser: Boolean) { override fun onProgressChanged(seekBar: SeekBar, value: Int, fromUser: Boolean) {
if (activity.viewer != null && fromUser) { if (activity.viewer != null && fromUser) {
binding.pageText.text = "${value + 1}/${binding.pageSeekbar.max + 1}"
binding.pageSeekbar.progress = value binding.pageSeekbar.progress = value
activity.moveToPageIndex(value) activity.moveToPageIndex(value)
} }
@ -105,7 +109,14 @@ class ReaderChapterSheet(private val activity: ReaderActivity) : BottomSheetDial
fun refreshList() { fun refreshList() {
launchUI { launchUI {
val chapters = presenter.getChapters(context).sortedBy { it.source_order } val chapters = with(presenter.getChapters(context)) {
when (activity.presenter.manga?.sorting) {
Manga.SORTING_SOURCE -> sortedBy { it.source_order }
Manga.SORTING_NUMBER -> sortedByDescending { it.chapter_number }
Manga.SORTING_UPLOAD_DATE -> sortedBy { it.date_upload }
else -> sortedBy { it.source_order }
}
}
selectedChapterId = chapters.find { it.isCurrent }?.chapter?.id ?: -1L selectedChapterId = chapters.find { it.isCurrent }?.chapter?.id ?: -1L
itemAdapter.clear() itemAdapter.clear()