Skip to content

[Jetsnack] Update to snapshot 6964664 #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JolandaVerhoef merged 8 commits into from
Nov 11, 2020
Merged

[Jetsnack] Update to snapshot 6964664 #271

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
308a6ca
[Jetsnack] Update to snapshot 6953474
JolandaVerhoef Nov 6, 2020
65d752a
[Jetsnack] Fix review comments
JolandaVerhoef Nov 9, 2020
c83c3cf
Merge branch 'dev_alpha07' into jv/js_alpha07
JolandaVerhoef Nov 9, 2020
40a4194
[Jetsnack] Update to snapshot 6961312
JolandaVerhoef Nov 10, 2020
d5cc734
Merge branch 'dev_alpha07' into jv/js_alpha07
JolandaVerhoef Nov 10, 2020
f5e0219
[Jetsnack] Update to snapshot 6964664
JolandaVerhoef Nov 11, 2020
c40635d
Merge branch 'dev_alpha07' into jv/js_alpha07
JolandaVerhoef Nov 11, 2020
6fcd168
[Jetsnack] Fix review comment
JolandaVerhoef Nov 11, 2020
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
Prev Previous commit
[Jetsnack] Fix review comment
  • Loading branch information
@JolandaVerhoef
JolandaVerhoef committed Nov 11, 2020
commit 6fcd168c741ab050ebe6f9fb41bcba27b0bb1659
23 changes: 14 additions & 9 deletions Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/QuantitySelector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ import androidx.compose.animation.Crossfade
import androidx.compose.foundation.layout.ChainStyle
import androidx.compose.foundation.layout.ConstraintLayout
import androidx.compose.foundation.layout.preferredWidthIn
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.ContentAlpha
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.AddCircleOutline
import androidx.compose.material.icons.outlined.RemoveCircleOutline
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
Expand All @@ -45,15 +48,17 @@ fun QuantitySelector(
ConstraintLayout(modifier = modifier) {
val (qty, minus, quantity, plus) = createRefs()
createHorizontalChain(qty, minus, quantity, plus, chainStyle = ChainStyle.Packed)
Text(
text = stringResource(R.string.quantity),
style = MaterialTheme.typography.subtitle1,
color = JetsnackTheme.colors.textSecondary,
modifier = Modifier.constrainAs(qty) {
start.linkTo(parent.start)
linkTo(top = parent.top, bottom = parent.bottom)
}
)
Providers(AmbientContentAlpha provides ContentAlpha.medium) {
Text(
text = stringResource(R.string.quantity),
style = MaterialTheme.typography.subtitle1,
color = JetsnackTheme.colors.textSecondary,
modifier = Modifier.constrainAs(qty) {
start.linkTo(parent.start)
linkTo(top = parent.top, bottom = parent.bottom)
}
)
}
JetsnackGradientTintedIconButton(
asset = Icons.Outlined.RemoveCircleOutline,
onClick = decreaseItemCount,
Expand Down