Aperture: Switch to coil3

Removes unused okhttp dep

Change-Id: Ib1e68cd27b6a25476560425bf28a3133ce205bc7

app/Android.bp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
+// SPDX-FileCopyrightText: 2022-2025 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -48,8 +48,10 @@ android_app {
         "androidx.preference_preference",
         "com.google.android.material_material",
         "Aperture_com.google.zxing_core",
-        "Aperture_io.coil-kt_coil",
-        "Aperture_io.coil-kt_coil-video",
+        "Aperture_io.coil-kt.coil3_coil",
+        "Aperture_io.coil-kt.coil3_coil-android",
+        "Aperture_io.coil-kt.coil3_coil-core-android",
+        "Aperture_io.coil-kt.coil3_coil-video",
         "Aperture_io.github.zxing-cpp_android",
         "kotlin-stdlib-jdk8",
     ],

app/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022-2025 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -115,8 +115,8 @@ dependencies {
     implementation("io.github.zxing-cpp:android:2.2.0")
 
     // Coil
-    implementation("io.coil-kt:coil:2.4.0")
-    implementation("io.coil-kt:coil-video:2.4.0")
+    implementation("io.coil-kt.coil3:coil:3.0.4")
+    implementation("io.coil-kt.coil3:coil-video:3.0.4")
 }
 
 configure<GenerateBpPluginExtension> {

app/libs/Android.bp

@@ -619,181 +619,178 @@ java_library_static {
     ],
 }
 
