Skip to content

Commit f9f1ab9

Browse files
committed
[Jetsnack] Update to snapshot 7067732.
Change-Id: Ie59d2a99425c4d5c9d77214b847f2eadff58bd13
1 parent ccd3b11 commit f9f1ab9

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

Jetsnack/app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ dependencies {
8282

8383
implementation Libs.Coroutines.core
8484

85-
implementation Libs.AndroidX.coreKtx
85+
// Accompanist.insets currently requires SNAPSHOT version of AndroidX.core
86+
implementation(Libs.AndroidX.core) { force true }
87+
implementation(Libs.AndroidX.coreKtx) { force true }
8688

8789
implementation Libs.AndroidX.Compose.runtime
8890
implementation Libs.AndroidX.Compose.foundation

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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

19-
import androidx.compose.animation.animate
19+
import androidx.compose.animation.animateAsState
2020
import androidx.compose.foundation.ScrollableRow
2121
import androidx.compose.foundation.layout.Box
2222
import androidx.compose.foundation.layout.Spacer
@@ -33,6 +33,7 @@ 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
36+
import androidx.compose.runtime.getValue
3637
import androidx.compose.ui.Alignment
3738
import androidx.compose.ui.Modifier
3839
import androidx.compose.ui.graphics.Shape
@@ -75,18 +76,20 @@ fun FilterChip(
7576
shape: Shape = MaterialTheme.shapes.small
7677
) {
7778
val (selected, setSelected) = filter.enabled
78-
val backgroundColor =
79-
animate(if (selected) JetsnackTheme.colors.brand else JetsnackTheme.colors.uiBackground)
79+
val backgroundColor by
80+
animateAsState(if (selected) JetsnackTheme.colors.brand else JetsnackTheme.colors.uiBackground)
8081
val border = Modifier.fadeInDiagonalGradientBorder(
8182
showBorder = !selected,
8283
colors = JetsnackTheme.colors.interactiveSecondary,
8384
shape = shape
8485
)
85-
val textColor = animate(
86+
val textColor by animateAsState(
8687
if (selected) JetsnackTheme.colors.textInteractive else JetsnackTheme.colors.textSecondary
8788
)
8889
JetsnackSurface(
89-
modifier = modifier.preferredHeight(28.dp).then(border),
90+
modifier = modifier
91+
.preferredHeight(28.dp)
92+
.then(border),
9093
color = backgroundColor,
9194
contentColor = textColor,
9295
shape = shape,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

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

19-
import androidx.compose.animation.animate
19+
import androidx.compose.animation.animateAsState
2020
import androidx.compose.foundation.background
2121
import androidx.compose.foundation.border
2222
import androidx.compose.ui.Modifier
@@ -71,7 +71,7 @@ fun Modifier.fadeInDiagonalGradientBorder(
7171
shape: Shape
7272
) = composed {
7373
val animatedColors = List(colors.size) { i ->
74-
animate(if (showBorder) colors[i] else colors[i].copy(alpha = 0f))
74+
animateAsState(if (showBorder) colors[i] else colors[i].copy(alpha = 0f)).value
7575
}
7676
diagonalGradientBorder(
7777
colors = animatedColors,

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ import androidx.annotation.FloatRange
2020
import androidx.annotation.StringRes
2121
import androidx.compose.animation.AnimatedFloatModel
2222
import androidx.compose.animation.Crossfade
23-
import androidx.compose.animation.animate
23+
import androidx.compose.animation.animateAsState
2424
import androidx.compose.animation.animatedFloat
2525
import androidx.compose.animation.core.AnimationSpec
2626
import androidx.compose.animation.core.SpringSpec
27+
import androidx.compose.animation.core.animateAsState
2728
import androidx.compose.foundation.border
2829
import androidx.compose.foundation.layout.Box
2930
import androidx.compose.foundation.layout.BoxScope
@@ -42,6 +43,7 @@ import androidx.compose.material.icons.outlined.Home
4243
import androidx.compose.material.icons.outlined.Search
4344
import androidx.compose.material.icons.outlined.ShoppingCart
4445
import androidx.compose.runtime.Composable
46+
import androidx.compose.runtime.getValue
4547
import androidx.compose.runtime.onCommit
4648
import androidx.compose.runtime.remember
4749
import androidx.compose.runtime.savedinstancestate.savedInstanceState
@@ -130,7 +132,7 @@ private fun JetsnackBottomNav(
130132
) {
131133
items.forEach { section ->
132134
val selected = section == currentSection
133-
val tint = animate(
135+
val tint by animateAsState(
134136
if (selected) {
135137
JetsnackTheme.colors.iconInteractive
136138
} else {
@@ -264,7 +266,7 @@ fun JetsnackBottomNavigationItem(
264266
contentAlignment = Alignment.Center
265267
) {
266268
// Animate the icon/text positions within the item based on selection
267-
val animationProgress = animate(if (selected) 1f else 0f, animSpec)
269+
val animationProgress by animateAsState(if (selected) 1f else 0f, animSpec)
268270
JetsnackBottomNavItemLayout(
269271
icon = icon,
270272
text = text,

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha03"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha04"
2525
const val junit = "junit:junit:4.13"
2626

2727
object Accompanist {
28-
private const val version = "0.4.1"
28+
private const val version = "0.4.2.compose-7067732-SNAPSHOT"
2929
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3030
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
3131
}
@@ -45,11 +45,12 @@ object Libs {
4545
}
4646

4747
object AndroidX {
48-
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha05"
48+
const val core = "androidx.core:core:1.5.0-SNAPSHOT"
49+
const val coreKtx = "androidx.core:core-ktx:1.5.0-SNAPSHOT"
4950

5051
object Compose {
51-
const val snapshot = ""
52-
const val version = "1.0.0-alpha09"
52+
const val snapshot = "7067732"
53+
const val version = "1.0.0-SNAPSHOT"
5354

5455
const val foundation = "androidx.compose.foundation:foundation:${version}"
5556
const val layout = "androidx.compose.foundation:foundation-layout:${version}"

0 commit comments

Comments
 (0)