react-native-fast-image 8.6.29 → 8.6.31

package/android/build.gradle

@@ -74,6 +74,8 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
     implementation "com.github.bumptech.glide:glide:${glideVersion}"
+    // FastImageGlideModule and FastImageOkHttpProgressGlideModule use @GlideModule.
+    implementation "com.github.bumptech.glide:annotations:${glideVersion}"
     implementation "com.github.bumptech.glide:okhttp3-integration:${glideVersion}"
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
 }

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

@@ -17,6 +17,7 @@ public class FastImageSource extends ImageSource {
     private static final String ANDROID_RESOURCE_SCHEME = "android.resource";
     private static final String ANDROID_CONTENT_SCHEME = "content";
     private static final String LOCAL_FILE_SCHEME = "file";
+    private static final String ASSET_SCHEME = "asset";
     private final Headers mHeaders;
     private Uri mUri;
 
@@ -40,6 +41,10 @@ public class FastImageSource extends ImageSource {
         return LOCAL_FILE_SCHEME.equals(uri.getScheme());
     }
 
+    public static boolean isAssetUri(Uri uri) {
+        return ASSET_SCHEME.equals(uri.getScheme());
+    }
+
     public FastImageSource(Context context, String source) {
         this(context, source, null);
     }
@@ -62,6 +67,12 @@ public class FastImageSource extends ImageSource {
             // glide can understand the uri.
             mUri = Uri.parse(mUri.toString().replace("res:/", ANDROID_RESOURCE_SCHEME + "://" + context.getPackageName() + "/"));
         }
+
+        if (isAssetUri(mUri) && mUri.getPath() != null) {
+            // Convert asset:/ (a file in the app's assets, as React Native's
+            // Image supports) to file:///android_asset/, which Glide loads.
+            mUri = Uri.parse(LOCAL_FILE_SCHEME + ":///android_asset" + mUri.getPath());
+        }
     }
 
 

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

@@ -55,16 +55,9 @@ class FastImageViewModule extends ReactContextBaseJavaModule {
 
                     Glide
                             .with(activity.getApplicationContext())
-                            // This will make this work for remote and local images. e.g.
-                            //    - file:///
-                            //    - content://
-                            //    - res:/
-                            //    - android.resource://
-                            //    - data:image/png;base64
-                            .load(
-                                    imageSource.isBase64Resource() ? imageSource.getSource() :
-                                    imageSource.isResource() ? imageSource.getUri() : imageSource.getGlideUrl()
-                            )
+                            // Load it the way the view does, so local images
+                            // (file://, content://, asset:/) work too.
+                            .load(imageSource.getSourceForLoad())
                             .apply(FastImageViewConverter.getOptions(activity, imageSource, source))
                             .preload();
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "8.6.29",
+    "version": "8.6.31",
     "description": "🚩 FastImage, performant React Native image component.",
     "keywords": [
         "cache",