[All] Update to Compose rc02

[All] Update to Compose rc02

Author: JoseAlcerreca

.github/workflows/JetNews.yaml

@@ -43,7 +43,7 @@ jobs:
 
       - name: Build project and run local tests
         working-directory: ${{ env.SAMPLE_PATH }}
-        run: ./gradlew spotlessCheck assembleDebug lintDebug testDebug --stacktrace
+        run: ./gradlew spotlessCheck assembleDebug lintDebug testDebug --stacktrace --no-build-cache --rerun-tasks
 
       - name: Upload build outputs (APKs)
         uses: actions/upload-artifact@v2

Crane/app/build.gradle

@@ -114,7 +114,6 @@ dependencies {
         }
     }
 
-    implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.insets
     implementation Libs.AndroidX.Activity.activityCompose
     implementation Libs.AndroidX.appcompat
@@ -131,6 +130,8 @@ dependencies {
     implementation Libs.Hilt.android
     kapt Libs.Hilt.compiler
 
+    implementation Libs.Coil.coilCompose
+
     androidTestImplementation Libs.JUnit.junit
     androidTestImplementation Libs.AndroidX.Test.runner
     androidTestImplementation Libs.AndroidX.Test.espressoCore

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

@@ -47,8 +47,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.coil.rememberCoilPainter
-import com.google.accompanist.imageloading.ImageLoadState
+import coil.annotation.ExperimentalCoilApi
+import coil.compose.ImagePainter.State.Loading
+import coil.compose.rememberImagePainter
 import com.google.accompanist.insets.navigationBarsHeight
 
 @Composable
@@ -86,6 +87,7 @@ fun ExploreSection(
     }
 }
 
