diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt index 8fea05918..63eb7a276 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt @@ -2,13 +2,13 @@ package eu.kanade.tachiyomi.ui.browse.migration.sources import android.view.View import androidx.core.view.isVisible +import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder import io.github.mthli.slice.Slice import kotlinx.android.synthetic.main.source_main_controller_card_item.card import kotlinx.android.synthetic.main.source_main_controller_card_item.image -import kotlinx.android.synthetic.main.source_main_controller_card_item.source_browse import kotlinx.android.synthetic.main.source_main_controller_card_item.source_latest import kotlinx.android.synthetic.main.source_main_controller_card_item.title @@ -23,15 +23,15 @@ class SourceHolder(view: View, override val adapter: SourceAdapter) : override val viewToSlice: View get() = card + // SY --> init { - source_latest.isVisible = false - // SY --> - source_browse.text = "All" - source_browse.setOnClickListener { + source_latest.isVisible = true + source_latest.text = view.context.getString(R.string.all) + source_latest.setOnClickListener { adapter.allClickListener?.onAllClick(bindingAdapterPosition) } - // SY <-- } + // SY <-- fun bind(item: SourceItem) { val source = item.source diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt index fc8c6d9af..030b52180 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt @@ -7,15 +7,16 @@ import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder +import eu.kanade.tachiyomi.util.system.getResourceColor +import eu.kanade.tachiyomi.util.view.setVectorCompat import io.github.mthli.slice.Slice import kotlinx.android.synthetic.main.source_main_controller_card_item.card import kotlinx.android.synthetic.main.source_main_controller_card_item.image import kotlinx.android.synthetic.main.source_main_controller_card_item.pin -import kotlinx.android.synthetic.main.source_main_controller_card_item.source_browse import kotlinx.android.synthetic.main.source_main_controller_card_item.source_latest import kotlinx.android.synthetic.main.source_main_controller_card_item.title -class SourceHolder(view: View, override val adapter: SourceAdapter /* SY --> */, val showButtons: Boolean /* SY <-- */) : +class SourceHolder(private val view: View, override val adapter: SourceAdapter /* SY --> */, val showButtons: Boolean /* SY <-- */) : BaseFlexibleViewHolder(view, adapter), SlicedHolder { @@ -27,10 +28,6 @@ class SourceHolder(view: View, override val adapter: SourceAdapter /* SY --> */, get() = card init { - source_browse.setOnClickListener { - adapter.clickListener.onBrowseClick(bindingAdapterPosition) - } - source_latest.setOnClickListener { adapter.clickListener.onLatestClick(bindingAdapterPosition) } @@ -41,7 +38,6 @@ class SourceHolder(view: View, override val adapter: SourceAdapter /* SY --> */, // SY --> if (!showButtons) { - source_browse.isVisible = false source_latest.isVisible = false } // SY <-- @@ -63,16 +59,13 @@ class SourceHolder(view: View, override val adapter: SourceAdapter /* SY --> */, } } - source_browse.setText(R.string.browse) source_latest.isVisible = source.supportsLatest/* SY --> */ && showButtons /* SY <-- */ pin.isVisible = true - pin.setImageResource( - if (item.isPinned) { - R.drawable.ic_push_pin_filled_24dp - } else { - R.drawable.ic_push_pin_24dp - } - ) + if (item.isPinned) { + pin.setVectorCompat(R.drawable.ic_push_pin_filled_24dp, view.context.getResourceColor(R.attr.colorAccent)) + } else { + pin.setVectorCompat(R.drawable.ic_push_pin_24dp, view.context.getResourceColor(android.R.attr.textColorHint)) + } } } diff --git a/app/src/main/res/layout/source_main_controller_card_item.xml b/app/src/main/res/layout/source_main_controller_card_item.xml index 777a751b8..c31b2a2dd 100644 --- a/app/src/main/res/layout/source_main_controller_card_item.xml +++ b/app/src/main/res/layout/source_main_controller_card_item.xml @@ -49,30 +49,17 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:text="@string/latest" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/source_browse" - app:layout_constraintTop_toTopOf="parent" /> - -