msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 22:17:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 4

common: use upstream ColorScheme#surfaceColorAtElevation

Browse source
This commit is contained in:
Harsh Shandilya 2022-08-03 00:27:14 +05:30
parent 46ed4fd3f1
commit 492219e3a8
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
1 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
common/src/main/kotlin/dev/msfjarvis/claw/common/ui/ext.kt
View file

@ -2,26 +2,13 @@ package dev.msfjarvis.claw.common.ui
import androidx.compose.material3.ColorScheme import androidx.compose.material3.ColorScheme
import androidx.compose.material3.LocalAbsoluteTonalElevation import androidx.compose.material3.LocalAbsoluteTonalElevation
import androidx.compose.material3.NavigationBarDefaults
import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.compositeOver
import androidx.compose.ui.unit.dp
import kotlin.math.ln
/**
* Returns the [ColorScheme.surface] color with an alpha of the [ColorScheme.primary] color overlaid
* on top of it. Computes the surface tonal color at different elevation levels e.g. surface1
* through surface5.
*
* Stolen from AndroidX, keep in sync when upgrading Compose. This version is hard-coded to
* replicate the logic used by the Material3 NavigationBar to determine its surface color.
* https://github.com/androidx/androidx/blob/74d3510b608c3cc26b9cf9be8d15a6a6c26192c2/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/ColorScheme.kt#L453-L466
*/
@Composable @Composable
fun ColorScheme.surfaceColorAtNavigationBarElevation(): Color { fun ColorScheme.surfaceColorAtNavigationBarElevation(): Color {
// Absolute tonal elevation + NavigationBarTokens.ContainerElevation val elevation = LocalAbsoluteTonalElevation.current + NavigationBarDefaults.Elevation
val elevation = LocalAbsoluteTonalElevation.current + 3.0.dp return surfaceColorAtElevation(elevation)
if (elevation == 0.dp) return surface
val alpha = ((4.5f * ln(elevation.value + 1)) + 2f) / 100f
return primary.copy(alpha = alpha).compositeOver(surface)
} }