+@OptIn(ExperimentalCoilApi::class)
 @Composable
 private fun ExploreItem(
     modifier: Modifier = Modifier,
@@ -99,15 +101,20 @@ private fun ExploreItem(
     ) {
         ExploreImageContainer {
             Box {
-                val painter = rememberCoilPainter(item.imageUrl, fadeIn = true)
+                val painter = rememberImagePainter(
+                    data = item.imageUrl,
+                    builder = {
+                        crossfade(true)
+                    }
+                )
                 Image(
                     painter = painter,
                     contentDescription = null,
                     contentScale = ContentScale.Crop,
                     modifier = Modifier.fillMaxSize(),
                 )
 
-                if (painter.loadState is ImageLoadState.Loading) {
+                if (painter.state is Loading) {
                     Image(
                         painter = painterResource(id = R.drawable.ic_crane_logo),
                         contentDescription = null,

Crane/app/src/main/java/androidx/compose/samples/crane/util/NetworkUtil.kt

@@ -22,10 +22,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import coil.ImageLoader
 import coil.annotation.ExperimentalCoilApi
+import coil.compose.LocalImageLoader
 import coil.intercept.Interceptor
 import coil.request.ImageResult
 import coil.size.PixelSize
-import com.google.accompanist.coil.LocalImageLoader
 import okhttp3.HttpUrl
 
 @Composable

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

@@ -21,10 +21,7 @@ object Versions {
 }
 
 object Libs {
-    // FIXME Hilt currently incompatible with AGP 7.0.0-beta04
-    // https://github.com/google/dagger/issues/2337
-    // https://github.com/google/dagger/issues/2700
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta05"
     const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
 
     object GoogleMaps {
@@ -37,8 +34,7 @@ object Libs {
     }
 
     object Accompanist {
-        const val version = "0.13.0"
-        const val coil = "com.google.accompanist:accompanist-coil:$version"
+        const val version = "0.14.0"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
     }
 
@@ -64,7 +60,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-rc01"
+            const val version = "1.0.0-rc02"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -107,6 +103,10 @@ object Libs {
         private const val version = "4.13"
         const val junit = "junit:junit:$version"
     }
+
+    object Coil {
+        const val coilCompose = "io.coil-kt:coil-compose:1.3.0"
+    }
 }
 
 object Urls {

JetNews/build.gradle

@@ -16,17 +16,17 @@
 
 buildscript {
     ext.kotlin_version = '1.5.10'
-    ext.compose_version = '1.0.0-rc01'
+    ext.compose_version = '1.0.0-rc02'
     ext.coroutines_version = '1.4.2'
-    ext.accompanist_version = '0.13.0'
+    ext.accompanist_version = '0.14.0'
 
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-beta04'
+        classpath 'com.android.tools.build:gradle:7.0.0-beta05'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

Jetcaster/app/build.gradle

@@ -111,10 +111,11 @@ dependencies {
     implementation Libs.AndroidX.Lifecycle.viewmodel
     implementation Libs.AndroidX.Lifecycle.viewModelCompose
 
-    implementation Libs.Accompanist.coil
     implementation Libs.Accompanist.pager
     implementation Libs.Accompanist.insets
 
+    implementation Libs.Coil.coilCompose
+
     implementation Libs.OkHttp.okhttp
     implementation Libs.OkHttp.logging
 

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

@@ -62,6 +62,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import coil.compose.rememberImagePainter
 import com.example.jetcaster.R
 import com.example.jetcaster.data.PodcastWithExtraInfo
 import com.example.jetcaster.ui.home.discover.Discover
@@ -73,7 +74,6 @@ import com.example.jetcaster.util.contrastAgainst
 import com.example.jetcaster.util.quantityStringResource
 import com.example.jetcaster.util.rememberDominantColorState
 import com.example.jetcaster.util.verticalGradientScrim
-import com.google.accompanist.coil.rememberCoilPainter
 import com.google.accompanist.insets.statusBarsHeight
 import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.HorizontalPager
@@ -355,7 +355,7 @@ private fun FollowedPodcastCarouselItem(
         ) {
             if (podcastImageUrl != null) {
                 Image(
-                    painter = rememberCoilPainter(podcastImageUrl),
+                    painter = rememberImagePainter(data = podcastImageUrl),
                     contentDescription = null,
                     contentScale = ContentScale.Crop,
                     modifier = Modifier

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

@@ -64,6 +64,7 @@ import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension.Companion.fillToConstraints
 import androidx.constraintlayout.compose.Dimension.Companion.preferredWrapContent
 import androidx.lifecycle.viewmodel.compose.viewModel
+import coil.compose.rememberImagePainter
 import com.example.jetcaster.R
 import com.example.jetcaster.data.Episode
 import com.example.jetcaster.data.Podcast
@@ -74,7 +75,6 @@ import com.example.jetcaster.ui.theme.JetcasterTheme
 import com.example.jetcaster.ui.theme.Keyline1
 import com.example.jetcaster.util.ToggleFollowPodcastIconButton
 import com.example.jetcaster.util.viewModelProviderFactoryOf
-import com.google.accompanist.coil.rememberCoilPainter
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
@@ -146,7 +146,12 @@ fun EpisodeListItem(
 
         // If we have an image Url, we can show it using Coil
         Image(
-            painter = rememberCoilPainter(podcast.imageUrl, fadeIn = true),
+            painter = rememberImagePainter(
+                data = podcast.imageUrl,
+                builder = {
+                    crossfade(true)
+                }
+            ),
             contentDescription = null,
             contentScale = ContentScale.Crop,
             modifier = Modifier
@@ -316,7 +321,12 @@ private fun TopPodcastRowItem(
         ) {
             if (podcastImageUrl != null) {
                 Image(
-                    painter = rememberCoilPainter(podcastImageUrl, fadeIn = true),
+                    painter = rememberImagePainter(
+                        data = podcastImageUrl,
+                        builder = {
+                            crossfade(true)
+                        }
+                    ),
                     contentDescription = null,
                     contentScale = ContentScale.Crop,
                     modifier = Modifier

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

@@ -21,12 +21,11 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta05"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     object Accompanist {
-        const val version = "0.13.0"
-        const val coil = "com.google.accompanist:accompanist-coil:$version"
+        const val version = "0.14.0"
         const val insets = "com.google.accompanist:accompanist-insets:$version"
         const val pager = "com.google.accompanist:accompanist-pager:$version"
     }
@@ -72,7 +71,7 @@ object Libs {
 
         object Compose {
             const val snapshot = ""
-            const val version = "1.0.0-rc01"
+            const val version = "1.0.0-rc02"
 
             @get:JvmStatic
             val snapshotUrl: String
@@ -121,4 +120,8 @@ object Libs {
         const val rome = "com.rometools:rome:$version"
         const val modules = "com.rometools:rome-modules:$version"
     }
+
+    object Coil {
+        const val coilCompose = "io.coil-kt:coil-compose:1.3.0"
+    }
 }