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

fade only the lower third, deepening with scroll

Browse Source
This commit is contained in:
austinried
2026-10-04 00:29:53 +00:00
parent ab19bbd1a4
commit 5b0b301f3d
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
-1
View File
@@ -80,7 +80,6 @@ import com.subtracks.ui.theme.ArtworkColors
import com.subtracks.ui.theme.ArtworkTheme import com.subtracks.ui.theme.ArtworkTheme
import com.subtracks.ui.theme.HeroGradient import com.subtracks.ui.theme.HeroGradient
import com.subtracks.ui.theme.gradientColorAt import com.subtracks.ui.theme.gradientColorAt
import com.subtracks.ui.theme.heroDarken
import com.subtracks.ui.theme.rememberArtworkColors import com.subtracks.ui.theme.rememberArtworkColors
import org.koin.compose.koinInject import org.koin.compose.koinInject
import org.koin.compose.viewmodel.koinViewModel import org.koin.compose.viewmodel.koinViewModel
app/src/main/kotlin/com/subtracks/ui/theme/ArtworkTheme.kt
+5 -11
View File
@@ -38,8 +38,8 @@ private const val BLOB_COUNT = 4
private const val ACCENT_MAX_LUMINANCE = 0.34f private const val ACCENT_MAX_LUMINANCE = 0.34f
private const val HERO_DARKEN_MAX = 0.8f private const val HERO_DARKEN_MAX = 0.8f
private const val HERO_DARKEN_SCREENS = 1.5f private const val HERO_DARKEN_SCREENS = 1.5f
private const val BASE_BOTTOM_DARKEN = 0.45f private const val BASE_BOTTOM_DARKEN = 0.35f
private const val POSITION_FADE_START = 0.30f private const val POSITION_FADE_START = 0.66f
data class ArtworkColors( data class ArtworkColors(
val scheme: ColorScheme, val scheme: ColorScheme,
@@ -284,6 +284,8 @@ fun HeroGradient(
} }
} }
} }
val progress = (scroll / (size.height * HERO_DARKEN_SCREENS)).coerceIn(0f, 1f)
val bottomAlpha = BASE_BOTTOM_DARKEN + (HERO_DARKEN_MAX - BASE_BOTTOM_DARKEN) * progress
drawRect( drawRect(
brush = brush =
Brush.verticalGradient( Brush.verticalGradient(
@@ -291,21 +293,13 @@ fun HeroGradient(
arrayOf( arrayOf(
0f to Color.Transparent, 0f to Color.Transparent,
POSITION_FADE_START to Color.Transparent, POSITION_FADE_START to Color.Transparent,
1f to 1f to Color.Black.copy(alpha = bottomAlpha),
Color.Black.copy(
alpha = (BASE_BOTTOM_DARKEN + heroDarken(scroll, size.height)).coerceAtMost(HERO_DARKEN_MAX),
),
), ),
), ),
) )
} }
} }
fun heroDarken(
scrollPx: Float,
screenHeightPx: Float,
): Float = (scrollPx / (screenHeightPx * HERO_DARKEN_SCREENS)).coerceIn(0f, 1f) * HERO_DARKEN_MAX
private fun Color.toHsl(): Triple<Float, Float, Float> { private fun Color.toHsl(): Triple<Float, Float, Float> {
val max = maxOf(red, green, blue) val max = maxOf(red, green, blue)
val min = minOf(red, green, blue) val min = minOf(red, green, blue)