Skip to content

Commit

Permalink
Update to coil 3.0.1 (#302)
Browse files Browse the repository at this point in the history
* Update to coil 2.7.0

* Update to coil 3.0.1

* Remove all codes for ImageUriProvider
  • Loading branch information
fornewid authored Nov 7, 2024
1 parent 6fffb28 commit 1325491
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 242 deletions.
29 changes: 19 additions & 10 deletions app/dependencies/releaseRuntimeClasspath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ androidx.activity:activity-compose:1.9.3
androidx.activity:activity-ktx:1.9.3
androidx.activity:activity:1.9.3
androidx.annotation:annotation-experimental:1.4.1
androidx.annotation:annotation-jvm:1.8.1
androidx.annotation:annotation:1.8.1
androidx.annotation:annotation-jvm:1.9.1
androidx.annotation:annotation:1.9.1
androidx.appcompat:appcompat-resources:1.7.0
androidx.appcompat:appcompat:1.7.0
androidx.arch.core:core-common:2.2.0
Expand Down Expand Up @@ -107,7 +107,7 @@ androidx.navigation:navigation-compose:2.8.3
androidx.navigation:navigation-runtime-ktx:2.8.3
androidx.navigation:navigation-runtime:2.8.3
androidx.print:print:1.0.0
androidx.profileinstaller:profileinstaller:1.3.1
androidx.profileinstaller:profileinstaller:1.4.1
androidx.resourceinspection:resourceinspection-annotation:1.0.1
androidx.room:room-common:2.6.1
androidx.room:room-ktx:2.6.1
Expand All @@ -126,7 +126,7 @@ androidx.viewpager:viewpager:1.0.0
androidx.window.extensions.core:core:1.0.0
androidx.window:window:1.3.0
androidx.work:work-runtime:2.10.0
com.google.accompanist:accompanist-drawablepainter:0.32.0
com.google.accompanist:accompanist-drawablepainter:0.36.0
com.google.android.datatransport:transport-api:3.2.0
com.google.android.datatransport:transport-backend-cct:3.3.0
com.google.android.datatransport:transport-runtime:3.3.0
Expand Down Expand Up @@ -161,20 +161,29 @@ com.google.firebase:firebase-sessions:2.0.6
com.google.guava:listenablefuture:1.0
com.jakewharton.timber:timber:5.0.1
com.squareup.okhttp3:okhttp:4.12.0
com.squareup.okio:okio-jvm:3.8.0
com.squareup.okio:okio:3.8.0
com.squareup.okio:okio-jvm:3.9.1
com.squareup.okio:okio:3.9.1
com.squareup.retrofit2:converter-kotlinx-serialization:2.11.0
com.squareup.retrofit2:retrofit:2.11.0
com.webtoonscorp.android:readmore-foundation:1.5.6
com.webtoonscorp.android:readmore-material:1.5.6
io.coil-kt:coil-base:2.6.0
io.coil-kt:coil-compose-base:2.6.0
io.coil-kt:coil-compose:2.6.0
io.coil-kt:coil:2.6.0
io.coil-kt.coil3:coil-android:3.0.1
io.coil-kt.coil3:coil-compose-android:3.0.1
io.coil-kt.coil3:coil-compose-core-android:3.0.1
io.coil-kt.coil3:coil-compose-core:3.0.1
io.coil-kt.coil3:coil-compose:3.0.1
io.coil-kt.coil3:coil-core-android:3.0.1
io.coil-kt.coil3:coil-core:3.0.1
io.coil-kt.coil3:coil-network-core-android:3.0.1
io.coil-kt.coil3:coil-network-core:3.0.1
io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.1
io.coil-kt.coil3:coil-network-okhttp:3.0.1
io.coil-kt.coil3:coil:3.0.1
io.github.fornewid:material-motion-compose-core:1.1.3
io.github.fornewid:photo-compose:1.0.1
jakarta.inject:jakarta.inject-api:2.0.1
javax.inject:javax.inject:1
org.jetbrains.compose.foundation:foundation:1.6.11
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
Expand Down
2 changes: 0 additions & 2 deletions core/imageloading/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ android {
}

dependencies {
implementation projects.core.kotlin

implementation libs.kotlin.stdlib

implementation libs.compose.foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.ui.graphics.FilterQuality
import androidx.compose.ui.graphics.drawscope.DrawScope.Companion.DefaultFilterQuality
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.layout.ContentScale
import coil.compose.AsyncImage
import coil3.compose.AsyncImage

@Composable
fun AsyncImage(
Expand All @@ -40,6 +40,7 @@ fun AsyncImage(
alpha: Float = DefaultAlpha,
colorFilter: ColorFilter? = null,
filterQuality: FilterQuality = DefaultFilterQuality,
clipToBounds: Boolean = true,
) {
AsyncImage(
model = model,
Expand All @@ -60,5 +61,6 @@ fun AsyncImage(
alpha = alpha,
colorFilter = colorFilter,
filterQuality = filterQuality,
clipToBounds = clipToBounds,
)
}

This file was deleted.

19 changes: 2 additions & 17 deletions core/imageloading/impl/build.gradle
Original file line number Diff line number Diff line change
@@ -1,32 +1,17 @@
plugins {
id "moop.android.library"
id "moop.android.hilt"
}

android {
namespace "soup.movie.core.imageloading.impl"
buildFeatures {
buildConfig true
}
buildTypes {
debug {
def filesAuthorityValue = 'soup.movie.debug.shareprovider'
buildConfigField 'String', 'FILES_AUTHORITY', "\"${filesAuthorityValue}\""
manifestPlaceholders = [filesAuthority: filesAuthorityValue]
}
release {
def filesAuthorityValue = 'soup.movie.shareprovider'
buildConfigField 'String', 'FILES_AUTHORITY', "\"${filesAuthorityValue}\""
manifestPlaceholders = [filesAuthority: filesAuthorityValue]
}
}
}

dependencies {
implementation projects.core.kotlin
implementation projects.core.imageloading.api

implementation libs.kotlin.stdlib

implementation libs.androidx.startup
implementation libs.coil.runtime
implementation libs.coil.okhttp
}
10 changes: 0 additions & 10 deletions core/imageloading/impl/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@
android:name="soup.movie.core.imageloading.impl.CoilInitializer"
android:value="androidx.startup" />
</provider>

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${filesAuthority}"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/coil_disk_cache_path" />
</provider>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,18 @@ package soup.movie.core.imageloading.impl

import android.content.Context
import androidx.startup.Initializer
import coil.Coil
import coil.ImageLoader
import coil3.ImageLoader
import coil3.SingletonImageLoader
import coil3.request.crossfade

class CoilInitializer : Initializer<Unit> {

override fun create(context: Context) {
val imageLoader = ImageLoader.Builder(context)
.crossfade(true)
.build()
Coil.setImageLoader(imageLoader)
SingletonImageLoader.setSafe {
ImageLoader.Builder(context)
.crossfade(true)
.build()
}
}

override fun dependencies(): List<Class<out Initializer<*>>> {
Expand Down

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions core/imageloading/impl/src/main/res/xml/coil_disk_cache_path.xml

This file was deleted.

Loading

0 comments on commit 1325491

Please sign in to comment.