Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-10 06:45:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Readded refresh button for single category libraries

Browse Source 
Long pressing the library icon now updates the ui on library and recents
This commit is contained in:
Jay 2020-04-30 00:29:39 -04:00
parent 6e99caf458
commit 2e4af90b63
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
View File

@ -241,14 +241,15 @@ class LibraryUpdateService(
} else { } else {
val categoriesToUpdate = val categoriesToUpdate =
preferences.libraryUpdateCategories().getOrDefault().map(String::toInt) preferences.libraryUpdateCategories().getOrDefault().map(String::toInt)
if (categoriesToUpdate.isNotEmpty()) {
categoryIds.addAll(categoriesToUpdate) categoryIds.addAll(categoriesToUpdate)
if (categoriesToUpdate.isNotEmpty())
db.getLibraryMangas().executeAsBlocking() db.getLibraryMangas().executeAsBlocking()
.filter { it.category in categoriesToUpdate } .filter { it.category in categoriesToUpdate }.distinctBy { it.id }
.distinctBy { it.id } } else {
else categoryIds.addAll(db.getCategories().executeAsBlocking().mapNotNull { it.id } + 0)
db.getLibraryMangas().executeAsBlocking().distinctBy { it.id } db.getLibraryMangas().executeAsBlocking().distinctBy { it.id }
} }
}
if (target == Target.CHAPTERS && preferences.updateOnlyNonCompleted()) { if (target == Target.CHAPTERS && preferences.updateOnlyNonCompleted()) {
listToUpdate = listToUpdate.filter { it.status != SManga.COMPLETED } listToUpdate = listToUpdate.filter { it.status != SManga.COMPLETED }
} }
@ -339,12 +340,13 @@ class LibraryUpdateService(
Timber.e(exception) Timber.e(exception)
stopSelf(startId) stopSelf(startId)
} }
if (target == Target.CHAPTERS) { job = if (target == Target.CHAPTERS) {
job = GlobalScope.launch(handler) { listener?.onUpdateManga(LibraryManga())
GlobalScope.launch(handler) {
updateChaptersJob(mangaToAdd) updateChaptersJob(mangaToAdd)
} }
} else { } else {
job = GlobalScope.launch(handler) { GlobalScope.launch(handler) {
updateTrackings(mangaToAdd) updateTrackings(mangaToAdd)
} }
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt
View File

@ -154,7 +154,7 @@ class LibraryHeaderItem(
else -> { else -> {
catProgress.gone() catProgress.gone()
checkboxImage.gone() checkboxImage.gone()
updateButton.visInvisIf(!(category.isFirst == true && category.isLast == true)) updateButton.visInvisIf(category.id ?: 0 > -1)
} }
} }
} }

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

@ -204,7 +204,7 @@ class RecentsController(bundle: Bundle? = null) : BaseController(bundle),
setPadding(dl_bottom_sheet.sheetBehavior?.isHideable == true) setPadding(dl_bottom_sheet.sheetBehavior?.isHideable == true)
} }
fun reEnableSwipe() { fun setRefreshing(refresh: Boolean) {
swipe_refresh.isRefreshing = false swipe_refresh.isRefreshing = false
} }

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

@ -242,8 +242,13 @@ class RecentsPresenter(
} }
override fun onUpdateManga(manga: LibraryManga) { override fun onUpdateManga(manga: LibraryManga) {
if (manga.id == null) scope.launch(Dispatchers.Main) { controller.reEnableSwipe() } if (manga.id == null && !LibraryUpdateService.isRunning()) {
else getRecents() scope.launch(Dispatchers.Main) { controller.setRefreshing(false) }
} else if (manga.id == null) {
scope.launch(Dispatchers.Main) { controller.setRefreshing(true) }
} else {
getRecents()
}
} }
/** /**