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 332c02b

Browse files
committedSep 16, 2020
[Rally] Bumps to alpha03 snapshot
Change-Id: I79c1f177b1c2ae93bd028d6d8adc8bb2923e4337
1 parent 3aaa57a commit 332c02b

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed
 

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class AnimatingCircleTests {
4747
@Test
4848
fun circleAnimation_idle_screenshot() {
4949
showAnimatedCircle()
50-
assertScreenshotMatchesGolden("circle_done", onRoot())
50+
assertScreenshotMatchesGolden("circle_done", composeTestRule.onRoot())
5151
}
5252

5353
@Test
@@ -81,7 +81,7 @@ class AnimatingCircleTests {
8181
composeTestRule.clockTestRule.advanceClock(timeMs)
8282

8383
// Take screenshot and compare with golden image in androidTest/assets
84-
assertScreenshotMatchesGolden(goldenName, onRoot())
84+
assertScreenshotMatchesGolden(goldenName, composeTestRule.onRoot())
8585
}
8686

8787
private fun showAnimatedCircle() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private fun BaseRow(
8080
) {
8181
Row(
8282
modifier = Modifier.preferredHeight(68.dp),
83-
verticalGravity = Alignment.CenterVertically
83+
verticalAlignment = Alignment.CenterVertically
8484
) {
8585
val typography = MaterialTheme.typography
8686
AccountIndicator(
@@ -103,14 +103,14 @@ private fun BaseRow(
103103
Text(
104104
text = if (negative) "–$ " else "$ ",
105105
style = typography.h6,
106-
modifier = Modifier.gravity(Alignment.CenterVertically)
106+
modifier = Modifier.align(Alignment.CenterVertically)
107107
)
108108
Text(
109109
text = formatAmount(
110110
amount
111111
),
112112
style = typography.h6,
113-
modifier = Modifier.gravity(Alignment.CenterVertically)
113+
modifier = Modifier.align(Alignment.CenterVertically)
114114
)
115115
}
116116
Spacer(Modifier.preferredWidth(16.dp))

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ fun <T> StatementBody(
5151
AnimatedCircle(
5252
accountsProportion,
5353
circleColors,
54-
Modifier.preferredHeight(300.dp).gravity(Alignment.Center).fillMaxWidth()
54+
Modifier.preferredHeight(300.dp).align(Alignment.Center).fillMaxWidth()
5555
)
56-
Column(modifier = Modifier.gravity(Alignment.Center)) {
56+
Column(modifier = Modifier.align(Alignment.Center)) {
5757
Text(
5858
text = circleLabel,
5959
style = MaterialTheme.typography.body1,
60-
modifier = Modifier.gravity(Alignment.CenterHorizontally)
60+
modifier = Modifier.align(Alignment.CenterHorizontally)
6161
)
6262
Text(
6363
text = formatAmount(amountsTotal),
6464
style = MaterialTheme.typography.h2,
65-
modifier = Modifier.gravity(Alignment.CenterHorizontally)
65+
modifier = Modifier.align(Alignment.CenterHorizontally)
6666
)
6767
}
6868
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package com.example.compose.rally.ui.components
1818

1919
import androidx.compose.foundation.Text
2020
import androidx.compose.foundation.layout.Column
21-
import androidx.compose.foundation.layout.InnerPadding
21+
import androidx.compose.foundation.layout.PaddingValues
2222
import androidx.compose.foundation.layout.fillMaxWidth
2323
import androidx.compose.foundation.layout.padding
2424
import androidx.compose.material.AlertDialog
@@ -50,7 +50,7 @@ fun RallyAlertDialog(
5050
TextButton(
5151
onClick = onDismiss,
5252
shape = RectangleShape,
53-
contentPadding = InnerPadding(16.dp),
53+
contentPadding = PaddingValues(16.dp),
5454
modifier = Modifier.fillMaxWidth()
5555
) {
5656
Text(buttonText)

‎Rally/app/src/main/java/com/example/compose/rally/ui/overview/OverviewScreen.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import androidx.compose.foundation.Text
2222
import androidx.compose.foundation.background
2323
import androidx.compose.foundation.layout.Arrangement
2424
import androidx.compose.foundation.layout.Column
25-
import androidx.compose.foundation.layout.InnerPadding
25+
import androidx.compose.foundation.layout.PaddingValues
2626
import androidx.compose.foundation.layout.Row
2727
import androidx.compose.foundation.layout.Spacer
2828
import androidx.compose.foundation.layout.fillMaxWidth
@@ -57,7 +57,7 @@ import com.example.compose.rally.ui.components.formatAmount
5757

5858
@Composable
5959
fun OverviewBody(onScreenChange: (RallyScreen) -> Unit = {}) {
60-
ScrollableColumn(contentPadding = InnerPadding(16.dp)) {
60+
ScrollableColumn(contentPadding = PaddingValues(16.dp)) {
6161
AlertCard()
6262
Spacer(Modifier.preferredHeight(RallyDefaultPadding))
6363
AccountsCard(onScreenChange)
@@ -106,13 +106,13 @@ private fun AlertHeader(onClickSeeAll: () -> Unit) {
106106
Text(
107107
text = "Alerts",
108108
style = MaterialTheme.typography.subtitle2,
109-
modifier = Modifier.gravity(Alignment.CenterVertically)
109+
modifier = Modifier.align(Alignment.CenterVertically)
110110
)
111111
}
112112
TextButton(
113113
onClick = onClickSeeAll,
114-
contentPadding = InnerPadding(0.dp),
115-
modifier = Modifier.gravity(Alignment.CenterVertically)
114+
contentPadding = PaddingValues(0.dp),
115+
modifier = Modifier.align(Alignment.CenterVertically)
116116
) {
117117
Text(
118118
text = "SEE ALL",
@@ -136,7 +136,7 @@ private fun AlertItem(message: String) {
136136
)
137137
IconButton(
138138
onClick = {},
139-
modifier = Modifier.gravity(Alignment.Top)
139+
modifier = Modifier.align(Alignment.Top)
140140
) {
141141
Icon(Icons.Filled.Sort)
142142
}

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

Lines changed: 5 additions & 5 deletions
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.37.2"
20+
const val ktlint = "0.38.1"
2121
}
2222

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

2727
const val junit = "junit:junit:4.13"
@@ -44,11 +44,11 @@ object Libs {
4444

4545
object AndroidX {
4646
const val appcompat = "androidx.appcompat:appcompat:1.2.0-rc01"
47-
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
47+
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-alpha01"
50+
const val snapshot = "6824694"
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

Lines changed: 1 addition & 1 deletion
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.6-bin.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip

0 commit comments

Comments
 (0)
Please sign in to comment.