[Crane] Updates to snapshot 6953474 (android#268)

Author: manuelvicnt

Crane/app/build.gradle

@@ -96,9 +96,10 @@ android {
     }
 
     packagingOptions {
-        exclude "META-INF/licenses/**"
-        exclude "META-INF/AL2.0"
-        exclude "META-INF/LGPL2.1"
+        // Multiple dependency bring these files in. Exclude them to enable
+        // our test APK to build (has no effect on our AARs)
+        excludes += "/META-INF/AL2.0"
+        excludes += "/META-INF/LGPL2.1"
     }
 }
 

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

@@ -26,13 +26,13 @@ import androidx.compose.samples.crane.calendar.model.DaySelectedStatus.Selected
 import androidx.compose.samples.crane.data.DatesRepository
 import androidx.compose.samples.crane.di.DispatchersModule
 import androidx.compose.samples.crane.ui.CraneTheme
-import androidx.ui.test.ComposeTestRule
-import androidx.ui.test.SemanticsMatcher
-import androidx.ui.test.assertLabelEquals
-import androidx.ui.test.createAndroidComposeRule
-import androidx.ui.test.onNodeWithLabel
-import androidx.ui.test.performClick
-import androidx.ui.test.performScrollTo
+import androidx.compose.ui.test.SemanticsMatcher
+import androidx.compose.ui.test.assertLabelEquals
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithLabel
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules

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

@@ -21,15 +21,15 @@ import androidx.compose.samples.crane.data.DestinationsRepository
 import androidx.compose.samples.crane.data.ExploreModel
 import androidx.compose.samples.crane.data.MADRID
 import androidx.compose.samples.crane.di.DispatchersModule
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.onNodeWithText
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.test.AndroidComposeTestRule
-import androidx.ui.test.assertIsDisplayed
-import androidx.ui.test.onNodeWithText
 import com.google.android.libraries.maps.MapView
 import com.google.android.libraries.maps.model.CameraPosition
 import com.google.android.libraries.maps.model.LatLng

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

@@ -16,12 +16,10 @@
 
 package androidx.compose.samples.crane.home
 
-import androidx.compose.material.Surface
 import androidx.compose.samples.crane.di.DispatchersModule
