Skip to content

Commit a661310

Browse files
committed
chore: update coil-compose 2.0.0
1 parent 9143980 commit a661310

File tree

4 files changed

+29
-28
lines changed

4 files changed

+29
-28
lines changed

buildSrc/src/main/kotlin/Dep.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@ object Dep {
136136

137137
const val javaxInject = "javax.inject:javax.inject:1"
138138
const val timber = "com.jakewharton.timber:timber:5.0.1"
139-
const val coil = "io.coil-kt:coil-compose:1.4.0"
139+
const val coil = "io.coil-kt:coil-compose:2.0.0"
140140

141141
}

presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/detail/DetailScreen.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package io.github.shinhyo.brba.presentation.ui.detail
1717

18-
import androidx.compose.foundation.Image
1918
import androidx.compose.foundation.background
2019
import androidx.compose.foundation.layout.*
2120
import androidx.compose.foundation.lazy.LazyColumn
@@ -29,11 +28,13 @@ import androidx.compose.ui.Alignment
2928
import androidx.compose.ui.Modifier
3029
import androidx.compose.ui.graphics.Color
3130
import androidx.compose.ui.layout.ContentScale
31+
import androidx.compose.ui.platform.LocalContext
3232
import androidx.compose.ui.text.font.FontWeight
3333
import androidx.compose.ui.unit.dp
3434
import androidx.constraintlayout.compose.ConstraintLayout
3535
import androidx.constraintlayout.compose.Dimension
36-
import coil.compose.rememberImagePainter
36+
import coil.compose.AsyncImage
37+
import coil.request.ImageRequest
3738
import io.github.shinhyo.brba.domain.model.Character
3839
import io.github.shinhyo.brba.presentation.ui.common.IconFavorite
3940

@@ -52,13 +53,11 @@ private fun Body(character: Character, clickFavorite: (Character) -> Unit) {
5253
) {
5354
LazyColumn {
5455
item {
55-
Image(
56-
painter = rememberImagePainter(
57-
data = character.img,
58-
builder = {
59-
crossfade(true)
60-
}
61-
),
56+
AsyncImage(
57+
model = ImageRequest.Builder(LocalContext.current)
58+
.data(character.img)
59+
.crossfade(true)
60+
.build(),
6261
contentScale = ContentScale.Crop,
6362
contentDescription = character.name,
6463
alignment = Alignment.TopCenter,

presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/favorite/FavoriteScreen.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package io.github.shinhyo.brba.presentation.ui.favorite
1717

18-
import androidx.compose.foundation.Image
1918
import androidx.compose.foundation.background
2019
import androidx.compose.foundation.clickable
2120
import androidx.compose.foundation.layout.*
@@ -34,13 +33,15 @@ import androidx.compose.ui.Modifier
3433
import androidx.compose.ui.draw.clip
3534
import androidx.compose.ui.graphics.Color
3635
import androidx.compose.ui.layout.ContentScale
36+
import androidx.compose.ui.platform.LocalContext
3737
import androidx.compose.ui.res.painterResource
3838
import androidx.compose.ui.res.stringResource
3939
import androidx.compose.ui.text.font.FontWeight
4040
import androidx.compose.ui.unit.dp
4141
import androidx.constraintlayout.compose.ConstraintLayout
4242
import androidx.constraintlayout.compose.Dimension
43-
import coil.compose.rememberImagePainter
43+
import coil.compose.AsyncImage
44+
import coil.request.ImageRequest
4445
import io.github.shinhyo.brba.domain.model.Character
4546
import io.github.shinhyo.brba.presentation.R
4647
import io.github.shinhyo.brba.presentation.ui.common.IconFavorite
@@ -148,13 +149,11 @@ private fun ItemContent(
148149

149150
) {
150151
val (img, name, nickname, favorite) = createRefs()
151-
Image(
152-
painter = rememberImagePainter(
153-
data = item.img,
154-
builder = {
155-
crossfade(true)
156-
}
157-
),
152+
AsyncImage(
153+
model = ImageRequest.Builder(LocalContext.current)
154+
.data(item.img)
155+
.crossfade(true)
156+
.build(),
158157
contentDescription = null,
159158
contentScale = ContentScale.Crop,
160159
alignment = Alignment.TopCenter,

presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/list/ListScreen.kt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
*/
1616
package io.github.shinhyo.brba.presentation.ui.list
1717

18-
import androidx.compose.foundation.*
18+
import androidx.compose.foundation.ScrollState
19+
import androidx.compose.foundation.background
20+
import androidx.compose.foundation.clickable
1921
import androidx.compose.foundation.layout.*
22+
import androidx.compose.foundation.verticalScroll
2023
import androidx.compose.material.MaterialTheme
2124
import androidx.compose.material.Surface
2225
import androidx.compose.material.Text
@@ -27,6 +30,7 @@ import androidx.compose.ui.graphics.Brush
2730
import androidx.compose.ui.graphics.Color
2831
import androidx.compose.ui.layout.ContentScale
2932
import androidx.compose.ui.layout.Layout
33+
import androidx.compose.ui.platform.LocalContext
3034
import androidx.compose.ui.res.stringResource
3135
import androidx.compose.ui.text.font.FontWeight
3236
import androidx.compose.ui.text.style.TextAlign
@@ -35,7 +39,8 @@ import androidx.compose.ui.unit.dp
3539
import androidx.compose.ui.unit.sp
3640
import androidx.constraintlayout.compose.ConstraintLayout
3741
import androidx.constraintlayout.compose.Dimension
38-
import coil.compose.rememberImagePainter
42+
import coil.compose.AsyncImage
43+
import coil.request.ImageRequest
3944
import io.github.shinhyo.brba.domain.model.Character
4045
import io.github.shinhyo.brba.presentation.R
4146
import io.github.shinhyo.brba.presentation.ui.common.IconFavorite
@@ -114,13 +119,11 @@ fun FeaturedList(
114119
modifier = Modifier.clickable { select.invoke(character) }
115120
) {
116121
val (image, name, dim, favorite) = createRefs()
117-
Image(
118-
painter = rememberImagePainter(
119-
data = character.img,
120-
builder = {
121-
crossfade(true)
122-
}
123-
),
122+
AsyncImage(
123+
model = ImageRequest.Builder(LocalContext.current)
124+
.data(character.img)
125+
.crossfade(true)
126+
.build(),
124127
contentDescription = null,
125128
contentScale = ContentScale.Crop,
126129
modifier = Modifier

0 commit comments

Comments
 (0)