Skip to content

Commit ccd3b11

Browse files
authoredJan 11, 2021
[Rally] Update to snapshot 7067732 (android#346)
1 parent 5627d5c commit ccd3b11

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed
 

‎Rally/app/src/androidTest/java/com/example/compose/rally/AnimatingCircleTests.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.compose.foundation.background
2121
import androidx.compose.foundation.layout.preferredSize
2222
import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.graphics.Color
24-
import androidx.compose.ui.test.ExperimentalTesting
24+
import androidx.compose.ui.test.ExperimentalTestApi
2525
import androidx.compose.ui.test.junit4.createComposeRule
2626
import androidx.compose.ui.test.onRoot
2727
import androidx.compose.ui.unit.dp
@@ -41,7 +41,7 @@ import org.junit.Test
4141
*
4242
* Note that different systems can produce slightly different screenshots making the test fail.
4343
*/
44-
@ExperimentalTesting
44+
@ExperimentalTestApi
4545
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.O)
4646
class AnimatingCircleTests {
4747

‎Rally/app/src/main/java/com/example/compose/rally/ui/components/TopAppBar.kt

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

1717
package com.example.compose.rally.ui.components
1818

19-
import androidx.compose.animation.animate
19+
import androidx.compose.animation.animateAsState
2020
import androidx.compose.animation.animateContentSize
2121
import androidx.compose.animation.core.LinearEasing
2222
import androidx.compose.animation.core.tween
@@ -33,6 +33,7 @@ import androidx.compose.material.Surface
3333
import androidx.compose.material.Text
3434
import androidx.compose.material.ripple.rememberRipple
3535
import androidx.compose.runtime.Composable
36+
import androidx.compose.runtime.getValue
3637
import androidx.compose.runtime.remember
3738
import androidx.compose.ui.Modifier
3839
import androidx.compose.ui.graphics.Color
@@ -47,7 +48,11 @@ fun RallyTopAppBar(
4748
onTabSelected: (RallyScreen) -> Unit,
4849
currentScreen: RallyScreen
4950
) {
50-
Surface(Modifier.preferredHeight(TabHeight).fillMaxWidth()) {
51+
Surface(
52+
Modifier
53+
.preferredHeight(TabHeight)
54+
.fillMaxWidth()
55+
) {
5156
Row {
5257
allScreens.forEach { screen ->
5358
RallyTab(
@@ -77,9 +82,9 @@ private fun RallyTab(
7782
delayMillis = TabFadeInAnimationDelay
7883
)
7984
}
80-
val tabTintColor = animate(
81-
target = if (selected) color else color.copy(alpha = InactiveTabOpacity),
82-
animSpec = animSpec
85+
val tabTintColor by animateAsState(
86+
targetValue = if (selected) color else color.copy(alpha = InactiveTabOpacity),
87+
animationSpec = animSpec
8388
)
8489
Row(
8590
modifier = Modifier

‎Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package com.example.compose.rally.buildsrc
1818

1919
object Versions {
20-
const val ktlint = "0.39.0"
20+
const val ktlint = "0.40.0"
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha02"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha04"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

2727
const val junit = "junit:junit:4.13"
@@ -47,8 +47,8 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
4848

4949
object Compose {
50-
const val snapshot = ""
51-
const val version = "1.0.0-alpha09"
50+
const val snapshot = "7067732"
51+
const val version = "1.0.0-SNAPSHOT"
5252

5353
const val core = "androidx.compose.ui:ui:$version"
5454
const val foundation = "androidx.compose.foundation:foundation:$version"

‎Rally/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
22+
distributionUrl=https://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip

0 commit comments

Comments
 (0)