-java_import {
-    name: "Aperture_com.squareup.okhttp3_okhttp-nodeps",
-    jars: ["com/squareup/okhttp3/okhttp/4.11.0/okhttp-4.11.0.jar"],
+java_library_static {
+    name: "Aperture_com.squareup.okio_okio",
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    static_libs: [
+        "Aperture_com.squareup.okio_okio-jvm",
+    ],
 }
 
-java_library_static {
-    name: "Aperture_com.squareup.okhttp3_okhttp",
+java_import {
+    name: "Aperture_com.squareup.okio_okio-jvm-nodeps",
+    jars: ["com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.jar"],
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    static_libs: [
-        "Aperture_com.squareup.okhttp3_okhttp-nodeps",
-        "Aperture_com.squareup.okio_okio",
-        "kotlin-stdlib",
-        "kotlin-stdlib-jdk8",
-    ],
 }
 
 java_library_static {
-    name: "Aperture_com.squareup.okio_okio",
+    name: "Aperture_com.squareup.okio_okio-jvm",
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Aperture_com.squareup.okio_okio-jvm",
+        "Aperture_com.squareup.okio_okio-jvm-nodeps",
+        "kotlin-stdlib",
     ],
 }
 
-java_import {
-    name: "Aperture_com.squareup.okio_okio-jvm-nodeps",
-    jars: ["com/squareup/okio/okio-jvm/3.3.0/okio-jvm-3.3.0.jar"],
+java_library_static {
+    name: "Aperture_io.coil-kt.coil3_coil",
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    static_libs: [
+        "Aperture_io.coil-kt.coil3_coil-android",
+    ],
 }
 
-java_library_static {
-    name: "Aperture_com.squareup.okio_okio-jvm",
+android_library_import {
+    name: "Aperture_io.coil-kt.coil3_coil-android-nodeps",
+    aars: ["io/coil-kt/coil3/coil-android/3.0.4/coil-release.aar"],
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Aperture_com.squareup.okio_okio-jvm-nodeps",
-        "kotlin-stdlib-jdk8",
+        "Aperture_io.coil-kt.coil3_coil-core",
+        "kotlin-stdlib",
     ],
 }
 
-android_library_import {
-    name: "Aperture_io.coil-kt_coil-nodeps",
-    aars: ["io/coil-kt/coil/2.4.0/coil-2.4.0.aar"],
+android_library {
+    name: "Aperture_io.coil-kt.coil3_coil-android",
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    manifest: "io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml",
     static_libs: [
-        "Aperture_io.coil-kt_coil-base",
-        "kotlin-stdlib-jdk8",
+        "Aperture_io.coil-kt.coil3_coil-android-nodeps",
+        "Aperture_io.coil-kt.coil3_coil-core",
+        "kotlin-stdlib",
     ],
 }
 
-android_library {
-    name: "Aperture_io.coil-kt_coil",
+java_library_static {
+    name: "Aperture_io.coil-kt.coil3_coil-core",
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "io/coil-kt/coil/2.4.0/AndroidManifest.xml",
     static_libs: [
-        "Aperture_io.coil-kt_coil-nodeps",
-        "Aperture_io.coil-kt_coil-base",
-        "kotlin-stdlib-jdk8",
+        "Aperture_io.coil-kt.coil3_coil-core-android",
     ],
 }
 
 android_library_import {
-    name: "Aperture_io.coil-kt_coil-base-nodeps",
-    aars: ["io/coil-kt/coil-base/2.4.0/coil-base-2.4.0.aar"],
+    name: "Aperture_io.coil-kt.coil3_coil-core-android-nodeps",
+    aars: ["io/coil-kt/coil3/coil-core-android/3.0.4/coil-core-release.aar"],
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Aperture_com.squareup.okhttp3_okhttp",
         "Aperture_com.squareup.okio_okio",
         "androidx.annotation_annotation",
         "androidx.appcompat_appcompat-resources",
-        "androidx.collection_collection",
         "androidx.core_core-ktx",
         "androidx.exifinterface_exifinterface",
         "androidx.lifecycle_lifecycle-runtime",
         "androidx.profileinstaller_profileinstaller",
         "kotlin-stdlib",
         "kotlinx-coroutines-android",
+        "kotlinx-coroutines-core",
     ],
 }
 
 android_library {
-    name: "Aperture_io.coil-kt_coil-base",
+    name: "Aperture_io.coil-kt.coil3_coil-core-android",
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "io/coil-kt/coil-base/2.4.0/AndroidManifest.xml",
+    manifest: "io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml",
     static_libs: [
-        "Aperture_io.coil-kt_coil-base-nodeps",
-        "Aperture_com.squareup.okhttp3_okhttp",
+        "Aperture_io.coil-kt.coil3_coil-core-android-nodeps",
         "Aperture_com.squareup.okio_okio",
         "androidx.annotation_annotation",
         "androidx.appcompat_appcompat-resources",
-        "androidx.collection_collection",
         "androidx.core_core-ktx",
         "androidx.exifinterface_exifinterface",
         "androidx.lifecycle_lifecycle-runtime",
         "androidx.profileinstaller_profileinstaller",
         "kotlin-stdlib",
         "kotlinx-coroutines-android",
+        "kotlinx-coroutines-core",
     ],
 }
 
 android_library_import {
-    name: "Aperture_io.coil-kt_coil-video-nodeps",
-    aars: ["io/coil-kt/coil-video/2.4.0/coil-video-2.4.0.aar"],
+    name: "Aperture_io.coil-kt.coil3_coil-video-nodeps",
+    aars: ["io/coil-kt/coil3/coil-video/3.0.4/coil-video-3.0.4.aar"],
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Aperture_io.coil-kt_coil-base",
+        "Aperture_io.coil-kt.coil3_coil-core",
         "androidx.core_core-ktx",
-        "kotlin-stdlib-jdk8",
+        "kotlin-stdlib",
     ],
 }
 
 android_library {
-    name: "Aperture_io.coil-kt_coil-video",
+    name: "Aperture_io.coil-kt.coil3_coil-video",
     sdk_version: "35",
     min_sdk_version: "26",
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "io/coil-kt/coil-video/2.4.0/AndroidManifest.xml",
+    manifest: "io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml",
     static_libs: [
-        "Aperture_io.coil-kt_coil-video-nodeps",
-        "Aperture_io.coil-kt_coil-base",
+        "Aperture_io.coil-kt.coil3_coil-video-nodeps",
+        "Aperture_io.coil-kt.coil3_coil-core",
         "androidx.core_core-ktx",
-        "kotlin-stdlib-jdk8",
+        "kotlin-stdlib",
     ],
 }
 

app/libs/io/coil-kt/coil/2.4.0/AndroidManifest.xml → app/libs/io/coil-kt/coil3/coil-android/3.0.4/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="coil.singleton" >
+    package="coil3.singleton" >
 
     <uses-sdk android:minSdkVersion="21" />
 

app/libs/io/coil-kt/coil-video/2.4.0/AndroidManifest.xml → app/libs/io/coil-kt/coil3/coil-core-android/3.0.4/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="coil.video" >
+    package="coil3.core" >
 
     <uses-sdk android:minSdkVersion="21" />
 

app/libs/io/coil-kt/coil-base/2.4.0/AndroidManifest.xml → app/libs/io/coil-kt/coil3/coil-video/3.0.4/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="coil.base" >
+    package="coil3.video" >
 
     <uses-sdk android:minSdkVersion="21" />
 

app/src/main/java/org/lineageos/aperture/CameraActivity.kt

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022-2025 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -86,11 +86,14 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.preference.PreferenceManager
-import coil.decode.VideoFrameDecoder
-import coil.load
-import coil.request.ErrorResult
-import coil.request.ImageRequest
-import coil.size.Scale
+import coil3.load
+import coil3.request.ErrorResult
+import coil3.request.ImageRequest
+import coil3.request.crossfade
+import coil3.request.error
+import coil3.request.fallback
+import coil3.size.Scale
+import coil3.video.VideoFrameDecoder
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest