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

Display read progress on read chapters for E/Exhentai manga

Browse Source
This commit is contained in:
Jobobby04 2020-09-05 19:02:09 -04:00
parent 69c530dc34
commit 85ef1031b5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
View File

@ -9,6 +9,8 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.data.download.model.Download
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import exh.EH_SOURCE_ID
import exh.EXH_SOURCE_ID
import java.util.Date import java.util.Date
import kotlinx.android.synthetic.main.chapters_item.bookmark_icon import kotlinx.android.synthetic.main.chapters_item.bookmark_icon
import kotlinx.android.synthetic.main.chapters_item.chapter_description import kotlinx.android.synthetic.main.chapters_item.chapter_description
@ -47,7 +49,7 @@ class ChapterHolder(
if (chapter.date_upload > 0) { if (chapter.date_upload > 0) {
descriptions.add(adapter.dateFormat.format(Date(chapter.date_upload))) descriptions.add(adapter.dateFormat.format(Date(chapter.date_upload)))
} }
if (!chapter.read && chapter.last_page_read > 0) { if ((!chapter.read || (adapter.preserveReadingPosition && (manga.source == EH_SOURCE_ID || manga.source == EXH_SOURCE_ID))) && chapter.last_page_read > 0) {
val lastPageRead = SpannableString(itemView.context.getString(R.string.chapter_progress, chapter.last_page_read + 1)).apply { val lastPageRead = SpannableString(itemView.context.getString(R.string.chapter_progress, chapter.last_page_read + 1)).apply {
setSpan(ForegroundColorSpan(adapter.readColor), 0, length, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE) setSpan(ForegroundColorSpan(adapter.readColor), 0, length, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE)
} }

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt
View File

@ -33,6 +33,10 @@ class ChaptersAdapter(
val dateFormat: DateFormat = preferences.dateFormat() val dateFormat: DateFormat = preferences.dateFormat()
// SY -->
val preserveReadingPosition: Boolean = preferences.eh_preserveReadingPosition().get()
// SY <--
override fun updateDataSet(items: List<ChapterItem>?) { override fun updateDataSet(items: List<ChapterItem>?) {
this.items = items ?: emptyList() this.items = items ?: emptyList()
super.updateDataSet(items) super.updateDataSet(items)