Skip to content

Commit

Permalink
replace deprecated accompanist coil with coil compose (Gurupreet#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
wiryadev authored Jul 16, 2021
1 parent 6f025e1 commit 112ac68
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ fun DemoUIList() {
) {
Text(text = title, modifier = Modifier.padding(8.dp))
}
})
}
)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,6 @@ internal val androidInstrumentationTestsDependencies = listOf(

internal val thirdPartyUiDependencies = listOf(
Dependencies.coilAccompanist,
Dependencies.coilCompose,
Dependencies.lottie
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -78,7 +78,7 @@ fun MoviePagerItem(
) {
Column {
Image(
painter = rememberCoilPainter(request = posterFullPath),
painter = rememberImagePainter(data = posterFullPath),
contentScale = ContentScale.Crop,
contentDescription = null,
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ fun WatchlistScreen(moviesHomeInteractionEvents: (MoviesHomeInteractionEvents) -
)
}
)
})
}
)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,4 +262,4 @@ fun LoginOnboarding() {
}

fun invalidInput(email: String, password: String) =
email.isNullOrBlank() || password.isNullOrBlank()
email.isBlank() || password.isBlank()
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "[email protected]"
const val twitterUrl = "https://www.twitter.com/_gurupreet"
Expand Down Expand Up @@ -69,7 +69,7 @@ fun ProfileScreen() {

@Composable
fun TopAppBarView(scroll: Float) {
if (scroll > initialimageFloat + 5) {
if (scroll > initialImageFloat + 5) {
TopAppBar(
title = {
Text(text = name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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,
Expand Down

0 comments on commit 112ac68

Please sign in to comment.