@nativescript-community/ui-image 4.0.30 → 4.0.34

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+
+
+
+
+## [4.0.31](https://github.com/nativescript-community/ui-image/compare/v4.0.30...v4.0.31) (2021-10-07)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
+
+
+
+
 ## [4.0.30](https://github.com/nativescript-community/ui-image/compare/v4.0.29...v4.0.30) (2021-10-07)
 
 **Note:** Version bump only for package @nativescript-community/ui-image

package/image.android.js

@@ -589,7 +589,15 @@ export class Img extends ImageBase {
     getDrawable(path) {
         let drawable;
         if (typeof path === 'string') {
-            if (isFileOrResourcePath(path)) {
+            if (isFontIconURI(path)) {
+                const fontIconCode = (path).split('//')[1];
+                if (fontIconCode !== undefined) {
+                    const font = this.style.fontInternal;
+                    const color = this.style.color;
+                    drawable = new android.graphics.drawable.BitmapDrawable(ad.getApplicationContext().getResources(), ImageSource.fromFontIconCodeSync(fontIconCode, font, color).android);
+                }
+            }
+            else if (isFileOrResourcePath(path)) {
                 if (path.indexOf(RESOURCE_PREFIX) === 0) {
                     return this.getDrawableFromResource(path);
                 }

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

@@ -8,16 +8,6 @@ var SDImageRoundAsCircleTransformer = /** @class */ (function (_super) {
     function SDImageRoundAsCircleTransformer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    // _cornerRadius = 20;
-    // get cornerRadius() {
-    //     return this._cornerRadius;
-    // }
-    // get corners() {
-    //     return UIRectCorner.AllCorners;
-    // }
-    // get borderWidth() {
-    //     return 0;
-    // }
     SDImageRoundAsCircleTransformer.transformer = function () {
         var transformer = SDImageRoundAsCircleTransformer.alloc().init();
         return transformer;
@@ -211,15 +201,9 @@ export class Img extends ImageBase {
         this._imageSourceAffectsLayout = true;
         this.handleImageLoaded = (image, error, cacheType) => {
             this.isLoading = false;
-            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);
+            const animate = (this.alwaysFade || cacheType !== 2) && this.fadeDuration > 0;
+            if (image) {
+                this._setNativeImage(image, animate);
             }
             if (!this.autoPlayAnimations) {
                 this.nativeViewProtected.stopAnimating();
@@ -233,9 +217,10 @@ export class Img extends ImageBase {
                 this.notify(args);
                 if (this.failureImageUri) {
                     image = this.getUIImage(this.failureImageUri);
+                    this._setNativeImage(image, animate);
                 }
             }
-            else {
+            else if (image) {
                 const args = {
                     eventName: ImageBase.finalImageSetEvent,
                     object: this,
@@ -303,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();
@@ -316,7 +310,15 @@ export class Img extends ImageBase {
         }
         let image;
         if (typeof imagePath === 'string') {
-            if (isFileOrResourcePath(imagePath)) {
+            if (isFontIconURI(imagePath)) {
+                const fontIconCode = (imagePath).split('//')[1];
+                if (fontIconCode !== undefined) {
+                    const font = this.style.fontInternal;
+                    const color = this.style.color;
+                    image = (ImageSource.fromFontIconCodeSync(fontIconCode, font, color).ios);
+                }
+            }
+            if (!image && isFileOrResourcePath(imagePath)) {
                 image = ImageSource.fromFileOrResourceSync(imagePath);
             }
         }
@@ -332,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') {
@@ -342,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;
                     }
@@ -386,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.30",
+    "version": "4.0.34",
     "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": "ea3233132cb196baa46253fe3ff8126bdf2f5fec"
+    "gitHead": "9293bf7be60719ed1f475a9d9ce71a82d873821b"
 }