Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 308a6ca

Browse files
JolandaVerhoefJolandaVerhoef
committedNov 6, 2020
[Jetsnack] Update to snapshot 6953474
1 parent 5a6895e commit 308a6ca

File tree

20 files changed

+48
-59
lines changed

20 files changed

+48
-59
lines changed
 

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.example.jetsnack.ui.components
1818

1919
import androidx.compose.foundation.BorderStroke
20-
import androidx.compose.foundation.ProvideTextStyle
2120
import androidx.compose.foundation.clickable
2221
import androidx.compose.foundation.layout.Arrangement
2322
import androidx.compose.foundation.layout.PaddingValues
@@ -29,6 +28,7 @@ import androidx.compose.foundation.layout.padding
2928
import androidx.compose.foundation.shape.RoundedCornerShape
3029
import androidx.compose.material.ButtonConstants
3130
import androidx.compose.material.MaterialTheme
31+
import androidx.compose.material.ProvideTextStyle
3232
import androidx.compose.runtime.Composable
3333
import androidx.compose.ui.Alignment
3434
import androidx.compose.ui.Modifier

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.example.jetsnack.ui.components
1818

1919
import androidx.compose.animation.animate
2020
import androidx.compose.foundation.ScrollableRow
21-
import androidx.compose.foundation.Text
2221
import androidx.compose.foundation.layout.Box
2322
import androidx.compose.foundation.layout.Spacer
2423
import androidx.compose.foundation.layout.padding
@@ -30,6 +29,7 @@ import androidx.compose.foundation.shape.CircleShape
3029
import androidx.compose.material.Icon
3130
import androidx.compose.material.IconButton
3231
import androidx.compose.material.MaterialTheme
32+
import androidx.compose.material.Text
3333
import androidx.compose.material.icons.Icons
3434
import androidx.compose.material.icons.rounded.FilterList
3535
import androidx.compose.runtime.Composable

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import androidx.compose.ui.graphics.HorizontalGradient
3434
import androidx.compose.ui.graphics.LinearGradient
3535
import androidx.compose.ui.graphics.Shape
3636
import androidx.compose.ui.graphics.TileMode
37-
import androidx.compose.ui.onSizeChanged
37+
import androidx.compose.ui.layout.onSizeChanged
3838
import androidx.compose.ui.unit.Dp
3939
import androidx.compose.ui.unit.IntSize
4040
import androidx.compose.ui.unit.dp
@@ -48,7 +48,7 @@ fun Modifier.horizontalGradientBackground(
4848
endX = size.width,
4949
colors = colors
5050
)
51-
onDraw {
51+
onDrawBehind {
5252
drawRect(brush = gradient)
5353
}
5454
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.example.jetsnack.ui.components
1818

1919
import androidx.compose.runtime.Composable
20-
import androidx.compose.ui.Layout
2120
import androidx.compose.ui.Modifier
21+
import androidx.compose.ui.layout.Layout
2222

2323
/**
2424
* A simple grid which lays elements out vertically in evenly sized [columns].

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@
1717
package com.example.jetsnack.ui.components
1818

1919
import androidx.compose.animation.Crossfade
20-
import androidx.compose.foundation.Text
2120
import androidx.compose.foundation.layout.ChainStyle
2221
import androidx.compose.foundation.layout.ConstraintLayout
2322
import androidx.compose.foundation.layout.preferredWidthIn
24-
import androidx.compose.material.AmbientEmphasisLevels
23+
import androidx.compose.material.AmbientContentAlpha
24+
import androidx.compose.material.ContentAlpha
2525
import androidx.compose.material.MaterialTheme
26-
import androidx.compose.material.ProvideEmphasis
26+
import androidx.compose.material.Text
2727
import androidx.compose.material.icons.Icons
2828
import androidx.compose.material.icons.outlined.AddCircleOutline
2929
import androidx.compose.material.icons.outlined.RemoveCircleOutline
3030
import androidx.compose.runtime.Composable
31+
import androidx.compose.runtime.Providers
3132
import androidx.compose.ui.Modifier
3233
import androidx.compose.ui.res.stringResource
3334
import androidx.compose.ui.text.style.TextAlign
@@ -47,7 +48,7 @@ fun QuantitySelector(
4748
ConstraintLayout(modifier = modifier) {
4849
val (qty, minus, quantity, plus) = createRefs()
4950
createHorizontalChain(qty, minus, quantity, plus, chainStyle = ChainStyle.Packed)
50-
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
51+
Providers(AmbientContentAlpha provides ContentAlpha.high) {
5152
Text(
5253
text = stringResource(R.string.quantity),
5354
style = MaterialTheme.typography.subtitle1,
@@ -66,7 +67,7 @@ fun QuantitySelector(
6667
linkTo(top = parent.top, bottom = parent.bottom)
6768
}
6869
)
69-
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.high) {
70+
Providers(AmbientContentAlpha provides ContentAlpha.high) {
7071
Crossfade(
7172
current = count,
7273
modifier = Modifier

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.example.jetsnack.ui.components
1818

1919
import androidx.compose.foundation.ScrollableRow
20-
import androidx.compose.foundation.Text
2120
import androidx.compose.foundation.clickable
2221
import androidx.compose.foundation.layout.Box
2322
import androidx.compose.foundation.layout.Column
@@ -38,6 +37,7 @@ import androidx.compose.foundation.shape.CircleShape
3837
import androidx.compose.material.Icon
3938
import androidx.compose.material.IconButton
4039
import androidx.compose.material.MaterialTheme
40+
import androidx.compose.material.Text
4141
import androidx.compose.material.icons.Icons
4242
import androidx.compose.material.icons.outlined.ArrowForward
4343
import androidx.compose.runtime.Composable

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.example.jetsnack.ui.components
1818

19-
import androidx.compose.foundation.AmbientContentColor
2019
import androidx.compose.foundation.BorderStroke
2120
import androidx.compose.foundation.background
2221
import androidx.compose.foundation.border
2322
import androidx.compose.foundation.layout.Box
23+
import androidx.compose.material.AmbientContentColor
2424
import androidx.compose.runtime.Composable
2525
import androidx.compose.runtime.Providers
2626
import androidx.compose.ui.Modifier

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.example.jetsnack.ui.home
1818

19-
import androidx.compose.foundation.Text
2019
import androidx.compose.foundation.layout.Column
2120
import androidx.compose.material.Icon
2221
import androidx.compose.material.IconButton
2322
import androidx.compose.material.MaterialTheme
23+
import androidx.compose.material.Text
2424
import androidx.compose.material.TopAppBar
2525
import androidx.compose.material.icons.Icons
2626
import androidx.compose.material.icons.outlined.ExpandMore

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

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.example.jetsnack.ui.home
1919
import androidx.compose.foundation.layout.Box
2020
import androidx.compose.foundation.layout.Spacer
2121
import androidx.compose.foundation.layout.fillMaxSize
22-
import androidx.compose.foundation.lazy.ExperimentalLazyDsl
2322
import androidx.compose.foundation.lazy.LazyColumn
2423
import androidx.compose.runtime.Composable
2524
import androidx.compose.runtime.remember
@@ -66,7 +65,6 @@ private fun Feed(
6665
}
6766
}
6867

69-
@OptIn(ExperimentalLazyDsl::class)
7068
@Composable
7169
private fun SnackCollectionList(
7270
snackCollections: List<SnackCollection>,

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.compose.animation.animate
2424
import androidx.compose.animation.animatedFloat
2525
import androidx.compose.animation.core.AnimationSpec
2626
import androidx.compose.animation.core.SpringSpec
27-
import androidx.compose.foundation.Text
2827
import androidx.compose.foundation.border
2928
import androidx.compose.foundation.layout.Box
3029
import androidx.compose.foundation.layout.BoxScope
@@ -36,6 +35,7 @@ import androidx.compose.foundation.selection.selectable
3635
import androidx.compose.foundation.shape.RoundedCornerShape
3736
import androidx.compose.material.Icon
3837
import androidx.compose.material.MaterialTheme
38+
import androidx.compose.material.Text
3939
import androidx.compose.material.icons.Icons
4040
import androidx.compose.material.icons.outlined.AccountCircle
4141
import androidx.compose.material.icons.outlined.Home
@@ -46,16 +46,17 @@ import androidx.compose.runtime.onCommit
4646
import androidx.compose.runtime.remember
4747
import androidx.compose.runtime.savedinstancestate.savedInstanceState
4848
import androidx.compose.ui.Alignment
49-
import androidx.compose.ui.Layout
50-
import androidx.compose.ui.MeasureScope
5149
import androidx.compose.ui.Modifier
52-
import androidx.compose.ui.Placeable
5350
import androidx.compose.ui.TransformOrigin
5451
import androidx.compose.ui.draw.clip
5552
import androidx.compose.ui.drawLayer
5653
import androidx.compose.ui.graphics.Color
5754
import androidx.compose.ui.graphics.Shape
5855
import androidx.compose.ui.graphics.vector.VectorAsset
56+
import androidx.compose.ui.layout.Layout
57+
import androidx.compose.ui.layout.MeasureResult
58+
import androidx.compose.ui.layout.MeasureScope
59+
import androidx.compose.ui.layout.Placeable
5960
import androidx.compose.ui.layout.id
6061
import androidx.compose.ui.layout.layoutId
6162
import androidx.compose.ui.platform.AnimationClockAmbient
@@ -316,7 +317,7 @@ private fun MeasureScope.placeTextAndIcon(
316317
width: Int,
317318
height: Int,
318319
@FloatRange(from = 0.0, to = 1.0) animationProgress: Float
319-
): MeasureScope.MeasureResult {
320+
): MeasureResult {
320321
val iconY = (height - iconPlaceable.height) / 2
321322
val textY = (height - textPlaceable.height) / 2
322323

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.example.jetsnack.ui.home
1818

19-
import androidx.compose.foundation.Text
2019
import androidx.compose.foundation.layout.fillMaxSize
2120
import androidx.compose.foundation.layout.wrapContentSize
21+
import androidx.compose.material.Text
2222
import androidx.compose.runtime.Composable
2323
import androidx.compose.ui.Modifier
2424
import androidx.compose.ui.res.stringResource

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.example.jetsnack.ui.home.cart
1818

19-
import androidx.compose.foundation.Text
2019
import androidx.compose.foundation.background
2120
import androidx.compose.foundation.clickable
2221
import androidx.compose.foundation.layout.Box
@@ -34,12 +33,11 @@ import androidx.compose.foundation.layout.preferredHeightIn
3433
import androidx.compose.foundation.layout.preferredSize
3534
import androidx.compose.foundation.layout.wrapContentHeight
3635
import androidx.compose.foundation.layout.wrapContentWidth
37-
import androidx.compose.foundation.lazy.ExperimentalLazyDsl
3836
import androidx.compose.foundation.lazy.LazyColumn
39-
import androidx.compose.foundation.text.LastBaseline
4037
import androidx.compose.material.Icon
4138
import androidx.compose.material.IconButton
4239
import androidx.compose.material.MaterialTheme
40+
import androidx.compose.material.Text
4341
import androidx.compose.material.icons.Icons
4442
import androidx.compose.material.icons.filled.Close
4543
import androidx.compose.runtime.Composable
@@ -49,6 +47,7 @@ import androidx.compose.runtime.remember
4947
import androidx.compose.ui.Alignment
5048
import androidx.compose.ui.Modifier
5149
import androidx.compose.ui.graphics.RectangleShape
50+
import androidx.compose.ui.layout.LastBaseline
5251
import androidx.compose.ui.platform.ContextAmbient
5352
import androidx.compose.ui.res.stringResource
5453
import androidx.compose.ui.text.style.TextOverflow
@@ -117,7 +116,6 @@ fun Cart(
117116
}
118117
}
119118

120-
@OptIn(ExperimentalLazyDsl::class)
121119
@Composable
122120
private fun CartContent(
123121
orderLines: List<OrderLine>,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.example.jetsnack.ui.home.search
1818

19-
import androidx.compose.foundation.Text
2019
import androidx.compose.foundation.clickable
2120
import androidx.compose.foundation.layout.Column
2221
import androidx.compose.foundation.layout.Spacer
@@ -29,12 +28,13 @@ import androidx.compose.foundation.layout.wrapContentHeight
2928
import androidx.compose.foundation.lazy.LazyColumnForIndexed
3029
import androidx.compose.foundation.shape.RoundedCornerShape
3130
import androidx.compose.material.MaterialTheme
31+
import androidx.compose.material.Text
3232
import androidx.compose.runtime.Composable
33-
import androidx.compose.ui.Layout
3433
import androidx.compose.ui.Modifier
3534
import androidx.compose.ui.draw.clip
3635
import androidx.compose.ui.draw.drawShadow
3736
import androidx.compose.ui.graphics.Color
37+
import androidx.compose.ui.layout.Layout
3838
import androidx.compose.ui.unit.Constraints
3939
import androidx.compose.ui.unit.dp
4040
import androidx.ui.tooling.preview.Preview

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.example.jetsnack.ui.home.search
1818

1919
import androidx.compose.foundation.Image
20-
import androidx.compose.foundation.Text
2120
import androidx.compose.foundation.clickable
2221
import androidx.compose.foundation.layout.ChainStyle
2322
import androidx.compose.foundation.layout.Column
@@ -34,6 +33,7 @@ import androidx.compose.foundation.lazy.LazyColumnForIndexed
3433
import androidx.compose.foundation.shape.CircleShape
3534
import androidx.compose.material.Icon
3635
import androidx.compose.material.MaterialTheme
36+
import androidx.compose.material.Text
3737
import androidx.compose.material.icons.Icons
3838
import androidx.compose.material.icons.outlined.Add
3939
import androidx.compose.runtime.Composable

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

+8-13
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616

1717
package com.example.jetsnack.ui.home.search
1818

19-
import androidx.compose.foundation.BaseTextField
2019
import androidx.compose.foundation.ExperimentalFoundationApi
21-
import androidx.compose.foundation.Text
22-
import androidx.compose.foundation.contentColor
2320
import androidx.compose.foundation.layout.Box
2421
import androidx.compose.foundation.layout.Column
2522
import androidx.compose.foundation.layout.Row
@@ -32,15 +29,17 @@ import androidx.compose.foundation.layout.preferredSize
3229
import androidx.compose.foundation.layout.preferredWidth
3330
import androidx.compose.foundation.layout.wrapContentHeight
3431
import androidx.compose.foundation.layout.wrapContentSize
32+
import androidx.compose.foundation.text.BasicTextField
3533
import androidx.compose.material.CircularProgressIndicator
3634
import androidx.compose.material.Icon
3735
import androidx.compose.material.IconButton
3836
import androidx.compose.material.MaterialTheme
37+
import androidx.compose.material.Text
3938
import androidx.compose.material.icons.Icons
4039
import androidx.compose.material.icons.outlined.ArrowBack
4140
import androidx.compose.material.icons.outlined.Search
4241
import androidx.compose.runtime.Composable
43-
import androidx.compose.runtime.LaunchedTask
42+
import androidx.compose.runtime.LaunchedEffect
4443
import androidx.compose.runtime.Stable
4544
import androidx.compose.runtime.getValue
4645
import androidx.compose.runtime.mutableStateOf
@@ -52,7 +51,6 @@ import androidx.compose.ui.focus.ExperimentalFocus
5251
import androidx.compose.ui.focus.isFocused
5352
import androidx.compose.ui.focusObserver
5453
import androidx.compose.ui.res.stringResource
55-
import androidx.compose.ui.text.input.ImeAction
5654
import androidx.compose.ui.text.input.TextFieldValue
5755
import androidx.compose.ui.unit.dp
5856
import androidx.ui.tooling.preview.Preview
@@ -87,7 +85,7 @@ fun Search(
8785
)
8886
JetsnackDivider()
8987

90-
LaunchedTask(state.query.text) {
88+
LaunchedEffect(state.query.text) {
9189
state.searching = true
9290
state.searchResults = SearchRepo.search(state.query.text)
9391
state.searching = false
@@ -200,13 +198,10 @@ private fun SearchBar(
200198
)
201199
}
202200
}
203-
BaseTextField(
204-
value = query,
205-
onValueChange = onQueryChange,
206-
imeAction = ImeAction.Search,
207-
onImeActionPerformed = { /* todo */ },
208-
cursorColor = JetsnackTheme.colors.textPrimary,
209-
modifier = Modifier
201+
BasicTextField(
202+
query,
203+
onQueryChange,
204+
Modifier
210205
.weight(1f)
211206
.focusObserver {
212207
onSearchFocusChange(it.isFocused)

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616

1717
package com.example.jetsnack.ui.home.search
1818

19-
import androidx.compose.foundation.Text
2019
import androidx.compose.foundation.clickable
2120
import androidx.compose.foundation.layout.Spacer
2221
import androidx.compose.foundation.layout.padding
2322
import androidx.compose.foundation.layout.preferredHeight
2423
import androidx.compose.foundation.layout.preferredHeightIn
2524
import androidx.compose.foundation.layout.wrapContentHeight
2625
import androidx.compose.foundation.layout.wrapContentSize
27-
import androidx.compose.foundation.lazy.ExperimentalLazyDsl
2826
import androidx.compose.foundation.lazy.LazyColumn
2927
import androidx.compose.material.MaterialTheme
28+
import androidx.compose.material.Text
3029
import androidx.compose.runtime.Composable
3130
import androidx.compose.ui.Alignment
3231
import androidx.compose.ui.Modifier
@@ -37,7 +36,6 @@ import com.example.jetsnack.model.SearchSuggestionGroup
3736
import com.example.jetsnack.ui.components.JetsnackSurface
3837
import com.example.jetsnack.ui.theme.JetsnackTheme
3938

40-
@OptIn(ExperimentalLazyDsl::class)
4139
@Composable
4240
fun SearchSuggestions(
4341
suggestions: List<SearchSuggestionGroup>,
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.