@nativescript-community/ui-image 4.0.32 → 4.1.1

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.1](https://github.com/nativescript-community/ui-image/compare/v4.1.0...v4.1.1) (2021-12-23)
+
+
+### Bug Fixes
+
+* android remove dep on annotationx ([c9fdfbe](https://github.com/nativescript-community/ui-image/commit/c9fdfbe8f7c7f876abb53b1d8b9b7c68d65ae21f))
+
+
+
+
+
+# [4.1.0](https://github.com/nativescript-community/ui-image/compare/v4.0.34...v4.1.0) (2021-10-21)
+
+
+### Features
+
+* **android:** native-api-usage ([0ec235c](https://github.com/nativescript-community/ui-image/commit/0ec235c2df1d5c4f6f30615766ea17ba74576dc7))
+
+
+
+
+
+## [4.0.34](https://github.com/nativescript-community/ui-image/compare/v4.0.33...v4.0.34) (2021-10-15)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
+
+
+
+
+## [4.0.33](https://github.com/nativescript-community/ui-image/compare/v4.0.32...v4.0.33) (2021-10-08)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
+
+
+
+
 ## [4.0.32](https://github.com/nativescript-community/ui-image/compare/v4.0.31...v4.0.32) (2021-10-08)
 
 **Note:** Version bump only for package @nativescript-community/ui-image

package/image-common.d.ts

@@ -41,6 +41,7 @@ export interface ImageError {
 }
 export interface ImagePipelineConfigSetting {
     isDownsampleEnabled?: boolean;
+    leakTracker?: any;
 }
 export declare class EventData implements IEventData {
     private _eventName;

package/image.android.js

@@ -18,9 +18,13 @@ export function initialize(config) {
         if (config && config.isDownsampleEnabled) {
             builder.setDownsampleEnabled(true);
         }
+        if (config && config.leakTracker) {
+            builder.setCloseableReferenceLeakTracker(config.leakTracker);
+        }
         const imagePipelineConfig = builder.build();
         com.facebook.drawee.backends.pipeline.Fresco.initialize(context, imagePipelineConfig);
         initialized = true;
+        initializeConfig = null;
     }
 }
 export function getImagePipeline() {

package/image.ios.d.ts

@@ -38,7 +38,7 @@ export declare class Img extends ImageBase {
     _setNativeClipToBounds(): void;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
     updateImageUri(): void;
-    _setNativeImage(nativeImage: UIImage): void;
+    _setNativeImage(nativeImage: UIImage, animated?: boolean): void;
     private handleImageLoaded;
     private onLoadProgress;
     private getUIImage;

package/image.ios.js

@@ -201,17 +201,9 @@ export class Img extends ImageBase {
         this._imageSourceAffectsLayout = true;
         this.handleImageLoaded = (image, error, cacheType) => {
             this.isLoading = false;
+            const animate = (this.alwaysFade || cacheType !== 2) && this.fadeDuration > 0;
             if (image) {
-                if ((this.alwaysFade || cacheType !== 2) && this.fadeDuration > 0) {
-                    this.nativeViewProtected.alpha = 0.0;
-                    this._setNativeImage(image);
-                    UIView.animateWithDurationAnimations(this.fadeDuration / 1000, () => {
-                        this.nativeViewProtected.alpha = this.opacity;
-                    });
-                }
-                else {
-                    this._setNativeImage(image);
-                }
+                this._setNativeImage(image, animate);
             }
             if (!this.autoPlayAnimations) {
                 this.nativeViewProtected.stopAnimating();
@@ -225,7 +217,7 @@ export class Img extends ImageBase {
                 this.notify(args);
                 if (this.failureImageUri) {
                     image = this.getUIImage(this.failureImageUri);
-                    this._setNativeImage(image);
+                    this._setNativeImage(image, animate);
                 }
             }
             else if (image) {
@@ -296,8 +288,17 @@ export class Img extends ImageBase {
         this.src = null;
         this.src = src;
     }
-    _setNativeImage(nativeImage) {
-        this.nativeViewProtected.image = nativeImage;
+    _setNativeImage(nativeImage, animated = true) {
+        if (animated) {
+            this.nativeViewProtected.alpha = 0.0;
+            this.nativeViewProtected.image = nativeImage;
+            UIView.animateWithDurationAnimations(this.fadeDuration / 1000, () => {
+                this.nativeViewProtected.alpha = this.opacity;
+            });
+        }
+        else {
+            this.nativeViewProtected.image = nativeImage;
+        }
         if (this._imageSourceAffectsLayout) {
             this._imageSourceAffectsLayout = false;
             this.requestLayout();
@@ -333,8 +334,9 @@ export class Img extends ImageBase {
         if (this.nativeViewProtected) {
             const src = this.src;
             if (src) {
+                const animate = this.fadeDuration > 0;
                 if (src instanceof ImageSource) {
-                    this._setNativeImage(src.ios);
+                    this._setNativeImage(src.ios, animate);
                     return;
                 }
                 else if (typeof src === 'string') {
@@ -343,7 +345,7 @@ export class Img extends ImageBase {
                         if (fontIconCode !== undefined) {
                             const font = this.style.fontInternal;
                             const color = this.style.color;
-                            this._setNativeImage(ImageSource.fromFontIconCodeSync(fontIconCode, font, color).ios);
+                            this._setNativeImage(ImageSource.fromFontIconCodeSync(fontIconCode, font, color).ios, animate);
                         }
                         return;
                     }
@@ -387,6 +389,9 @@ export class Img extends ImageBase {
                 }
                 this.nativeViewProtected.sd_setImageWithURLPlaceholderImageOptionsContextProgressCompleted(uri, this.placeholderImage, options, context, this.onLoadProgress, this.handleImageLoaded);
             }
+            else if (this.placeholderImage) {
+                this._setNativeImage(this.placeholderImage);
+            }
             else {
                 this._setNativeImage(null);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.0.32",
+    "version": "4.1.1",
     "description": "Advanced and efficient image display plugin which uses Fresco (Android) and SDWebImage (iOS) to implement caching, placeholders, image effects, and much more.",
     "main": "./image",
     "sideEffects": false,
@@ -36,5 +36,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "b6fe5203d463683f1cb1c4435466825f54316e51"
+    "gitHead": "c7d280737dc5545b82039bf08cbd7631ef4cd7a5"
 }

package/platforms/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Dec 23 15:59:45 CET 2021
+gradle.version=6.4

package/platforms/android/include.gradle

@@ -10,12 +10,16 @@ dependencies {
 	implementation("com.facebook.fresco:fresco:$frescoVersion") {
         exclude group: 'com.facebook.soloader', module: 'soloader'
 		exclude group: 'com.facebook.fresco', module: 'soloader'
+		exclude group: 'com.facebook.fresco', module: 'nativeimagefilters'
+        exclude group: 'com.facebook.fresco', module: 'nativeimagetranscoder'
+        exclude group: 'com.facebook.fresco', module: 'memory-type-native'
+        exclude group: 'com.facebook.fresco', module: 'imagepipeline-native'
 	}
 	implementation("com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion") {
 		exclude group: 'com.facebook.soloader', module: 'soloader'
 	}
-	implementation ("com.facebook.fresco:animated-gif:$frescoVersion") {
-		exclude group: 'com.facebook.soloader', module: 'soloader'
-	}
+	// implementation ("com.facebook.fresco:animated-gif:$frescoVersion") {
+	// 	exclude group: 'com.facebook.soloader', module: 'soloader'
+	// }
     implementation(name:'widgets-release', ext:'aar')
 }

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

@@ -24,8 +24,6 @@ import org.nativescript.widgets.BorderDrawable;
 
 import java.util.Arrays;
 
-import androidx.annotation.RequiresApi;
-
 public class DraweeView extends SimpleDraweeView {
     public int imageWidth = 0;
     public int imageHeight = 0;
@@ -108,7 +106,6 @@ public class DraweeView extends SimpleDraweeView {
     Path innerBorderPath;
     Path innerBorderTempPath;
 
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     private Path generateInnerBorderPath(BorderDrawable borderDrawable) {
 
         float borderTopLeftRadius = borderDrawable.getBorderTopLeftRadius();
@@ -154,7 +151,6 @@ public class DraweeView extends SimpleDraweeView {
         return innerBorderPath;
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     @Override
     protected void onDraw(Canvas canvas) {
         Drawable drawable = getBackground();

package/platforms/android/native-api-usage.json

@@ -1,5 +1,32 @@
 {
     "uses": [
-        "com.facebook.drawee.drawable:ScalingUtils*","com.facebook.drawee.drawable.ScalingUtils:ScaleType*","com.facebook.drawee.generic:RoundingParams*","com.facebook.drawee.drawable:ProgressBarDrawable*","com.facebook.drawee.view:DraweeView*","com.facebook.drawee.interfaces:DraweeHierarchy*","com.facebook.drawee.interfaces:SettableDraweeHierarchy*","com.facebook.drawee.interfaces:SimpleDraweeControllerBuilder*","com.facebook.drawee.interfaces:DraweeController*","com.facebook.drawee.generic:GenericDraweeHierarchyBuilder*","com.facebook.drawee.generic:GenericDraweeHierarchy*","com.facebook.imagepipeline.request:ImageRequestBuilder*","com.facebook.imagepipeline.request:ImageRequest*","com.facebook.imagepipeline.core:ImagePipelineConfig*","com.facebook.imagepipeline.common:RotationOptions*","com.facebook.imagepipeline.common:ResizeOptions*","com.facebook.drawee.backends.pipeline:Fresco*","com.facebook.drawee.backends.pipeline:PipelineDraweeControllerBuilder*","com.facebook.drawee.backends.pipeline:PipelineDraweeController*","com.facebook.drawee.controller:AbstractDraweeControllerBuilder*","com.facebook.drawee.controller:AbstractDraweeController*","com.facebook.drawee.backends.pipeline.info:ImagePerfDataListener*","com.facebook.drawee.backends.pipeline.info:ImagePerfData*","com.facebook.drawee.controller:ControllerListener*","com.nativescript.image:DraweeView*","com.nativescript.image:ScalingBlurPostprocessor*","android.graphics.drawable:Animatable"
+        "com.facebook.drawee.drawable:ScalingUtils*",
+        "com.facebook.drawee.drawable.ScalingUtils:ScaleType*",
+        "com.facebook.drawee.generic:RoundingParams*",
+        "com.facebook.drawee.drawable:ProgressBarDrawable*",
+        "com.facebook.drawee.view:DraweeView*",
+        "com.facebook.drawee.interfaces:DraweeHierarchy*",
+        "com.facebook.drawee.interfaces:SettableDraweeHierarchy*",
+        "com.facebook.drawee.interfaces:SimpleDraweeControllerBuilder*",
+        "com.facebook.drawee.interfaces:DraweeController*",
+        "com.facebook.drawee.generic:GenericDraweeHierarchyBuilder*",
+        "com.facebook.drawee.generic:GenericDraweeHierarchy*",
+        "com.facebook.imagepipeline.request:ImageRequestBuilder*",
+        "com.facebook.imagepipeline.request:ImageRequest*",
+        "com.facebook.imagepipeline.core:ImagePipelineConfig*",
+        "com.facebook.imagepipeline.common:RotationOptions*",
+        "com.facebook.imagepipeline.common:ResizeOptions*",
+        "com.facebook.drawee.backends.pipeline:Fresco*",
+        "com.facebook.drawee.backends.pipeline:PipelineDraweeControllerBuilder*",
+        "com.facebook.drawee.backends.pipeline:PipelineDraweeController*",
+        "com.facebook.drawee.controller:AbstractDraweeControllerBuilder*",
+        "com.facebook.drawee.controller:AbstractDraweeController*",
+        "com.facebook.drawee.backends.pipeline.info:ImagePerfDataListener*",
+        "com.facebook.drawee.backends.pipeline.info:ImagePerfData*",
+        "com.facebook.drawee.controller:ControllerListener*",
+        "com.nativescript.image:DraweeView*",
+        "com.nativescript.image:ScalingBlurPostprocessor*",
+        "android.graphics.drawable:Animatable",
+        "com.facebook.imagepipeline.image:ImageInfo*"
     ]
 }

package/flipper/index.d.ts

@@ -1,4 +0,0 @@
-declare const ImagePlugin: {
-    install(client: any): void;
-};
-export default ImagePlugin;

package/flipper/index.js

@@ -1,9 +0,0 @@
-import { enableFlipper } from '../image';
-const ImagePlugin = {
-    install(client) {
-        enableFlipper();
-        client.addPlugin(new com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin());
-    }
-};
-export default ImagePlugin;
-//# sourceMappingURL=index.js.map