[Jetsnack] Update to snapshot 6964664

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

@@ -17,7 +17,6 @@
 package com.example.jetsnack.ui.components
 
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.ProvideTextStyle
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
@@ -29,6 +28,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ButtonConstants
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.ProvideTextStyle
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

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

@@ -18,7 +18,6 @@ package com.example.jetsnack.ui.components
 
 import androidx.compose.animation.animate
 import androidx.compose.foundation.ScrollableRow
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
@@ -30,6 +29,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.FilterList
 import androidx.compose.runtime.Composable

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

@@ -34,7 +34,7 @@ import androidx.compose.ui.graphics.HorizontalGradient
 import androidx.compose.ui.graphics.LinearGradient
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.TileMode
-import androidx.compose.ui.onSizeChanged
+import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
@@ -48,7 +48,7 @@ fun Modifier.horizontalGradientBackground(
         endX = size.width,
         colors = colors
     )
-    onDraw {
+    onDrawBehind {
         drawRect(brush = gradient)
     }
 }

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

@@ -17,8 +17,8 @@
 package com.example.jetsnack.ui.components
 
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Layout
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.Layout
 
 /**
  * A simple grid which lays elements out vertically in evenly sized [columns].

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

@@ -17,17 +17,18 @@
 package com.example.jetsnack.ui.components
 
 import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.ChainStyle
 import androidx.compose.foundation.layout.ConstraintLayout
 import androidx.compose.foundation.layout.preferredWidthIn
-import androidx.compose.material.AmbientEmphasisLevels
+import androidx.compose.material.AmbientContentAlpha
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ProvideEmphasis
+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
@@ -47,7 +48,7 @@ fun QuantitySelector(
     ConstraintLayout(modifier = modifier) {
         val (qty, minus, quantity, plus) = createRefs()
         createHorizontalChain(qty, minus, quantity, plus, chainStyle = ChainStyle.Packed)
-        ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
+        Providers(AmbientContentAlpha provides ContentAlpha.medium) {
             Text(
                 text = stringResource(R.string.quantity),
                 style = MaterialTheme.typography.subtitle1,
@@ -66,21 +67,19 @@ fun QuantitySelector(
                 linkTo(top = parent.top, bottom = parent.bottom)
             }
         )
-        ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.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,

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

@@ -17,7 +17,6 @@
 package com.example.jetsnack.ui.components
 
 import androidx.compose.foundation.ScrollableRow
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -38,6 +37,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowForward
 import androidx.compose.runtime.Composable

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

@@ -16,11 +16,11 @@
 
 package com.example.jetsnack.ui.components
 
-import androidx.compose.foundation.AmbientContentColor
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
+import androidx.compose.material.AmbientContentColor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Providers
 import androidx.compose.ui.Modifier

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

@@ -16,11 +16,11 @@
 
 package com.example.jetsnack.ui.home
 
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ExpandMore

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

@@ -19,7 +19,6 @@ package com.example.jetsnack.ui.home
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.lazy.ExperimentalLazyDsl
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -66,7 +65,6 @@ private fun Feed(
     }
 }
 
-@OptIn(ExperimentalLazyDsl::class)
 @Composable
 private fun SnackCollectionList(
     snackCollections: List<SnackCollection>,

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

@@ -24,7 +24,6 @@ import androidx.compose.animation.animate
 import androidx.compose.animation.animatedFloat
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.SpringSpec
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
@@ -36,6 +35,7 @@ import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.AccountCircle
 import androidx.compose.material.icons.outlined.Home
@@ -46,16 +46,17 @@ import androidx.compose.runtime.onCommit
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.savedinstancestate.savedInstanceState
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Layout
-import androidx.compose.ui.MeasureScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.Placeable
 import androidx.compose.ui.TransformOrigin
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.drawLayer
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.vector.VectorAsset
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.MeasureResult
+import androidx.compose.ui.layout.MeasureScope
+import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.layout.id
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.AnimationClockAmbient
@@ -316,7 +317,7 @@ private fun MeasureScope.placeTextAndIcon(
     width: Int,
     height: Int,
     @FloatRange(from = 0.0, to = 1.0) animationProgress: Float
-): MeasureScope.MeasureResult {
+): MeasureResult {
     val iconY = (height - iconPlaceable.height) / 2
     val textY = (height - textPlaceable.height) / 2
 

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

@@ -16,9 +16,9 @@
 
 package com.example.jetsnack.ui.home
 
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource

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

@@ -16,7 +16,6 @@
 
 package com.example.jetsnack.ui.home.cart
 
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -34,12 +33,11 @@ import androidx.compose.foundation.layout.preferredHeightIn
 import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.foundation.lazy.ExperimentalLazyDsl
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.LastBaseline
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.runtime.Composable
@@ -49,6 +47,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.layout.LastBaseline
 import androidx.compose.ui.platform.ContextAmbient
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
@@ -117,7 +116,6 @@ fun Cart(
     }
 }
 
-@OptIn(ExperimentalLazyDsl::class)
 @Composable
 private fun CartContent(
     orderLines: List<OrderLine>,

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

@@ -16,7 +16,6 @@
 
 package com.example.jetsnack.ui.home.search
 
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -29,12 +28,13 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumnForIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Layout
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawShadow
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
 import androidx.ui.tooling.preview.Preview

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

@@ -17,7 +17,6 @@
 package com.example.jetsnack.ui.home.search
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.ChainStyle
 import androidx.compose.foundation.layout.Column
@@ -34,6 +33,7 @@ import androidx.compose.foundation.lazy.LazyColumnForIndexed
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.runtime.Composable

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

@@ -16,10 +16,7 @@
 
 package com.example.jetsnack.ui.home.search
 
-import androidx.compose.foundation.BaseTextField
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.Text
-import androidx.compose.foundation.contentColor
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -32,15 +29,17 @@ import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.preferredWidth
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedTask
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -52,7 +51,6 @@ import androidx.compose.ui.focus.ExperimentalFocus
 import androidx.compose.ui.focus.isFocused
 import androidx.compose.ui.focusObserver
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.ui.tooling.preview.Preview
@@ -87,7 +85,7 @@ fun Search(
             )
             JetsnackDivider()
 
-            LaunchedTask(state.query.text) {
+            LaunchedEffect(state.query.text) {
                 state.searching = true
                 state.searchResults = SearchRepo.search(state.query.text)
                 state.searching = false
@@ -200,12 +198,9 @@ private fun SearchBar(
                         )
                     }
                 }
-                BaseTextField(
+                BasicTextField(
                     value = query,
                     onValueChange = onQueryChange,
-                    imeAction = ImeAction.Search,
-                    onImeActionPerformed = { /* todo */ },
-                    cursorColor = JetsnackTheme.colors.textPrimary,
                     modifier = Modifier
                         .weight(1f)
                         .focusObserver {