Improve tracking search results (#1178)

* initial commit changed tracking info screen added ability to click logo to launch website * added publishing status and type to description. adjusted layout some * added start date to track info * tweaked layout * tweaked layout * tweaked layout * code review changes * code review changes part 2 * code review changes
2025-11-15 13:37:29 +01:00 · 2018-02-17 07:04:49 -05:00
parent aa7dfb7bee
commit 40b222f8bc
25 changed files with 466 additions and 107 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt
@@ -15,7 +15,7 @@ class TrackAdapter(controller: TrackController) : RecyclerView.Adapter<TrackHold
            }
        }

-    val rowClickListener: OnRowClickListener = controller
+    val rowClickListener: OnClickListener = controller

    fun getItem(index: Int): TrackItem? {
        return items.getOrNull(index)
@@ -34,7 +34,8 @@ class TrackAdapter(controller: TrackController) : RecyclerView.Adapter<TrackHold
        holder.bind(items[position])
    }

-    interface OnRowClickListener {
+    interface OnClickListener {
+        fun onLogoClick(position: Int)
        fun onTitleClick(position: Int)
        fun onStatusClick(position: Int)
        fun onChaptersClick(position: Int)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackController.kt
@@ -1,19 +1,22 @@
 package eu.kanade.tachiyomi.ui.manga.track

+import android.content.Intent
+import android.net.Uri
 import android.support.v7.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.jakewharton.rxbinding.support.v4.widget.refreshes
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.toast
 import kotlinx.android.synthetic.main.track_controller.*
+import timber.log.Timber

 class TrackController : NucleusController<TrackPresenter>(),
-        TrackAdapter.OnRowClickListener,
+        TrackAdapter.OnClickListener,
        SetTrackStatusDialog.Listener,
        SetTrackChaptersDialog.Listener,
        SetTrackScoreDialog.Listener {
@@ -58,12 +61,13 @@ class TrackController : NucleusController<TrackPresenter>(),
        (parentController as? MangaController)?.setTrackingIcon(atLeastOneLink)
    }

-    fun onSearchResults(results: List<Track>) {
+    fun onSearchResults(results: List<TrackSearch>) {
        getSearchDialog()?.onSearchResults(results)
    }

    @Suppress("UNUSED_PARAMETER")
    fun onSearchResultsError(error: Throwable) {
+        Timber.e(error)
        getSearchDialog()?.onSearchResultsError()
    }

@@ -80,6 +84,16 @@ class TrackController : NucleusController<TrackPresenter>(),
        activity?.toast(error.message)
    }

+    override fun onLogoClick(position: Int) {
+        val track = adapter?.getItem(position)?.track ?: return
+
+        if (track.tracking_url.isNullOrBlank()) {
+            activity?.toast(R.string.url_not_set)
+        } else {
+            activity?.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(track.tracking_url)))
+        }
+    }
+
    override fun onTitleClick(position: Int) {
        val item = adapter?.getItem(position) ?: return
        TrackSearchDialog(this, item.service).showDialog(router, TAG_SEARCH_CONTROLLER)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt
@@ -7,9 +7,10 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseViewHolder
 import kotlinx.android.synthetic.main.track_item.*

 class TrackHolder(view: View, adapter: TrackAdapter) : BaseViewHolder(view) {
-    
+
    init {
        val listener = adapter.rowClickListener
+        logo_container.setOnClickListener { listener.onLogoClick(adapterPosition) }
        title_container.setOnClickListener { listener.onTitleClick(adapterPosition) }
        status_container.setOnClickListener { listener.onStatusClick(adapterPosition) }
        chapters_container.setOnClickListener { listener.onChaptersClick(adapterPosition) }
@@ -21,7 +22,7 @@ class TrackHolder(view: View, adapter: TrackAdapter) : BaseViewHolder(view) {
    fun bind(item: TrackItem) {
        val track = item.track
        track_logo.setImageResource(item.service.getLogo())
-        logo.setBackgroundColor(item.service.getLogoColor())
+        logo_container.setBackgroundColor(item.service.getLogoColor())
        if (track != null) {
            track_title.setTextAppearance(itemView.context, R.style.TextAppearance_Regular_Body1_Secondary)
            track_title.setAllCaps(false)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackPresenter.kt
@@ -16,6 +16,7 @@ import rx.schedulers.Schedulers
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

+
 class TrackPresenter(
        val manga: Manga,
        preferences: PreferencesHelper = Injekt.get(),
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
@@ -4,14 +4,17 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
+import eu.kanade.tachiyomi.data.glide.GlideApp
+import eu.kanade.tachiyomi.util.gone
 import eu.kanade.tachiyomi.util.inflate
 import kotlinx.android.synthetic.main.track_search_item.view.*
 import java.util.*

 class TrackSearchAdapter(context: Context)
-: ArrayAdapter<Track>(context, R.layout.track_search_item, ArrayList<Track>()) {
+    : ArrayAdapter<TrackSearch>(context, R.layout.track_search_item, ArrayList<TrackSearch>()) {

    override fun getView(position: Int, view: View?, parent: ViewGroup): View {
        var v = view
@@ -30,7 +33,7 @@ class TrackSearchAdapter(context: Context)
        return v
    }

-    fun setItems(syncs: List<Track>) {
+    fun setItems(syncs: List<TrackSearch>) {
        setNotifyOnChange(false)
        clear()
        addAll(syncs)
@@ -39,8 +42,40 @@ class TrackSearchAdapter(context: Context)

    class TrackSearchHolder(private val view: View) {

-        fun onSetValues(track: Track) {
+        fun onSetValues(track: TrackSearch) {
            view.track_search_title.text = track.title
+            view.track_search_summary.text = track.summary
+            GlideApp.with(view.context).clear(view.track_search_cover)
+            if (!track.cover_url.isNullOrEmpty()) {
+                GlideApp.with(view.context)
+                        .load(track.cover_url)
+                        .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                        .centerCrop()
+                        .into(view.track_search_cover)
+
+
+                if (track.publishing_status.isNullOrBlank()) {
+                    view.track_search_status.gone()
+                    view.track_search_status_result.gone()
+                } else {
+                    view.track_search_status_result.text = track.publishing_status.capitalize()
+                }
+
+                if (track.publishing_type.isNullOrBlank()) {
+                    view.track_search_type.gone()
+                    view.track_search_type_result.gone()
+                } else {
+                    view.track_search_type_result.text = track.publishing_type.capitalize()
+                }
+
+                if (track.start_date.isNullOrBlank()) {
+                    view.track_search_start.gone()
+                    view.track_search_start_result.gone()
+                } else {
+                    view.track_search_start_result.text = track.start_date
+                }
+
+            }
        }
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
@@ -8,6 +8,7 @@ import com.jakewharton.rxbinding.widget.itemClicks
 import com.jakewharton.rxbinding.widget.textChanges
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
+import eu.kanade.tachiyomi.data.track.model.TrackSearch
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
@@ -114,11 +115,10 @@ class TrackSearchDialog : DialogController {
        val view = dialogView ?: return
        view.progress.visibility = View.VISIBLE
        view.track_search_list.visibility = View.GONE
-
        trackController.presenter.search(query, service)
    }

-    fun onSearchResults(results: List<Track>) {
+    fun onSearchResults(results: List<TrackSearch>) {
        selectedItem = null
        val view = dialogView ?: return
        view.progress.visibility = View.GONE