Merge pull request #38 from ricknout/develop

Update Compose to 1.0.0-alpha08

Author: ricknout

buildSrc/src/main/java/com/google/android/material/composethemeadapter/dependencies.kt

@@ -21,14 +21,14 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha15"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha01"
 
     const val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.12.0"
 
     const val mdc = "com.google.android.material:material:1.1.0"
 
     object Kotlin {
-        const val version = "1.4.10"
+        const val version = "1.4.20"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
 
@@ -47,7 +47,7 @@ object Libs {
             val snapshotUrl: String
                 get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/ui/repository/"
 
-            private const val version = "1.0.0-alpha07"
+            private const val version = "1.0.0-alpha08"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"

gradle/wrapper/gradle-wrapper.properties

@@ -15,7 +15,7 @@
 #
 
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME

lib/src/androidTest/java/com/google/android/material/composethemeadapter/MdcThemeTest.kt

@@ -22,10 +22,10 @@ import androidx.compose.foundation.shape.CutCornerShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.platform.ContextAmbient
-import androidx.compose.ui.platform.DensityAmbient
+import androidx.compose.ui.platform.AmbientContext
+import androidx.compose.ui.platform.AmbientDensity
 import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.asFontFamily
@@ -36,7 +36,6 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
-import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.filters.MediumTest
 import com.google.android.material.composethemeadapter.test.R
 import org.junit.Assert.assertEquals
@@ -57,10 +56,8 @@ class MdcThemeTest<T : AppCompatActivity>(activityClass: Class<T>) {
         fun activities() = listOf(DarkMdcActivity::class.java, LightMdcActivity::class.java)
     }
 
-    private val activityRule = ActivityScenarioRule(activityClass)
-
     @get:Rule
-    val composeTestRule = AndroidComposeTestRule(activityRule)
+    val composeTestRule = createAndroidComposeRule(activityClass)
 
     @Test
     fun colors() = composeTestRule.setContent {
@@ -76,7 +73,7 @@ class MdcThemeTest<T : AppCompatActivity>(activityClass: Class<T>) {
 
             // We don't check isSystemInDarkTheme() here since that only checks the system
             // dark theme setting: https://issuetracker.google.com/163103826
-            if (ContextAmbient.current.isInDarkTheme()) {
+            if (AmbientContext.current.isInDarkTheme()) {
                 // In dark theme secondaryVariant is ignored and always return secondary
                 assertEquals(colorResource(R.color.dark_golden_rod), color.secondaryVariant)
             } else {
@@ -98,7 +95,7 @@ class MdcThemeTest<T : AppCompatActivity>(activityClass: Class<T>) {
     fun shapes() = composeTestRule.setContent {
         MdcTheme {
             val shapes = MaterialTheme.shapes
-            val density = DensityAmbient.current
+            val density = AmbientDensity.current
 
             shapes.small.run {
                 assertTrue(this is CutCornerShape)
@@ -128,7 +125,7 @@ class MdcThemeTest<T : AppCompatActivity>(activityClass: Class<T>) {
     fun type() = composeTestRule.setContent {
         MdcTheme {
             val typography = MaterialTheme.typography
-            val density = DensityAmbient.current
+            val density = AmbientDensity.current
 
             val rubik300 = font(R.font.rubik_300).asFontFamily()
             val rubik400 = font(R.font.rubik_400).asFontFamily()

lib/src/main/java/com/google/android/material/composethemeadapter/MdcTheme.kt

@@ -27,7 +27,7 @@ import androidx.compose.material.darkColors
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.ContextAmbient
+import androidx.compose.ui.platform.AmbientContext
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Density
 import androidx.core.content.res.getResourceIdOrThrow
@@ -55,7 +55,7 @@ import java.lang.reflect.Method
  */
 @Composable
 fun MdcTheme(
-    context: Context = ContextAmbient.current,
+    context: Context = AmbientContext.current,
     readColors: Boolean = true,
     readTypography: Boolean = true,
     readShapes: Boolean = true,

lib/src/main/java/com/google/android/material/composethemeadapter/TypedArrayUtils.kt

@@ -74,7 +74,7 @@ internal fun textStyleFromTextAppearance(
             lineHeight = run {
                 a.getTextUnitOrNull(R.styleable.ComposeThemeAdapterTextAppearance_lineHeight, density)
                     ?: a.getTextUnitOrNull(R.styleable.ComposeThemeAdapterTextAppearance_android_lineHeight, density)
-                    ?: TextUnit.Inherit
+                    ?: TextUnit.Unspecified
             },
             fontFamily = when {
                 fontFamily != null -> fontFamily.fontFamily
@@ -118,7 +118,7 @@ internal fun textStyleFromTextAppearance(
                 a.hasValue(R.styleable.ComposeThemeAdapterTextAppearance_android_letterSpacing) -> {
                     a.getFloat(R.styleable.ComposeThemeAdapterTextAppearance_android_letterSpacing, 0f).em
                 }
-                else -> TextUnit.Inherit
+                else -> TextUnit.Unspecified
             }
         )
     }
@@ -240,7 +240,7 @@ internal data class FontFamilyWithWeight(
 internal fun TypedArray.getTextUnit(
     index: Int,
     density: Density,
-    fallback: TextUnit = TextUnit.Inherit
+    fallback: TextUnit = TextUnit.Unspecified
 ): TextUnit = getTextUnitOrNull(index, density) ?: fallback
 
 /**

sample/src/main/java/com/google/android/material/composethemeadapter/sample/BasicIntegration.kt

@@ -91,7 +91,7 @@ fun ComponentsSample() {
 
                 FloatingActionButton(
                     onClick = {},
-                    icon = { Icon(Icons.Default.Favorite) }
+                    content = { Icon(Icons.Default.Favorite) }
                 )
                 VerticalSpacer()