Skip to content

Commit 54acaf9

Browse files
nickbutchernickbutcher
committedSep 16, 2020
[Jetsnack] Update to alpha03.
Change-Id: Ie225d3c83cdbd901ce55fb58e5a4d05ab6e2bc7f
1 parent df641e3 commit 54acaf9

File tree

11 files changed

+39
-36
lines changed

11 files changed

+39
-36
lines changed
 

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Filters.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.foundation.Box
2121
import androidx.compose.foundation.Icon
2222
import androidx.compose.foundation.ScrollableRow
2323
import androidx.compose.foundation.Text
24+
import androidx.compose.foundation.layout.RowScope.align
2425
import androidx.compose.foundation.layout.Spacer
2526
import androidx.compose.foundation.layout.padding
2627
import androidx.compose.foundation.layout.preferredHeight
@@ -42,11 +43,11 @@ import com.example.jetsnack.ui.theme.JetsnackTheme
4243

4344
@Composable
4445
fun FilterBar(filters: List<Filter>) {
45-
ScrollableRow(modifier = Modifier.preferredHeightIn(minHeight = 56.dp)) {
46+
ScrollableRow(modifier = Modifier.preferredHeightIn(min = 56.dp)) {
4647
Spacer(Modifier.preferredWidth(8.dp))
4748
IconButton(
4849
onClick = { /* todo */ },
49-
modifier = Modifier.gravity(Alignment.CenterVertically)
50+
modifier = Modifier.align(Alignment.CenterVertically)
5051
) {
5152
Icon(
5253
asset = Icons.Rounded.FilterList,
@@ -61,7 +62,7 @@ fun FilterBar(filters: List<Filter>) {
6162
filters.forEach { filter ->
6263
FilterChip(
6364
filter = filter,
64-
modifier = Modifier.gravity(Alignment.CenterVertically)
65+
modifier = Modifier.align(Alignment.CenterVertically)
6566
)
6667
Spacer(Modifier.preferredWidth(8.dp))
6768
}

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/components/Snacks.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import androidx.compose.foundation.Text
2323
import androidx.compose.foundation.clickable
2424
import androidx.compose.foundation.layout.Column
2525
import androidx.compose.foundation.layout.Row
26+
import androidx.compose.foundation.layout.RowScope.align
2627
import androidx.compose.foundation.layout.Spacer
2728
import androidx.compose.foundation.layout.Stack
2829
import androidx.compose.foundation.layout.fillMaxSize
@@ -75,9 +76,9 @@ fun SnackCollection(
7576
) {
7677
Column(modifier = modifier) {
7778
Row(
78-
verticalGravity = Alignment.CenterVertically,
79+
verticalAlignment = Alignment.CenterVertically,
7980
modifier = Modifier
80-
.preferredHeightIn(minHeight = 56.dp)
81+
.preferredHeightIn(min = 56.dp)
8182
.padding(start = 24.dp)
8283
) {
8384
Text(
@@ -90,7 +91,7 @@ fun SnackCollection(
9091
)
9192
IconButton(
9293
onClick = { /* todo */ },
93-
modifier = Modifier.gravity(Alignment.CenterVertically)
94+
modifier = Modifier.align(Alignment.CenterVertically)
9495
) {
9596
Icon(
9697
asset = Icons.Outlined.ArrowForward,
@@ -160,7 +161,7 @@ fun SnackItem(
160161
modifier = modifier.padding(bottom = 8.dp)
161162
) {
162163
Column(
163-
horizontalGravity = Alignment.CenterHorizontally,
164+
horizontalAlignment = Alignment.CenterHorizontally,
164165
modifier = Modifier
165166
.clickable(onClick = { onSnackClick(snack.id) })
166167
.padding(8.dp)
@@ -223,7 +224,7 @@ private fun HighlightSnackItem(
223224
imageUrl = snack.imageUrl,
224225
modifier = Modifier
225226
.preferredSize(120.dp)
226-
.gravity(Alignment.BottomCenter)
227+
.align(Alignment.BottomCenter)
227228
)
228229
}
229230
Spacer(modifier = Modifier.preferredHeight(8.dp))

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/Feed.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import androidx.compose.foundation.Icon
2020
import androidx.compose.foundation.ScrollableColumn
2121
import androidx.compose.foundation.Text
2222
import androidx.compose.foundation.layout.Column
23+
import androidx.compose.foundation.layout.RowScope.align
2324
import androidx.compose.foundation.layout.Spacer
2425
import androidx.compose.foundation.layout.Stack
2526
import androidx.compose.foundation.layout.fillMaxSize
@@ -116,11 +117,11 @@ private fun DestinationBar(modifier: Modifier = Modifier) {
116117
overflow = TextOverflow.Ellipsis,
117118
modifier = Modifier
118119
.weight(1f)
119-
.gravity(Alignment.CenterVertically)
120+
.align(Alignment.CenterVertically)
120121
)
121122
IconButton(
122123
onClick = { /* todo */ },
123-
modifier = Modifier.gravity(Alignment.CenterVertically)
124+
modifier = Modifier.align(Alignment.CenterVertically)
124125
) {
125126
Icon(
126127
asset = Icons.Outlined.ExpandMore,

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Categories.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private fun SearchCategoryCollection(
6868
style = MaterialTheme.typography.h6,
6969
color = JetsnackTheme.colors.textPrimary,
7070
modifier = Modifier
71-
.preferredHeightIn(minHeight = 56.dp)
71+
.preferredHeightIn(min = 56.dp)
7272
.padding(horizontal = 24.dp, vertical = 4.dp)
7373
.wrapContentHeight()
7474
)

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Results.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import androidx.compose.foundation.layout.ChainStyle
2424
import androidx.compose.foundation.layout.Column
2525
import androidx.compose.foundation.layout.ConstraintLayout
2626
import androidx.compose.foundation.layout.Dimension
27-
import androidx.compose.foundation.layout.InnerPadding
27+
import androidx.compose.foundation.layout.PaddingValues
2828
import androidx.compose.foundation.layout.Spacer
2929
import androidx.compose.foundation.layout.fillMaxSize
3030
import androidx.compose.foundation.layout.fillMaxWidth
@@ -155,7 +155,7 @@ private fun SearchResult(
155155
JetsnackButton(
156156
onClick = { /* todo */ },
157157
shape = CircleShape,
158-
padding = InnerPadding(0.dp),
158+
padding = PaddingValues(0.dp),
159159
modifier = Modifier
160160
.preferredSize(36.dp)
161161
.constrainAs(add) {
@@ -174,7 +174,7 @@ fun NoResults(
174174
modifier: Modifier = Modifier
175175
) {
176176
Column(
177-
horizontalGravity = Alignment.CenterHorizontally,
177+
horizontalAlignment = Alignment.CenterHorizontally,
178178
modifier = modifier
179179
.fillMaxSize()
180180
.wrapContentSize()

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Search.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private fun SearchBar(
188188
SearchHint()
189189
}
190190
Row(
191-
verticalGravity = Alignment.CenterVertically,
191+
verticalAlignment = Alignment.CenterVertically,
192192
modifier = Modifier
193193
.fillMaxSize()
194194
.wrapContentHeight()
@@ -234,7 +234,7 @@ private val IconSize = 48.dp
234234
@Composable
235235
private fun SearchHint() {
236236
Row(
237-
verticalGravity = Alignment.CenterVertically,
237+
verticalAlignment = Alignment.CenterVertically,
238238
modifier = Modifier.fillMaxSize().wrapContentSize()
239239
) {
240240
Icon(

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/search/Suggestions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fun SearchSuggestions(
4242
style = MaterialTheme.typography.h6,
4343
color = JetsnackTheme.colors.textPrimary,
4444
modifier = Modifier
45-
.preferredHeightIn(minHeight = 56.dp)
45+
.preferredHeightIn(min = 56.dp)
4646
.padding(horizontal = 24.dp, vertical = 4.dp)
4747
.wrapContentHeight()
4848
)
@@ -52,7 +52,7 @@ fun SearchSuggestions(
5252
style = MaterialTheme.typography.subtitle1,
5353
modifier = Modifier
5454
.fillParentMaxWidth()
55-
.preferredHeightIn(minHeight = 48.dp)
55+
.preferredHeightIn(min = 48.dp)
5656
.clickable { onSuggestionSelect(suggestion) }
5757
.padding(start = 24.dp)
5858
.wrapContentHeight()

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/snackdetail/SnackDetail.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fun SnackDetail(
103103
Title(snack, scroll.value)
104104
Image(snack.imageUrl, scroll.value)
105105
Up(upPress)
106-
CartBottomBar(modifier = Modifier.gravity(Alignment.BottomCenter))
106+
CartBottomBar(modifier = Modifier.align(Alignment.BottomCenter))
107107
}
108108
}
109109

@@ -219,7 +219,7 @@ private fun Title(snack: Snack, scroll: Float) {
219219
Column(
220220
verticalArrangement = Arrangement.Bottom,
221221
modifier = Modifier
222-
.preferredHeightIn(minHeight = TitleHeight)
222+
.preferredHeightIn(min = TitleHeight)
223223
.statusBarsPadding()
224224
.drawLayer(translationY = offset)
225225
.background(color = JetsnackTheme.colors.uiBackground)
@@ -309,11 +309,11 @@ private fun CartBottomBar(modifier: Modifier = Modifier) {
309309
Column {
310310
JetsnackDivider()
311311
Row(
312-
verticalGravity = Alignment.CenterVertically,
312+
verticalAlignment = Alignment.CenterVertically,
313313
modifier = Modifier
314314
.navigationBarsPadding(left = false, right = false)
315315
.then(HzPadding)
316-
.preferredHeightIn(minHeight = BottomBarHeight)
316+
.preferredHeightIn(min = BottomBarHeight)
317317
) {
318318
Text(
319319
text = stringResource(R.string.quantity),
@@ -330,7 +330,7 @@ private fun CartBottomBar(modifier: Modifier = Modifier) {
330330
fontSize = 18.sp,
331331
color = JetsnackTheme.colors.textPrimary,
332332
textAlign = TextAlign.Center,
333-
modifier = Modifier.preferredWidthIn(minWidth = 24.dp)
333+
modifier = Modifier.preferredWidthIn(min = 24.dp)
334334
)
335335
JetsnackGradientTintedIconButton(
336336
asset = Icons.Outlined.AddCircleOutline,

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/utils/Insets.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.example.jetsnack.ui.utils
2020

2121
import android.view.View
22-
import androidx.compose.foundation.layout.InnerPadding
22+
import androidx.compose.foundation.layout.PaddingValues
2323
import androidx.compose.foundation.layout.height
2424
import androidx.compose.runtime.Composable
2525
import androidx.compose.runtime.Providers
@@ -425,38 +425,38 @@ fun Modifier.navigationBarsWidthPlus(
425425
}
426426

427427
/**
428-
* Returns the current insets converted into a [InnerPadding].
428+
* Returns the current insets converted into [PaddingValues].
429429
*
430430
* @param start Whether to apply the inset on the start dimension.
431431
* @param top Whether to apply the inset on the top dimension.
432432
* @param end Whether to apply the inset on the end dimension.
433433
* @param bottom Whether to apply the inset on the bottom dimension.
434434
*/
435435
@Composable
436-
fun Insets.toInnerPadding(
436+
fun Insets.toPaddingValues(
437437
start: Boolean = true,
438438
top: Boolean = true,
439439
end: Boolean = true,
440440
bottom: Boolean = true
441-
): InnerPadding = with(DensityAmbient.current) {
441+
): PaddingValues = with(DensityAmbient.current) {
442442
val layoutDirection = LayoutDirectionAmbient.current
443-
InnerPadding(
443+
PaddingValues(
444444
start = when {
445-
start && layoutDirection == LayoutDirection.Ltr -> this@toInnerPadding.left.toDp()
446-
start && layoutDirection == LayoutDirection.Rtl -> this@toInnerPadding.right.toDp()
445+
start && layoutDirection == LayoutDirection.Ltr -> this@toPaddingValues.left.toDp()
446+
start && layoutDirection == LayoutDirection.Rtl -> this@toPaddingValues.right.toDp()
447447
else -> 0.dp
448448
},
449449
top = when {
450-
top -> this@toInnerPadding.top.toDp()
450+
top -> this@toPaddingValues.top.toDp()
451451
else -> 0.dp
452452
},
453453
end = when {
454-
end && layoutDirection == LayoutDirection.Ltr -> this@toInnerPadding.right.toDp()
455-
end && layoutDirection == LayoutDirection.Rtl -> this@toInnerPadding.left.toDp()
454+
end && layoutDirection == LayoutDirection.Ltr -> this@toPaddingValues.right.toDp()
455+
end && layoutDirection == LayoutDirection.Rtl -> this@toPaddingValues.left.toDp()
456456
else -> 0.dp
457457
},
458458
bottom = when {
459-
bottom -> this@toInnerPadding.bottom.toDp()
459+
bottom -> this@toPaddingValues.bottom.toDp()
460460
else -> 0.dp
461461
}
462462
)

‎Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object Libs {
2525
const val junit = "junit:junit:4.13"
2626

2727
object Accompanist {
28-
private const val version = "0.2.1"
28+
private const val version = "0.2.2.ui-6824694-SNAPSHOT"
2929
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3030
}
3131

‎Jetsnack/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)
Please sign in to comment.