replace deprecated accompanist coil with coil compose (#102)

wiryadev · web-flow · commit 112ac6876a94 · 2021-07-16T22:24:10.000+08:00
diff --git a/app/src/main/java/com/guru/composecookbook/ui/demoapps/DemoUIList.kt b/app/src/main/java/com/guru/composecookbook/ui/demoapps/DemoUIList.kt
@@ -100,7 +100,8 @@ fun DemoUIList() {
                     ) {
                         Text(text = title, modifier = Modifier.padding(8.dp))
                     }
-                })
+                }
+            )
         }
     }
 }
diff --git a/app/src/main/java/com/guru/composecookbook/ui/home/advancelists/AnimatedLists.kt b/app/src/main/java/com/guru/composecookbook/ui/home/advancelists/AnimatedLists.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.google.accompanist.coil.rememberCoilPainter
+import coil.compose.rememberImagePainter
 import com.guru.composecookbook.data.DemoDataProvider
 import com.guru.composecookbook.data.model.Tweet
 import com.guru.composecookbook.theme.typography
@@ -170,8 +170,8 @@ fun AnimatedListItem(tweet: Tweet, itemIndex: Int, animationIndex: Int) {
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Image(
-            painter = rememberCoilPainter(
-                request = "https://picsum.photos/id/${
+            painter = rememberImagePainter(
+                data = "https://picsum.photos/id/${
                     itemIndex +
                         1
                 }/200/200"
diff --git a/buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/Dependencies.kt
@@ -52,6 +52,7 @@ object Dependencies {
 
     const val coilAccompanist =
         "com.google.accompanist:accompanist-coil:${Versions.accompanistCoil}"
+    const val coilCompose = "io.coil-kt:coil-compose:${Versions.coilCompose}"
     const val lifecycleRuntimeKtx =
         "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycleRuntimeKtx}"
     const val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
diff --git a/buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/GroupedDependencies.kt b/buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/GroupedDependencies.kt
@@ -90,5 +90,6 @@ internal val androidInstrumentationTestsDependencies = listOf(
 
 internal val thirdPartyUiDependencies = listOf(
     Dependencies.coilAccompanist,
+    Dependencies.coilCompose,
     Dependencies.lottie
 )
diff --git a/buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/Versions.kt b/buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/Versions.kt
@@ -10,6 +10,7 @@ internal object Versions {
     const val lottieCompose = "1.0.0-beta03-1"
     const val fontAwesomeCompose = "1.0.0-beta02"
     const val accompanistCoil = "0.14.0"
+    const val coilCompose = "1.3.0"
     const val kotlin = "1.5.10"
     const val coroutine = "1.4.2"
     const val androidLifecycleGrouped = "2.2.0"
diff --git a/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/home/MoviewsHomeViewModel.kt b/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/home/MoviewsHomeViewModel.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
+@Suppress("UNCHECKED_CAST")
 class MoviesHomeViewModelFactory(val context: Context) : ViewModelProvider.Factory {
     override fun <T : ViewModel?> create(modelClass: Class<T>): T {
         return MoviesHomeViewModel(context) as T
diff --git a/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/home/components/MoviePagerItem.kt b/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/home/components/MoviePagerItem.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.google.accompanist.coil.rememberCoilPainter
+import coil.compose.rememberImagePainter
 import com.guru.composecookbook.moviesapp.data.DemoMovieDataProvider
 import com.guru.composecookbook.moviesapp.data.db.models.Genre
 import com.guru.composecookbook.moviesapp.data.db.models.Movie
@@ -78,7 +78,7 @@ fun MoviePagerItem(
     ) {
         Column {
             Image(
-                painter = rememberCoilPainter(request = posterFullPath),
+                painter = rememberImagePainter(data = posterFullPath),
                 contentScale = ContentScale.Crop,
                 contentDescription = null,
                 modifier = Modifier
diff --git a/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/trending/components/MoviesLaneItem.kt b/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/trending/components/MoviesLaneItem.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.coil.rememberCoilPainter
+import coil.compose.rememberImagePainter
 import com.guru.composecookbook.moviesapp.data.db.models.Movie
 import com.guru.composecookbook.theme.typography
 
@@ -33,8 +33,8 @@ fun MoviesLaneItem(movies: List<Movie>, title: String = "", onMovieSelected: (Mo
             items = movies,
             itemContent = { movie: Movie ->
                 Image(
-                    painter = rememberCoilPainter(
-                        request = "https://image.tmdb.org/t/p/w500/${movie.poster_path}"
+                    painter = rememberImagePainter(
+                        data = "https://image.tmdb.org/t/p/w500/${movie.poster_path}",
                     ),
                     contentDescription = null,
                     modifier = Modifier
diff --git a/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/watch/components/MovieWatchlistItem.kt b/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/watch/components/MovieWatchlistItem.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.coil.rememberCoilPainter
+import coil.compose.rememberImagePainter
 import com.guru.composecookbook.moviesapp.data.db.models.Movie
 import com.guru.composecookbook.theme.typography
 
@@ -28,8 +28,8 @@ fun MovieWatchlistItem(
 ) {
     Box(modifier = Modifier.clickable(onClick = onMovieSelected)) {
         Image(
-            painter = rememberCoilPainter(
-                request = "https://image.tmdb.org/t/p/original/${movie.backdrop_path}"
+            painter = rememberImagePainter(
+                data = "https://image.tmdb.org/t/p/original/${movie.backdrop_path}"
             ),
             contentDescription = null,
             modifier = Modifier
diff --git a/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/watch/components/WatchlistScreen.kt b/demos/moviesapp/app/src/main/java/com/guru/composecookbook/moviesapp/ui/watch/components/WatchlistScreen.kt
@@ -49,7 +49,8 @@ fun WatchlistScreen(moviesHomeInteractionEvents: (MoviesHomeInteractionEvents) -
                             )
                         }
                     )
-                })
+                }
+            )
         }
     }
 }
diff --git a/demos/tiktok/src/main/java/com/guru/composecookbook/tiktok/components/discovers/MediaItem.kt b/demos/tiktok/src/main/java/com/guru/composecookbook/tiktok/components/discovers/MediaItem.kt
@@ -8,16 +8,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.coil.rememberCoilPainter
+import coil.compose.rememberImagePainter
 
 @Composable
 fun MediaItem(
     id: Int,
     modifier: Modifier = Modifier
 ) {
     Image(
-        painter = rememberCoilPainter(
-            request = "https://picsum.photos/id/${id}/200/200"
+        painter = rememberImagePainter(
+            data = "https://picsum.photos/id/${id}/200/200"
         ),
         contentDescription = null,
         contentScale = ContentScale.Crop,
diff --git a/templates/login/src/main/java/com/guru/composecookbook/login/LoginScreen.kt b/templates/login/src/main/java/com/guru/composecookbook/login/LoginScreen.kt
@@ -262,4 +262,4 @@ fun LoginOnboarding() {
 }
 
 fun invalidInput(email: String, password: String) =
-    email.isNullOrBlank() || password.isNullOrBlank()
+    email.isBlank() || password.isBlank()
diff --git a/templates/profile/src/main/java/com/guru/composecookbook/profile/ProfileScreen.kt b/templates/profile/src/main/java/com/guru/composecookbook/profile/ProfileScreen.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp
 import com.guru.composecookbook.theme.gradientBluePurple
 import com.guru.composecookbook.theme.modifiers.horizontalGradientBackground
 
-const val initialimageFloat = 170f
+const val initialImageFloat = 170f
 const val name = "Gurupreet Singh"
 const val email = "gurpreet.usit@gmail.com"
 const val twitterUrl = "https://www.twitter.com/_gurupreet"
@@ -69,7 +69,7 @@ fun ProfileScreen() {
 
 @Composable
 fun TopAppBarView(scroll: Float) {
-    if (scroll > initialimageFloat + 5) {
+    if (scroll > initialImageFloat + 5) {
         TopAppBar(
             title = {
                 Text(text = name)
diff --git a/templates/profile/src/main/java/com/guru/composecookbook/profile/TopScrollingContent.kt b/templates/profile/src/main/java/com/guru/composecookbook/profile/TopScrollingContent.kt
@@ -23,7 +23,7 @@ import com.guru.composecookbook.theme.typography
 
 @Composable
 fun TopScrollingContent(scrollState: ScrollState) {
-    val visibilityChangeFloat = scrollState.value > initialimageFloat - 20
+    val visibilityChangeFloat = scrollState.value > initialImageFloat - 20
     Row {
         AnimatedImage(scroll = scrollState.value.toFloat())
         Column(
@@ -46,7 +46,7 @@ fun TopScrollingContent(scrollState: ScrollState) {
 
 @Composable
 fun AnimatedImage(scroll: Float) {
-    val dynamicAnimationSizeValue = (initialimageFloat - scroll).coerceIn(36f, initialimageFloat)
+    val dynamicAnimationSizeValue = (initialImageFloat - scroll).coerceIn(36f, initialImageFloat)
     Image(
         painter = painterResource(id = R.drawable.p1),
         contentScale = ContentScale.Crop,

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ fun DemoUIList() {`
`100`	`100`	`) {`
`101`	`101`	`Text(text = title, modifier = Modifier.padding(8.dp))`
`102`	`102`	`}`
`103`		`- })`
	`103`	`+ }`
	`104`	`+ )`
`104`	`105`	`}`
`105`	`106`	`}`
`106`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,6 @@ internal val androidInstrumentationTestsDependencies = listOf(`
`90`	`90`
`91`	`91`	`internal val thirdPartyUiDependencies = listOf(`
`92`	`92`	`Dependencies.coilAccompanist,`
	`93`	`+ Dependencies.coilCompose,`
`93`	`94`	`Dependencies.lottie`
`94`	`95`	`)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ fun WatchlistScreen(moviesHomeInteractionEvents: (MoviesHomeInteractionEvents) -`
`49`	`49`	`)`
`50`	`50`	`}`
`51`	`51`	`)`
`52`		`- })`
	`52`	`+ }`
	`53`	`+ )`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`