Skip to content

Commit c656f2d

Browse files
t895t895
committed
Replace Glide with Coil
1 parent a274656 commit c656f2d

File tree

4 files changed

+47
-106
lines changed

4 files changed

+47
-106
lines changed

‎app/build.gradle.kts

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ if (useKeystoreProperties) {
1111
plugins {
1212
id("com.android.application")
1313
kotlin("android")
14-
id("com.google.devtools.ksp")
1514
id("androidx.navigation.safeargs")
1615
id("kotlin-parcelize")
1716
}
@@ -109,7 +108,5 @@ dependencies {
109108
implementation("androidx.lifecycle:lifecycle-viewmodel:$lifecycleVersion")
110109
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
111110

112-
val glideVersion = "4.16.0"
113-
implementation("com.github.bumptech.glide:glide:$glideVersion")
114-
ksp("com.github.bumptech.glide:ksp:$glideVersion")
111+
implementation("io.coil-kt:coil:2.6.0")
115112
}

‎app/src/main/java/app/grapheneos/apps/ui/PackageListAdapter.kt

+6-8
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import app.grapheneos.apps.core.PackageState
1818
import app.grapheneos.apps.core.ReleaseChannel
1919
import app.grapheneos.apps.databinding.PackageListItemBinding
2020
import app.grapheneos.apps.util.maybeSetText
21-
import com.bumptech.glide.Glide
22-
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
21+
import coil.load
22+
import coil.transform.RoundedCornersTransformation
2323

2424
class ViewBindingVH<T : ViewBinding>(val binding: T) : ViewHolder(binding.root)
2525

@@ -78,12 +78,10 @@ fun PackageListItemBinding.set(fragment: Fragment, pkgState: PackageState) {
7878

7979
val iconUrl = rPackage.common.iconUrl
8080
if (iconUrl != null && pkgIcon.tag != iconUrl) {
81-
Glide.with(fragment)
82-
.load(iconUrl)
83-
.placeholder(R.drawable.ic_placeholder_app_icon)
84-
.centerInside()
85-
.transform(RoundedCorners(20))
86-
.into(pkgIcon)
81+
pkgIcon.load(iconUrl) {
82+
transformations(RoundedCornersTransformation(20f))
83+
placeholder(R.drawable.ic_placeholder_app_icon)
84+
}
8785
}
8886

8987
if (iconUrl == null) {

‎build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id("com.android.application") version "8.3.2" apply false
33
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
44
id("androidx.navigation.safeargs") version "2.7.7" apply false
5-
id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false
65
}
76

87
allprojects {

‎gradle/verification-metadata.xml

+40-93
Original file line numberDiff line numberDiff line change
@@ -1113,46 +1113,6 @@
11131113
<sha512 value="dc334a1622202206a9c2e2703bf0e53ab3a27010a22022b95adb37061d49f8e881d8eebdb60ddcae4d119c4457ceebfc1a1110cdc1b8ae72deab84aeea991f25" origin="Generated by Gradle"/>
11141114
</artifact>
11151115
</component>
1116-
<component group="com.github.bumptech.glide" name="annotations" version="4.16.0">
1117-
<artifact name="annotations-4.16.0.jar">
1118-
<sha512 value="4f0a89fa84ef35c7d636a142e849b78e7ac80cd9a6f47fa6d73b5f7110db369fcc4e18c1c6af650a343fa70e347af6f9a73084c12c59112c195aeb828ea557c0" origin="Generated by Gradle"/>
1119-
</artifact>
1120-
<artifact name="annotations-4.16.0.module">
1121-
<sha512 value="468ff3d21a277fccccee6e3c6113d9390260fa9b6e4ac12eea86d9e3f4c0daf122ba25caadc18c0cd942281b4a70324ff0b810a88a0f13eb7c939832102f21ec" origin="Generated by Gradle"/>
1122-
</artifact>
1123-
</component>
1124-
<component group="com.github.bumptech.glide" name="disklrucache" version="4.16.0">
1125-
<artifact name="disklrucache-4.16.0.jar">
1126-
<sha512 value="a167124e4c59325ae01c5cb0a90d418dd16e428af5c96533ec4871394cf1d793149e2b027e328ed30af855d98e60192f1acff74e70f5b68c0c1af98ad993f9c4" origin="Generated by Gradle"/>
1127-
</artifact>
1128-
<artifact name="disklrucache-4.16.0.pom">
1129-
<sha512 value="08f4d9c3f69fc6ce45feadf2e8b2186ad7bedd8f20dfb6a0660137a5fcc6a7ba89cbe4d2ef09a6b5f2cd184164d604c896f2b7907c5e6e4f5cfdd8111c3a2b08" origin="Generated by Gradle"/>
1130-
</artifact>
1131-
</component>
1132-
<component group="com.github.bumptech.glide" name="gifdecoder" version="4.16.0">
1133-
<artifact name="gifdecoder-4.16.0.aar">
1134-
<sha512 value="bfdd119584205f2ecee6599395af9a74a78407256f2b895141485150d2024fcf3cb22e4c6dba054fa1d04d483b624cd1fb3ea7ebb7cf7f1343dc77fd9cccb3f8" origin="Generated by Gradle"/>
1135-
</artifact>
1136-
<artifact name="gifdecoder-4.16.0.pom">
1137-
<sha512 value="404f6170e8dc0c0c3d034a378541013b365713569ef85787a56ab94cdce18ece00193e2f37f3d2a4cdea0aba3b59722ed7dcf00e794bc58a2e21a8667afdd57c" origin="Generated by Gradle"/>
1138-
</artifact>
1139-
</component>
1140-
<component group="com.github.bumptech.glide" name="glide" version="4.16.0">
1141-
<artifact name="glide-4.16.0.aar">
1142-
<sha512 value="619168f28cd14593e82e9124f94a7db8da890868d65b409f15bb264716fc02c423e1c82217d5559b9b16dad7fbfd36f2332cbfed37e04e2be42d4bf07a0dca6b" origin="Generated by Gradle"/>
1143-
</artifact>
1144-
<artifact name="glide-4.16.0.pom">
1145-
<sha512 value="34875c6d76a0ade9bdf80d83067a0638b6f2d5e1429a470ae1bc2d3b0e1c3d0e48991d6a9315c3ba0356877ba068e5a7d5161211c93ed6e6ffbd96ebb8b9fc23" origin="Generated by Gradle"/>
1146-
</artifact>
1147-
</component>
1148-
<component group="com.github.bumptech.glide" name="ksp" version="4.16.0">
1149-
<artifact name="ksp-4.16.0.jar">
1150-
<sha512 value="39fc556cd0dee89ff1604726a2149b206fd3fbbe08a01d1d0fc1d7a1207486ea91aae280b65072f1179bf71db066b79fed9e09fde4543728110022f12ef97c39" origin="Generated by Gradle"/>
1151-
</artifact>
1152-
<artifact name="ksp-4.16.0.module">
1153-
<sha512 value="76f33142458caa02a6c954d25cd2dba5a7ee83e3023cdf1d066df1bc7b7808fa5c0309805da03f3e45e6dd778860946cebb77e03b2cc4b44d1935b3c9bb33939" origin="Generated by Gradle"/>
1154-
</artifact>
1155-
</component>
11561116
<component group="com.google.android" name="annotations" version="4.1.1.4">
11571117
<artifact name="annotations-4.1.1.4.jar">
11581118
<sha512 value="530bfa9e7aea7b2dc2e8776f083705f12772045f6f4bbe235a1c3e97646bd0b0a367358aab0f129058d1899573f4bce97d7db3dfff96dfdabc99377c5d837222" origin="Generated by Gradle"/>
@@ -1245,59 +1205,6 @@
12451205
<sha512 value="51cd57eec1b311890e7d7fb3706a7202f7fcb2252e91f8979800f48225ce8cfd429811c95c9ea05d3a7fb6519a61279604dc6c1d27666da10d8a6d61747477de" origin="Generated by Gradle"/>
12461206
</artifact>
12471207
</component>
1248-
<component group="com.google.devtools.ksp" name="com.google.devtools.ksp.gradle.plugin" version="1.9.23-1.0.20">
1249-
<artifact name="com.google.devtools.ksp.gradle.plugin-1.9.23-1.0.20.pom">
1250-
<sha512 value="b7a2d97dda842bb1c304fa7dc94bb1aaba731125a217445b7d378d6aa2a336a622115573dec08167097a68bbe5345d1691a4a9d7f1cd81d7349d762606003a11" origin="Generated by Gradle"/>
1251-
</artifact>
1252-
</component>
1253-
<component group="com.google.devtools.ksp" name="symbol-processing" version="1.9.23-1.0.20">
1254-
<artifact name="symbol-processing-1.9.23-1.0.20.jar">
1255-
<sha512 value="32e221a50feef3403c623bb8efcf687e923ed15032159e863b324705fd51edac0663a5808e413a394a573b478a8c2bb444a07b4145fef598749d6bd0ff6dd335" origin="Generated by Gradle"/>
1256-
</artifact>
1257-
<artifact name="symbol-processing-1.9.23-1.0.20.pom">
1258-
<sha512 value="e56ab28032fedae6793f6cc7ba571c964f0f5409ba4d443359673da93fd16ba1a533a398e348a8a3e0fb7268a5dae96c9a2710642ced5794a12ebbc7af651d93" origin="Generated by Gradle"/>
1259-
</artifact>
1260-
</component>
1261-
<component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.7.0-1.0.6">
1262-
<artifact name="symbol-processing-api-1.7.0-1.0.6.jar">
1263-
<sha512 value="6c19939b007235943f5d214cee9a43b7e68a649b54e253b9b2ecba8e2d5eade9ed0563626122cf13c9424e3517b1a3ce04648eae69b8c606dc8b36efbade5b86" origin="Generated by Gradle"/>
1264-
</artifact>
1265-
<artifact name="symbol-processing-api-1.7.0-1.0.6.module">
1266-
<sha512 value="106b06fa01438887fc10a5e65e6b75ede46f3900f36d59ea1e5d29d01ffc103293a93979407349a11f285abd7381b6e0ad4eadc95bf12081e81848142b87649b" origin="Generated by Gradle"/>
1267-
</artifact>
1268-
</component>
1269-
<component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.9.23-1.0.20">
1270-
<artifact name="symbol-processing-api-1.9.23-1.0.20.jar">
1271-
<sha512 value="5d83bee781aec4c8b562bc278ea39c1341d8d19a3ba84f3fdf94788be11a2310d4814e5e63b045305fae0750d72208ddab9a5d3901f17b5c18cd6494c6d88af5" origin="Generated by Gradle"/>
1272-
</artifact>
1273-
<artifact name="symbol-processing-api-1.9.23-1.0.20.module">
1274-
<sha512 value="fbce72dde74a67ba50f0532dcc07c77c9c4bd334fff5299599be23e0e7abd7d0a70b157ed66c4664f375f137708ded6ff38a47f50a658caa32c3e7f540e41fb0" origin="Generated by Gradle"/>
1275-
</artifact>
1276-
</component>
1277-
<component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="1.9.23-1.0.20">
1278-
<artifact name="symbol-processing-cmdline-1.9.23-1.0.20.jar">
1279-
<sha512 value="69967a3c488f03bc69fd7391980d4de48a263ea059d2ccc1bcd3e2bb9ef6d5bd6befe439c7e24c8f25da0ffb8cb62a749491d92d3584f350a30ed2e8832c0bfe" origin="Generated by Gradle"/>
1280-
</artifact>
1281-
<artifact name="symbol-processing-cmdline-1.9.23-1.0.20.pom">
1282-
<sha512 value="4d4f46b0d5e0641b0aa8c2d17a67d65721bc64575c155cd5edd046dc7475b641b0db31b88fc92f6ef2e22c703a8fdffe8f0983a607d553699689fac793e4c30e" origin="Generated by Gradle"/>
1283-
</artifact>
1284-
</component>
1285-
<component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="1.9.23-1.0.20">
1286-
<artifact name="symbol-processing-common-deps-1.9.23-1.0.20.jar">
1287-
<sha512 value="9de47fefae1e8b5b4f5de3aeea334e6a118028f65a8f195aa9755b5c32cf53a4e9cf9c4f467e5ddac35fc7ba67705d3d16b85ae274a6dbe90168fa50651056bc" origin="Generated by Gradle"/>
1288-
</artifact>
1289-
<artifact name="symbol-processing-common-deps-1.9.23-1.0.20.module">
1290-
<sha512 value="5e11cfe5ec9b37c00a3efec934e546c66d42a5f26acc390c071bfe5f738f9101e83342b7dee2a4d455dadb45259e4e295e0dd739c4bb79e8d88dab06f6b19b36" origin="Generated by Gradle"/>
1291-
</artifact>
1292-
</component>
1293-
<component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="1.9.23-1.0.20">
1294-
<artifact name="symbol-processing-gradle-plugin-1.9.23-1.0.20.jar">
1295-
<sha512 value="f62f08f9008220aca2abc75c14eb30ea8119928f61a5ca5eaa453d87a87b34864ee7420a4ba22a3b3628c7cc2e30f7b8b580a2be504be5b07b0def805574bd23" origin="Generated by Gradle"/>
1296-
</artifact>
1297-
<artifact name="symbol-processing-gradle-plugin-1.9.23-1.0.20.module">
1298-
<sha512 value="f62f3ce7405300d65d4bf208f17b3199fb409bf2da8fed38a9a6ea20570ec1d63b7b0f923e71ff55e586dfc828d9ec12a9a05dc8ac933f10c891fe86382e00c9" origin="Generated by Gradle"/>
1299-
</artifact>
1300-
</component>
13011208
<component group="com.google.errorprone" name="error_prone_annotations" version="2.11.0">
13021209
<artifact name="error_prone_annotations-2.11.0.pom">
13031210
<sha512 value="6d405d36bc10042af42b8f414fe269c23e3fa1bf154799ad06d6c623dcdd380ca8417ca4f3b7e942a14305ab97418c134ca9cdce653ad91d55b2c4d146b72e1c" origin="Generated by Gradle"/>
@@ -1499,6 +1406,30 @@
14991406
<sha512 value="a8f4813a20e68e5e2adcef0193e69decaba9f097a6c58c40e421ebb779c458aa286ad908c56b5e7b86947465688d66f2f094a1957e7ea035a5f38a78a4a511ca" origin="Generated by Gradle"/>
15001407
</artifact>
15011408
</component>
1409+
<component group="com.squareup.okhttp3" name="okhttp" version="4.12.0">
1410+
<artifact name="okhttp-4.12.0.jar">
1411+
<sha512 value="da63f77c1cae377b40f6fd00cfbbe8177e760e4e622ae2c66860fffd3bbbdf605c8e8e415762e9263445b2289ee834100237c63949f2e01c30b6704315dd8f7b" origin="Generated by Gradle"/>
1412+
</artifact>
1413+
<artifact name="okhttp-4.12.0.module">
1414+
<sha512 value="650297e5804bfbd9878179cfd3e3538bb4e1fc0cc3f9b4690b36853d6c8942b27c429cf67d076c26c4757c22203bd891576d4343760dc0898276ef0b9d3192a0" origin="Generated by Gradle"/>
1415+
</artifact>
1416+
</component>
1417+
<component group="com.squareup.okio" name="okio" version="3.8.0">
1418+
<artifact name="okio-3.8.0.module">
1419+
<sha512 value="3e5bbf0b0900b216748207408c1bb5aa8a0ac7c78f98eb76c5fb4dfd9abc262bff958ffcf0cff5388bc05014a6ae331aa67f851074d425f6779582d82462900c" origin="Generated by Gradle"/>
1420+
</artifact>
1421+
<artifact name="okio-metadata-3.8.0.jar">
1422+
<sha512 value="d43ce1ff08e88b892e624b5e81c61a6bcaf0df80e55272a56a36c664338bce39666bd8be5fbbf3ae143ca0321deb7d207b8efe08206495ada15f4cc87a503d38" origin="Generated by Gradle"/>
1423+
</artifact>
1424+
</component>
1425+
<component group="com.squareup.okio" name="okio-jvm" version="3.8.0">
1426+
<artifact name="okio-jvm-3.8.0.jar">
1427+
<sha512 value="41b1ec8f0393f761570be3811ece823f4d4a84d1535b275c07b18d6303e4e762b12717508498b28481115b5983fb60f7bdaca46a51149bb08dd0c6f106d07ae2" origin="Generated by Gradle"/>
1428+
</artifact>
1429+
<artifact name="okio-jvm-3.8.0.module">
1430+
<sha512 value="b8e3d5ea6ff9461cfc918a68a867c8bda001c7a6fefb0dc91d142667cab9244ff4b85391855ae5d2f0db509b6d061aa846043556e37ab545cd65f2d66191b6a9" origin="Generated by Gradle"/>
1431+
</artifact>
1432+
</component>
15021433
<component group="com.sun.activation" name="all" version="1.2.0">
15031434
<artifact name="all-1.2.0.pom">
15041435
<sha512 value="9efe921f24ff6f0e5713f3e327b0029ddaba7bf7da93738ca04f80ccad2f0a26870195ba7eb990d8a026daedd83daf8042137cce9cd71ffeef12ddc329e3163d" origin="Generated by Gradle"/>
@@ -1595,6 +1526,22 @@
15951526
<sha512 value="75bef548eea62ab04569791f2fdeed3d0a61edae0534aa035a905dc1d011988fc0f06f52bde377f44e94e6afd4380197148120b152b7a4d20628fb6236cc7261" origin="Generated by Gradle"/>
15961527
</artifact>
15971528
</component>
1529+
<component group="io.coil-kt" name="coil" version="2.6.0">
1530+
<artifact name="coil-2.6.0.aar">
1531+
<sha512 value="fbfdb1574819a01ec3428349a1eaca76046669a3470ba9c1fa0c463d33607d26b482549155f0fb161db307950f6e52d523636e8043c456252418a92ae9b93c1f" origin="Generated by Gradle"/>
1532+
</artifact>
1533+
<artifact name="coil-2.6.0.module">
1534+
<sha512 value="e5706cfe4a7f3e618d805865257d006b15ec93f320e0da7a2787cf8311e9063595f8c3032020dae5d3ac793a059026dd5977a738f2d5fdee81b1cec3f45a5675" origin="Generated by Gradle"/>
1535+
</artifact>
1536+
</component>
1537+
<component group="io.coil-kt" name="coil-base" version="2.6.0">
1538+
<artifact name="coil-base-2.6.0.aar">
1539+
<sha512 value="753953d9b87db3ccf9ed9cc9d2c1c3a481420eae97fc73298a19eb198d8f8ccc98b9944214207ef2a72c69f9102209d9858586665a388762ffec113a3710420e" origin="Generated by Gradle"/>
1540+
</artifact>
1541+
<artifact name="coil-base-2.6.0.module">
1542+
<sha512 value="76b545e6273ad09ee77ae85ac7d3ef27e1e050ac7a244cdfc431939569a400e3edea3c49a000cabc051373a93e815635fed3c81c151aa49c7c476084b44a1607" origin="Generated by Gradle"/>
1543+
</artifact>
1544+
</component>
15981545
<component group="io.grpc" name="grpc-api" version="1.57.0">
15991546
<artifact name="grpc-api-1.57.0.jar">
16001547
<sha512 value="5824f05b82b83bf815c8d8499a620246622f9889308c1bbba1378e6ff17e0fb5eec7327c57d96a8e4cef74d089d7354265bfa0f5db04d0bbf856efa29c414f5b" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)