expo-image 2.3.1-canary-20250612-338ef55 → 2.3.1-canary-20250613-b29d676

package/CHANGELOG.md

@@ -8,6 +8,9 @@
 
 ### 🐛 Bug fixes
 
+- [Android] Fix animation resuming by casting image to GifDrawable. ([#37363](https://github.com/expo/expo/pull/37363) by [@Wenszel](https://github.com/Wenszel))
+- [iOS] Fixed contentPosition is not correct after switching theme. ([#37374](https://github.com/expo/expo/pull/37374) by [@kudo](https://github.com/kudo))
+
 ### 💡 Others
 
 ## 2.3.0 - 2025-06-11

package/android/build.gradle

@@ -8,7 +8,7 @@ android {
   namespace "expo.modules.image"
   defaultConfig {
     versionCode 1
-    versionName "2.3.1-canary-20250612-338ef55"
+    versionName "2.3.1-canary-20250613-b29d676"
     consumerProguardFiles("proguard-rules.pro")
 
     buildConfigField("boolean", "ALLOW_GLIDE_LOGS", project.properties.get("EXPO_ALLOW_GLIDE_LOGS", "false"))

package/android/src/main/java/expo/modules/image/ExpoImageViewWrapper.kt

@@ -18,6 +18,7 @@ import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import com.bumptech.glide.request.RequestOptions
+import com.github.penfeizhou.animation.gif.GifDrawable
 import expo.modules.image.enums.ContentFit
 import expo.modules.image.enums.Priority
 import expo.modules.image.events.GlideRequestListener
@@ -169,14 +170,32 @@ class ExpoImageViewWrapper(context: Context, appContext: AppContext) : ExpoView(
   internal var cachePolicy: CachePolicy = CachePolicy.DISK
 
   fun setIsAnimating(setAnimating: Boolean) {
-    val resource = activeView.drawable
+    // Animatable animations always start from the beginning when resumed.
+    // So we check first if the resource is a GifDrawable, because it can continue
+    // from where it was paused.
+    when (val resource = activeView.drawable) {
+      is GifDrawable -> setIsAnimating(resource, setAnimating)
+      is Animatable -> setIsAnimating(resource, setAnimating)
+    }
+  }
 
-    if (resource is Animatable) {
-      if (setAnimating) {
-        resource.start()
+  private fun setIsAnimating(resource: GifDrawable, setAnimating: Boolean) {
+    if (setAnimating) {
+      if (resource.isPaused) {
+        resource.resume()
       } else {
-        resource.stop()
+        resource.start()
       }
+    } else {
+      resource.pause()
+    }
+  }
+
+  private fun setIsAnimating(resource: Animatable, setAnimating: Boolean) {
+    if (setAnimating) {
+      resource.start()
+    } else {
+      resource.stop()
     }
   }
 

package/expo-module.config.json

@@ -8,7 +8,7 @@
     "publication": {
       "groupId": "BareExpo",
       "artifactId": "expo.modules.image",
-      "version": "2.3.1-canary-20250612-338ef55",
+      "version": "2.3.1-canary-20250613-b29d676",
       "repository": "local-maven-repo"
     }
   }

package/ios/ImageView.swift

@@ -70,6 +70,11 @@ public final class ImageView: ExpoView {
 
   var useAppleWebpCodec: Bool = true
 
+  /**
+   The ideal image size that fills in the container size while maintaining the source aspect ratio.
+   */
+  var imageIdealSize: CGSize = .zero
+
   // MARK: - Events
 
   let onLoadStart = EventDispatcher()
@@ -120,6 +125,15 @@ public final class ImageView: ExpoView {
     }
   }
 
+  public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    super.traitCollectionDidChange(previousTraitCollection)
+    if self.traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+      // The mask layer we adjusted would be invaliated from `RCTViewComponentView.traitCollectionDidChange`.
+      // After that we have to recalculate the mask layer in `applyContentPosition`.
+      applyContentPosition(contentSize: imageIdealSize, containerSize: frame.size)
+    }
+  }
+
   // MARK: - Implementation
 
   func reload(force: Bool = false) {
@@ -228,15 +242,15 @@ public final class ImageView: ExpoView {
       ])
 
       let scale = window?.screen.scale ?? UIScreen.main.scale
-      let idealSize = idealSize(
+      imageIdealSize = idealSize(
         contentPixelSize: image.size * image.scale,
         containerSize: frame.size,
         scale: scale,
         contentFit: contentFit
       ).rounded(.up)
 
-      let image = processImage(image, idealSize: idealSize, scale: scale)
-      applyContentPosition(contentSize: idealSize, containerSize: frame.size)
+      let image = processImage(image, idealSize: imageIdealSize, scale: scale)
+      applyContentPosition(contentSize: imageIdealSize, containerSize: frame.size)
       renderSourceImage(image)
     } else {
       displayPlaceholderIfNecessary()

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676-sources.jar.md5

@@ -0,0 +1 @@
+9577f57d26c4aa7b69867a10706b137c

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676-sources.jar.sha1

@@ -0,0 +1 @@
+3cfeed78b10cdda536fad00f02e8bf6488f6d4ec

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676-sources.jar.sha256

@@ -0,0 +1 @@
+a96cf11480fb58e05f51ed53e33fd3e6926b187c9ee903a0fe5afe9fd1f7138f

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676-sources.jar.sha512

@@ -0,0 +1 @@
+8e07f18c251e5016f8a1dabbe2956d8908b8d6343ddbe06114d7cf823c99582d62cdda5c8b038b57c6e504a34479de3d067da7989066747cdabc36de31a941da

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.aar.md5

@@ -0,0 +1 @@
+97350108d5e605397c192409049c4e78

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.aar.sha1

@@ -0,0 +1 @@
+57400eebee7243f229061e9917eb2ec76e73b278

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.aar.sha256

@@ -0,0 +1 @@
+d98575e750efff41503a99f29f3c34f12778bf0923ce259d73101f82a5b3e770

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.aar.sha512

@@ -0,0 +1 @@
+b1335dc5ab08240639d90ec8bdc113739616bdc8f900ee853a30f2334286812d6972e76600e03491646e239a588b57e8cf8b78b50ad5daaefa8fc28ba6a1dfc9

package/local-maven-repo/BareExpo/expo.modules.image/{2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.module → 2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "BareExpo",
     "module": "expo.modules.image",
-    "version": "2.3.1-canary-20250612-338ef55",
+    "version": "2.3.1-canary-20250613-b29d676",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -54,13 +54,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.image-2.3.1-canary-20250612-338ef55.aar",
-          "url": "expo.modules.image-2.3.1-canary-20250612-338ef55.aar",
-          "size": 279687,
-          "sha512": "227d071e0843c8a88b91c5f890ca955db2f21b0fac806827fc3101f9fa294ad31a64e7f1c3bf695960c6204568d31f7ecee17c8bd0e2b5e1ed8526f738557df6",
-          "sha256": "6ee8c7984bcf949b1b1f40ee6081382f8a33720ad60f29815c14f35d6884703b",
-          "sha1": "1002adced0addf2143391ee95583419f45f002b5",
-          "md5": "051569f8d4efae72dcac67816b480d0e"
+          "name": "expo.modules.image-2.3.1-canary-20250613-b29d676.aar",
+          "url": "expo.modules.image-2.3.1-canary-20250613-b29d676.aar",
+          "size": 279968,
+          "sha512": "b1335dc5ab08240639d90ec8bdc113739616bdc8f900ee853a30f2334286812d6972e76600e03491646e239a588b57e8cf8b78b50ad5daaefa8fc28ba6a1dfc9",
+          "sha256": "d98575e750efff41503a99f29f3c34f12778bf0923ce259d73101f82a5b3e770",
+          "sha1": "57400eebee7243f229061e9917eb2ec76e73b278",
+          "md5": "97350108d5e605397c192409049c4e78"
         }
       ]
     },
@@ -143,13 +143,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.image-2.3.1-canary-20250612-338ef55.aar",
-          "url": "expo.modules.image-2.3.1-canary-20250612-338ef55.aar",
-          "size": 279687,
-          "sha512": "227d071e0843c8a88b91c5f890ca955db2f21b0fac806827fc3101f9fa294ad31a64e7f1c3bf695960c6204568d31f7ecee17c8bd0e2b5e1ed8526f738557df6",
-          "sha256": "6ee8c7984bcf949b1b1f40ee6081382f8a33720ad60f29815c14f35d6884703b",
-          "sha1": "1002adced0addf2143391ee95583419f45f002b5",
-          "md5": "051569f8d4efae72dcac67816b480d0e"
+          "name": "expo.modules.image-2.3.1-canary-20250613-b29d676.aar",
+          "url": "expo.modules.image-2.3.1-canary-20250613-b29d676.aar",
+          "size": 279968,
+          "sha512": "b1335dc5ab08240639d90ec8bdc113739616bdc8f900ee853a30f2334286812d6972e76600e03491646e239a588b57e8cf8b78b50ad5daaefa8fc28ba6a1dfc9",
+          "sha256": "d98575e750efff41503a99f29f3c34f12778bf0923ce259d73101f82a5b3e770",
+          "sha1": "57400eebee7243f229061e9917eb2ec76e73b278",
+          "md5": "97350108d5e605397c192409049c4e78"
         }
       ]
     },
@@ -163,13 +163,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.image-2.3.1-canary-20250612-338ef55-sources.jar",
-          "url": "expo.modules.image-2.3.1-canary-20250612-338ef55-sources.jar",
-          "size": 64213,
-          "sha512": "16d4384079cca560d3755a544494e3ca5fe00313de647e53f20a3d734cdac96f1d44b8896ac42d5d526345bb1811383caeaae812c90fe68463569a76650eb46c",
-          "sha256": "e48a00dcafcebec3b928754c0288ac58f1dfaeac61827619d2cc7b153ee0a531",
-          "sha1": "7f083c927add65013047d49ee796e7d345056a68",
-          "md5": "7503ed0734f934f764355c1bbe24fd65"
+          "name": "expo.modules.image-2.3.1-canary-20250613-b29d676-sources.jar",
+          "url": "expo.modules.image-2.3.1-canary-20250613-b29d676-sources.jar",
+          "size": 64377,
+          "sha512": "8e07f18c251e5016f8a1dabbe2956d8908b8d6343ddbe06114d7cf823c99582d62cdda5c8b038b57c6e504a34479de3d067da7989066747cdabc36de31a941da",
+          "sha256": "a96cf11480fb58e05f51ed53e33fd3e6926b187c9ee903a0fe5afe9fd1f7138f",
+          "sha1": "3cfeed78b10cdda536fad00f02e8bf6488f6d4ec",
+          "md5": "9577f57d26c4aa7b69867a10706b137c"
         }
       ]
     }

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.module.md5

