expo-image-loader 4.2.0 → 4.3.0

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 4.3.0 — 2023-06-13
+
+- Removed `com.facebook.fresco:fresco` dependency ([#22542](https://github.com/expo/expo/pull/22542) by [@josephyanks](https://github.com/josephyanks))
+### 📚 3rd party library updates
+- Updated `com.github.bumptech.glide:glide` to `4.13.2` and added customizable `glideVersion` variable on ext. ([#22542](https://github.com/expo/expo/pull/22542) by [@josephyanks](https://github.com/josephyanks))
+
+### 🐛 Bug fixes
+
+- Fixed Android build warnings for Gradle version 8. ([#22537](https://github.com/expo/expo/pull/22537), [#22609](https://github.com/expo/expo/pull/22609) by [@kudo](https://github.com/kudo))
+
 ## 4.2.0 — 2023-05-08
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -33,21 +33,13 @@ buildscript {
 }
 
 group = 'host.exp.exponent'
-version = '4.2.0'
-
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
+version = '4.3.0'
 
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -70,25 +62,32 @@ android {
     jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
+  namespace "expo.modules.imageloader"
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 8
-    versionName "4.2.0"
+    versionName "4.3.0"
   }
   lintOptions {
     abortOnError false
   }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 repositories {
   mavenCentral()
 }
 
+def glideVersion = safeExtGet('glideVersion', '4.13.2')
+
 dependencies {
   implementation project(':expo-modules-core')
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-  api 'com.github.bumptech.glide:glide:4.9.0'
-  api 'com.facebook.fresco:fresco:2.0.0'
+  api "com.github.bumptech.glide:glide:${glideVersion}"
 }

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
-<manifest package="expo.modules.imageloader">
+<manifest>
 </manifest>

package/android/src/main/java/expo/modules/imageloader/ImageLoaderModule.kt

@@ -3,27 +3,18 @@ package expo.modules.imageloader
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
-import android.os.AsyncTask
-import androidx.annotation.NonNull
-import androidx.annotation.Nullable
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
-import com.facebook.common.references.CloseableReference
-import com.facebook.datasource.DataSource
-import com.facebook.drawee.backends.pipeline.Fresco
-import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
-import com.facebook.imagepipeline.image.CloseableImage
-import com.facebook.imagepipeline.request.ImageRequest
-import expo.modules.interfaces.imageloader.ImageLoaderInterface
 import expo.modules.core.interfaces.InternalModule
+import expo.modules.interfaces.imageloader.ImageLoaderInterface
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Future
 
 class ImageLoaderModule(val context: Context) : InternalModule, ImageLoaderInterface {
 
-  override fun getExportedInterfaces(): List<Class<*>>? {
+  override fun getExportedInterfaces(): List<Class<*>> {
     return listOf(ImageLoaderInterface::class.java)
   }
 
@@ -34,50 +25,53 @@ class ImageLoaderModule(val context: Context) : InternalModule, ImageLoaderInter
       object : ImageLoaderInterface.ResultListener {
         override fun onSuccess(bitmap: Bitmap) = future.set(bitmap)
 
-        override fun onFailure(@Nullable cause: Throwable?) = future.setException(ExecutionException(cause))
+        override fun onFailure(cause: Throwable?) =
+          future.setException(ExecutionException(cause))
       }
     )
     return future
   }
 
-  override fun loadImageForDisplayFromURL(url: String, resultListener: ImageLoaderInterface.ResultListener) {
-    val imageRequest = ImageRequest.fromUri(url)
-    val imagePipeline = Fresco.getImagePipeline()
-    val dataSource = imagePipeline.fetchDecodedImage(imageRequest, context)
-
-    dataSource.subscribe(
-      object : BaseBitmapDataSubscriber() {
-        override fun onNewResultImpl(bitmap: Bitmap?) {
-          bitmap?.let {
-            resultListener.onSuccess(bitmap)
-            return
-          }
+  override fun loadImageForDisplayFromURL(
+    url: String,
+    resultListener: ImageLoaderInterface.ResultListener
+  ) {
+    Glide.with(context)
+      .asBitmap()
+      .load(url)
+      .into(object : CustomTarget<Bitmap>() {
+        override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+          resultListener.onSuccess(resource)
+        }
 
-          resultListener.onFailure(Exception("Loaded bitmap is null"))
+        override fun onLoadCleared(placeholder: Drawable?) {
+          // no op
         }
 
-        override fun onFailureImpl(@NonNull dataSource: DataSource<CloseableReference<CloseableImage>>) {
-          resultListener.onFailure(dataSource.failureCause)
+        override fun onLoadFailed(errorDrawable: Drawable?) {
+          super.onLoadFailed(errorDrawable)
+          resultListener.onFailure(Exception("Loading bitmap failed"))
         }
-      },
-      AsyncTask.THREAD_POOL_EXECUTOR
-    )
+      })
   }
 
-  override fun loadImageForManipulationFromURL(@NonNull url: String): Future<Bitmap> {
+  override fun loadImageForManipulationFromURL(url: String): Future<Bitmap> {
     val future = SimpleSettableFuture<Bitmap>()
     loadImageForManipulationFromURL(
       url,
       object : ImageLoaderInterface.ResultListener {
         override fun onSuccess(bitmap: Bitmap) = future.set(bitmap)
 
-        override fun onFailure(@NonNull cause: Throwable?) = future.setException(ExecutionException(cause))
+        override fun onFailure(cause: Throwable?) = future.setException(ExecutionException(cause))
       }
     )
     return future
   }
 
-  override fun loadImageForManipulationFromURL(url: String, resultListener: ImageLoaderInterface.ResultListener) {
+  override fun loadImageForManipulationFromURL(
+    url: String,
+    resultListener: ImageLoaderInterface.ResultListener
+  ) {
     val normalizedUrl = normalizeAssetsUrl(url)
 
     Glide.with(context)
@@ -85,12 +79,17 @@ class ImageLoaderModule(val context: Context) : InternalModule, ImageLoaderInter
       .diskCacheStrategy(DiskCacheStrategy.NONE)
       .skipMemoryCache(true)
       .load(normalizedUrl)
-      .into(object : SimpleTarget<Bitmap>() {
+      .into(object : CustomTarget<Bitmap>() {
         override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
           resultListener.onSuccess(resource)
         }
 
+        override fun onLoadCleared(placeholder: Drawable?) {
+          // no op
+        }
+
         override fun onLoadFailed(errorDrawable: Drawable?) {
+          super.onLoadFailed(errorDrawable)
           resultListener.onFailure(Exception("Loading bitmap failed"))
         }
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-image-loader",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Image loader",
   "main": "index.js",
   "keywords": [
@@ -24,5 +24,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "4ba50c428c8369bb6b3a51a860d4898ad4ccbe78"
+  "gitHead": "66d0501185956602c144a03a891bdb34d3c03910"
 }