Skip to content

Commit 92f2f16

Browse files
florina-muntenescuflorina-muntenescu
authored
Merge pull request android#407 from android/dev_beta01
Compose beta01
2 parents f1e930d + 0f195d9 commit 92f2f16

File tree

100 files changed

+831
-735
lines changed

Some content is hidden

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

100 files changed

+831
-735
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.compose.samples.crane.data.DatesRepository
2727
import androidx.compose.samples.crane.ui.CraneTheme
2828
import androidx.compose.ui.test.SemanticsMatcher
2929
import androidx.compose.ui.test.assertContentDescriptionEquals
30+
import androidx.compose.ui.test.assertIsDisplayed
3031
import androidx.compose.ui.test.junit4.ComposeTestRule
3132
import androidx.compose.ui.test.junit4.createAndroidComposeRule
3233
import androidx.compose.ui.test.onNodeWithContentDescription
@@ -68,16 +69,17 @@ class CalendarTest {
6869
@Ignore("performScrollTo doesn't work with LazyLists: issuetracker.google.com/178483889")
6970
@Test
7071
fun scrollsToTheBottom() {
71-
composeTestRule.onNodeWithContentDescription("January 1").assertExists()
72+
composeTestRule.onNodeWithContentDescription("January 1").assertIsDisplayed()
7273
composeTestRule.onNodeWithContentDescription("December 31").performScrollTo().performClick()
7374
assert(datesRepository.datesSelected.toString() == "Dec 31")
7475
}
7576

7677
@Test
7778
fun onDaySelected() {
78-
composeTestRule.onNodeWithContentDescription("January 1").assertExists()
79-
composeTestRule.onNodeWithContentDescription("January 2").assertExists().performClick()
80-
composeTestRule.onNodeWithContentDescription("January 3").assertExists()
79+
composeTestRule.onNodeWithContentDescription("January 1").assertIsDisplayed()
80+
composeTestRule.onNodeWithContentDescription("January 2")
81+
.assertIsDisplayed().performClick()
82+
composeTestRule.onNodeWithContentDescription("January 3").assertIsDisplayed()
8183

8284
val datesNoSelected = composeTestRule.onDateNodes(NoSelected)
8385
datesNoSelected[0].assertContentDescriptionEquals("January 1")
@@ -88,13 +90,15 @@ class CalendarTest {
8890

8991
@Test
9092
fun twoDaysSelected() {
91-
composeTestRule.onNodeWithContentDescription("January 2").assertExists().performClick()
93+
composeTestRule.onNodeWithContentDescription("January 2")
94+
.assertIsDisplayed().performClick()
9295

9396
val datesNoSelectedOneClick = composeTestRule.onDateNodes(NoSelected)
9497
datesNoSelectedOneClick[0].assertContentDescriptionEquals("January 1")
9598
datesNoSelectedOneClick[1].assertContentDescriptionEquals("January 3")
9699

97-
composeTestRule.onNodeWithContentDescription("January 4").assertExists().performClick()
100+
composeTestRule.onNodeWithContentDescription("January 4")
101+
.assertIsDisplayed().performClick()
98102

99103
composeTestRule.onDateNode(FirstDay).assertContentDescriptionEquals("January 2")
100104
composeTestRule.onDateNode(Selected).assertContentDescriptionEquals("January 3")

‎Crane/app/src/androidTest/java/androidx/compose/samples/crane/home/HomeTest.kt‎

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

1717
package androidx.compose.samples.crane.home
1818

19+
import androidx.compose.ui.test.assertIsDisplayed
1920
import androidx.compose.ui.test.junit4.createAndroidComposeRule
2021
import androidx.compose.ui.test.onNodeWithText
2122
import androidx.compose.ui.test.performClick
2223
import dagger.hilt.android.testing.HiltAndroidRule
2324
import dagger.hilt.android.testing.HiltAndroidTest
2425
import org.junit.Before
26+
import org.junit.Ignore
2527
import org.junit.Rule
2628
import org.junit.Test
2729

@@ -41,14 +43,15 @@ class HomeTest {
4143
}
4244
}
4345

46+
@Ignore("Swipeable bug makes the app crash: https://issuetracker.google.com/180488877")
4447
@Test
4548
fun home_navigatesToAllScreens() {
46-
composeTestRule.onNodeWithText("Explore Flights by Destination").assertExists()
49+
composeTestRule.onNodeWithText("Explore Flights by Destination").assertIsDisplayed()
4750
composeTestRule.onNodeWithText("SLEEP").performClick()
48-
composeTestRule.onNodeWithText("Explore Properties by Destination").assertExists()
51+
composeTestRule.onNodeWithText("Explore Properties by Destination").assertIsDisplayed()
4952
composeTestRule.onNodeWithText("EAT").performClick()
50-
composeTestRule.onNodeWithText("Explore Restaurants by Destination").assertExists()
53+
composeTestRule.onNodeWithText("Explore Restaurants by Destination").assertIsDisplayed()
5154
composeTestRule.onNodeWithText("FLY").performClick()
52-
composeTestRule.onNodeWithText("Explore Flights by Destination").assertExists()
55+
composeTestRule.onNodeWithText("Explore Flights by Destination").assertIsDisplayed()
5356
}
5457
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import androidx.compose.foundation.ExperimentalFoundationApi
2121
import androidx.compose.foundation.layout.Row
2222
import androidx.compose.foundation.layout.Spacer
2323
import androidx.compose.foundation.layout.padding
24-
import androidx.compose.foundation.layout.preferredSize
25-
import androidx.compose.foundation.layout.preferredWidth
24+
import androidx.compose.foundation.layout.size
25+
import androidx.compose.foundation.layout.width
2626
import androidx.compose.foundation.text.BasicTextField
2727
import androidx.compose.material.Icon
2828
import androidx.compose.material.LocalContentColor
@@ -39,6 +39,7 @@ import androidx.compose.samples.crane.ui.captionTextStyle
3939
import androidx.compose.ui.Alignment
4040
import androidx.compose.ui.Modifier
4141
import androidx.compose.ui.graphics.Color
42+
import androidx.compose.ui.graphics.SolidColor
4243
import androidx.compose.ui.res.painterResource
4344
import androidx.compose.ui.text.input.TextFieldValue
4445
import androidx.compose.ui.tooling.preview.Preview
@@ -104,7 +105,7 @@ fun CraneEditableUserInput(
104105
} else {
105106
MaterialTheme.typography.body1.copy(color = LocalContentColor.current)
106107
},
107-
cursorColor = LocalContentColor.current
108+
cursorBrush = SolidColor(LocalContentColor.current)
108109
)
109110
}
110111
}
@@ -123,20 +124,20 @@ private fun CraneBaseUserInput(
123124
Row(Modifier.padding(all = 12.dp)) {
124125
if (vectorImageId != null) {
125126
Icon(
126-
modifier = Modifier.preferredSize(24.dp, 24.dp),
127+
modifier = Modifier.size(24.dp, 24.dp),
127128
painter = painterResource(id = vectorImageId),
128129
tint = if (tintIcon()) tint else Color(0x80FFFFFF),
129130
contentDescription = null
130131
)
131-
Spacer(Modifier.preferredWidth(8.dp))
132+
Spacer(Modifier.width(8.dp))
132133
}
133134
if (caption != null && showCaption()) {
134135
Text(
135136
modifier = Modifier.align(Alignment.CenterVertically),
136137
text = caption,
137138
style = (captionTextStyle).copy(color = tint)
138139
)
139-
Spacer(Modifier.preferredWidth(8.dp))
140+
Spacer(Modifier.width(8.dp))
140141
}
141142
Row(Modifier.weight(1f).align(Alignment.CenterVertically)) {
142143
content()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import androidx.compose.foundation.Image
2020
import androidx.compose.foundation.layout.Column
2121
import androidx.compose.foundation.layout.Spacer
2222
import androidx.compose.foundation.layout.fillMaxSize
23+
import androidx.compose.foundation.layout.height
2324
import androidx.compose.foundation.layout.padding
24-
import androidx.compose.foundation.layout.preferredHeight
2525
import androidx.compose.material.MaterialTheme
2626
import androidx.compose.material.Text
2727
import androidx.compose.runtime.Composable
@@ -47,7 +47,7 @@ fun CraneDrawer(modifier: Modifier = Modifier) {
4747
contentDescription = stringResource(R.string.cd_drawer)
4848
)
4949
for (screen in screens) {
50-
Spacer(Modifier.preferredHeight(24.dp))
50+
Spacer(Modifier.height(24.dp))
5151
Text(text = screen, style = MaterialTheme.typography.h4)
5252
}
5353
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ import androidx.compose.foundation.BorderStroke
2020
import androidx.compose.foundation.Image
2121
import androidx.compose.foundation.border
2222
import androidx.compose.foundation.clickable
23-
import androidx.compose.foundation.layout.ExperimentalLayout
2423
import androidx.compose.foundation.layout.Row
2524
import androidx.compose.foundation.layout.Spacer
2625
import androidx.compose.foundation.layout.padding
27-
import androidx.compose.foundation.layout.preferredWidth
26+
import androidx.compose.foundation.layout.width
2827
import androidx.compose.foundation.shape.RoundedCornerShape
2928
import androidx.compose.material.MaterialTheme
3029
import androidx.compose.material.Tab
@@ -58,7 +57,7 @@ fun CraneTabBar(
5857
painter = painterResource(id = R.drawable.ic_menu),
5958
contentDescription = stringResource(id = R.string.cd_menu)
6059
)
61-
Spacer(Modifier.preferredWidth(8.dp))
60+
Spacer(Modifier.width(8.dp))
6261
Image(
6362
painter = painterResource(id = R.drawable.ic_crane_logo),
6463
contentDescription = null
@@ -72,7 +71,6 @@ fun CraneTabBar(
7271
}
7372
}
7473

75-
@OptIn(ExperimentalLayout::class)
7674
@Composable
7775
fun CraneTabs(
7876
modifier: Modifier = Modifier,

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import androidx.compose.foundation.layout.Column
2323
import androidx.compose.foundation.layout.Row
2424
import androidx.compose.foundation.layout.Spacer
2525
import androidx.compose.foundation.layout.fillMaxSize
26+
import androidx.compose.foundation.layout.height
2627
import androidx.compose.foundation.layout.padding
27-
import androidx.compose.foundation.layout.preferredHeight
28-
import androidx.compose.foundation.layout.preferredSize
29-
import androidx.compose.foundation.layout.preferredWidth
28+
import androidx.compose.foundation.layout.size
29+
import androidx.compose.foundation.layout.width
3030
import androidx.compose.foundation.lazy.LazyColumn
3131
import androidx.compose.foundation.lazy.items
3232
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -62,7 +62,7 @@ fun ExploreSection(
6262
text = title,
6363
style = MaterialTheme.typography.caption.copy(color = crane_caption)
6464
)
65-
Spacer(Modifier.preferredHeight(8.dp))
65+
Spacer(Modifier.height(8.dp))
6666
LazyColumn(
6767
modifier = Modifier.weight(1f),
6868
) {
@@ -101,21 +101,21 @@ private fun ExploreItem(
101101
loading = {
102102
Box(Modifier.fillMaxSize()) {
103103
Image(
104-
modifier = Modifier.preferredSize(36.dp).align(Alignment.Center),
104+
modifier = Modifier.size(36.dp).align(Alignment.Center),
105105
painter = painterResource(id = R.drawable.ic_crane_logo),
106106
contentDescription = null
107107
)
108108
}
109109
}
110110
)
111111
}
112-
Spacer(Modifier.preferredWidth(24.dp))
112+
Spacer(Modifier.width(24.dp))
113113
Column {
114114
Text(
115115
text = item.city.nameToDisplay,
116116
style = MaterialTheme.typography.h6
117117
)
118-
Spacer(Modifier.preferredHeight(8.dp))
118+
Spacer(Modifier.height(8.dp))
119119
Text(
120120
text = item.description,
121121
style = MaterialTheme.typography.caption.copy(color = crane_caption)
@@ -126,7 +126,7 @@ private fun ExploreItem(
126126

127127
@Composable
128128
private fun ExploreImageContainer(content: @Composable () -> Unit) {
129-
Surface(Modifier.preferredSize(width = 60.dp, height = 60.dp), RoundedCornerShape(4.dp)) {
129+
Surface(Modifier.size(width = 60.dp, height = 60.dp), RoundedCornerShape(4.dp)) {
130130
content()
131131
}
132132
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import androidx.compose.foundation.layout.Spacer
2323
import androidx.compose.foundation.layout.fillMaxHeight
2424
import androidx.compose.foundation.layout.fillMaxSize
2525
import androidx.compose.foundation.layout.fillMaxWidth
26+
import androidx.compose.foundation.layout.height
27+
import androidx.compose.foundation.layout.heightIn
2628
import androidx.compose.foundation.layout.padding
27-
import androidx.compose.foundation.layout.preferredHeight
28-
import androidx.compose.foundation.layout.preferredHeightIn
29-
import androidx.compose.foundation.layout.preferredSize
29+
import androidx.compose.foundation.layout.size
3030
import androidx.compose.foundation.layout.wrapContentSize
3131
import androidx.compose.foundation.layout.wrapContentWidth
3232
import androidx.compose.foundation.lazy.LazyColumn
@@ -64,11 +64,11 @@ fun Calendar(
6464
modifier: Modifier = Modifier
6565
) {
6666
LazyColumn(modifier) {
67-
item { Spacer(Modifier.preferredHeight(32.dp)) }
67+
item { Spacer(Modifier.height(32.dp)) }
6868
for (month in calendarYear) {
6969
itemsCalendarMonth(month = month, onDayClicked = onDayClicked)
7070
item {
71-
Spacer(Modifier.preferredHeight(32.dp))
71+
Spacer(Modifier.height(32.dp))
7272
}
7373
}
7474
}
@@ -102,7 +102,7 @@ private fun Week(
102102
Row(modifier = modifier) {
103103
val spaceModifiers = Modifier
104104
.weight(1f)
105-
.preferredHeightIn(max = CELL_SIZE)
105+
.heightIn(max = CELL_SIZE)
106106
Surface(modifier = spaceModifiers, color = leftFillColor) {
107107
Spacer(Modifier.fillMaxHeight())
108108
}
@@ -175,7 +175,7 @@ private fun DayContainer(
175175
) {
176176
// What if this doesn't fit the screen? - LayoutFlexible(1f) + LayoutAspectRatio(1f)
177177
Surface(
178-
modifier = modifier.preferredSize(width = CELL_SIZE, height = CELL_SIZE),
178+
modifier = modifier.size(width = CELL_SIZE, height = CELL_SIZE),
179179
color = backgroundColor
180180
) {
181181
content()
@@ -234,7 +234,7 @@ private fun LazyListScope.itemsCalendarMonth(
234234
)
235235
}
236236
item {
237-
Spacer(Modifier.preferredHeight(8.dp))
237+
Spacer(Modifier.height(8.dp))
238238
}
239239
}
240240
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import androidx.compose.foundation.layout.Column
2727
import androidx.compose.foundation.layout.Row
2828
import androidx.compose.foundation.layout.Spacer
2929
import androidx.compose.foundation.layout.fillMaxWidth
30+
import androidx.compose.foundation.layout.height
3031
import androidx.compose.foundation.layout.padding
31-
import androidx.compose.foundation.layout.preferredHeight
3232
import androidx.compose.material.Button
3333
import androidx.compose.material.ButtonDefaults
3434
import androidx.compose.material.MaterialTheme
@@ -121,7 +121,7 @@ fun DetailsScreen(
121121
@Composable
122122
fun DetailsContent(exploreModel: ExploreModel) {
123123
Column(verticalArrangement = Arrangement.Center) {
124-
Spacer(Modifier.preferredHeight(32.dp))
124+
Spacer(Modifier.height(32.dp))
125125
Text(
126126
modifier = Modifier.align(Alignment.CenterHorizontally),
127127
text = exploreModel.city.nameToDisplay,
@@ -132,7 +132,7 @@ fun DetailsContent(exploreModel: ExploreModel) {
132132
text = exploreModel.description,
133133
style = MaterialTheme.typography.h6
134134
)
135-
Spacer(Modifier.preferredHeight(16.dp))
135+
Spacer(Modifier.height(16.dp))
136136
CityMapView(exploreModel.city.latitude, exploreModel.city.longitude)
137137
}
138138
}

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ import androidx.compose.material.BackdropScaffold
2020
import androidx.compose.material.BackdropValue
2121
import androidx.compose.material.DrawerValue
2222
import androidx.compose.material.ExperimentalMaterialApi
23-
import androidx.compose.material.ModalDrawerLayout
23+
import androidx.compose.material.ModalDrawer
2424
import androidx.compose.material.rememberBackdropScaffoldState
2525
import androidx.compose.material.rememberDrawerState
2626
import androidx.compose.runtime.Composable
2727
import androidx.compose.runtime.getValue
2828
import androidx.compose.runtime.livedata.observeAsState
2929
import androidx.compose.runtime.mutableStateOf
3030
import androidx.compose.runtime.remember
31+
import androidx.compose.runtime.rememberCoroutineScope
3132
import androidx.compose.runtime.setValue
3233
import androidx.compose.samples.crane.base.CraneDrawer
3334
import androidx.compose.samples.crane.base.CraneTabBar
@@ -37,6 +38,7 @@ import androidx.compose.samples.crane.data.ExploreModel
3738
import androidx.compose.ui.Modifier
3839
import androidx.compose.ui.graphics.Color
3940
import androidx.lifecycle.viewmodel.compose.viewModel
41+
import kotlinx.coroutines.launch
4042

4143
typealias OnExploreItemClicked = (ExploreModel) -> Unit
4244

@@ -51,19 +53,23 @@ fun CraneHome(
5153
modifier: Modifier = Modifier,
5254
) {
5355
val drawerState = rememberDrawerState(DrawerValue.Closed)
54-
ModalDrawerLayout(
56+
ModalDrawer(
5557
drawerState = drawerState,
5658
gesturesEnabled = drawerState.isOpen,
5759
drawerContent = { CraneDrawer() },
58-
bodyContent = {
59-
CraneHomeContent(
60-
modifier = modifier,
61-
onExploreItemClicked = onExploreItemClicked,
62-
onDateSelectionClicked = onDateSelectionClicked,
63-
openDrawer = { drawerState.open() }
64-
)
65-
}
66-
)
60+
) {
61+
val scope = rememberCoroutineScope()
62+
CraneHomeContent(
63+
modifier = modifier,
64+
onExploreItemClicked = onExploreItemClicked,
65+
onDateSelectionClicked = onDateSelectionClicked,
66+
openDrawer = {
67+
scope.launch {
68+
drawerState.open()
69+
}
70+
}
71+
)
72+
}
6773
}
6874

6975
@OptIn(ExperimentalMaterialApi::class)

0 commit comments

Comments
 (0)