Remove usage of alpha color selectors (fixes #2957)

Doesn't work properly in API < 23
This commit is contained in:
arkon
2020-04-26 17:24:31 -04:00
parent b25ab941ba
commit 0a509cb382
6 changed files with 22 additions and 13 deletions

View File

@@ -1,7 +1,6 @@
package eu.kanade.tachiyomi.ui.manga.chapter
import android.content.Context
import androidx.core.content.ContextCompat
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -21,7 +20,7 @@ class ChaptersAdapter(
var items: List<ChapterItem> = emptyList()
val readColor = ContextCompat.getColor(context, R.color.material_on_surface_disabled)
val readColor = context.getResourceColor(R.attr.colorOnSurface, 0.38f)
val unreadColor = context.getResourceColor(R.attr.colorOnSurface)
val bookmarkedColor = context.getResourceColor(R.attr.colorAccent)

View File

@@ -1,7 +1,6 @@
package eu.kanade.tachiyomi.ui.recent.updates
import android.view.View
import androidx.core.content.ContextCompat
import com.bumptech.glide.load.engine.DiskCacheStrategy
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.download.model.Download
@@ -27,7 +26,7 @@ import kotlinx.android.synthetic.main.updates_item.manga_title
class UpdatesHolder(private val view: View, private val adapter: UpdatesAdapter) :
BaseFlexibleViewHolder(view, adapter) {
private var readColor = ContextCompat.getColor(view.context, R.color.material_on_surface_disabled)
private var readColor = view.context.getResourceColor(R.attr.colorOnSurface, 0.38f)
private var unreadColor = view.context.getResourceColor(R.attr.colorOnSurface)
/**

View File

@@ -1,7 +1,6 @@
package eu.kanade.tachiyomi.ui.source.browse
import android.view.View
import androidx.core.content.ContextCompat
import com.bumptech.glide.load.engine.DiskCacheStrategy
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.kanade.tachiyomi.R
@@ -23,7 +22,7 @@ import kotlinx.android.synthetic.main.source_list_item.title
class SourceListHolder(private val view: View, adapter: FlexibleAdapter<*>) :
SourceHolder(view, adapter) {
private val favoriteColor = ContextCompat.getColor(view.context, R.color.material_on_surface_disabled)
private val favoriteColor = view.context.getResourceColor(R.attr.colorOnSurface, 0.38f)
private val unfavoriteColor = view.context.getResourceColor(R.attr.colorOnSurface)
/**

View File

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.source.filter
import android.view.View
import android.widget.CheckedTextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import com.google.android.material.R
@@ -46,7 +45,7 @@ open class TriStateItem(val filter: Filter.TriState) : AbstractFlexibleItem<TriS
val color = if (filter.state == Filter.TriState.STATE_INCLUDE) {
view.context.getResourceColor(R.attr.colorAccent)
} else {
ContextCompat.getColor(view.context, R.color.material_on_background_disabled)
view.context.getResourceColor(R.attr.colorOnBackground, 0.38f)
}
setTint(color)