[Compose] Update to Beta 01 (#1748)
diff --git a/build.gradle b/build.gradle
index b35e692..94c7ad3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
buildscript {
ext {
- composeVersion = '1.0.0-alpha12'
+ composeVersion = '1.0.0-beta01'
kotlinVersion = '1.4.30'
daggerVersion = '2.32'
}
@@ -16,7 +16,7 @@
}
dependencies {
classpath 'org.ajoberstar:grgit:1.9.3'
- classpath 'com.android.tools.build:gradle:7.0.0-alpha07'
+ classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
classpath 'org.ajoberstar:grgit:1.9.3'
diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle
index 91745e7..3dba64d 100644
--- a/sample-compose/build.gradle
+++ b/sample-compose/build.gradle
@@ -62,13 +62,13 @@
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.activity:activity-ktx:1.2.0'
- implementation 'androidx.activity:activity-compose:1.3.0-alpha02'
+ implementation 'androidx.activity:activity-compose:1.3.0-alpha03'
implementation 'com.google.android.material:material:1.3.0'
implementation "androidx.compose.ui:ui:$composeVersion"
implementation "androidx.compose.material:material:$composeVersion"
implementation "androidx.compose.material:material-icons-extended:$composeVersion"
implementation "androidx.compose.ui:ui-tooling:$composeVersion"
- implementation "androidx.navigation:navigation-compose:1.0.0-alpha07"
+ implementation "androidx.navigation:navigation-compose:1.0.0-alpha08"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0'
@@ -82,7 +82,7 @@
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
- implementation "dev.chrisbanes.accompanist:accompanist-coil:0.5.1"
+ implementation "dev.chrisbanes.accompanist:accompanist-coil:0.6.0"
implementation 'com.airbnb.android:mavericks:2.0.0'
testImplementation 'junit:junit:4.13.1'
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt
index ee7ae9e..48ee9d4 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/ComposeActivity.kt
@@ -9,7 +9,7 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.material.*
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Providers
+import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@@ -41,7 +41,7 @@
private fun LottieScaffold() {
val navController = rememberNavController()
- Providers(
+ CompositionLocalProvider(
LocalNavController provides navController,
) {
LottieTheme {
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
index 9b8c695..ac410ce 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/AnimationRow.kt
@@ -5,7 +5,7 @@
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.preferredSize
+import androidx.compose.foundation.layout.size
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
@@ -38,7 +38,7 @@
data = previewUrl,
modifier = Modifier
.padding(end = 16.dp)
- .preferredSize(40.dp)
+ .size(40.dp)
.background(color = previewBackgroundColor),
contentDescription = null
)
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Loader.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Loader.kt
index 4762035..722bdcf 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Loader.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/composables/Loader.kt
@@ -1,6 +1,6 @@
package com.airbnb.lottie.sample.compose.composables
-import androidx.compose.foundation.layout.preferredSize
+import androidx.compose.foundation.layout.size
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
@@ -17,7 +17,7 @@
LottieAnimation(
animationSpec,
modifier = Modifier
- .preferredSize(100.dp)
+ .size(100.dp)
.then(modifier)
)
}
\ No newline at end of file
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt
index a2edd2c..af6942e 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/lottiefiles/LottieFilesPage.kt
@@ -51,7 +51,9 @@
modifier: Modifier = Modifier
) {
Row(
- modifier = Modifier.fillMaxWidth().then(modifier),
+ modifier = Modifier
+ .fillMaxWidth()
+ .then(modifier),
horizontalArrangement = Arrangement.Start
) {
for (tab in LottieFilesTab.values()) {
@@ -89,9 +91,9 @@
Box(
modifier = Modifier
.align(Alignment.CenterHorizontally)
- .preferredHeight(3.dp)
+ .height(3.dp)
.background(MaterialTheme.colors.primary.copy(alpha = tabAlpha))
- .preferredWidth(tabWidth)
+ .width(tabWidth)
)
}
}
\ No newline at end of file
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
index f882c01..db74f52 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/PlayerPage.kt
@@ -142,7 +142,7 @@
DebouncedCircularProgressIndicator(
color = Teal,
modifier = Modifier
- .preferredSize(48.dp)
+ .size(48.dp)
)
}
}
@@ -337,7 +337,7 @@
.clip(CircleShape)
.background(color)
.clickable(onClick = onClick)
- .preferredSize(24.dp)
+ .size(24.dp)
.border(1.dp, strokeColor, shape = CircleShape)
)
}
@@ -411,7 +411,7 @@
Surface(
shape = RoundedCornerShape(4.dp),
modifier = Modifier
- .preferredWidth(400.dp)
+ .width(400.dp)
.heightIn(min = 32.dp, max = 500.dp)
) {
Box(
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt
index 1440c32..cc09630 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/player/ToolbarChip.kt
@@ -50,10 +50,10 @@
iconPainter,
tint = if (isActivated) Color.White else unActivatedColor,
modifier = Modifier
- .preferredSize(12.dp),
+ .size(12.dp),
contentDescription = null
)
- Spacer(modifier = Modifier.preferredWidth(6.dp))
+ Spacer(modifier = Modifier.width(6.dp))
}
Text(
label,
diff --git a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt
index 3db713b..e67e03a 100644
--- a/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt
+++ b/sample-compose/src/main/java/com/airbnb/lottie/sample/compose/preview/PreviewPage.kt
@@ -75,7 +75,7 @@
Column {
Row(
modifier = Modifier
- .preferredHeight(48.dp)
+ .height(48.dp)
) {
Icon(
painterResource(iconRes),
