null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use best color for cover color, use color accent when cover theming is off

Browse source
This commit is contained in:
Jays2Kings 2021-10-16 14:50:40 -04:00
parent 7cc73ba503
commit e6f295d506
2 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/image/coil/LibraryMangaImageTarget.kt
View file

@ -67,6 +67,8 @@ inline fun ImageView.loadManga(
return imageLoader.enqueue(request)
}
fun Palette.getBestColor(defaultColor: Int) = getBestColor() ?: defaultColor
fun Palette.getBestColor(): Int? {
val vibPopulation = vibrantSwatch?.population ?: -1
val domLum = dominantSwatch?.hsl?.get(2) ?: -1f

45
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
View file

@ -223,6 +223,7 @@ class MangaDetailsController :
private fun setAccentColorValue(colorToUse: Int? = null) {
val context = view?.context ?: return
setCoverColorValue(colorToUse)
accentColor = if (presenter.preferences.themeMangaDetails()) {
(colorToUse ?: manga?.vibrantCoverColor)?.let {
val luminance = ColorUtils.calculateLuminance(it).toFloat()
@ -242,6 +243,34 @@ class MangaDetailsController :
}
}
private fun setCoverColorValue(colorToUse: Int? = null) {
val context = view?.context ?: return
val colorBack = context.getResourceColor(R.attr.background)
coverColor =
(
if (presenter.preferences.themeMangaDetails()) {
(colorToUse ?: manga?.vibrantCoverColor)
} else {
ColorUtils.blendARGB(
context.getResourceColor(R.attr.colorSecondary),
colorBack,
0.5f
)
}
)?.let {
// this makes the color more consistent regardless of theme
val dominant = it
val domLum = ColorUtils.calculateLuminance(dominant)
val lumWrongForTheme =
(if (context.isInNightMode()) domLum > 0.8 else domLum <= 0.2)
ColorUtils.blendARGB(
it,
colorBack,
if (lumWrongForTheme) 0.9f else 0.7f
)
}
}
private fun setRefreshStyle() {
with(binding.swipeRefresh) {
if (presenter.preferences.themeMangaDetails() && accentColor != null && headerColor != null) {
@ -458,19 +487,6 @@ class MangaDetailsController :
if (bitmap != null) {
Palette.from(bitmap).generate {
if (it == null) return@generate
val colorBack = view.context.getResourceColor(R.attr.background)
// this makes the color more consistent regardless of theme
val dominant = it.getDominantColor(colorBack)
val domLum = ColorUtils.calculateLuminance(dominant)
val lumWrongForTheme = (if (view.context.isInNightMode()) domLum > 0.8 else domLum <= 0.2)
val backDropColor =
ColorUtils.blendARGB(
it.getDominantColor(colorBack),
colorBack,
if (lumWrongForTheme) 0.9f else 0.65f
)
coverColor = backDropColor
if (presenter.preferences.themeMangaDetails()) {
launchUI {
view.context.getResourceColor(R.attr.colorSecondary)
@ -493,7 +509,8 @@ class MangaDetailsController :
}
}
} else {
getHeader()?.setBackDrop(backDropColor)
setCoverColorValue()
coverColor?.let { color -> getHeader()?.setBackDrop(color) }
}
}
}