-import androidx.compose.samples.crane.ui.CraneTheme
-import androidx.ui.test.createAndroidComposeRule
-import androidx.ui.test.onNodeWithText
-import androidx.ui.test.performClick
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import dagger.hilt.android.testing.UninstallModules
@@ -42,15 +40,7 @@ class HomeTest {
     @Before
     fun setUp() {
         composeTestRule.setContent {
-            CraneTheme {
-                Surface {
-                    CraneHomeContent(
-                        onExploreItemClicked = { },
-                        onDateSelectionClicked = { },
-                        openDrawer = { }
-                    )
-                }
-            }
+            MainScreen({ }, { })
         }
     }
 

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

@@ -17,18 +17,18 @@
 package androidx.compose.samples.crane.base
 
 import androidx.annotation.DrawableRes
-import androidx.compose.foundation.AmbientContentColor
-import androidx.compose.foundation.BaseTextField
 import androidx.compose.foundation.ExperimentalFoundationApi
-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.foundation.text.BasicTextField
+import androidx.compose.material.AmbientContentColor
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -93,13 +93,18 @@ fun CraneEditableUserInput(
         showCaption = { !isHint() },
         vectorImageId = vectorImageId
     ) {
-        BaseTextField(
+        BasicTextField(
             value = textFieldState,
             onValueChange = {
                 textFieldState = it
                 if (!isHint()) onInputChanged(textFieldState.text)
             },
-            textStyle = if (isHint()) captionTextStyle else MaterialTheme.typography.body1,
+            textStyle = if (isHint()) {
+                captionTextStyle.copy(color = AmbientContentColor.current)
+            } else {
+                MaterialTheme.typography.body1
+            },
+            cursorColor = AmbientContentColor.current
         )
     }
 }

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

@@ -17,13 +17,13 @@
 package androidx.compose.samples.crane.base
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.samples.crane.R
 import androidx.compose.samples.crane.ui.CraneTheme

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

@@ -18,7 +18,6 @@ package androidx.compose.samples.crane.base
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.ExperimentalLayout
@@ -30,6 +29,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Tab
 import androidx.compose.material.TabRow
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.samples.crane.R
 import androidx.compose.samples.crane.home.CraneScreen

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

@@ -17,7 +17,6 @@
 package androidx.compose.samples.crane.base
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -33,6 +32,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.samples.crane.R
 import androidx.compose.samples.crane.data.ExploreModel

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

@@ -17,7 +17,6 @@
 package androidx.compose.samples.crane.calendar
 
 import androidx.compose.foundation.ScrollableColumn
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -35,6 +34,7 @@ import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.material.Colors
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.samples.crane.calendar.model.CalendarDay
 import androidx.compose.samples.crane.calendar.model.CalendarMonth

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

@@ -21,11 +21,11 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.samples.crane.R

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

@@ -21,7 +21,6 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.annotation.VisibleForTesting
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -32,6 +31,7 @@ import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonConstants
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember

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

@@ -20,7 +20,9 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedTask
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.samples.crane.R
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -32,9 +34,12 @@ private const val SplashWaitTime: Long = 2000
 @Composable
 fun LandingScreen(modifier: Modifier = Modifier, onTimeout: () -> Unit) {
     Box(modifier = modifier.fillMaxSize(), alignment = Alignment.Center) {
-        LaunchedTask {
+        // Adds composition consistency. Use the value when LaunchedEffect is first called
+        val currentOnTimeout by rememberUpdatedState(onTimeout)
+
+        LaunchedEffect(Unit) {
             delay(SplashWaitTime)
-            onTimeout()
+            currentOnTimeout()
         }
         Image(asset = vectorResource(id = R.drawable.ic_crane_drawer))
     }

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

@@ -18,6 +18,7 @@ package androidx.compose.samples.crane.home
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.annotation.VisibleForTesting
 import androidx.compose.animation.DpPropKey
 import androidx.compose.animation.core.FloatPropKey
 import androidx.compose.animation.core.Spring.StiffnessLow
@@ -51,29 +52,31 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            CraneScaffold {
-                val onExploreItemClicked: OnExploreItemClicked = remember {
-                    { launchDetailsActivity(context = this, item = it) }
-                }
-                val onDateSelectionClicked = remember {
-                    { launchCalendarActivity(this) }
-                }
+            MainScreen(
+                onExploreItemClicked = { launchDetailsActivity(context = this, item = it) },
+                onDateSelectionClicked = { launchCalendarActivity(this) }
+            )
+        }
+    }
+}
 
-                var splashShown by remember { mutableStateOf(SplashState.Shown) }
-                val transition = transition(splashTransitionDefinition, splashShown)
-                Box {
-                    LandingScreen(
-                        modifier = Modifier.drawOpacity(transition[splashAlphaKey]),
-                        onTimeout = { splashShown = SplashState.Completed }
-                    )
-                    MainContent(
-                        modifier = Modifier.drawOpacity(transition[contentAlphaKey]),
-                        topPadding = transition[contentTopPaddingKey],
-                        onExploreItemClicked = onExploreItemClicked,
-                        onDateSelectionClicked = onDateSelectionClicked
-                    )
-                }
-            }
+@VisibleForTesting
+@Composable
+fun MainScreen(onExploreItemClicked: OnExploreItemClicked, onDateSelectionClicked: () -> Unit) {
+    CraneScaffold {
+        var splashShown by remember { mutableStateOf(SplashState.Shown) }
+        val transition = transition(splashTransitionDefinition, splashShown)
+        Box {
+            LandingScreen(
+                modifier = Modifier.drawOpacity(transition[splashAlphaKey]),
+                onTimeout = { splashShown = SplashState.Completed }
+            )
+            MainContent(
+                modifier = Modifier.drawOpacity(transition[contentAlphaKey]),
+                topPadding = transition[contentTopPaddingKey],
+                onExploreItemClicked = onExploreItemClicked,
+                onDateSelectionClicked = onDateSelectionClicked
+            )
         }
     }
 }

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

@@ -20,10 +20,10 @@ import androidx.compose.animation.ColorPropKey
 import androidx.compose.animation.core.transitionDefinition
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.transition
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf

Crane/build.gradle

@@ -67,6 +67,10 @@ subprojects {
             // Use experimental APIs
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
             freeCompilerArgs += '-Xallow-jvm-ir-dependencies'
+            freeCompilerArgs += [
+                    '-P',
+                    'plugin:androidx.compose.compiler.plugins.kotlin:intrinsicRemember=true'
+            ]
         }
     }
 }

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-alpha15"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha16"
     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.2"
+        private const val version = "0.3.3.compose-6961312-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
@@ -37,16 +37,16 @@ object Libs {
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
 
         object Coroutines {
-            private const val version = "1.4.0-M1"
+            private const val version = "1.4.0"
             const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
             const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
         }
     }
 
     object AndroidX {
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-alpha06"
+            const val snapshot = "6961312"
+            const val version = "1.0.0-SNAPSHOT"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"