Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove explicit source browse button, tint pin icon when pinned

Browse Source 
(cherry picked from commit 34aaa7fb0a2869c497c2e65ba5718288d711ad5f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
This commit is contained in:
arkon 2020-07-26 16:28:58 -04:00 committed by Jobobby04
parent 2339388d6f
commit c449a59696
3 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
View File

@ -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

23
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
View File

@ -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))
}
}
}

25
app/src/main/res/layout/source_main_controller_card_item.xml
View File

@ -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" />
<Button
android:id="@+id/source_browse"
style="@style/Theme.Widget.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxHeight="48dp"
android:minWidth="0dp"
android:minHeight="48dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/browse"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pin"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<ImageButton
android:id="@+id/pin"
android:layout_width="44dp"
android:layout_width="40dp"
android:layout_height="0dp"
android:alpha="0.75"
android:layout_marginEnd="8dp"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/action_pin"
android:visibility="gone"
@ -80,7 +67,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_push_pin_24dp"
app:tint="?attr/colorOnSurface" />
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>