Show tracker status in button
(cherry picked from commit a443dc3040f5e736ce632a5d00cbca77832ca46d) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt # app/src/main/res/drawable/ic_done_white_18dp.xml
This commit is contained in:
arkon
Jobobby04
parent
62091790a5
commit
a5c4098109
@ -403,6 +403,10 @@ class MangaController :
|
||||
activity?.toast(error.message)
|
||||
}
|
||||
|
||||
fun onTrackingCount(trackCount: Int) {
|
||||
mangaInfoAdapter?.setTrackingCount(trackCount)
|
||||
}
|
||||
|
||||
fun openMangaInWebView() {
|
||||
val source = presenter.source as? HttpSource ?: return
|
||||
|
||||
|
||||
@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.data.download.DownloadManager
|
||||
import eu.kanade.tachiyomi.data.download.model.Download
|
||||
import eu.kanade.tachiyomi.data.library.CustomMangaManager
|
||||
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
|
||||
import eu.kanade.tachiyomi.data.track.TrackManager
|
||||
import eu.kanade.tachiyomi.source.LocalSource
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
import eu.kanade.tachiyomi.source.online.LewdSource
|
||||
@ -57,6 +58,7 @@ class MangaPresenter(
|
||||
val source: Source,
|
||||
val preferences: PreferencesHelper = Injekt.get(),
|
||||
private val db: DatabaseHelper = Injekt.get(),
|
||||
private val trackManager: TrackManager = Injekt.get(),
|
||||
private val downloadManager: DownloadManager = Injekt.get(),
|
||||
private val coverCache: CoverCache = Injekt.get(),
|
||||
// SY -->
|
||||
@ -122,8 +124,13 @@ class MangaPresenter(
|
||||
// Manga info - start
|
||||
|
||||
getMangaObservable()
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribeLatestCache({ view, manga -> view.onNextMangaInfo(manga, source /* SY --> */, meta/* SY <-- */) })
|
||||
|
||||
getTrackingObservable()
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribeLatestCache(MangaController::onTrackingCount) { _, error -> Timber.e(error) }
|
||||
|
||||
// Prepare the relay.
|
||||
chaptersRelay.flatMap { applyChapterFilters(it) }
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
@ -187,7 +194,19 @@ class MangaPresenter(
|
||||
|
||||
private fun getMangaObservable(): Observable<Manga> {
|
||||
return db.getManga(manga.url, manga.source).asRxObservable()
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
}
|
||||
|
||||
private fun getTrackingObservable(): Observable<Int> {
|
||||
if (!trackManager.hasLoggedServices()) {
|
||||
return Observable.just(0)
|
||||
}
|
||||
|
||||
return db.getTracks(manga).asRxObservable()
|
||||
.map { tracks ->
|
||||
val loggedServices = trackManager.services.filter { it.isLogged }.map { it.id }
|
||||
tracks.filter { it.sync_id in loggedServices }
|
||||
}
|
||||
.map { it.size }
|
||||
}
|
||||
|
||||
// SY -->
|
||||
|
||||
@ -17,7 +17,6 @@ import eu.kanade.tachiyomi.data.database.models.Manga
|
||||
import eu.kanade.tachiyomi.data.glide.GlideApp
|
||||
import eu.kanade.tachiyomi.data.glide.MangaThumbnail
|
||||
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
|
||||
import eu.kanade.tachiyomi.data.track.TrackManager
|
||||
import eu.kanade.tachiyomi.databinding.MangaInfoHeaderBinding
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
import eu.kanade.tachiyomi.source.SourceManager
|
||||
@ -56,7 +55,10 @@ class MangaInfoHeaderAdapter(
|
||||
|
||||
private var manga: Manga = controller.presenter.manga
|
||||
private var source: Source = controller.presenter.source
|
||||
private var trackCount: Int = 0
|
||||
// SY -->
|
||||
private var meta: RaisedSearchMetadata? = controller.presenter.meta
|
||||
// SY <--
|
||||
|
||||
private val scope = CoroutineScope(Job() + Dispatchers.Main)
|
||||
private lateinit var binding: MangaInfoHeaderBinding
|
||||
@ -91,6 +93,12 @@ class MangaInfoHeaderAdapter(
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
fun setTrackingCount(trackCount: Int) {
|
||||
this.trackCount = trackCount
|
||||
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
inner class HeaderViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
|
||||
fun bind() {
|
||||
// For rounded corners
|
||||
@ -106,13 +114,26 @@ class MangaInfoHeaderAdapter(
|
||||
.launchIn(scope)
|
||||
}
|
||||
|
||||
if (controller.presenter.manga.favorite && Injekt.get<TrackManager>().hasLoggedServices()) {
|
||||
binding.btnTracking.visible()
|
||||
binding.btnTracking.clicks()
|
||||
.onEach { controller.onTrackingClick() }
|
||||
.launchIn(scope)
|
||||
} else {
|
||||
binding.btnTracking.gone()
|
||||
with(binding.btnTracking) {
|
||||
if (controller.presenter.manga.favorite) {
|
||||
visible()
|
||||
|
||||
if (trackCount > 0) {
|
||||
setIconResource(R.drawable.ic_done_24dp)
|
||||
text = view.context.resources.getQuantityString(R.plurals.num_trackers, trackCount, trackCount)
|
||||
isChecked = true
|
||||
} else {
|
||||
setIconResource(R.drawable.ic_sync_24dp)
|
||||
text = view.context.getString(R.string.manga_tracking_tab)
|
||||
isChecked = false
|
||||
}
|
||||
|
||||
clicks()
|
||||
.onEach { controller.onTrackingClick() }
|
||||
.launchIn(scope)
|
||||
} else {
|
||||
gone()
|
||||
}
|
||||
}
|
||||
|
||||
if (controller.presenter.source is HttpSource) {
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="18dp"
|
||||
android:height="18dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
|
||||
</vector>
|
||||
@ -514,6 +514,10 @@
|
||||
|
||||
<!-- Tracking Screen -->
|
||||
<string name="manga_tracking_tab">Tracking</string>
|
||||
<plurals name="num_trackers">
|
||||
<item quantity="one">1 tracker</item>
|
||||
<item quantity="other">%d trackers</item>
|
||||
</plurals>
|
||||
<string name="add_tracking">Add tracking</string>
|
||||
<string name="reading">Reading</string>
|
||||
<string name="currently_reading">Currently reading</string>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user