Skip to content

Commit 6df714f

Browse files
committed
chore: update coil-compose 2.0.0
1 parent 04cf71f commit 6df714f

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
@@ -135,6 +135,6 @@ object Dep {
135135

136136
const val javaxInject = "javax.inject:javax.inject:1"
137137
const val timber = "com.jakewharton.timber:timber:5.0.1"
138-
const val coil = "io.coil-kt:coil-compose:1.4.0"
138+
const val coil = "io.coil-kt:coil-compose:2.0.0"
139139

140140
}

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.*
@@ -33,13 +32,15 @@ import androidx.compose.ui.Modifier
3332
import androidx.compose.ui.draw.clip
3433
import androidx.compose.ui.graphics.Color
3534
import androidx.compose.ui.layout.ContentScale
35+
import androidx.compose.ui.platform.LocalContext
3636
import androidx.compose.ui.res.painterResource
3737
import androidx.compose.ui.res.stringResource
3838
import androidx.compose.ui.text.font.FontWeight
3939
import androidx.compose.ui.unit.dp
4040
import androidx.constraintlayout.compose.ConstraintLayout
4141
import androidx.constraintlayout.compose.Dimension
42-
import coil.compose.rememberImagePainter
42+
import coil.compose.AsyncImage
43+
import coil.request.ImageRequest
4344
import io.github.shinhyo.brba.domain.model.Character
4445
import io.github.shinhyo.brba.presentation.R
4546
import io.github.shinhyo.brba.presentation.ui.common.IconFavorite
@@ -123,13 +124,11 @@ private fun ItemContent(
123124

124125
) {
125126
val (img, name, nickname, favorite) = createRefs()
126-
Image(
127-
painter = rememberImagePainter(
128-
data = item.img,
129-
builder = {
130-
crossfade(true)
131-
}
132-
),
127+
AsyncImage(
128+
model = ImageRequest.Builder(LocalContext.current)
129+
.data(item.img)
130+
.crossfade(true)
131+
.build(),
133132
contentDescription = null,
134133
contentScale = ContentScale.Crop,
135134
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
@@ -28,6 +31,7 @@ import androidx.compose.ui.graphics.Brush
2831
import androidx.compose.ui.graphics.Color
2932
import androidx.compose.ui.layout.ContentScale
3033
import androidx.compose.ui.layout.Layout
34+
import androidx.compose.ui.platform.LocalContext
3135
import androidx.compose.ui.res.stringResource
3236
import androidx.compose.ui.text.font.FontWeight
3337
import androidx.compose.ui.text.style.TextAlign
@@ -36,7 +40,8 @@ import androidx.compose.ui.unit.dp
3640
import androidx.compose.ui.unit.sp
3741
import androidx.constraintlayout.compose.ConstraintLayout
3842
import androidx.constraintlayout.compose.Dimension
39-
import coil.compose.rememberImagePainter
43+
import coil.compose.AsyncImage
44+
import coil.request.ImageRequest
4045
import io.github.shinhyo.brba.domain.model.Character
4146
import io.github.shinhyo.brba.presentation.R
4247
import io.github.shinhyo.brba.presentation.ui.common.IconFavorite
@@ -106,13 +111,11 @@ fun FeaturedList(
106111
modifier = Modifier.clickable { select.invoke(character) }
107112
) {
108113
val (image, name, dim, favorite) = createRefs()
109-
Image(
110-
painter = rememberImagePainter(
111-
data = character.img,
112-
builder = {
113-
crossfade(true)
114-
}
115-
),
114+
AsyncImage(
115+
model = ImageRequest.Builder(LocalContext.current)
116+
.data(character.img)
117+
.crossfade(true)
118+
.build(),
116119
contentDescription = null,
117120
contentScale = ContentScale.Crop,
118121
modifier = Modifier

0 commit comments

Comments
 (0)