Merge pull request #490 from android/dev_beta06

[All] Update to Compose beta06

Author: manuelvicnt

Crane/README.md

@@ -5,7 +5,7 @@ Studies built with [Jetpack Compose](https://developer.android.com/jetpack/compo
 The goal of the sample is to showcase Material components, draggable UI elements, Android Views
 inside Compose, and UI state handling.
 
-To try out this sample app, you need to use the latest Canary version of Android Studio 4.2.
+To try out this sample app, you need to use the latest Canary version of Android Studio Arctic Fox.
 You can clone this repository or import the
 project from Android Studio following the steps
 [here](https://developer.android.com/jetpack/compose/setup#sample).
@@ -22,8 +22,6 @@ the bottom of the screen.
 - __Home__ [screen][home] where you can explore flights, hotels, and restaurants specifying
 the number of people.
  - Clicking on the number of people refreshes the destinations.
- - The [backdrop](https://material.io/components/backdrop) is draggable and can pin to the top of
- the screen, just under the search criteria, and to the bottom. Implemented [here][backdrop].
  - Destination's images are retrieved using the [coil-accompanist][coil-accompanist] library.
 - __Calendar__ [screen][calendar]. Tapping on __Select Dates__ takes you to a calendar built
 completely from scratch. It makes a heavy usage of Compose's state APIs.
@@ -32,6 +30,9 @@ implemented using a different Activity will be displayed. In there, you can see
 embedded in Compose and Compose buttons updating the Android View. Notice how you can also
 interact with the `MapView` seamlessly.
 
+Crane is a multi-activity app that showcases how navigating between activities can be done in
+Jetpack Compose.
+
 ## Hilt
 
 Crane uses [Hilt][hilt] to manage its dependencies. Hilt's ViewModel (with the
@@ -48,8 +49,9 @@ class MainViewModel @Inject constructor(
 ) : ViewModel() { ... }
 
 @Composable
-fun CraneHomeContent(...) {
-    val viewModel: MainViewModel = viewModel()
+fun CraneHomeContent(
+    viewModel: MainViewModel = viewModel()
+) {
     ...
 }
 ```
@@ -75,11 +77,9 @@ and include it in the `local.properties` file as follows:
 google.maps.key={insert_your_api_key_here}
 ```
 
-## Data
+## Images
 
-The data is hardcoded in the _CraneData_ [file][data] and exposed to the UI using the
-[MainViewModel][mainViewModel]. Image resources are retrieved from
-[Unsplash](https://unsplash.com/).
+Image resources are retrieved from [Unsplash](https://unsplash.com/).
 
 ## Testing
 
@@ -107,10 +107,8 @@ limitations under the License.
 
 [landing]: app/src/main/java/androidx/compose/samples/crane/home/LandingScreen.kt
 [home]: app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt
-[backdrop]: app/src/main/java/androidx/compose/samples/crane/ui/BackdropFrontLayer.kt
 [calendar]: app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt
 [details]: app/src/main/java/androidx/compose/samples/crane/details/DetailsActivity.kt
-[data]: app/src/main/java/androidx/compose/samples/crane/data/CraneData.kt
 [mainViewModel]: app/src/main/java/androidx/compose/samples/crane/home/MainViewModel.kt
 [detailsViewModel]: app/src/main/java/androidx/compose/samples/crane/details/DetailsViewModel.kt
 [homeTest]: app/src/androidTest/java/androidx/compose/samples/crane/home/HomeTest.kt

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

@@ -25,18 +25,19 @@ import androidx.compose.samples.crane.calendar.model.DaySelectedStatus.NoSelecte
 import androidx.compose.samples.crane.calendar.model.DaySelectedStatus.Selected
 import androidx.compose.samples.crane.data.DatesRepository
 import androidx.compose.samples.crane.ui.CraneTheme
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.assertContentDescriptionEquals
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasScrollToKeyAction
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.performScrollToKey
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import javax.inject.Inject
@@ -66,11 +67,12 @@ class CalendarTest {
         }
     }
 
-    @Ignore("performScrollTo doesn't work with LazyLists: issuetracker.google.com/178483889")
+    @ExperimentalTestApi
     @Test
     fun scrollsToTheBottom() {
         composeTestRule.onNodeWithContentDescription("January 1").assertIsDisplayed()
-        composeTestRule.onNodeWithContentDescription("December 31").performScrollTo().performClick()
+        composeTestRule.onNode(hasScrollToKeyAction()).performScrollToKey("2020/12/4")
+        composeTestRule.onNodeWithContentDescription("December 31").performClick()
         assert(datesRepository.datesSelected.toString() == "Dec 31")
     }
 

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

@@ -107,7 +107,7 @@ private fun ExploreItem(
                     modifier = Modifier.fillMaxSize(),
                 )
 
-                if (painter.loadState == ImageLoadState.Loading) {
+                if (painter.loadState is ImageLoadState.Loading) {
                     Image(
                         painter = painterResource(id = R.drawable.ic_crane_logo),
                         contentDescription = null,

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

@@ -224,8 +224,12 @@ private fun LazyListScope.itemsCalendarMonth(
     item {
         DaysOfWeek(modifier = contentModifier)
     }
-    for (week in month.weeks.value) {
-        item {
+
+    month.weeks.value.forEachIndexed { index, week ->
+        // A custom key needs to be given to these items so that they can be found in tests that
+        // need scrolling. The format of the key is ${year/month/weekNumber}. Thus,
+        // the key for the fourth week of December 2020 is "2020/12/4"
+        item(key = "${month.year}/${month.monthNumber}/${index + 1}") {
             Week(
                 modifier = contentModifier,
                 week = week,

Crane/app/src/main/java/androidx/compose/samples/crane/util/Shapes.kt

@@ -23,6 +23,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
 
 @Composable
 fun Circle(color: Color) {
@@ -33,8 +35,11 @@ fun Circle(color: Color) {
 
 @Composable
 fun SemiRect(color: Color, lookingLeft: Boolean = true) {
+    val layoutDirection = LocalLayoutDirection.current
     Canvas(Modifier.fillMaxSize()) {
-        val offset = if (lookingLeft) {
+        // The SemiRect should face left EITHER the lookingLeft param is true
+        // OR the layoutDirection is Rtl
+        val offset = if (lookingLeft xor (layoutDirection == LayoutDirection.Rtl)) {
             Offset(0f, 0f)
         } else {
             Offset(size.width / 2, 0f)

Crane/build.gradle

@@ -31,7 +31,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.11.1'
+    id 'com.diffplug.spotless' version '5.12.4'
 }
 
 subprojects {

Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt

@@ -17,11 +17,11 @@
 package com.example.crane.buildsrc
 
 object Versions {
-    const val ktLint = "0.40.0"
+    const val ktLint = "0.41.0"
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha14"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha15"
     const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
 
     object GoogleMaps {
@@ -30,7 +30,7 @@ object Libs {
     }
 
     object Accompanist {
-        const val version = "0.8.0"
+        const val version = "0.9.0"
         const val coil = "com.google.accompanist:accompanist-coil:$version"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
@@ -57,7 +57,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-beta05"
+            const val version = "1.0.0-beta06"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"

Crane/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

JetNews/build.gradle

@@ -16,7 +16,7 @@
 
 buildscript {
     ext.kotlin_version = '1.4.32'
-    ext.compose_version = '1.0.0-beta05'
+    ext.compose_version = '1.0.0-beta06'
     ext.coroutines_version = '1.4.2'
 
     repositories {
@@ -25,7 +25,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

JetNews/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists