Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.getcode.ui.components

import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
Expand All @@ -9,12 +10,18 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.lerp
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.getcode.ui.components.AppBarDefaults.IconSize
import androidx.compose.foundation.clickable
import com.getcode.theme.CodeTheme
import dev.chrisbanes.haze.HazeState
import dev.chrisbanes.haze.blur.HazeBlurStyle
import dev.chrisbanes.haze.blur.HazeColorEffect
import dev.chrisbanes.haze.blur.blurEffect
import dev.chrisbanes.haze.hazeEffect

private val ButtonSize: Dp
@Composable get() = CodeTheme.dimens.staticGrid.x8
Expand All @@ -26,15 +33,35 @@ fun CircularIconButton(
modifier: Modifier = Modifier,
imageSize: Dp = IconSize,
buttonSize: Dp = ButtonSize,
hazeState: HazeState? = null,
onClick: () -> Unit,
testTag: String? = null,
content: @Composable (Dp) -> Unit,
) {
// When a HazeState is supplied the button frosts whatever content scrolls beneath the app bar
// (iOS "liquid glass"), matching the v2 nav pill; `clip` precedes `hazeEffect` so the blur is
// bounded to the circle. Falls back to the flat translucent fill when no HazeState is supplied.
val fill = if (hazeState != null) {
val glassTint = lerp(CodeTheme.colors.background, Color.White, 0.18f)
val liquidGlass = HazeBlurStyle(
blurRadius = CodeTheme.dimens.grid.x4,
backgroundColor = CodeTheme.colors.background,
colorEffect = HazeColorEffect.tint(glassTint.copy(alpha = 0.72f)),
)
Modifier
.clip(CircleShape)
.hazeEffect(hazeState) { blurEffect { style = liquidGlass } }
.border(CodeTheme.dimens.border, Color.White.copy(alpha = 0.08f), CircleShape)
} else {
Modifier
.background(ButtonBackground, CircleShape)
.clip(CircleShape)
}

Box(
modifier = modifier
.size(buttonSize)
.background(ButtonBackground, CircleShape)
.clip(CircleShape)
.then(fill)
.clickable { onClick() }
.then(if (testTag != null) Modifier.testTag(testTag) else Modifier),
contentAlignment = Alignment.Center,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.getcode.navigation.core.LocalCodeNavigator
import dev.chrisbanes.haze.HazeState
import com.getcode.navigation.flow.FlowDismissStyle
import com.getcode.navigation.flow.LocalFlowDismissStyle
import com.getcode.navigation.scenes.LocalSheetNavigator
Expand All @@ -51,9 +52,10 @@ object AppBarDefaults {
internal val IconSize = 20.dp

@Composable
fun UpNavigation(modifier: Modifier = Modifier, onClick: () -> Unit) {
fun UpNavigation(modifier: Modifier = Modifier, hazeState: HazeState? = null, onClick: () -> Unit) {
CircularIconButton(
modifier = modifier,
hazeState = hazeState,
onClick = onClick,
testTag = "action_back"
) { size ->
Expand All @@ -67,9 +69,10 @@ object AppBarDefaults {
}

@Composable
fun Close(modifier: Modifier = Modifier, onClick: () -> Unit) {
fun Close(modifier: Modifier = Modifier, hazeState: HazeState? = null, onClick: () -> Unit) {
CircularIconButton(
modifier = modifier,
hazeState = hazeState,
onClick = onClick,
testTag = "action_close"
) { size ->
Expand All @@ -83,9 +86,10 @@ object AppBarDefaults {
}

@Composable
fun Share(modifier: Modifier = Modifier, onClick: () -> Unit) {
fun Share(modifier: Modifier = Modifier, hazeState: HazeState? = null, onClick: () -> Unit) {
CircularIconButton(
modifier = modifier,
hazeState = hazeState,
onClick = onClick,
testTag = "action_share"
) { size ->
Expand Down Expand Up @@ -190,6 +194,7 @@ fun AppBarWithTitle(
titleAlignment: Alignment.Horizontal = Alignment.Start,
contentPadding: PaddingValues = AppBarDefaults.ContentPadding,
onBackIconClicked: (() -> Unit)? = null,
hazeState: HazeState? = null,
endContent: @Composable RowScope.() -> Unit = { },
) {
val navigator = LocalCodeNavigator.current
Expand All @@ -215,7 +220,7 @@ fun AppBarWithTitle(
contentPadding = contentPadding,
leftIcon = {
if (showBack && !showClose) {
AppBarDefaults.UpNavigation { onBackIconClicked() }
AppBarDefaults.UpNavigation(hazeState = hazeState) { onBackIconClicked() }
}
},
titleRegion = {
Expand All @@ -229,7 +234,7 @@ fun AppBarWithTitle(
rightContents = {
endContent()
if (showClose) {
AppBarDefaults.Close { onBackIconClicked() }
AppBarDefaults.Close(hazeState = hazeState) { onBackIconClicked() }
}
},
)
Expand Down
Loading