[All] Update to Compose 1.0.0-alpha06

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

@@ -43,7 +43,7 @@ import org.junit.Test
 class CalendarTest {
 
     @get:Rule
-    val composeTestRule = createComposeRule(disableTransitions = true)
+    val composeTestRule = createComposeRule()
 
     var dateSelected = ""
     private val onDayClicked: (CalendarDay, CalendarMonth) -> Unit = { day, month ->

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

@@ -28,7 +28,7 @@ import org.junit.Test
 class HomeTest {
 
     @get:Rule
-    val composeTestRule = createComposeRule(disableTransitions = true)
+    val composeTestRule = createComposeRule()
 
     @Before
     fun setUp() {

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

@@ -20,13 +20,13 @@ import androidx.annotation.DrawableRes
 import androidx.compose.foundation.AmbientContentColor
 import androidx.compose.foundation.BaseTextField
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.preferredWidth
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable

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

@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.material.Button
+import androidx.compose.material.ButtonConstants
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -163,8 +164,10 @@ private fun ZoomControls(
 private fun ZoomButton(text: String, onClick: () -> Unit) {
     Button(
         modifier = Modifier.padding(8.dp),
-        backgroundColor = MaterialTheme.colors.onPrimary,
-        contentColor = MaterialTheme.colors.primary,
+        colors = ButtonConstants.defaultButtonColors(
+            backgroundColor = MaterialTheme.colors.onPrimary,
+            contentColor = MaterialTheme.colors.primary
+        ),
         onClick = onClick
     ) {
         Text(text = text, style = MaterialTheme.typography.h5)

Crane/build.gradle

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

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

@@ -21,12 +21,12 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha14"
     const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
     const val googleMaps = "com.google.android.libraries.maps:maps:3.1.0-beta"
 
     object Accompanist {
-        private const val version = "0.3.1"
+        private const val version = "0.3.2.compose-6922857-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
@@ -39,8 +39,8 @@ object Libs {
 
     object AndroidX {
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-alpha05"
+            const val snapshot = "6922857"
+            const val version = "1.0.0-SNAPSHOT"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -71,5 +71,5 @@ object Libs {
 object Urls {
     const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
     const val composeSnapshotRepo = "https://androidx-dev-prod.appspot.com/snapshots/builds/" +
-        "${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
+        "${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
 }

Crane/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 15 11:35:59 CEST 2020
+#Fri Oct 23 09:30:32 CEST 2020
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt

@@ -16,7 +16,6 @@
 
 package com.example.jetcaster.ui.home
 
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.background
@@ -35,6 +34,7 @@ import androidx.compose.foundation.layout.preferredHeightIn
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.AmbientEmphasisLevels
+import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideEmphasis

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt

@@ -17,7 +17,6 @@
 package com.example.jetcaster.ui.home.category
 
 import androidx.compose.foundation.AmbientContentColor
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
@@ -38,6 +37,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRowForIndexed
 import androidx.compose.material.AmbientEmphasisLevels
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideEmphasis

Jetcaster/app/src/main/java/com/example/jetcaster/util/Buttons.kt

@@ -18,10 +18,10 @@ package com.example.jetcaster.util
 
 import androidx.compose.animation.animate
 import androidx.compose.foundation.AmbientContentColor
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.AmbientEmphasisLevels
+import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons

Jetcaster/build.gradle

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

Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt

@@ -21,15 +21,15 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha14"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val junit = "junit:junit:4.13"
 
     const val material = "com.google.android.material:material:1.1.0"
 
     object Accompanist {
-        private const val version = "0.3.1"
+        private const val version = "0.3.2.compose-6922857-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
@@ -57,16 +57,16 @@ object Libs {
         const val appcompat = "androidx.appcompat:appcompat:1.2.0-rc01"
         const val palette = "androidx.palette:palette:1.0.0"
 
-        const val core = "androidx.core:core:1.5.0-alpha02"
-        const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
+        const val core = "androidx.core:core:1.5.0-alpha04"
+        const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04"
 
         object Compose {
-            private const val snapshot = ""
-            const val version = "1.0.0-alpha05"
+            private const val snapshot = "6922857"
+            const val version = "1.0.0-SNAPSHOT"
 
             @get:JvmStatic
             val snapshotUrl: String
-                get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/ui/repository/"
+                get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"

Jetcaster/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt

@@ -46,7 +46,7 @@ import org.junit.Test
 class ConversationTest {
 
     @get:Rule
-    val composeTestRule = createAndroidComposeRule<NavActivity>(disableTransitions = true)
+    val composeTestRule = createAndroidComposeRule<NavActivity>()
 
     // Note that keeping these references is only safe if the activity is not recreated.
     // See: https://issuetracker.google.com/160862278

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt

@@ -40,7 +40,7 @@ import org.junit.Test
 class NavigationTest {
 
     @get:Rule
-    val composeTestRule = createAndroidComposeRule<NavActivity>(disableTransitions = true)
+    val composeTestRule = createAndroidComposeRule<NavActivity>()
 
     // Note that keeping these references is only safe if the activity is not recreated.
     // See: https://issuetracker.google.com/160862278

Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt

@@ -47,7 +47,7 @@ import org.junit.Test
 class UserInputTest {
 
     @get:Rule
-    val composeTestRule = createAndroidComposeRule<NavActivity>(disableTransitions = true)
+    val composeTestRule = createAndroidComposeRule<NavActivity>()
 
     // Note that keeping these references is only safe if the activity is not recreated.
     // See: https://issuetracker.google.com/160862278

Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatAppBar.kt

@@ -74,3 +74,11 @@ fun JetchatAppBarPreview() {
         JetchatAppBar(title = { Text("Preview!") })
     }
 }
+
+@Preview
+@Composable
+fun JetchatAppBarPreviewDark() {
+    JetchatTheme(isDarkTheme = true) {
+        JetchatAppBar(title = { Text("Preview!") })
+    }
+}

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt

@@ -17,7 +17,6 @@
 package com.example.compose.jetchat.conversation
 
 import androidx.compose.foundation.ClickableText
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.ScrollableColumn
@@ -43,6 +42,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.LastBaseline
 import androidx.compose.material.AmbientEmphasisLevels
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideEmphasis
 import androidx.compose.material.Surface
@@ -316,7 +316,7 @@ private fun AuthorNameTimestamp(msg: Message) {
                 text = msg.author,
                 style = MaterialTheme.typography.subtitle1,
                 modifier = Modifier
-                    .alignWithSiblings(LastBaseline)
+                    .alignBy(LastBaseline)
                     .relativePaddingFrom(LastBaseline, after = 8.dp) // Space to 1st bubble
             )
         }
@@ -325,7 +325,7 @@ private fun AuthorNameTimestamp(msg: Message) {
             Text(
                 text = msg.timestamp,
                 style = MaterialTheme.typography.caption,
-                modifier = Modifier.alignWithSiblings(LastBaseline)
+                modifier = Modifier.alignBy(LastBaseline)
             )
         }
     }

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/JumpToBottom.kt

@@ -19,11 +19,11 @@ package com.example.compose.jetchat.conversation
 import androidx.compose.animation.DpPropKey
 import androidx.compose.animation.core.transitionDefinition
 import androidx.compose.animation.transition
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.material.ExtendedFloatingActionButton
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDownward

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/UserInput.kt

@@ -24,12 +24,10 @@ import androidx.compose.foundation.AmbientTextStyle
 import androidx.compose.foundation.BaseTextField
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.Icon
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.ScrollableRow
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.contentColor
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -49,12 +47,12 @@ import androidx.compose.material.AmbientEmphasisLevels
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonConstants
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ProvideEmphasis
 import androidx.compose.material.Surface
 import androidx.compose.material.TextButton
-import androidx.compose.material.contentColorFor
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.AlternateEmail
 import androidx.compose.material.icons.outlined.Duo
@@ -309,27 +307,22 @@ private fun UserInputSelector(
         }
         Spacer(modifier = Modifier.weight(1f))
 
-        val backgroundColor = ButtonConstants.defaultButtonBackgroundColor(
-            enabled = sendMessageEnabled,
-            disabledColor = MaterialTheme.colors.surface
-        )
         val disabledContentColor =
             AmbientEmphasisLevels.current.disabled.applyEmphasis(MaterialTheme.colors.onSurface)
-        val contentColor = ButtonConstants.defaultButtonContentColor(
-            enabled = sendMessageEnabled,
-            defaultColor = contentColorFor(backgroundColor),
-            disabledColor = disabledContentColor
+
+        val buttonColors = ButtonConstants.defaultButtonColors(
+            disabledBackgroundColor = MaterialTheme.colors.surface,
+            disabledContentColor = disabledContentColor
         )
+
         // Send button
         Button(
             modifier = Modifier
                 .padding(horizontal = 16.dp)
                 .preferredHeight(36.dp),
-            elevation = 0.dp,
             enabled = sendMessageEnabled,
             onClick = onMessageSent,
-            contentColor = contentColor,
-            backgroundColor = backgroundColor,
+            colors = buttonColors,
             border = border,
             // TODO: Workaround for https://issuetracker.google.com/158830170
             contentPadding = PaddingValues(0.dp)
@@ -486,25 +479,20 @@ fun ExtendedSelectorInnerButton(
     selected: Boolean,
     modifier: Modifier = Modifier
 ) {
-    val backgroundColor = if (selected) {
-        MaterialTheme.colors.onSurface.copy(alpha = 0.08f)
-    } else {
-        // Same as background
-        getSelectorExpandedColor()
-    }
-    val color = if (selected) {
-        MaterialTheme.colors.onSurface
-    } else {
-        MaterialTheme.colors.onSurface.copy(alpha = 0.74f)
-    }
+    val colors = ButtonConstants.defaultButtonColors(
+        backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.08f),
+        disabledBackgroundColor = getSelectorExpandedColor(), // Same as background
+        contentColor = MaterialTheme.colors.onSurface,
+        disabledContentColor = MaterialTheme.colors.onSurface.copy(alpha = 0.74f)
+    )
     TextButton(
         onClick = onClick,
         modifier = modifier
             .padding(horizontal = 8.dp, vertical = 8.dp)
             .preferredHeight(30.dp),
         shape = MaterialTheme.shapes.medium,
-        backgroundColor = backgroundColor,
-        contentColor = color,
+        enabled = selected,
+        colors = colors,
         // TODO: Workaround for https://issuetracker.google.com//158830170
         contentPadding = PaddingValues(0.dp)
     ) {