Skip to content

Commit de4d7b8

Browse files
chrisbaneschrisbanes
authored
Merge pull request android#333 from android/dev_alpha09
Update for Jetpack Compose 1.0.0-alpha09
2 parents a09e341 + a5f658f commit de4d7b8

File tree

72 files changed

+343
-435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+343
-435
lines changed

‎Crane/app/src/androidTest/java/androidx/compose/samples/crane/calendar/CalendarTest.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.compose.ui.test.SemanticsMatcher
3030
import androidx.compose.ui.test.assertLabelEquals
3131
import androidx.compose.ui.test.junit4.ComposeTestRule
3232
import androidx.compose.ui.test.junit4.createAndroidComposeRule
33-
import androidx.compose.ui.test.onNodeWithLabel
33+
import androidx.compose.ui.test.onNodeWithContentDescription
3434
import androidx.compose.ui.test.performClick
3535
import androidx.compose.ui.test.performScrollTo
3636
import dagger.hilt.android.testing.HiltAndroidRule
@@ -69,16 +69,16 @@ class CalendarTest {
6969

7070
@Test
7171
fun scrollsToTheBottom() {
72-
composeTestRule.onNodeWithLabel("January 1").assertExists()
73-
composeTestRule.onNodeWithLabel("December 31").performScrollTo().performClick()
72+
composeTestRule.onNodeWithContentDescription("January 1").assertExists()
73+
composeTestRule.onNodeWithContentDescription("December 31").performScrollTo().performClick()
7474
assert(datesRepository.datesSelected.toString() == "Dec 31")
7575
}
7676

7777
@Test
7878
fun onDaySelected() {
79-
composeTestRule.onNodeWithLabel("January 1").assertExists()
80-
composeTestRule.onNodeWithLabel("January 2").assertExists().performClick()
81-
composeTestRule.onNodeWithLabel("January 3").assertExists()
79+
composeTestRule.onNodeWithContentDescription("January 1").assertExists()
80+
composeTestRule.onNodeWithContentDescription("January 2").assertExists().performClick()
81+
composeTestRule.onNodeWithContentDescription("January 3").assertExists()
8282

8383
val datesNoSelected = composeTestRule.onDateNodes(NoSelected)
8484
datesNoSelected[0].assertLabelEquals("January 1")
@@ -89,13 +89,13 @@ class CalendarTest {
8989

9090
@Test
9191
fun twoDaysSelected() {
92-
composeTestRule.onNodeWithLabel("January 2").assertExists().performClick()
92+
composeTestRule.onNodeWithContentDescription("January 2").assertExists().performClick()
9393

9494
val datesNoSelectedOneClick = composeTestRule.onDateNodes(NoSelected)
9595
datesNoSelectedOneClick[0].assertLabelEquals("January 1")
9696
datesNoSelectedOneClick[1].assertLabelEquals("January 3")
9797

98-
composeTestRule.onNodeWithLabel("January 4").assertExists().performClick()
98+
composeTestRule.onNodeWithContentDescription("January 4").assertExists().performClick()
9999

100100
composeTestRule.onDateNode(FirstDay).assertLabelEquals("January 2")
101101
composeTestRule.onDateNode(Selected).assertLabelEquals("January 3")

‎Crane/app/src/androidTest/java/androidx/compose/samples/crane/details/DetailsActivityTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ import org.junit.Rule
4141
import org.junit.Test
4242
import java.util.concurrent.CountDownLatch
4343
import javax.inject.Inject
44+
import kotlin.math.pow
45+
import kotlin.math.round
4446

4547
@UninstallModules(DispatchersModule::class)
4648
@HiltAndroidTest
@@ -118,4 +120,5 @@ class DetailsActivityTest {
118120
}
119121
}
120122

121-
private fun Double.round(decimals: Int = 2): Double = "%.${decimals}f".format(this).toDouble()
123+
private fun Double.round(decimals: Int = 2): Double =
124+
round(this * 10f.pow(decimals)) / 10f.pow(decimals)

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/BaseUserInput.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private fun CraneBaseUserInput(
117117
showCaption: () -> Boolean = { true },
118118
tintIcon: () -> Boolean,
119119
tint: Color = AmbientContentColor.current,
120-
children: @Composable () -> Unit
120+
content: @Composable () -> Unit
121121
) {
122122
Surface(modifier = modifier, color = MaterialTheme.colors.primaryVariant) {
123123
Row(Modifier.padding(all = 12.dp)) {
@@ -138,15 +138,15 @@ private fun CraneBaseUserInput(
138138
Spacer(Modifier.preferredWidth(8.dp))
139139
}
140140
Row(Modifier.weight(1f).align(Alignment.CenterVertically)) {
141-
children()
141+
content()
142142
}
143143
}
144144
}
145145
}
146146

147147
@Preview
148148
@Composable
149-
fun previewInput() {
149+
fun PreviewInput() {
150150
CraneScaffold {
151151
CraneBaseUserInput(
152152
tintIcon = { true },

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import androidx.compose.foundation.layout.padding
2727
import androidx.compose.foundation.layout.preferredHeight
2828
import androidx.compose.foundation.layout.preferredSize
2929
import androidx.compose.foundation.layout.preferredWidth
30-
import androidx.compose.foundation.lazy.LazyColumnFor
30+
import androidx.compose.foundation.lazy.LazyColumn
3131
import androidx.compose.foundation.shape.RoundedCornerShape
3232
import androidx.compose.material.Divider
3333
import androidx.compose.material.MaterialTheme
@@ -62,16 +62,19 @@ fun ExploreSection(
6262
style = MaterialTheme.typography.caption.copy(color = crane_caption)
6363
)
6464
Spacer(Modifier.preferredHeight(8.dp))
65-
LazyColumnFor(
65+
LazyColumn(
6666
modifier = Modifier.weight(1f),
67-
items = exploreList
68-
) { item ->
69-
ExploreItem(
70-
modifier = Modifier.fillParentMaxWidth(),
71-
item = item,
72-
onItemClicked = onItemClicked
73-
)
74-
Divider(color = crane_divider_color)
67+
) {
68+
items(exploreList) { exploreItem ->
69+
Column(Modifier.fillParentMaxWidth()) {
70+
ExploreItem(
71+
modifier = Modifier.fillParentMaxWidth(),
72+
item = exploreItem,
73+
onItemClicked = onItemClicked
74+
)
75+
Divider(color = crane_divider_color)
76+
}
77+
}
7578
}
7679
}
7780
}
@@ -119,8 +122,8 @@ private fun ExploreItem(
119122
}
120123

121124
@Composable
122-
private fun ExploreImageContainer(children: @Composable () -> Unit) {
125+
private fun ExploreImageContainer(content: @Composable () -> Unit) {
123126
Surface(Modifier.preferredSize(width = 60.dp, height = 60.dp), RoundedCornerShape(4.dp)) {
124-
children()
127+
content()
125128
}
126129
}

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/Scaffold.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import androidx.compose.runtime.Composable
2222
import androidx.compose.samples.crane.ui.CraneTheme
2323

2424
@Composable
25-
fun CraneScaffold(children: @Composable () -> Unit) {
25+
fun CraneScaffold(content: @Composable () -> Unit) {
2626
CraneTheme {
2727
Surface(color = MaterialTheme.colors.primary) {
28-
children()
28+
content()
2929
}
3030
}
3131
}

‎Crane/app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import androidx.compose.ui.Modifier
5050
import androidx.compose.ui.graphics.Color
5151
import androidx.compose.ui.semantics.SemanticsPropertyKey
5252
import androidx.compose.ui.semantics.SemanticsPropertyReceiver
53-
import androidx.compose.ui.semantics.accessibilityLabel
53+
import androidx.compose.ui.semantics.contentDescription
5454
import androidx.compose.ui.semantics.semantics
5555
import androidx.compose.ui.tooling.preview.Preview
5656
import androidx.compose.ui.unit.dp
@@ -137,7 +137,7 @@ private fun Week(
137137
day,
138138
onDayClicked,
139139
Modifier.semantics {
140-
accessibilityLabel = "${month.name} ${day.value}"
140+
contentDescription = "${month.name} ${day.value}"
141141
dayStatusProperty = day.status
142142
}
143143
)
@@ -195,21 +195,21 @@ private fun Day(name: String) {
195195
private fun DayContainer(
196196
modifier: Modifier = Modifier,
197197
backgroundColor: Color = Color.Transparent,
198-
children: @Composable () -> Unit
198+
content: @Composable () -> Unit
199199
) {
200200
// What if this doesn't fit the screen? - LayoutFlexible(1f) + LayoutAspectRatio(1f)
201201
Surface(
202202
modifier = modifier.preferredSize(width = CELL_SIZE, height = CELL_SIZE),
203203
color = backgroundColor
204204
) {
205-
children()
205+
content()
206206
}
207207
}
208208

209209
@Composable
210210
private fun DayStatusContainer(
211211
status: DaySelectedStatus,
212-
children: @Composable () -> Unit
212+
content: @Composable () -> Unit
213213
) {
214214
if (status.isMarked()) {
215215
Box {
@@ -220,10 +220,10 @@ private fun DayStatusContainer(
220220
} else if (status == DaySelectedStatus.LastDay) {
221221
SemiRect(color = color, lookingLeft = true)
222222
}
223-
children()
223+
content()
224224
}
225225
} else {
226-
children()
226+
content()
227227
}
228228
}
229229

‎Crane/app/src/main/java/androidx/compose/samples/crane/calendar/model/CalendarMonth.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ data class CalendarMonth(
2323
val monthNumber: Int,
2424
val startDayOfWeek: DayOfWeek
2525
) {
26-
val days = mutableListOf<CalendarDay>().apply {
26+
private val days = mutableListOf<CalendarDay>().apply {
2727
// Add offset of the start of the month
2828
for (i in 1..startDayOfWeek.ordinal) {
2929
add(

‎Crane/app/src/main/java/androidx/compose/samples/crane/details/DetailsActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
2929
import androidx.compose.foundation.layout.padding
3030
import androidx.compose.foundation.layout.preferredHeight
3131
import androidx.compose.material.Button
32-
import androidx.compose.material.ButtonConstants
32+
import androidx.compose.material.ButtonDefaults
3333
import androidx.compose.material.MaterialTheme
3434
import androidx.compose.material.Text
3535
import androidx.compose.runtime.Composable
@@ -186,7 +186,7 @@ private fun ZoomControls(
186186
private fun ZoomButton(text: String, onClick: () -> Unit) {
187187
Button(
188188
modifier = Modifier.padding(8.dp),
189-
colors = ButtonConstants.defaultButtonColors(
189+
colors = ButtonDefaults.buttonColors(
190190
backgroundColor = MaterialTheme.colors.onPrimary,
191191
contentColor = MaterialTheme.colors.primary
192192
),

‎Crane/app/src/main/java/androidx/compose/samples/crane/home/HomeFeatures.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ fun EatSearchContent(datesSelected: String, eatUpdates: EatSearchContentUpdates)
6767
}
6868

6969
@Composable
70-
private fun CraneSearch(searchItems: @Composable () -> Unit) {
70+
private fun CraneSearch(content: @Composable () -> Unit) {
7171
Column(Modifier.padding(start = 24.dp, top = 0.dp, end = 24.dp, bottom = 12.dp)) {
72-
searchItems()
72+
content()
7373
}
7474
}

‎Crane/app/src/main/java/androidx/compose/samples/crane/ui/CraneTheme.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ val BottomSheetShape = RoundedCornerShape(
4949
)
5050

5151
@Composable
52-
fun CraneTheme(children: @Composable () -> Unit) {
52+
fun CraneTheme(content: @Composable () -> Unit) {
5353
MaterialTheme(colors = craneColors, typography = craneTypography) {
54-
children()
54+
content()
5555
}
5656
}

‎Crane/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ buildscript {
3131
}
3232

3333
plugins {
34-
id 'com.diffplug.spotless' version '5.7.0'
34+
id 'com.diffplug.spotless' version '5.8.2'
3535
}
3636

3737
subprojects {

‎Crane/buildSrc/src/main/java/com/example/crane/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.crane.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-alpha03"
2525
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
2626

2727
object GoogleMaps {
@@ -30,12 +30,12 @@ object Libs {
3030
}
3131

3232
object Accompanist {
33-
private const val version = "0.4.0"
33+
private const val version = "0.4.1"
3434
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
3535
}
3636

3737
object Kotlin {
38-
private const val version = "1.4.20"
38+
private const val version = "1.4.21"
3939
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
4040
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
4141
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -50,7 +50,7 @@ object Libs {
5050
object AndroidX {
5151
object Compose {
5252
const val snapshot = ""
53-
const val version = "1.0.0-alpha08"
53+
private const val version = "1.0.0-alpha09"
5454

5555
const val runtime = "androidx.compose.runtime:runtime:$version"
5656
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"

‎Crane/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Oct 23 09:30:32 CEST 2020
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)