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
Expand Up @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.requiredSize
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -21,6 +22,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.flipcash.app.bills.ScannableRenderer
import com.flipcash.app.bills.components.cards.LocalTipCardColor
import com.flipcash.app.core.bill.Scannable
import com.flipcash.app.core.tipping.TipResult
import com.flipcash.app.core.tipping.TipStep
Expand Down Expand Up @@ -98,9 +100,13 @@ internal fun TipCardScreen() {
)
Spacer(Modifier.weight(1f))
state.tipCard?.let {
ScannableRenderer(
scannable = it,
)
CompositionLocalProvider(
LocalTipCardColor provides Color(0xFF101011)
) {
ScannableRenderer(
scannable = it,
)
}
}
Spacer(Modifier.weight(1f))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package com.flipcash.app.bills

import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewWrapper
import com.flipcash.app.bills.components.bills.CashBill
import com.flipcash.app.bills.components.bills.GoldBar
import com.flipcash.app.bills.components.cards.LocalTipCardColor
import com.flipcash.app.bills.components.cards.TipCard
import com.flipcash.app.core.bill.Scannable
import com.flipcash.app.theme.FlipcashThemeWrapper
Expand Down Expand Up @@ -38,12 +40,14 @@ fun ScannableRenderer(
payloadData = scannable.data,
amount = scannable.amount.underlyingTokenAmount,
)
is Scannable.TipCard -> TipCard(
modifier = modifier,
payloadData = scannable.data,
user = scannable.user,
contentAlignment = contentAlignment,
)
is Scannable.TipCard -> {
TipCard(
modifier = modifier,
payloadData = scannable.data,
user = scannable.user,
contentAlignment = contentAlignment,
)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand All @@ -16,11 +15,14 @@ import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.compositeOver
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.takeOrElse
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.flipcash.app.bills.components.ScannableCode
Expand All @@ -30,6 +32,8 @@ import com.flipcash.shared.common.ui.ContactAvatar
import com.getcode.theme.CodeTheme
import com.getcode.theme.xxl

val LocalTipCardColor = staticCompositionLocalOf { Color.Unspecified }

@OptIn(ExperimentalLayoutApi::class)
@Composable
internal fun TipCard(
Expand All @@ -38,6 +42,7 @@ internal fun TipCard(
modifier: Modifier = Modifier,
contentAlignment: Alignment = Alignment.Center,
) {
val cardColor = LocalTipCardColor.current.takeOrElse { CodeTheme.colors.tipCardColor }
BoxWithConstraints(
modifier = modifier
.windowInsetsPadding(WindowInsets.statusBarsIgnoringVisibility)
Expand All @@ -50,7 +55,7 @@ internal fun TipCard(
Column(
modifier = Modifier
.background(
CodeTheme.colors.tipCardColor,
color = cardColor,
shape = CodeTheme.shapes.xxl,
)
.padding(vertical = CodeTheme.dimens.grid.x8, horizontal = CodeTheme.dimens.grid.x7)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private val colors = with(Flipcash2ColorSpec) {
toggleUncheckedTrackColor = Color(0xFF666666),
cashBill = cashBill,
cashBillDecorColor = Color.White.copy(0.60f),
tipCard = Color(0xFF101011),
tipCard = Color(0xFF2A2620),
betaIndicator = BetaIndicator,
bannerThemed = bannerThemed,
bannerError = Error,
Expand Down
Loading