From 69121d39588e0b3999a52255af61cda87b67c0e5 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 29 May 2020 14:30:50 -0400 Subject: [PATCH] Small tweaks to manga info, now doesnt require it to be favorited to be in library --- .../tachiyomi/ui/manga/MangaAllInOneHolder.kt | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt index 5ecaf069e..3e625de5b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt @@ -92,20 +92,12 @@ class MangaAllInOneHolder( .onEach { adapter.delegate.onFavoriteClick() } .launchIn(adapter.delegate.controllerScope) - if ((Injekt.get().hasLoggedServices()) && presenter.manga.favorite) { + if ((Injekt.get().hasLoggedServices())) { btn_tracking.visible() } adapter.delegate.controllerScope.launch(Dispatchers.IO) { - if (Injekt.get().getTracks(presenter.manga).executeAsBlocking().any { - val status = Injekt.get().getService(it.sync_id)?.getStatus(it.status) - status != null - } - ) { - withContext(Dispatchers.Main) { - btn_tracking.icon = itemView.context.getDrawable(R.drawable.ic_cloud_white_24dp) - } - } + setTrackingIcon() } btn_tracking.clicks() @@ -268,7 +260,7 @@ class MangaAllInOneHolder( // EXH --> if (source?.id == MERGED_SOURCE_ID) { - manga_source_label.text = "Sources" + manga_source_label.setText(R.string.label_sources) } else { manga_source_label.setText(R.string.manga_info_source_label) } @@ -407,7 +399,7 @@ class MangaAllInOneHolder( val presenter = adapter.delegate.mangaPresenter() val isNowFavorite = presenter.toggleFavorite() - if (itemView != null && !isNowFavorite && presenter.hasDownloads()) { + if (!isNowFavorite && presenter.hasDownloads()) { itemView.snack(itemView.context.getString(R.string.delete_downloads_for_manga)) { setAction(R.string.action_delete) { presenter.deleteDownloads() @@ -447,4 +439,18 @@ class MangaAllInOneHolder( private fun performGlobalSearch(query: String) { adapter.delegate.performGlobalSearch(query) } + + private suspend fun setTrackingIcon() { + val presenter = adapter.delegate.mangaPresenter() + + if (Injekt.get().getTracks(presenter.manga).executeAsBlocking().any { + val status = Injekt.get().getService(it.sync_id)?.getStatus(it.status) + status != null + } + ) { + withContext(Dispatchers.Main) { + btn_tracking.setIconResource(R.drawable.ic_cloud_white_24dp) + } + } + } }