[Owl] Update to snapshot 7033025.

Change-Id: I13fc51cb6c007fa26535e67afe47cc840d2baadb

Author: nickbutcher

Owl/app/src/androidTest/java/com/example/owl/ui/NavigationTest.kt

@@ -18,10 +18,10 @@ package com.example.owl.ui
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.Providers
-import androidx.compose.ui.test.hasLabel
+import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasSubstring
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithLabel
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithSubstring
 import androidx.compose.ui.test.performClick
 import androidx.test.platform.app.InstrumentationRegistry
@@ -72,7 +72,7 @@ class NavigationTest {
         startActivity()
         // The first screen should be the onboarding screen.
         // Assert that the FAB label for the onboarding screen exists:
-        composeTestRule.onNodeWithLabel(getOnboardingFabLabel()).assertExists()
+        composeTestRule.onNodeWithContentDescription(getOnboardingFabLabel()).assertExists()
     }
 
     @Test
@@ -82,7 +82,7 @@ class NavigationTest {
 
         // Navigate to the next screen by clicking on the FAB
         val fabLabel = getOnboardingFabLabel()
-        composeTestRule.onNodeWithLabel(fabLabel).performClick()
+        composeTestRule.onNodeWithContentDescription(fabLabel).performClick()
 
         // The first course should be shown
         composeTestRule.onNodeWithSubstring(courses.first().name).assertExists()
@@ -95,7 +95,7 @@ class NavigationTest {
 
         // Navigate to the first course
         composeTestRule.onNode(
-            hasLabel(getFeaturedCourseLabel()).and(hasSubstring(courses.first().name))
+            hasContentDescription(getFeaturedCourseLabel()).and(hasSubstring(courses.first().name))
         ).performClick()
 
         // Assert navigated to the course details

Owl/app/src/main/java/com/example/owl/ui/course/CourseDetails.kt

@@ -32,7 +32,7 @@ import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredSize
-import androidx.compose.foundation.lazy.LazyRowFor
+import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.AmbientContentAlpha
@@ -298,23 +298,24 @@ private fun RelatedCourses(
                             vertical = 24.dp
                         )
                 )
-                LazyRowFor(
-                    items = relatedCourses,
+                LazyRow(
                     contentPadding = PaddingValues(
                         start = 16.dp,
                         bottom = 32.dp,
                         end = FabSize + 8.dp
                     )
-                ) { related ->
-                    CourseListItem(
-                        course = related,
-                        onClick = { selectCourse(related.id) },
-                        titleStyle = MaterialTheme.typography.body2,
-                        modifier = Modifier
-                            .padding(end = 8.dp)
-                            .preferredSize(288.dp, 80.dp),
-                        iconSize = 14.dp
-                    )
+                ) {
+                    items(relatedCourses) { related ->
+                        CourseListItem(
+                            course = related,
+                            onClick = { selectCourse(related.id) },
+                            titleStyle = MaterialTheme.typography.body2,
+                            modifier = Modifier
+                                .padding(end = 8.dp)
+                                .preferredSize(288.dp, 80.dp),
+                            iconSize = 14.dp
+                        )
+                    }
                 }
             }
         }

Owl/app/src/main/java/com/example/owl/ui/courses/FeaturedCourses.kt

@@ -34,7 +34,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.accessibilityLabel
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -89,7 +89,7 @@ fun FeaturedCourse(
                     onClick = { selectCourse(course.id) }
                 )
                 .semantics {
-                    accessibilityLabel = featuredString
+                    contentDescription = featuredString
                 }
         ) {
             val (image, avatar, subject, name, steps, icon) = createRefs()

Owl/app/src/main/java/com/example/owl/ui/onboarding/Onboarding.kt

@@ -60,7 +60,7 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.semantics.accessibilityLabel
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -89,7 +89,7 @@ fun Onboarding(onboardingComplete: () -> Unit) {
                     modifier = Modifier
                         .navigationBarsPadding()
                         .semantics {
-                            accessibilityLabel = fabLabel
+                            contentDescription = fabLabel
                         }
                 ) {
                     Icon(Icons.Rounded.Explore)

Owl/app/src/main/java/com/example/owl/ui/theme/Theme.kt

@@ -148,35 +148,35 @@ object OwlTheme {
     /**
      * Proxy to [MaterialTheme]
      */
-    @Composable
     val colors: Colors
+        @Composable
         get() = MaterialTheme.colors
 
     /**
      * Proxy to [MaterialTheme]
      */
-    @Composable
     val typography: Typography
+        @Composable
         get() = MaterialTheme.typography
 
     /**
      * Proxy to [MaterialTheme]
      */
-    @Composable
     val shapes: Shapes
+        @Composable
         get() = MaterialTheme.shapes
 
     /**
      * Retrieves the current [Elevations] at the call site's position in the hierarchy.
      */
-    @Composable
     val elevations: Elevations
+        @Composable
         get() = AmbientElevations.current
 
     /**
      * Retrieves the current [Images] at the call site's position in the hierarchy.
      */
-    @Composable
     val images: Images
+        @Composable
         get() = AmbientImages.current
 }

Owl/app/src/main/java/com/example/owl/ui/utils/Scrim.kt

@@ -17,22 +17,14 @@
 package com.example.owl.ui.utils
 
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithCache
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.VerticalGradient
 
 /**
  * A [Modifier] which draws a vertical gradient
  */
-fun Modifier.scrim(colors: List<Color>): Modifier = drawWithCache {
-    // Use drawWithCache modifier to create and cache the gradient when size is known or changes.
-    val gradient = VerticalGradient(
-        colors = colors,
-        startY = 0f,
-        endY = size.height
-    )
-    onDrawWithContent {
-        drawContent()
-        drawRect(brush = gradient)
-    }
+fun Modifier.scrim(colors: List<Color>): Modifier = drawWithContent {
+    drawContent()
+    drawRect(Brush.verticalGradient(colors))
 }

Owl/build.gradle

@@ -29,7 +29,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.7.0'
+    id 'com.diffplug.spotless' version '5.8.2'
 }
 
 subprojects {

Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt

@@ -17,21 +17,21 @@
 package com.example.owl.buildsrc
 
 object Versions {
-    const val ktlint = "0.39.0"
+    const val ktlint = "0.40.0"
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha02"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha03"
     const val junit = "junit:junit:4.13"
 
     object Accompanist {
-        private const val version = "0.4.0"
+        private const val version = "0.4.1.compose-7033025-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
         const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
     }
 
     object Kotlin {
-        private const val version = "1.4.20"
+        private const val version = "1.4.21"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -45,12 +45,12 @@ object Libs {
     }
 
     object AndroidX {
-        const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04"
-        const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha03"
+        const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha05"
+        const val navigation = "androidx.navigation:navigation-compose:1.0.0-SNAPSHOT"
 
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-alpha08"
+            const val snapshot = "7033025"
+            const val version = "1.0.0-SNAPSHOT"
 
             const val animation = "androidx.compose.animation:animation:$version"
             const val foundation = "androidx.compose.foundation:foundation:$version"

Owl/gradle/wrapper/gradle-wrapper.properties

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