react-native-fast-image 8.31.2 → 9.0.0

package/README.md

@@ -26,40 +26,38 @@ React Native's `Image` component handles image caching like browsers for the mos
 - **Responsive images**: give several sizes, and the one that fits the view loads ([`source`](#source)).
 - **Animated images** (GIF, WebP, APNG and AVIF) that can [loop](#loop) and [pause](#paused).
 - **Fades** in and between images ([`transition`](#transition)).
-- [**SVG**](docs/formats.md#svg-images) and [**photo library**](#photo-library-images-ios) images.
+- [**SVG**](docs/formats.md#svg-images) and [**photo library**](#photo-library-images-ios-and-tvos) images.
 - [**`FastImageBackground`**](#fastimagebackground) for content over an image.
 - **Expo and web support**, with a [config plugin](#expo-config-plugin) for Expo.
 
 ## Image formats
 
-| Format |        iOS        |      Android      |
-| ------ | :---------------: | :---------------: |
-| JPEG   |    ![Yes][yes]    |    ![Yes][yes]    |
-| PNG    |    ![Yes][yes]    |    ![Yes][yes]    |
-| APNG   |    ![Yes][yes]    |    ![Yes][yes]    |
-| GIF    |    ![Yes][yes]    |    ![Yes][yes]    |
-| WebP   |    ![Yes][yes]    |    ![Yes][yes]    |
-| AVIF   |    ![Yes][yes]    |    ![Yes][yes]    |
-| HEIC   |    ![Yes][yes]    |    ![Yes][yes]    |
-| SVG    | ![Yes][yes][^svg] | ![Yes][yes][^svg] |
-| ICO    |    ![Yes][yes]    |    ![Yes][yes]    |
-| BMP    |    ![Yes][yes]    |    ![Yes][yes]    |
-| TIFF   |    ![Yes][yes]    |     ![No][no]     |
-| ICNS   |    ![Yes][yes]    |     ![No][no]     |
-| PSD    | ![Yes][yes][^psd] |     ![No][no]     |
+| Format |        iOS        |   Android   |
+| ------ | :---------------: | :---------: |
+| JPEG   |    ![Yes][yes]    | ![Yes][yes] |
+| PNG    |    ![Yes][yes]    | ![Yes][yes] |
+| APNG   |    ![Yes][yes]    | ![Yes][yes] |
+| GIF    |    ![Yes][yes]    | ![Yes][yes] |
+| WebP   |    ![Yes][yes]    | ![Yes][yes] |
+| AVIF   |    ![Yes][yes]    | ![Yes][yes] |
+| HEIC   |    ![Yes][yes]    | ![Yes][yes] |
+| SVG    |    ![Yes][yes]    | ![Yes][yes] |
+| ICO    |    ![Yes][yes]    | ![Yes][yes] |
+| BMP    |    ![Yes][yes]    | ![Yes][yes] |
+| TIFF   |    ![Yes][yes]    |  ![No][no]  |
+| ICNS   |    ![Yes][yes]    |  ![No][no]  |
+| PSD    | ![Yes][yes][^psd] |  ![No][no]  |
 
 See [Formats](docs/formats.md) for the versions of iOS and Android each format needs, and what decodes it.
 
 [yes]: docs/assets/yes.svg
 [no]: docs/assets/no.svg
 
-[^svg]: With an SVG library in the app: see [SVG images](docs/formats.md#svg-images).
-
 [^psd]: Its composite image (the layers as Photoshop saved them flattened).
 
 ## Installation
 
-Works with React Native 0.60 and later, with the New Architecture (through React Native's interop layer) and the legacy architecture, and with Expo. It's tested on React Native 0.87 with the New Architecture, 0.73 with the legacy architecture, and Expo SDK 57. A native New Architecture component is planned for a future major version.
+Works with React Native 0.65 and later (iOS 13 and later, Android `minSdkVersion` 21 and later), with the New Architecture (through React Native's interop layer) and the legacy architecture, and with Expo. It's tested on React Native 0.87 with the New Architecture, 0.73 with the legacy architecture, and Expo SDK 57. A native New Architecture component is planned for a future major version.
 
 ```bash
 npm install react-native-fast-image
@@ -138,7 +136,7 @@ When `source` changes, the image that's showing stays until the new one has load
 
 Remote url to load the image from. e.g. `'https://example.com/image.jpg'`.
 
-Also loads local files (`file://`, and on Android `content://`), images in the app by name (e.g. `'my_image'`: in its asset catalog on iOS, a drawable on Android), photo library images on iOS (`ph://`, see [Photo library images](#photo-library-images-ios)) and SVG images (see [SVG images](docs/formats.md#svg-images)).
+Also loads local files (`file://`, and on Android `content://`), images in the app by name (e.g. `'my_image'`: in its asset catalog on iOS, a drawable on Android), photo library images on iOS and tvOS (`ph://`, see [Photo library images](#photo-library-images-ios-and-tvos)) and SVG images (see [SVG images](docs/formats.md#svg-images)).
 
 ---
 
@@ -435,7 +433,9 @@ If supplied, changes the color of all the non-transparent pixels to the given co
 
 **Type:** `ReactNode`
 
-Render children within the image. In the next major version, `FastImage` won't render children: use `FastImageBackground`.
+**Deprecated:** In the next major version, `FastImage` won't render children: use `FastImageBackground`.
+
+Render children within the image.
 
 <!-- api:props end -->
 
@@ -443,7 +443,7 @@ Render children within the image. In the next major version, `FastImage` won't r
 
 An image with content on top of it: a view that the image fills, with the children on top.
 
-Use it rather than giving `FastImage` children: in the next major version, `FastImage` won't render children, since the image will be a single native view ([#1137](https://github.com/DylanVann/react-native-fast-image/pull/1137)), which can't hold them. `FastImageBackground` works the same in both.
+Use it rather than giving `FastImage` children: in the next major version, `FastImage` won't render children, since the image will be a single native view ([#1220](https://github.com/DylanVann/react-native-fast-image/pull/1220)), which can't hold them. `FastImageBackground` works the same in both.
 
 ```jsx
 import { FastImageBackground } from 'react-native-fast-image'
@@ -804,9 +804,9 @@ If your app has its own `AppGlideModule` (see [using FastImage with an AppGlideM
 
 [^glide-memory]: Glide's default, which FastImage keeps: room for two screenfuls of decoded images (2 × the screen's width × height × 4 bytes, about 20 MB on a 1080 × 2400 screen), plus a pool of bitmaps to reuse (one screenful on Android 8 and later, four before). Together they're limited to 40% of the memory Android gives the app (33% on low-memory devices), and both shrink to fit.
 
-## Photo library images (iOS)
+## Photo library images (iOS and tvOS)
 
-A photo library url (`ph://<localIdentifier>`, as camera roll libraries give) loads with SDWebImagePhotosPlugin, which FastImage includes on iOS.
+A photo library url (`ph://<localIdentifier>`, as camera roll libraries give) loads with SDWebImagePhotosPlugin, which FastImage includes.
 
 The app needs access to the photo library, which it has if it got the url from there. A photo library image is decoded at about the view's size, since photos are large and usually shown small; `onLoad` still reports the photo's own size. `FastImage.preload` of a `ph://` source loads the full-size photo (there's no view to size it for), which doesn't make a view's smaller copy load faster, so preloading photo library images usually isn't worth it. `assets-library://` urls aren't supported. On Android, photo pickers give `content://` urls, which load as they are.
 

package/RNFastImage.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.authors       = { "Dylan Vann" => "dylan@dylanvann.com" }
   s.homepage      = "https://github.com/DylanVann/react-native-fast-image#readme"
   s.license       = "MIT"
-  s.platforms     = { :ios => "8.0", :tvos => "9.0" }
+  s.platforms     = { :ios => "13.0", :tvos => "13.0" }
   s.framework     = 'UIKit'
   s.requires_arc  = true
   s.source        = { :git => "https://github.com/DylanVann/react-native-fast-image.git", :tag => "v#{s.version}" }
@@ -21,7 +21,9 @@ Pod::Spec.new do |s|
   # manifest Apple requires.
   s.dependency 'SDWebImage', '>= 5.11.1', '< 6.0'
   s.dependency 'SDWebImageWebPCoder', '>= 0.8.4', '< 1.0'
-  # Photo library images (ph://). iOS only: it needs tvOS 10, and FastImage
-  # finds it at runtime, so a tvOS app can still add it.
-  s.ios.dependency 'SDWebImagePhotosPlugin', '>= 1.2.0', '< 2.0'
+  # SVG images. Every 1.x needs iOS 13 (Apple's SVG renderer). From 1.7, as
+  # expo-image's, so apps with it share one copy.
+  s.dependency 'SDWebImageSVGCoder', '>= 1.7.0', '< 2.0'
+  # Photo library images (ph://).
+  s.dependency 'SDWebImagePhotosPlugin', '>= 1.2.0', '< 2.0'
 end

package/android/build.gradle

@@ -32,15 +32,16 @@ def appHasExpoImage = {
 def excludeAppGlideModule = safeExtGet('excludeAppGlideModule', appHasExpoImage())
 
 // When changing the default, revisit the Glide rules in consumer-rules.pro.
-// 4.15+ animates animated WebP (Android 9+) and AVIF (Android 12+).
+// 4.15+ animates animated WebP (Android 9+) and AVIF (Android 12+), which
+// FastImageAnimated builds on. A version that isn't numbered (e.g. "4.+") is
+// taken to be recent.
 def glideVersion = safeExtGet('glideVersion', '4.16.0')
-// Whether it's 4.15 or later, which FastImageAnimated (src/glide-4.15) builds
-// on; an older one gets a stand-in (src/glide-older). A version that isn't
-// numbered (e.g. "4.+") is taken to be recent.
 def glideVersionParts = glideVersion.toString() =~ /^(\d+)\.(\d+)/
-def glideHasAnimatedDecoder = !glideVersionParts.find() ||
-        glideVersionParts.group(1).toInteger() > 4 ||
-        (glideVersionParts.group(1).toInteger() == 4 && glideVersionParts.group(2).toInteger() >= 15)
+if (glideVersionParts.find() &&
+        (glideVersionParts.group(1).toInteger() < 4 ||
+                (glideVersionParts.group(1).toInteger() == 4 && glideVersionParts.group(2).toInteger() < 15))) {
+    throw new GradleException("react-native-fast-image needs Glide 4.15 or later, but glideVersion is ${glideVersion}.")
+}
 
 // Newer versions of the Android Gradle plugin (7.3+) take the namespace from
 // build.gradle and warn about the package attribute in AndroidManifest.xml;
@@ -54,7 +55,7 @@ android {
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
+        minSdkVersion safeExtGet('minSdkVersion', 21)
         targetSdkVersion safeExtGet('targetSdkVersion', 28)
         versionCode 1
         versionName "1.0"
@@ -67,12 +68,8 @@ android {
                 manifest.srcFile "src/main/AndroidManifestNew.xml"
             }
             java {
-                srcDir glideHasAnimatedDecoder ? "src/glide-4.15/java" : "src/glide-older/java"
                 if (excludeAppGlideModule) {
-                    srcDir "src"
                     exclude "**/FastImageGlideModule.java"
-                    // Only the one chosen above.
-                    exclude "glide-*/**"
                 }
             }
         }
@@ -104,16 +101,11 @@ dependencies {
     implementation "com.github.bumptech.glide:annotations:${glideVersion}"
     implementation "com.github.bumptech.glide:okhttp3-integration:${glideVersion}"
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
-    // SVG images, when the app has AndroidSVG (either package): not shipped,
-    // so there's never a second copy of it (see FastImageSvg).
-    compileOnly 'com.caverock:androidsvg-aar:1.4'
-    // Animated PNGs, with APNG4Android (see FastImageApng), which needs
-    // minSdkVersion 21: shipped when the app's is 21 or later. With an older
-    // one, FastImage only compiles against it, and APNGs show their first
-    // frame.
-    if (safeExtGet('minSdkVersion', 16).toString().toInteger() >= 21) {
-        implementation 'com.github.penfeizhou.android.animation:apng:3.0.5'
-    } else {
-        compileOnly 'com.github.penfeizhou.android.animation:apng:3.0.5'
-    }
+    // SVG images (see FastImageSvg). The package expo-image uses too, so
+    // apps with it get one copy. An app with the other package
+    // (com.caverock:androidsvg, the same classes) excludes this one (see
+    // docs/troubleshooting.md); FastImageSvg works with either.
+    implementation 'com.caverock:androidsvg-aar:1.4'
+    // Animated PNGs (see FastImageApng).
+    implementation 'com.github.penfeizhou.android.animation:apng:3.0.5'
 }

package/android/consumer-rules.pro

@@ -34,19 +34,8 @@
   public *;
 }
 
-# React Native's event dispatcher, which FastImage looks up by name
-# (FastImageEvents), so it still compiles against React Native 0.60-0.62,
-# which don't have it. R8 would rename it, and on the New Architecture every
-# event (onLoad, onError, ...) would then be dropped.
--keep class com.facebook.react.uimanager.UIManagerHelper {
-  public static *** getEventDispatcherForReactTag(com.facebook.react.bridge.ReactContext, int);
-}
-
-# AndroidSVG, which FastImage uses for SVG images when the app has it
-# (FastImageSvgRenderer), and doesn't ship. Without it, R8 would stop at the
-# missing classes.
+# AndroidSVG, which FastImage includes, but an app with its other package
+# (com.caverock:androidsvg) leaves out (docs/troubleshooting.md), and may not
+# have at all: then SVG images fail with a message (FastImageSvg) instead of
+# the app's R8 build failing on the missing classes.
 -dontwarn com.caverock.androidsvg.**
-
-# APNG4Android, which FastImage uses for animated PNGs (FastImageApngRenderer),
-# and doesn't ship to apps with a minSdkVersion below 21 (build.gradle).
--dontwarn com.github.penfeizhou.animation.**

package/android/src/main/java/com/dylanvann/fastimage/FastImageAnimatable.java

@@ -1,7 +1,7 @@
 package com.dylanvann.fastimage;
 
 // An animated image that applies FastImage's loop and paused itself (an APNG,
-// FastImageApngRenderer). The view's target starts it when it's shown.
+// FastImageApng). The view's target starts it when it's shown.
 interface FastImageAnimatable {
     // loopCount as FastImageViewWithUrl has it: -1, as many times as the file
     // says; 0, forever; n, n times. restart: play it again from its first

package/android/src/{glide-4.15 → main}/java/com/dylanvann/fastimage/FastImageAnimated.java

@@ -49,9 +49,6 @@ import java.util.concurrent.Executors;
 // Not animated (dontAnimate: blurRadius, resizeMode repeat), they're decoded
 // as their first frame, a bitmap, as GIFs are, and as Glide did before 4.15.
 // Glide's own decoder for them doesn't check that option.
-//
-// Built only with Glide 4.15 or later, which has the decoder this wraps; with
-// an older Glide, src/glide-older's stand-in does nothing (build.gradle).
 final class FastImageAnimated {
     private FastImageAnimated() {}
 

package/android/src/main/java/com/dylanvann/fastimage/FastImageApng.java

@@ -1,7 +1,7 @@
 package com.dylanvann.fastimage;
 
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -12,6 +12,10 @@ import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifOptions;
 import com.bumptech.glide.util.ByteBufferUtil;
+import com.github.penfeizhou.animation.apng.APNGDrawable;
+import com.github.penfeizhou.animation.apng.decode.APNGDecoder;
+import com.github.penfeizhou.animation.loader.ByteBufferLoader;
+import com.github.penfeizhou.animation.loader.Loader;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,41 +23,23 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 // Animated PNGs (APNG), animated with APNG4Android
-// (com.github.penfeizhou.android.animation:apng), which FastImage ships when
-// the app's minSdkVersion is 21 or later, as APNG4Android needs (build.gradle).
-// Without it, an APNG shows its first frame, as Android shows it. Android and
-// Glide don't animate APNG themselves.
+// (com.github.penfeizhou.android.animation:apng), which FastImage includes.
+// Android and Glide don't animate APNG themselves.
 //
 // The decoders come before Glide's own, and only take PNGs with an animation
 // control chunk (acTL), when the request animates (not with dontAnimate:
 // blurRadius, resizeMode repeat, which get the first frame from Glide's
-// decoder). This class doesn't use APNG4Android itself
-// (FastImageApngRenderer does), so it loads without it.
+// decoder).
 final class FastImageApng {
     // As much of the start of the file as is read to find acTL, which comes
     // before the image data.
     private static final int HEAD_LENGTH = 4096;
     private static final byte[] SIGNATURE = {(byte) 0x89, 'P', 'N', 'G', '\r', '\n', 0x1a, '\n'};
-    @Nullable
-    private static Boolean available;
 
     private FastImageApng() {
     }
 
-    static synchronized boolean available() {
-        if (available == null) {
-            try {
-                // Android 5+, as APNG4Android needs.
-                available = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && FastImageApngRenderer.available();
-            } catch (Throwable e) {
-                available = false;
-            }
-        }
-        return available;
-    }
-
     static void register(@NonNull Registry registry) {
-        if (!available()) return;
         registry.prepend(InputStream.class, Drawable.class, new StreamDecoder())
                 .prepend(ByteBuffer.class, Drawable.class, new BufferDecoder());
     }
@@ -106,7 +92,7 @@ final class FastImageApng {
         @Override
         public Resource<Drawable> decode(@NonNull ByteBuffer source, int width, int height, @NonNull Options options)
                 throws IOException {
-            return FastImageApngRenderer.decode(source.duplicate(), plays(source));
+            return decodeApng(source.duplicate(), plays(source));
         }
     }
 
@@ -135,7 +121,136 @@ final class FastImageApng {
         public Resource<Drawable> decode(@NonNull InputStream source, int width, int height, @NonNull Options options)
                 throws IOException {
             ByteBuffer data = ByteBufferUtil.fromStream(source);
-            return FastImageApngRenderer.decode(data, plays(data));
+            return decodeApng(data, plays(data));
+        }
+    }
+
+    // APNG4Android: Glide keeps the image's data in its memory cache, and each
+    // view gets a drawable of its own over it, so views don't share playback:
+    // making one only reads the image's header, and it decodes its frames (at a
+    // sample size from the size it's drawn at) on APNG4Android's threads as it
+    // plays.
+    private static Loader loader(ByteBuffer data) {
+        return new ByteBufferLoader() {
+            @Override
+            public ByteBuffer getByteBuffer() {
+                ByteBuffer buffer = data.duplicate();
+                buffer.position(0);
+                return buffer;
+            }
+        };
+    }
+
+    // Null if APNG4Android can't read it (Glide then decodes it as a PNG).
+    @Nullable
+    private static Resource<Drawable> decodeApng(@NonNull ByteBuffer data, int plays) {
+        // Reads the header, waiting for APNG4Android's thread.
+        Rect bounds = new APNGDecoder(loader(data), null).getBounds();
+        if (bounds.isEmpty()) return null;
+        return new ApngResource(data, plays, bounds);
+    }
+
+    private static final class ApngResource implements Resource<Drawable> {
+        private final ByteBuffer data;
+        private final int plays;
+        private final Rect bounds;
+
+        ApngResource(ByteBuffer data, int plays, Rect bounds) {
+            this.data = data;
+            this.plays = plays;
+            this.bounds = bounds;
+        }
+
+        @NonNull
+        @Override
+        public Class<Drawable> getResourceClass() {
+            return Drawable.class;
+        }
+
+        @NonNull
+        @Override
+        public Drawable get() {
+            return new ApngDrawable(loader(data), plays);
+        }
+
+        // The data, and a frame at full size (each view's drawable has its
+        // own, at the size it's drawn at).
+        @Override
+        public int getSize() {
+            // As a long: a very large image's frame overflows an int.
+            long size = data.limit() + (long) bounds.width() * bounds.height() * 4;
+            return (int) Math.min(size, Integer.MAX_VALUE);
+        }
+
+        @Override
+        public void recycle() {
+        }
+    }
+
+    private static final class ApngDrawable extends APNGDrawable implements FastImageAnimatable {
+        // How many times the file says it plays (0: forever).
+        private final int plays;
+        private volatile boolean paused = false;
+        // Once a frame has been rendered (on the decoder's thread).
+        private volatile boolean rendered = false;
+
+        ApngDrawable(Loader loader, int plays) {
+            super(loader);
+            this.plays = plays;
+        }
+
+        @Override
+        public void setLoopCount(int loopCount, boolean restart) {
+            // Plays (0: forever), as APNG4Android counts them.
+            setLoopLimit(loopCount == -1 ? plays : loopCount);
+            if (restart) {
+                reset();
+                start();
+            }
+        }
+
+        @Override
+        public void setPaused(boolean paused) {
+            this.paused = paused;
+            // It starts and stops itself as it's shown and hidden, but not
+            // while paused.
+            setAutoPlay(!paused);
+            if (paused) {
+                // Before the first frame, onStart pauses once it's rendered:
+                // the decoder's start clears a pause, then skips rendering if
+                // one came in meanwhile, which left the view blank.
+                if (rendered) pause();
+            } else {
+                resume();
+            }
+        }
+
+        // From its first frame. The target starts it right after
+        // setVisible(true) has (auto play): APNG4Android's start() stops and
+        // starts a running decoder, and a stop made while the decoder is
+        // still starting can win over that start, leaving it stopped on its
+        // first frame. A running one is reset to its first frame instead.
+        @Override
+        public void start() {
+            if (isRunning()) {
+                getFrameSeqDecoder().reset();
+                return;
+            }
+            super.start();
+        }
+
+        @Override
+        public void onRender(ByteBuffer byteBuffer) {
+            super.onRender(byteBuffer);
+            rendered = true;
+        }
+
+        // On its decoder thread, once starting has drawn the first frame:
+        // starting clears a pause made before it got there, so pause again.
+        @Override
+        public void onStart() {
+            super.onStart();
+            if (paused) getFrameSeqDecoder().pause();
         }
     }
 }

package/android/src/main/java/com/dylanvann/fastimage/FastImageCookieHandler.java

@@ -1,10 +1,7 @@
 package com.dylanvann.fastimage;
 
-import android.content.Context;
-import android.os.Build;
 import android.text.TextUtils;
 import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
 
 import androidx.annotation.Nullable;
 
@@ -21,14 +18,9 @@ import java.util.Map;
 // without the ReactContext that one needs (up to at least 0.77). Used through
 // OkHttp's JavaNetCookieJar, which parses the cookies.
 final class FastImageCookieHandler extends CookieHandler {
-    private final Context context;
     @Nullable
     private CookieManager cookieManager;
 
-    FastImageCookieHandler(Context context) {
-        this.context = context.getApplicationContext();
-    }
-
     @Override
     public Map<String, List<String>> get(URI uri, Map<String, List<String>> requestHeaders) {
         CookieManager cookieManager = cookieManager();
@@ -52,28 +44,15 @@ final class FastImageCookieHandler extends CookieHandler {
                 added = true;
             }
         }
-        if (added) flush(cookieManager);
-    }
-
-    @SuppressWarnings("deprecation")
-    private static void flush(CookieManager cookieManager) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.flush();
-        } else {
-            CookieSyncManager.getInstance().sync();
-        }
+        if (added) cookieManager.flush();
     }
 
     // null while the WebView isn't available (not installed, or being
     // updated): requests go without cookies then, instead of failing.
     @Nullable
-    @SuppressWarnings("deprecation")
     private synchronized CookieManager cookieManager() {
         if (cookieManager == null) {
             try {
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                    CookieSyncManager.createInstance(context);
-                }
                 cookieManager = CookieManager.getInstance();
             } catch (Exception e) {
                 return null;

package/android/src/main/java/com/dylanvann/fastimage/FastImageEvent.java

@@ -2,7 +2,6 @@ package com.dylanvann.fastimage;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 // An event for a FastImage view, sent with the EventDispatcher (see
 // FastImageEvents) instead of the RCTEventEmitter JS module, which the New
@@ -11,11 +10,8 @@ class FastImageEvent extends Event<FastImageEvent> {
     private final String name;
     private final WritableMap data;
 
-    // Event(viewTag) works back to React Native 0.60. Without a surface id,
-    // Fabric finds the view by its tag.
-    @SuppressWarnings("deprecation")
-    FastImageEvent(int viewTag, String name, WritableMap data) {
-        super(viewTag);
+    FastImageEvent(int surfaceId, int viewTag, String name, WritableMap data) {
+        super(surfaceId, viewTag);
         this.name = name;
         this.data = data;
     }
@@ -31,15 +27,8 @@ class FastImageEvent extends Event<FastImageEvent> {
         return false;
     }
 
-    // Overrides Event.getEventData on React Native 0.65+ (not on older ones,
-    // hence no @Override).
+    @Override
     protected WritableMap getEventData() {
         return data;
     }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public void dispatch(RCTEventEmitter rctEventEmitter) {
-        rctEventEmitter.receiveEvent(getViewTag(), name, data);
-    }
 }

package/android/src/main/java/com/dylanvann/fastimage/FastImageEvents.java

@@ -2,23 +2,14 @@ package com.dylanvann.fastimage;
 
 import android.view.View;
 
-import androidx.annotation.Nullable;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.events.EventDispatcher;
 
-import java.lang.reflect.Method;
-
 // Sends FastImage view events through React Native's EventDispatcher.
 final class FastImageEvents {
-    // UIManagerHelper.getEventDispatcherForReactTag (React Native 0.63+, also
-    // bridgeless). Looked up by reflection so older versions still compile.
-    @Nullable
-    private static final Method GET_EVENT_DISPATCHER = findGetEventDispatcher();
-
     private FastImageEvents() {
     }
 
@@ -47,32 +38,12 @@ final class FastImageEvents {
     static void send(View view, String name, WritableMap data) {
         ReactContext context = FastImageViewManager.getReactContext(view.getContext());
         if (context == null) return;
-        EventDispatcher dispatcher = eventDispatcher(context, view.getId());
+        // The view's event dispatcher, on either architecture (also
+        // bridgeless).
+        EventDispatcher dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.getId());
         if (dispatcher != null) {
-            dispatcher.dispatchEvent(new FastImageEvent(view.getId(), name, data));
-        }
-    }
-
-    @Nullable
-    private static EventDispatcher eventDispatcher(ReactContext context, int viewTag) {
-        if (GET_EVENT_DISPATCHER != null) {
-            try {
-                return (EventDispatcher) GET_EVENT_DISPATCHER.invoke(null, context, viewTag);
-            } catch (Exception ignored) {
-                // Fall back to the UIManagerModule's.
-            }
-        }
-        UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
-        return uiManager == null ? null : uiManager.getEventDispatcher();
-    }
-
-    @Nullable
-    private static Method findGetEventDispatcher() {
-        try {
-            return Class.forName("com.facebook.react.uimanager.UIManagerHelper")
-                    .getMethod("getEventDispatcherForReactTag", ReactContext.class, int.class);
-        } catch (Exception e) {
-            return null;
+            dispatcher.dispatchEvent(new FastImageEvent(
+                    UIManagerHelper.getSurfaceId(view), view.getId(), name, data));
         }
     }
 }

package/android/src/main/java/com/dylanvann/fastimage/FastImageOkHttpProgressGlideModule.java

@@ -116,7 +116,7 @@ public class FastImageOkHttpProgressGlideModule extends LibraryGlideModule {
         // images were loaded without the app's cookies, unlike on iOS. Use the
         // same cookie store. A cookie jar the app set up itself is kept.
         if (sharedClient.cookieJar() instanceof CookieJarContainer) {
-            builder.cookieJar(new JavaNetCookieJar(new FastImageCookieHandler(context)));
+            builder.cookieJar(new JavaNetCookieJar(new FastImageCookieHandler()));
         }
         OkHttpClient client = builder.build();
         // `cache: 'web'` skips Glide's caches and relies on HTTP caching, so

package/android/src/main/java/com/dylanvann/fastimage/FastImageSvg.java

@@ -19,11 +19,11 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
-// SVG images (static), drawn with AndroidSVG when the app has it: either of
-// its packages (com.caverock:androidsvg or com.caverock:androidsvg-aar).
-// FastImage compiles against it but doesn't ship it, so an app never gets a
-// second copy of it (from another library, or its own). Without it, an SVG
-// image fails with a message saying what to add.
+// SVG images (static), drawn with AndroidSVG, which FastImage includes
+// (com.caverock:androidsvg-aar). An app with its other package
+// (com.caverock:androidsvg, the same classes) leaves FastImage's out
+// (docs/troubleshooting.md), so it may be missing: then an SVG image fails
+// with a message saying what to do.
 //
 // The decoders come after Glide's own, so they're only asked about data
 // Glide couldn't decode, and only take data that starts like an SVG. This
@@ -31,7 +31,7 @@ import java.util.Locale;
 // loads without it.
 final class FastImageSvg {
     static final String MISSING =
-            "SVG images need AndroidSVG: add implementation 'com.caverock:androidsvg-aar:1.4' to the app's dependencies";
+            "SVG images need AndroidSVG: the app leaves FastImage's out (an exclude of com.caverock:androidsvg-aar), so add its other package (implementation 'com.caverock:androidsvg:1.4') or remove the exclude";
     private static final int HEAD_LENGTH = 1024;
     @Nullable
     private static Boolean available;