Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 16:31:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to theme changes, and other page loading in recents

Browse Source
This commit is contained in:
Jays2Kings 2021-04-07 03:50:25 -04:00
parent 3c10e7975b
commit 40a9b2c421
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
View File

@ -121,7 +121,6 @@ class RecentsController(bundle: Bundle? = null) :
adapter.itemTouchHelperCallback.setSwipeFlags(
ItemTouchHelper.LEFT
)
resetProgressItem()
val attrsArray = intArrayOf(android.R.attr.actionBarSize)
val array = view.context.obtainStyledAttributes(attrsArray)
val appBarHeight = array.getDimensionPixelSize(0, 0)
@ -478,7 +477,7 @@ class RecentsController(bundle: Bundle? = null) :
setOnQueryTextChangeListener(searchView) {
if (presenter.query != it) {
presenter.query = it ?: return@setOnQueryTextChangeListener false
resetProgressItem()
onAddPageError()
refresh()
}
true
@ -554,17 +553,14 @@ class RecentsController(bundle: Bundle? = null) :
private fun onAddPageError() {
adapter.onLoadMoreComplete(null)
adapter.endlessTargetCount = 0
adapter.setEndlessScrollListener(null, progressItem!!)
adapter.setEndlessProgressItem(null)
}
/**
* Sets a new progress item and reenables the scroll listener.
*/
private fun resetProgressItem() {
adapter.onLoadMoreComplete(null)
progressItem = ProgressItem()
adapter.endlessTargetCount = 0
adapter.setEndlessScrollListener(this, progressItem!!)
}
}

32
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt
View File

@ -66,6 +66,17 @@ class RecentsPresenter(
}
}
init {
preferences.showReadInAllRecents()
.asFlow()
.drop(1)
.onEach {
page = 0
getRecents()
}
.launchIn(scope)
}
fun onCreate() {
downloadManager.addListener(this)
LibraryUpdateService.setListener(this)
@ -76,13 +87,6 @@ class RecentsPresenter(
lastRecents = null
}
getRecents()
preferences.showReadInAllRecents()
.asFlow()
.drop(1)
.onEach {
getRecents()
}
.launchIn(scope)
}
fun getRecents(updatePageCount: Boolean = false, retryCount: Int = 0, itemCount: Int = 0) {
@ -137,7 +141,7 @@ class RecentsPresenter(
time = Date()
when {
query.isNotEmpty() -> add(Calendar.YEAR, -50)
isUngrouped -> add(Calendar.MONTH, -1)
isUngrouped -> add(Calendar.MONTH, -(page + 1))
else -> add(Calendar.DAY_OF_YEAR, -1)
}
}
@ -179,6 +183,14 @@ class RecentsPresenter(
it.history.last_read
}.distinctBy {
if (query.isEmpty() && viewType != VIEW_TYPE_ONLY_HISTORY) it.manga.id else it.chapter.id
}.filter { mch ->
if (page > 0) {
if (query.isEmpty() && viewType != VIEW_TYPE_ONLY_HISTORY) {
recentItems.none { mch.manga.id == it.mch.manga.id }
} else {
recentItems.none { mch.chapter.id == it.mch.chapter.id }
}
} else true
}
val pairs = mangaList.mapNotNull {
val chapter = when {
@ -252,9 +264,9 @@ class RecentsPresenter(
}
val newCount = itemCount + newItems.size
val hasNewItems = newItems.isNotEmpty()
if (newCount < 25 && viewType != VIEW_TYPE_GROUP_ALL && query.isEmpty() && !limit) {
if (updatePageCount && newCount < 25 && viewType != VIEW_TYPE_GROUP_ALL && query.isEmpty() && !limit) {
page++
getRecents(true, retryCount + (if (hasNewItems) 0 else 1), newCount)
runRecents(oldQuery, true, retryCount + (if (hasNewItems) 0 else 1), newCount)
return
}
if (!limit) {