diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ab77d0fc..2a4ba370 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,6 @@ if (useKeystoreProperties) { plugins { id("com.android.application") kotlin("android") - id("com.google.devtools.ksp") id("androidx.navigation.safeargs") id("kotlin-parcelize") } @@ -90,7 +89,7 @@ dependencies { implementation("androidx.core:core-ktx:1.13.0") implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.activity:activity-ktx:1.8.2") + implementation("androidx.activity:activity-ktx:1.9.0") implementation("androidx.fragment:fragment-ktx:1.6.2") implementation("androidx.navigation:navigation-fragment-ktx:2.7.7") implementation("androidx.navigation:navigation-ui-ktx:2.7.7") @@ -109,7 +108,5 @@ dependencies { implementation("androidx.lifecycle:lifecycle-viewmodel:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion") - val glideVersion = "4.16.0" - implementation("com.github.bumptech.glide:glide:$glideVersion") - ksp("com.github.bumptech.glide:ksp:$glideVersion") + implementation("io.coil-kt:coil:2.6.0") } diff --git a/app/src/main/java/app/grapheneos/apps/ui/PackageListAdapter.kt b/app/src/main/java/app/grapheneos/apps/ui/PackageListAdapter.kt index 35715507..1034fc8e 100644 --- a/app/src/main/java/app/grapheneos/apps/ui/PackageListAdapter.kt +++ b/app/src/main/java/app/grapheneos/apps/ui/PackageListAdapter.kt @@ -18,8 +18,8 @@ import app.grapheneos.apps.core.PackageState import app.grapheneos.apps.core.ReleaseChannel import app.grapheneos.apps.databinding.PackageListItemBinding import app.grapheneos.apps.util.maybeSetText -import com.bumptech.glide.Glide -import com.bumptech.glide.load.resource.bitmap.RoundedCorners +import coil.load +import coil.transform.RoundedCornersTransformation class ViewBindingVH(val binding: T) : ViewHolder(binding.root) @@ -78,12 +78,10 @@ fun PackageListItemBinding.set(fragment: Fragment, pkgState: PackageState) { val iconUrl = rPackage.common.iconUrl if (iconUrl != null && pkgIcon.tag != iconUrl) { - Glide.with(fragment) - .load(iconUrl) - .placeholder(R.drawable.ic_placeholder_app_icon) - .centerInside() - .transform(RoundedCorners(20)) - .into(pkgIcon) + pkgIcon.load(iconUrl) { + transformations(RoundedCornersTransformation(20f)) + placeholder(R.drawable.ic_placeholder_app_icon) + } } if (iconUrl == null) { diff --git a/build.gradle.kts b/build.gradle.kts index 164b9f14..cf6afa52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,6 @@ plugins { id("com.android.application") version "8.3.2" apply false id("org.jetbrains.kotlin.android") version "1.9.23" apply false id("androidx.navigation.safeargs") version "2.7.7" apply false - id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false } allprojects { diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 270c6184..ce41712f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -10,20 +10,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -52,6 +52,11 @@ + + + + + @@ -73,6 +78,14 @@ + + + + + + + + @@ -131,6 +144,19 @@ + + + + + + + + + + + + + @@ -139,6 +165,14 @@ + + + + + + + + @@ -285,6 +319,14 @@ + + + + + + + + @@ -552,12 +594,20 @@ - - - + + + - - + + + + + + + + + + @@ -1113,46 +1163,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1245,59 +1255,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1499,6 +1456,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1595,6 +1576,22 @@ + + + + + + + + + + + + + + + + @@ -2394,6 +2391,22 @@ + + + + + + + + + + + + + + + + @@ -2418,6 +2431,22 @@ + + + + + + + + + + + + + + + +