Tweak tag style once more

This commit is contained in:
Jays2Kings 2021-07-19 00:03:45 -04:00
parent b7f52955cc
commit bb40a391b3

View File

@ -317,16 +317,25 @@ class MangaHeaderHolder(
with(binding.mangaGenresTags) { with(binding.mangaGenresTags) {
removeAllViews() removeAllViews()
val dark = context.isInNightMode() val dark = context.isInNightMode()
val amoled = adapter.delegate.mangaPresenter().preferences.themeDarkAmoled().get()
val baseTagColor = context.getResourceColor(R.attr.background)
val bgArray = FloatArray(3)
val accentArray = FloatArray(3) val accentArray = FloatArray(3)
val onAccentArray = FloatArray(3)
ColorUtils.colorToHSL(baseTagColor, bgArray)
ColorUtils.colorToHSL(context.getResourceColor(R.attr.colorAccent), accentArray) ColorUtils.colorToHSL(context.getResourceColor(R.attr.colorAccent), accentArray)
ColorUtils.colorToHSL(context.getResourceColor(R.attr.colorOnAccent), onAccentArray)
val downloadedColor = ColorUtils.setAlphaComponent( val downloadedColor = ColorUtils.setAlphaComponent(
ColorUtils.HSLToColor( ColorUtils.HSLToColor(
floatArrayOf( floatArrayOf(
accentArray[0], bgArray[0],
accentArray[1], bgArray[1],
(if (dark) 0.3f else 0.85f) (
when {
amoled && dark -> 0.1f
dark -> 0.225f
else -> 0.85f
}
)
) )
), ),
199 199
@ -334,8 +343,8 @@ class MangaHeaderHolder(
val textColor = ColorUtils.HSLToColor( val textColor = ColorUtils.HSLToColor(
floatArrayOf( floatArrayOf(
accentArray[0], accentArray[0],
0.8f, accentArray[1],
if (dark) 0.925f else 0.15f if (dark) 0.945f else 0.175f
) )
) )
if (manga.genre.isNullOrBlank().not()) { if (manga.genre.isNullOrBlank().not()) {