Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-11-11 07:29:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

damp the saturation of warm tonal surfaces to avoid brown

Browse Source
This commit is contained in:
austinried
2026-10-04 00:29:56 +00:00
parent c56ae3f0ed
commit 043c6201ba
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/theme/ArtworkTheme.kt
+7 -2
View File
@@ -34,6 +34,7 @@ private const val DARKEN_END_SCREENS = 1.5f
private const val DARKEN_KNEE = 0.2f private const val DARKEN_KNEE = 0.2f
private const val PLAYER_SURFACE_SATURATION_FACTOR = 1.6f private const val PLAYER_SURFACE_SATURATION_FACTOR = 1.6f
private const val LIBRARY_SURFACE_LIGHTNESS = 0.10f private const val LIBRARY_SURFACE_LIGHTNESS = 0.10f
private const val WARM_SURFACE_SATURATION_DAMPING = 0.2f
@Immutable @Immutable
data class ArtworkColors( data class ArtworkColors(
@@ -209,14 +210,18 @@ fun ArtworkTheme(
fun playerSurfaceColor(artwork: ArtworkColors): Color { fun playerSurfaceColor(artwork: ArtworkColors): Color {
val (hue, saturation, lightness) = artwork.scheme.surfaceContainerHigh.toHsl() val (hue, saturation, lightness) = artwork.scheme.surfaceContainerHigh.toHsl()
return Color.hsl(hue, (saturation * PLAYER_SURFACE_SATURATION_FACTOR).coerceIn(0f, 1f), lightness) val damping = if (isWarmHue(hue)) WARM_SURFACE_SATURATION_DAMPING else 1f
return Color.hsl(hue, (saturation * PLAYER_SURFACE_SATURATION_FACTOR * damping).coerceIn(0f, 1f), lightness)
} }
fun librarySurfaceColor(artwork: ArtworkColors): Color { fun librarySurfaceColor(artwork: ArtworkColors): Color {
val (hue, saturation, _) = artwork.scheme.surfaceContainerHigh.toHsl() val (hue, saturation, _) = artwork.scheme.surfaceContainerHigh.toHsl()
return Color.hsl(hue, saturation, LIBRARY_SURFACE_LIGHTNESS) val damping = if (isWarmHue(hue)) WARM_SURFACE_SATURATION_DAMPING else 1f
return Color.hsl(hue, (saturation * damping).coerceIn(0f, 1f), LIBRARY_SURFACE_LIGHTNESS)
} }
private fun isWarmHue(hue: Float): Boolean = hue in 0f..120f
fun heroBarColor( fun heroBarColor(
artwork: ArtworkColors?, artwork: ArtworkColors?,
scrollPx: Float, scrollPx: Float,