Merge branch 'dev_alpha09' into jv/js_alpha09

gsool · Dec 16, 2020 · 73d3f51 · 73d3f51
2 parents ba5c2fa + 2e800d7
commit 73d3f51
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 185 deletions.
diff --git a/Crane/app/src/androidTest/java/androidx/compose/samples/crane/calendar/CalendarTest.kt b/Crane/app/src/androidTest/java/androidx/compose/samples/crane/calendar/CalendarTest.kt
@@ -30,7 +30,7 @@ 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.onNodeWithContentDescription
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -69,16 +69,16 @@ class CalendarTest {
 
     @Test
     fun scrollsToTheBottom() {
-        composeTestRule.onNodeWithLabel("January 1").assertExists()
-        composeTestRule.onNodeWithLabel("December 31").performScrollTo().performClick()
+        composeTestRule.onNodeWithContentDescription("January 1").assertExists()
+        composeTestRule.onNodeWithContentDescription("December 31").performScrollTo().performClick()
         assert(datesRepository.datesSelected.toString() == "Dec 31")
     }
 
     @Test
     fun onDaySelected() {
-        composeTestRule.onNodeWithLabel("January 1").assertExists()
-        composeTestRule.onNodeWithLabel("January 2").assertExists().performClick()
-        composeTestRule.onNodeWithLabel("January 3").assertExists()
+        composeTestRule.onNodeWithContentDescription("January 1").assertExists()
+        composeTestRule.onNodeWithContentDescription("January 2").assertExists().performClick()
+        composeTestRule.onNodeWithContentDescription("January 3").assertExists()
 
         val datesNoSelected = composeTestRule.onDateNodes(NoSelected)
         datesNoSelected[0].assertLabelEquals("January 1")
@@ -89,13 +89,13 @@ class CalendarTest {
 
     @Test
     fun twoDaysSelected() {
-        composeTestRule.onNodeWithLabel("January 2").assertExists().performClick()
+        composeTestRule.onNodeWithContentDescription("January 2").assertExists().performClick()
 
         val datesNoSelectedOneClick = composeTestRule.onDateNodes(NoSelected)
         datesNoSelectedOneClick[0].assertLabelEquals("January 1")
         datesNoSelectedOneClick[1].assertLabelEquals("January 3")
 
-        composeTestRule.onNodeWithLabel("January 4").assertExists().performClick()
+        composeTestRule.onNodeWithContentDescription("January 4").assertExists().performClick()
 
         composeTestRule.onDateNode(FirstDay).assertLabelEquals("January 2")
         composeTestRule.onDateNode(Selected).assertLabelEquals("January 3")

diff --git a/Crane/app/src/androidTest/java/androidx/compose/samples/crane/details/DetailsActivityTest.kt b/Crane/app/src/androidTest/java/androidx/compose/samples/crane/details/DetailsActivityTest.kt
@@ -41,6 +41,8 @@ import org.junit.Rule
 import org.junit.Test
 import java.util.concurrent.CountDownLatch
 import javax.inject.Inject
+import kotlin.math.pow
+import kotlin.math.round
 
 @UninstallModules(DispatchersModule::class)
 @HiltAndroidTest
@@ -118,4 +120,5 @@ class DetailsActivityTest {
     }
 }
 
-private fun Double.round(decimals: Int = 2): Double = "%.${decimals}f".format(this).toDouble()
+private fun Double.round(decimals: Int = 2): Double =
+    round(this * 10f.pow(decimals)) / 10f.pow(decimals)
diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/base/BaseUserInput.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/base/BaseUserInput.kt
@@ -117,7 +117,7 @@ private fun CraneBaseUserInput(
     showCaption: () -> Boolean = { true },
     tintIcon: () -> Boolean,
     tint: Color = AmbientContentColor.current,
-    children: @Composable () -> Unit
+    content: @Composable () -> Unit
 ) {
     Surface(modifier = modifier, color = MaterialTheme.colors.primaryVariant) {
         Row(Modifier.padding(all = 12.dp)) {
@@ -138,15 +138,15 @@ private fun CraneBaseUserInput(
                 Spacer(Modifier.preferredWidth(8.dp))
             }
             Row(Modifier.weight(1f).align(Alignment.CenterVertically)) {
-                children()
+                content()
             }
         }
     }
 }
 
 @Preview
 @Composable
-fun previewInput() {
+fun PreviewInput() {
     CraneScaffold {
         CraneBaseUserInput(
             tintIcon = { true },

diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt
@@ -27,7 +27,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.layout.preferredWidth
-import androidx.compose.foundation.lazy.LazyColumnFor
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
@@ -62,16 +62,19 @@ fun ExploreSection(
                 style = MaterialTheme.typography.caption.copy(color = crane_caption)
             )
             Spacer(Modifier.preferredHeight(8.dp))
-            LazyColumnFor(
+            LazyColumn(
                 modifier = Modifier.weight(1f),
-                items = exploreList
-            ) { item ->
-                ExploreItem(
-                    modifier = Modifier.fillParentMaxWidth(),
-                    item = item,
-                    onItemClicked = onItemClicked
-                )
-                Divider(color = crane_divider_color)
+            ) {
+                items(exploreList) { exploreItem ->
+                    Column(Modifier.fillParentMaxWidth()) {
+                        ExploreItem(
+                            modifier = Modifier.fillParentMaxWidth(),
+                            item = exploreItem,
+                            onItemClicked = onItemClicked
+                        )
+                        Divider(color = crane_divider_color)
+                    }
+                }
             }
         }
     }
@@ -119,8 +122,8 @@ private fun ExploreItem(
 }
 
 @Composable
-private fun ExploreImageContainer(children: @Composable () -> Unit) {
+private fun ExploreImageContainer(content: @Composable () -> Unit) {
     Surface(Modifier.preferredSize(width = 60.dp, height = 60.dp), RoundedCornerShape(4.dp)) {
-        children()
+        content()
     }
 }
diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/base/Scaffold.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/base/Scaffold.kt
@@ -22,10 +22,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.samples.crane.ui.CraneTheme
 
 @Composable
-fun CraneScaffold(children: @Composable () -> Unit) {
+fun CraneScaffold(content: @Composable () -> Unit) {
     CraneTheme {
         Surface(color = MaterialTheme.colors.primary) {
-            children()
+            content()
         }
     }
 }
diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt
@@ -50,7 +50,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.semantics.SemanticsPropertyKey
 import androidx.compose.ui.semantics.SemanticsPropertyReceiver
-import androidx.compose.ui.semantics.accessibilityLabel
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -137,7 +137,7 @@ private fun Week(
                 day,
                 onDayClicked,
                 Modifier.semantics {
-                    accessibilityLabel = "${month.name} ${day.value}"
+                    contentDescription = "${month.name} ${day.value}"
                     dayStatusProperty = day.status
                 }
             )
@@ -195,21 +195,21 @@ private fun Day(name: String) {
 private fun DayContainer(
     modifier: Modifier = Modifier,
     backgroundColor: Color = Color.Transparent,
-    children: @Composable () -> Unit
+    content: @Composable () -> Unit
 ) {
     // What if this doesn't fit the screen? - LayoutFlexible(1f) + LayoutAspectRatio(1f)
     Surface(
         modifier = modifier.preferredSize(width = CELL_SIZE, height = CELL_SIZE),
         color = backgroundColor
     ) {
-        children()
+        content()
     }
 }
 
 @Composable
 private fun DayStatusContainer(
     status: DaySelectedStatus,
-    children: @Composable () -> Unit
+    content: @Composable () -> Unit
 ) {
     if (status.isMarked()) {
         Box {
@@ -220,10 +220,10 @@ private fun DayStatusContainer(
             } else if (status == DaySelectedStatus.LastDay) {
                 SemiRect(color = color, lookingLeft = true)
             }
-            children()
+            content()
         }
     } else {
-        children()
+        content()
     }
 }
 

diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/model/CalendarMonth.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/model/CalendarMonth.kt
@@ -23,7 +23,7 @@ data class CalendarMonth(
     val monthNumber: Int,
     val startDayOfWeek: DayOfWeek
 ) {
-    val days = mutableListOf<CalendarDay>().apply {
+    private val days = mutableListOf<CalendarDay>().apply {
         // Add offset of the start of the month
         for (i in 1..startDayOfWeek.ordinal) {
             add(

diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/details/DetailsActivity.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/details/DetailsActivity.kt
@@ -29,7 +29,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.ButtonDefaults
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -186,7 +186,7 @@ private fun ZoomControls(
 private fun ZoomButton(text: String, onClick: () -> Unit) {
     Button(
         modifier = Modifier.padding(8.dp),
-        colors = ButtonConstants.defaultButtonColors(
+        colors = ButtonDefaults.buttonColors(
             backgroundColor = MaterialTheme.colors.onPrimary,
             contentColor = MaterialTheme.colors.primary
         ),

diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/home/HomeFeatures.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/home/HomeFeatures.kt
@@ -67,8 +67,8 @@ fun EatSearchContent(datesSelected: String, eatUpdates: EatSearchContentUpdates)
 }
 
 @Composable
-private fun CraneSearch(searchItems: @Composable () -> Unit) {
+private fun CraneSearch(content: @Composable () -> Unit) {
     Column(Modifier.padding(start = 24.dp, top = 0.dp, end = 24.dp, bottom = 12.dp)) {
-        searchItems()
+        content()
     }
 }
diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/ui/CraneTheme.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/ui/CraneTheme.kt
@@ -49,8 +49,8 @@ val BottomSheetShape = RoundedCornerShape(
 )
 
 @Composable
-fun CraneTheme(children: @Composable () -> Unit) {
+fun CraneTheme(content: @Composable () -> Unit) {
     MaterialTheme(colors = craneColors, typography = craneTypography) {
-        children()
+        content()
     }
 }
diff --git a/Crane/build.gradle b/Crane/build.gradle
@@ -31,7 +31,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '5.7.0'
+    id 'com.diffplug.spotless' version '5.8.2'
 }
 
 subprojects {

diff --git a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt b/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.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 ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
 
     object GoogleMaps {
@@ -30,12 +30,12 @@ object Libs {
     }
 
     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"
     }
 
     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"
@@ -49,8 +49,8 @@ object Libs {
 
     object AndroidX {
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-alpha08"
+            const val snapshot = "7033025"
+            private const val version = "1.0.0-SNAPSHOT"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"

diff --git a/Crane/gradle/wrapper/gradle-wrapper.properties b/Crane/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Oct 23 09:30:32 CEST 2020
 distributionBase=GRADLE_USER_HOME
-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
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.center
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithLabel
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
@@ -164,5 +164,7 @@ class ConversationTest {
         composeTestRule.onNodeWithText(activity.getString(R.string.jumpBottom))
 
     private fun openEmojiSelector() =
-        composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_bt_desc)).performClick()
+        composeTestRule
+            .onNodeWithContentDescription(activity.getString(R.string.emoji_selector_bt_desc))
+            .performClick()
 }
diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt
@@ -24,10 +24,10 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.hasAnyAncestor
-import androidx.compose.ui.test.hasLabel
+import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasSetTextAction
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithLabel
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
@@ -111,7 +111,8 @@ class UserInputTest {
         // Click on text field to open the soft keyboard
         clickOnTextField()
 
-        // TODO: Soft keyboard is not correctly synchronized https://issuetracker.google.com/169235317
+        // TODO: Soft keyboard is not correctly synchronized
+        //  https://issuetracker.google.com/169235317
         Thread.sleep(200)
 
         composeTestRule.onNode(SemanticsMatcher.expectValue(KeyboardShownKey, true)).assertExists()
@@ -137,27 +138,27 @@ class UserInputTest {
     }
 
     private fun clickOnTextField() =
-        composeTestRule.onNodeWithLabel(activity.getString(R.string.textfield_desc))
+        composeTestRule.onNodeWithContentDescription(activity.getString(R.string.textfield_desc))
             .performClick()
 
     private fun openEmojiSelector() =
-        composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_bt_desc))
+        composeTestRule.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_bt_desc))
             .performClick()
 
     private fun assertEmojiSelectorIsDisplayed() =
-        composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_desc))
+        composeTestRule.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_desc))
             .assertIsDisplayed()
 
     private fun assertEmojiSelectorDoesNotExist() =
-        composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_desc))
+        composeTestRule.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_desc))
             .assertDoesNotExist()
 
     private fun findSendButton() = composeTestRule.onNodeWithText(activity.getString(R.string.send))
 
     private fun findTextInputField(): SemanticsNodeInteraction {
         return composeTestRule.onNode(
             hasSetTextAction() and
-                hasAnyAncestor(hasLabel(activity.getString(R.string.textfield_desc)))
+                hasAnyAncestor(hasContentDescription(activity.getString(R.string.textfield_desc)))
         )
     }
 }