diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 6f59d9c..4fc9dee 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -17,7 +17,6 @@ dependencies { implementation(project(":core:model")) implementation(project(":core:common")) - implementation(libs.glide.compose) implementation(libs.kotlinx.datetime) implementation(libs.androidx.paging.compose) implementation(libs.coil.compose) diff --git a/core/ui/src/main/java/kr/toongether/ui/SeriesCard.kt b/core/ui/src/main/java/kr/toongether/ui/SeriesCard.kt index 5c9f03a..3680f24 100644 --- a/core/ui/src/main/java/kr/toongether/ui/SeriesCard.kt +++ b/core/ui/src/main/java/kr/toongether/ui/SeriesCard.kt @@ -22,11 +22,9 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.times import androidx.core.graphics.toColorInt -import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi -import com.bumptech.glide.integration.compose.GlideImage +import coil.compose.AsyncImage import kr.toongether.designsystem.theme.Shape -@OptIn(ExperimentalGlideComposeApi::class) @Composable fun SeriesCard( modifier: Modifier = Modifier, @@ -43,7 +41,7 @@ fun SeriesCard( .padding(4.dp) .clip(Shape.medium) ) { - GlideImage( + AsyncImage( modifier = modifier .fillMaxWidth() .onGloballyPositioned { @@ -79,7 +77,7 @@ fun SeriesCard( .height(63.dp) .align(Alignment.BottomCenter) ) { - GlideImage( + AsyncImage( modifier = modifier .width(titleWidth.dp) .align(Alignment.Center), diff --git a/core/ui/src/main/java/kr/toongether/ui/ShortsCard.kt b/core/ui/src/main/java/kr/toongether/ui/ShortsCard.kt index deb0417..a2fbacf 100644 --- a/core/ui/src/main/java/kr/toongether/ui/ShortsCard.kt +++ b/core/ui/src/main/java/kr/toongether/ui/ShortsCard.kt @@ -19,14 +19,12 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi -import com.bumptech.glide.integration.compose.GlideImage +import coil.compose.AsyncImage import kotlinx.datetime.LocalDateTime import kr.toongether.common.toRelativeDateTime import kr.toongether.designsystem.theme.Gray import kr.toongether.designsystem.theme.pretendard -@OptIn(ExperimentalGlideComposeApi::class) @Composable fun ShortsCard( profileImage: String?, @@ -57,7 +55,7 @@ fun ShortsCard( contentDescription = null ) } else { - GlideImage( + AsyncImage( modifier = modifier.size(35.dp), model = profileImage, contentDescription = null @@ -98,7 +96,7 @@ fun ShortsCard( Spacer(modifier = modifier.height(8.dp)) - GlideImage( + AsyncImage( modifier = modifier.fillMaxWidth(), model = thumbnail, contentDescription = null, diff --git a/feature/comic/build.gradle.kts b/feature/comic/build.gradle.kts index ddaf6ac..38822a8 100644 --- a/feature/comic/build.gradle.kts +++ b/feature/comic/build.gradle.kts @@ -8,6 +8,6 @@ android { } dependencies { - implementation(libs.glide.compose) + implementation(libs.coil.compose) implementation(libs.kotlinx.datetime) } diff --git a/feature/comic/src/main/java/kr/toongether/comic/ComicScreen.kt b/feature/comic/src/main/java/kr/toongether/comic/ComicScreen.kt index 9bf743e..47ccdce 100644 --- a/feature/comic/src/main/java/kr/toongether/comic/ComicScreen.kt +++ b/feature/comic/src/main/java/kr/toongether/comic/ComicScreen.kt @@ -35,8 +35,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi -import com.bumptech.glide.integration.compose.GlideImage +import coil.compose.AsyncImage import kr.toongether.designsystem.component.ToongetherScrollbar import kr.toongether.designsystem.component.ToongetherTopAppBar import kr.toongether.designsystem.icon.ToongetherIcons @@ -207,7 +206,6 @@ internal fun ComicScreen( } } -@OptIn(ExperimentalGlideComposeApi::class) @Composable private fun ComicItem( modifier: Modifier = Modifier, @@ -220,7 +218,7 @@ private fun ComicItem( .defaultMinSize(minHeight = height) .background(Color.Black) ) { - GlideImage( + AsyncImage( modifier = modifier .fillMaxWidth(), model = imageUrl, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 35f1cec..a236895 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,6 @@ androidxEspresso = "3.5.1" androidxTestExt = "1.1.5" androidxTestRules = "1.5.0" androidxTestRunner = "1.5.2" -glide = "1.0.0-alpha.1" hilt = "2.44.2" hiltExt = "1.0.0" junit4 = "4.13.2" @@ -68,7 +67,6 @@ androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espres androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" } androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" } androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } -glide-compose = { group = "com.github.bumptech.glide", name = "compose", version.ref = "glide" } hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" } hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }