Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
[Jetsnack] Fix review comments
  • Loading branch information
JolandaVerhoef committed Nov 9, 2020
commit 65d752a4af65387061ad8ae8527042c67cd27174
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@ 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 @@ -48,17 +45,15 @@ fun QuantitySelector(
ConstraintLayout(modifier = modifier) {
val (qty, minus, quantity, plus) = createRefs()
createHorizontalChain(qty, minus, quantity, plus, chainStyle = ChainStyle.Packed)
Providers(AmbientContentAlpha provides ContentAlpha.high) {
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)
}
)
}
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 All @@ -67,21 +62,19 @@ fun QuantitySelector(
linkTo(top = parent.top, bottom = parent.bottom)
}
)
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Crossfade(
current = count,
modifier = Modifier
.constrainAs(quantity) { baseline.linkTo(qty.baseline) }
) {
Text(
text = "$it",
style = MaterialTheme.typography.subtitle2,
fontSize = 18.sp,
color = JetsnackTheme.colors.textPrimary,
textAlign = TextAlign.Center,
modifier = Modifier.preferredWidthIn(min = 24.dp)
)
}
Crossfade(
current = count,
modifier = Modifier
.constrainAs(quantity) { baseline.linkTo(qty.baseline) }
) {
Text(
text = "$it",
style = MaterialTheme.typography.subtitle2,
fontSize = 18.sp,
color = JetsnackTheme.colors.textPrimary,
textAlign = TextAlign.Center,
modifier = Modifier.preferredWidthIn(min = 24.dp)
)
}
JetsnackGradientTintedIconButton(
asset = Icons.Outlined.AddCircleOutline,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ private fun SearchBar(
}
}
BasicTextField(
query,
onQueryChange,
Modifier
value = query,
onValueChange = onQueryChange,
modifier = Modifier
.weight(1f)
.focusObserver {
onSearchFocusChange(it.isFocused)
Expand Down