@@ -0,0 +1 @@
+b1dd3730861e46d2bfe096d46ffbd646

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.module.sha1

@@ -0,0 +1 @@
+0bec286dfb4f97ebcc71ce1414709d3aa06dd447

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.module.sha256

@@ -0,0 +1 @@
+d63709274e2f6092913766c13ecc56bf67e074e232047276f101ee42b7647aa3

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.module.sha512

@@ -0,0 +1 @@
+2bb98688101b1c7bcdcda15915abef4777a2751005f8285630952bec2c59a7bdb571d34bc8f128e649455f9e38ff411ecfb365c6198f17c04c9418df74dd4212

package/local-maven-repo/BareExpo/expo.modules.image/{2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.pom → 2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>BareExpo</groupId>
   <artifactId>expo.modules.image</artifactId>
-  <version>2.3.1-canary-20250612-338ef55</version>
+  <version>2.3.1-canary-20250613-b29d676</version>
   <packaging>aar</packaging>
   <name>expo.modules.image</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.pom.md5

@@ -0,0 +1 @@
+eb020329600f0baf663ac26b4998b64f

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.pom.sha1

@@ -0,0 +1 @@
+f7c22e312294b882fe29508ca571d33df50031db

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.pom.sha256

@@ -0,0 +1 @@
+5572b03cfa94330de20ddfd56abe32840f8bf17c275bfa8d0c81a74f71cf6f74

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250613-b29d676/expo.modules.image-2.3.1-canary-20250613-b29d676.pom.sha512

@@ -0,0 +1 @@
+3c807aac0a6d89742e1cb19528e4cc930eccc7d2b6e88aca1f13d1b1543137b94b71396ceaf0d64f28c97b5b637c8f8cf1b46f48e9ede3c473fe3ea453e1c7ea

package/local-maven-repo/BareExpo/expo.modules.image/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>BareExpo</groupId>
   <artifactId>expo.modules.image</artifactId>
   <versioning>
-    <latest>2.3.1-canary-20250612-338ef55</latest>
-    <release>2.3.1-canary-20250612-338ef55</release>
+    <latest>2.3.1-canary-20250613-b29d676</latest>
+    <release>2.3.1-canary-20250613-b29d676</release>
     <versions>
-      <version>2.3.1-canary-20250612-338ef55</version>
+      <version>2.3.1-canary-20250613-b29d676</version>
     </versions>
-    <lastUpdated>20250612174751</lastUpdated>
+    <lastUpdated>20250613135945</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/BareExpo/expo.modules.image/maven-metadata.xml.md5

@@ -1 +1 @@
-cc8cdd7725a57e1b7c8490d06251a7c8
+1d7f4c9b9019865862e618279340e65a

package/local-maven-repo/BareExpo/expo.modules.image/maven-metadata.xml.sha1

@@ -1 +1 @@
-455e95ffe26f210b0f35d0770df65f351a5ddc7b
+8aef89146ba1ef244f70efca4975e4a527aff245

package/local-maven-repo/BareExpo/expo.modules.image/maven-metadata.xml.sha256

@@ -1 +1 @@
-ca85e5864e2bd0cc6c419c61f9e09729e7b8bafd3a09ca20832045aea730476b
+876ac5f25b8d41724a009d187b0ce936f63aef661aa96fa6a32de2c2ad97d350

package/local-maven-repo/BareExpo/expo.modules.image/maven-metadata.xml.sha512

@@ -1 +1 @@
-8f69636df9bafa22b4342e69f5e991ea9661bc58c9835e72b5ecc18ce1cf7132c8fbca929d6fd0c77e44c85c17ca8df0230a28e5446bd0529d921d0322b828a7
+fa401015eb332b073ff16007eb62666f45728b8c83fc00a0ea59483f8d2ce1df39ae06d2169e19f9f68d1a4cb2e6401119d5e012963af92217fbd139f9d707ba

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-image",
   "title": "Expo Image",
-  "version": "2.3.1-canary-20250612-338ef55",
+  "version": "2.3.1-canary-20250613-b29d676",
   "description": "A cross-platform, performant image component for React Native and Expo with Web support",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -29,10 +29,10 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "expo-module-scripts": "4.1.8-canary-20250612-338ef55"
+    "expo-module-scripts": "4.1.8-canary-20250613-b29d676"
   },
   "peerDependencies": {
-    "expo": "54.0.0-canary-20250612-338ef55",
+    "expo": "54.0.0-canary-20250613-b29d676",
     "react": "*",
     "react-native": "*",
     "react-native-web": "*"

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55-sources.jar.md5

@@ -1 +0,0 @@
-7503ed0734f934f764355c1bbe24fd65

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55-sources.jar.sha1

@@ -1 +0,0 @@
-7f083c927add65013047d49ee796e7d345056a68

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55-sources.jar.sha256

@@ -1 +0,0 @@
-e48a00dcafcebec3b928754c0288ac58f1dfaeac61827619d2cc7b153ee0a531

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55-sources.jar.sha512

@@ -1 +0,0 @@
-16d4384079cca560d3755a544494e3ca5fe00313de647e53f20a3d734cdac96f1d44b8896ac42d5d526345bb1811383caeaae812c90fe68463569a76650eb46c

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.aar.md5

@@ -1 +0,0 @@
-051569f8d4efae72dcac67816b480d0e

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.aar.sha1

@@ -1 +0,0 @@
-1002adced0addf2143391ee95583419f45f002b5

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.aar.sha256

@@ -1 +0,0 @@
-6ee8c7984bcf949b1b1f40ee6081382f8a33720ad60f29815c14f35d6884703b

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.aar.sha512

@@ -1 +0,0 @@
-227d071e0843c8a88b91c5f890ca955db2f21b0fac806827fc3101f9fa294ad31a64e7f1c3bf695960c6204568d31f7ecee17c8bd0e2b5e1ed8526f738557df6

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.module.md5

@@ -1 +0,0 @@
-e6431b1aed8b62bb4a3d51c7dcffc822

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.module.sha1

@@ -1 +0,0 @@
-acff916e9688a075d02e9e577edb94da223abc44

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.module.sha256

@@ -1 +0,0 @@
-0d2b8534e6a210ea27e0240e4d45ed7624294ceee68241d0a31b893c941d0172

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.module.sha512

@@ -1 +0,0 @@
-46b7827055b49be2cbde5fdc8cca802b47662f8fa761f36b4e034d68538ed1ed40ed2180d49f94d3ee638a7f057b87c0f15afebffb28ad72894e173353b61e71

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.pom.md5

@@ -1 +0,0 @@
-6aaf70f637a0a21d59b23732be28dc51

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.pom.sha1

@@ -1 +0,0 @@
-0dfceed7564bd6348337cc8ab6e8be9958715a10

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.pom.sha256

@@ -1 +0,0 @@
-d97c5c48a39a83d0fecbe088d24f9053cb3089d9bdf384e3996e9645cd96fc1b

package/local-maven-repo/BareExpo/expo.modules.image/2.3.1-canary-20250612-338ef55/expo.modules.image-2.3.1-canary-20250612-338ef55.pom.sha512

@@ -1 +0,0 @@
-f6635de0e3acac3d9d90db9bc719bd9d3d35f32178437cc13691b622a3f12e66881fe23b7608b8b7b9e52290bfc39640fada70f459b7fbca657bb697cddd45ec