@nativescript-community/ui-image 4.3.26 → 4.3.28

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.28](https://github.com/nativescript-community/ui-image/compare/v4.3.27...v4.3.28) (2024-01-23)
+
+### Bug Fixes
+
+* **android:** improvement for future N ([f8e10f5](https://github.com/nativescript-community/ui-image/commit/f8e10f56945dbb76800d9fd90f2c6bd40966423f))
+
+## [4.3.27](https://github.com/nativescript-community/ui-image/compare/v4.3.26...v4.3.27) (2023-11-24)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
 ## [4.3.26](https://github.com/nativescript-community/ui-image/compare/v4.3.25...v4.3.26) (2023-11-24)
 
 **Note:** Version bump only for package @nativescript-community/ui-image

package/index.android.d.ts

@@ -10,8 +10,8 @@ export declare class ImagePipeline {
     isInDiskCache(uri: string | android.net.Uri): boolean;
     isInBitmapMemoryCache(uri: string | android.net.Uri): boolean;
     evictFromMemoryCache(uri: string | android.net.Uri): void;
-    evictFromDiskCache(uri: string | android.net.Uri): void;
-    evictFromCache(uri: string | android.net.Uri): void;
+    evictFromDiskCache(uri: string | android.net.Uri): Promise<void>;
+    evictFromCache(uri: string | android.net.Uri): Promise<void>;
     clearCaches(): void;
     clearMemoryCaches(): void;
     clearDiskCaches(): void;
@@ -75,7 +75,7 @@ export declare class Img extends ImageBase {
     updateViewSize(imageInfo: any): void;
     disposeNativeView(): void;
     get cacheKey(): string | globalAndroid.net.Uri;
-    updateImageUri(): void;
+    updateImageUri(): Promise<void>;
     controllerListener: com.facebook.drawee.controller.ControllerListener<com.facebook.imagepipeline.image.ImageInfo>;
     protected initImage(): Promise<void>;
     private updateHierarchy;

package/index.android.js

@@ -8,7 +8,7 @@ let initialized = false;
 let initializeConfig;
 export function initialize(config) {
     if (!initialized) {
-        const context = Utils.ad.getApplicationContext();
+        const context = Utils.android.getApplicationContext();
         if (!context) {
             initializeConfig = config;
             return;
@@ -72,7 +72,7 @@ function getUri(src, asNative = true) {
     if (Utils.isFileOrResourcePath(imagePath)) {
         if (imagePath.indexOf(Utils.RESOURCE_PREFIX) === 0) {
             const resName = imagePath.substring(Utils.RESOURCE_PREFIX.length);
-            const identifier = Utils.ad.resources.getDrawableId(resName);
+            const identifier = Utils.android.resources.getDrawableId(resName);
             if (0 < identifier) {
                 const netUri = new android.net.Uri.Builder().scheme(com.facebook.common.util.UriUtil.LOCAL_RESOURCE_SCHEME).path(java.lang.String.valueOf(identifier)).build();
                 if (asNative) {
@@ -113,10 +113,10 @@ export class ImagePipeline {
     evictFromMemoryCache(uri) {
         this._android.evictFromMemoryCache(this.toUri(uri));
     }
-    evictFromDiskCache(uri) {
+    async evictFromDiskCache(uri) {
         this._android.evictFromDiskCache(this.toUri(uri));
     }
-    evictFromCache(uri) {
+    async evictFromCache(uri) {
         this._android.evictFromCache(this.toUri(uri));
     }
     clearCaches() {
@@ -360,14 +360,14 @@ export class Img extends ImageBase {
         }
         return undefined;
     }
-    updateImageUri() {
+    async updateImageUri() {
         const imagePipeLine = getImagePipeline();
         const cacheKey = this.cacheKey;
         const src = this.src;
         if (cacheKey) {
             // const isInCache = imagePipeLine.isInBitmapMemoryCache(uri);
             // // if (isInCache) {
-            imagePipeLine.evictFromCache(cacheKey);
+            await imagePipeLine.evictFromCache(cacheKey);
             // }
         }
         this.src = null;
@@ -448,7 +448,7 @@ export class Img extends ImageBase {
             if (src) {
                 let drawable;
                 if (src instanceof ImageSource) {
-                    drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), src.android);
+                    drawable = new android.graphics.drawable.BitmapDrawable(Utils.android.getApplicationContext().getResources(), src.android);
                     this.updateViewSize(src.android);
                 }
                 else if (Utils.isFontIconURI(src)) {
@@ -457,7 +457,7 @@ export class Img extends ImageBase {
                         // support sync mode only
                         const font = this.style.fontInternal;
                         const color = this.style.color;
-                        drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
+                        drawable = new android.graphics.drawable.BitmapDrawable(Utils.android.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
                     }
                 }
                 if (drawable) {
@@ -682,7 +682,7 @@ export class Img extends ImageBase {
             const bottomRightRadius = this.roundBottomRightRadius || 0;
             const bottomLeftRadius = this.roundBottomLeftRadius || 0;
             if (topLeftRadius || topRightRadius || bottomRightRadius || bottomLeftRadius) {
-                builder.setCornersRadii(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius);
+                builder.setCornersRadii(Utils.layout.toDevicePixels(topLeftRadius), Utils.layout.toDevicePixels(topRightRadius), Utils.layout.toDevicePixels(bottomRightRadius), Utils.layout.toDevicePixels(bottomLeftRadius));
             }
             this.nativeImageViewProtected.setHierarchy(builder.build());
             if (!this.mNeedRequestImage) {
@@ -699,7 +699,7 @@ export class Img extends ImageBase {
                     // support sync mode only
                     const font = this.style.fontInternal;
                     const color = this.style.color;
-                    drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
+                    drawable = new android.graphics.drawable.BitmapDrawable(Utils.android.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
                 }
             }
             else if (Utils.isFileOrResourcePath(path)) {
@@ -712,7 +712,7 @@ export class Img extends ImageBase {
             }
         }
         else {
-            drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), path.android);
+            drawable = new android.graphics.drawable.BitmapDrawable(Utils.android.getApplicationContext().getResources(), path.android);
         }
         return drawable;
     }
@@ -720,14 +720,17 @@ export class Img extends ImageBase {
         const img = ImageSource.fromFileSync(localFilePath);
         let drawable = null;
         if (img) {
-            drawable = new android.graphics.drawable.BitmapDrawable(Utils.ad.getApplicationContext().getResources(), img.android);
+            drawable = new android.graphics.drawable.BitmapDrawable(Utils.android.getApplicationContext().getResources(), img.android);
         }
         return drawable;
     }
     getDrawableFromResource(resourceName) {
-        const identifier = Utils.ad.getApplication().getResources().getIdentifier(resourceName.substr(Utils.RESOURCE_PREFIX.length), 'drawable', Utils.ad.getApplication().getPackageName());
+        const application = Utils.android.getApplication();
+        const resources = application.getResources();
+        const identifier = resources.getIdentifier(resourceName.substring(Utils.RESOURCE_PREFIX.length), 'drawable', application.getPackageName());
         // we return the identifier to allow Fresco to handle memory / caching
         return identifier;
+        // return Utils.android.getApplicationContext().getDrawable(identifier);
     }
     startAnimating() {
         if (this.nativeImageViewProtected) {

package/index.d.ts

@@ -55,7 +55,7 @@ export class Img extends View {
     /**
      * Removes all images with the specified Uri from the memory or/and disk and reinitialize the 'src'.
      */
-    updateImageUri(): void;
+    async updateImageUri();
 
     /**
      * Start image animation
@@ -378,12 +378,12 @@ export class ImagePipeline {
     /**
      * Removes all images with the specified Uri from disk cache.
      */
-    evictFromDiskCache(uri: string): void;
+    async evictFromDiskCache(uri: string): void;
 
     /**
      * Removes all images with the specified Uri from all the caches (memory and disk).
      */
-    evictFromCache(uri: string): void;
+    async evictFromCache(uri: string): void;
 
     /**
      * Clear all the caches (memory and disk).

package/index.ios.d.ts

@@ -20,8 +20,8 @@ export declare class ImagePipeline {
     isInDiskCache(key: string): boolean;
     isInBitmapMemoryCache(key: string): boolean;
     evictFromMemoryCache(key: string): void;
-    evictFromDiskCache(key: string): void;
-    evictFromCache(key: string): void;
+    evictFromDiskCache(key: string): Promise<void>;
+    evictFromCache(key: string): Promise<void>;
     clearCaches(): void;
     clearMemoryCaches(): void;
     clearDiskCaches(): void;
@@ -43,7 +43,7 @@ export declare class Img extends ImageBase {
     createNativeView(): UIImageView;
     _setNativeClipToBounds(): void;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
-    updateImageUri(): void;
+    updateImageUri(): Promise<void>;
     _setNativeImage(nativeImage: UIImage, animated?: boolean): void;
     private handleImageLoaded;
     private onLoadProgress;

package/index.ios.js

@@ -89,14 +89,15 @@ export class ImagePipeline {
     evictFromMemoryCache(key) {
         this.mIos.removeImageFromMemoryForKey(key);
     }
-    evictFromDiskCache(key) {
-        this.mIos.removeImageFromDiskForKey(key);
+    async evictFromDiskCache(key) {
+        return new Promise((resolve) => {
+            this.mIos.removeImageForKeyCacheTypeCompletion(key, 1 /* SDImageCacheType.Disk */, resolve);
+        });
     }
-    evictFromCache(key) {
-        // const key = getUri(uri).absoluteString;
-        this.mIos.removeImageFromDiskForKey(key);
-        this.mIos.removeImageFromMemoryForKey(key);
-        // this.mIos.removeImageForKeyWithCompletion(getUri(uri).absoluteString, null);
+    async evictFromCache(key) {
+        return new Promise((resolve) => {
+            this.mIos.removeImageForKeyCacheTypeCompletion(key, 3 /* SDImageCacheType.All */, resolve);
+        });
     }
     clearCaches() {
         this.mIos.clearMemory();
@@ -265,10 +266,10 @@ export class Img extends ImageBase {
                 const viewRatio = width / height;
                 if (viewRatio < ratio) {
                     widthMeasureSpec = layout.makeMeasureSpec(width, layout.EXACTLY);
-                    heightMeasureSpec = layout.makeMeasureSpec((width / ratio), layout.EXACTLY);
+                    heightMeasureSpec = layout.makeMeasureSpec(width / ratio, layout.EXACTLY);
                 }
                 else {
-                    widthMeasureSpec = layout.makeMeasureSpec((height * ratio), layout.EXACTLY);
+                    widthMeasureSpec = layout.makeMeasureSpec(height * ratio, layout.EXACTLY);
                     heightMeasureSpec = layout.makeMeasureSpec(height, layout.EXACTLY);
                 }
             }
@@ -278,18 +279,18 @@ export class Img extends ImageBase {
         }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
-    updateImageUri() {
+    async updateImageUri() {
         const imagePipeLine = getImagePipeline();
         const src = this.src;
         if (!(src instanceof ImageSource)) {
             const cachekKey = this.mCacheKey || getUri(src).absoluteString;
             // const isInCache = imagePipeLine.isInBitmapMemoryCache(cachekKey);
             // if (isInCache) {
-            imagePipeLine.evictFromCache(cachekKey);
+            await imagePipeLine.evictFromCache(cachekKey);
             // }
         }
         this.src = null;
-        // ensure we clear the image as 
+        // ensure we clear the image as
         this._setNativeImage(null, false);
         this.src = src;
     }
@@ -378,6 +379,10 @@ export class Img extends ImageBase {
                 const uri = getUri(src);
                 this.isLoading = true;
                 let options = 2048 /* SDWebImageOptions.ScaleDownLargeImages */ | 1024 /* SDWebImageOptions.AvoidAutoSetImage */;
+                if (this.placeholderImageUri) {
+                    this.placeholderImage = this.getUIImage(this.placeholderImageUri);
+                    this._setNativeImage(this.placeholderImage, animate);
+                }
                 if (this.noCache) {
                     // const key = uri.absoluteString;
                     // const imagePipeLine = getImagePipeline();
@@ -445,8 +450,8 @@ export class Img extends ImageBase {
         this.initImage();
     }
     [_c = placeholderImageUriProperty.setNative]() {
-        this.placeholderImage = this.getUIImage(this.placeholderImageUri);
-        this.initImage();
+        // this.placeholderImage = this.getUIImage(this.placeholderImageUri);
+        // this.initImage();
     }
     [failureImageUriProperty.setNative]() {
         // this.updateHierarchy();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.26",
+    "version": "4.3.28",
     "description": "Advanced and efficient image display plugin which uses Fresco (Android) and SDWebImage (iOS) to implement caching, placeholders, image effects, and much more.",
     "main": "./index",
     "sideEffects": false,
@@ -44,5 +44,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "2830ed62627e85464ad0c79fdb2bc1b20cae0255"
+    "gitHead": "482d5862d487c81f0ae413887f9ae3070c549772"
 }

package/platforms/android/java/com/nativescript/image/DraweeView.java

@@ -123,34 +123,40 @@ public class DraweeView extends SimpleDraweeView {
         mLegacyVisibilityHandlingEnabled = legacyVisibilityHandlingEnabled;
     }
 
-	// private final Rect outlineRect = new RectF();
-    public void updateOutlineProvider() {
+	public void updateOutlineProvider() {
         Drawable drawable = getBackground();
-        isUsingOutlineProvider = false;
-        if (android.os.Build.VERSION.SDK_INT >= 21 && drawable instanceof BorderDrawable && (android.os.Build.VERSION.SDK_INT >= 33 || ((BorderDrawable)drawable).hasUniformBorderRadius())) {
-            setOutlineProvider(new ViewOutlineProvider() {
-                @Override
-                public void getOutline(View view, Outline outline) {
-                    Drawable drawable = getBackground();
-                    if (drawable instanceof BorderDrawable) {
-                        BorderDrawable borderDrawable = (BorderDrawable) drawable;
-                        // that if test is only needed until N BorderDrawable is updated to do it
-                        if (borderDrawable.hasUniformBorderRadius()) {
-			                // outlineRect.set(borderDrawable.getBounds());
-                            outline.setRoundRect(borderDrawable.getBounds(), borderDrawable.getBorderBottomLeftRadius());
+        if (android.os.Build.VERSION.SDK_INT >= 21) {
+            // we try to support N setting outline provider now
+            if (!isUsingOutlineProvider && getOutlineProvider() != null) {
+                // already handled somewhere else
+                return;
+            }
+            if (drawable instanceof BorderDrawable && (android.os.Build.VERSION.SDK_INT >= 33 || ((BorderDrawable)drawable).hasUniformBorderRadius())) {
+                setOutlineProvider(new ViewOutlineProvider() {
+                    @Override
+                    public void getOutline(View view, Outline outline) {
+                        Drawable drawable = getBackground();
+                        if (drawable instanceof BorderDrawable) {
+                            BorderDrawable borderDrawable = (BorderDrawable) drawable;
+                            // that if test is only needed until N BorderDrawable is updated to do it
+                            if (borderDrawable.hasUniformBorderRadius()) {
+                                // outlineRect.set(borderDrawable.getBounds());
+                                outline.setRoundRect(borderDrawable.getBounds(), borderDrawable.getBorderBottomLeftRadius());
+                            } else {
+                                drawable.getOutline(outline);
+                            }
                         } else {
-                            drawable.getOutline(outline);
+                            outline.setRect(100, 100, view.getWidth() - 200, view.getHeight() - 200);
                         }
-                    } else {
-                        outline.setRect(100, 100, view.getWidth() - 200, view.getHeight() - 200);
                     }
-                }
-            });
-            setClipToOutline(true);
-            isUsingOutlineProvider = true;
-        } else if (android.os.Build.VERSION.SDK_INT >= 21) {
-            setOutlineProvider(null);
-            setClipToOutline(false);
+                });
+                setClipToOutline(true);
+                isUsingOutlineProvider = true;
+            // } else if (android.os.Build.VERSION.SDK_INT >= 21) {
+            //     isUsingOutlineProvider = false;
+            //     setOutlineProvider(null);
+            //     setClipToOutline(false);
+            }
         }
     }
 
@@ -293,6 +299,22 @@ public class DraweeView extends SimpleDraweeView {
         }
         
         ImageRequest request = requestBuilder.build();
+
+        // if (object != null && object.optBoolean("async") == false) {
+        //     DataSource<CloseableReference<CloseableImage>> dataSource =
+        //         imagePipeline.fetchImageFromBitmapCache(imageRequest, uri.toString());
+        //     try {
+        //     CloseableReference<CloseableImage> result = DataSources.waitForFinalResult(dataSource);
+        //     if (result != null) {
+        //         // Do something with the image, but do not keep the reference to it!
+        //         // The image may get recycled as soon as the reference gets closed below.
+        //         // If you need to keep a reference to the image, read the following sections.
+        //     }
+        //     } finally {
+        //         dataSource.close();
+        //     }
+        // }
+
         PipelineDraweeControllerBuilder builder = com.facebook.drawee.backends.pipeline.Fresco.newDraweeControllerBuilder();
         builder.setImageRequest(request);
         builder.setCallerContext(uri.toString());