@nativescript-community/ui-image 4.3.0 → 4.3.3

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.3](https://github.com/nativescript-community/ui-image/compare/v4.3.2...v4.3.3) (2022-09-12)
+
+**Note:** Version bump only for package @nativescript-community/ui-image
+
+
+
+
+
+## [4.3.2](https://github.com/nativescript-community/ui-image/compare/v4.3.1...v4.3.2) (2022-07-15)
+
+
+### Bug Fixes
+
+* **image:** imageRotation scaling fix ([2f12172](https://github.com/nativescript-community/ui-image/commit/2f12172c022c9e6122420763a43b68a2bc137503))
+
+
+
+
+
+## [4.3.1](https://github.com/nativescript-community/ui-image/compare/v4.3.0...v4.3.1) (2022-07-14)
+
+
+### Bug Fixes
+
+* **image:** make imageRotation work in ListView ([58913bd](https://github.com/nativescript-community/ui-image/commit/58913bde275284ed704fac07b4154c11090bc7b9))
+
+
+
+
+
 # [4.3.0](https://github.com/nativescript-community/ui-image/compare/v4.2.1...v4.3.0) (2022-07-13)
 
 

package/index-common.d.ts

@@ -84,6 +84,7 @@ export declare class ImageBase extends View {
     decodeWidth: number;
     decodeHeight: number;
     animatedImageView: boolean;
+    loadMode: 'sync' | 'async';
     alwaysFade: boolean;
     noCache: boolean;
     tintColor: Color;
@@ -115,6 +116,7 @@ export declare class ImageBase extends View {
     static roundTopRightRadiusProperty: Property<ImageBase, CoreTypes.LengthType>;
     static roundBottomLeftRadiusProperty: Property<ImageBase, CoreTypes.LengthType>;
     static roundBottomRightRadiusProperty: Property<ImageBase, CoreTypes.LengthType>;
+    static loadModeProperty: Property<ImageBase, "sync" | "async">;
     static clipToBoundsProperty: Property<ImageBase, boolean>;
     static animatedImageViewProperty: Property<ImageBase, boolean>;
     get nativeImageViewProtected(): any;

package/index-common.js

@@ -168,6 +168,10 @@ ImageBase.roundBottomRightRadiusProperty = new Property({
     defaultValue: 0,
     valueConverter: (v) => Length.toDevicePixels(Length.parse(v))
 });
+ImageBase.loadModeProperty = new Property({
+    name: 'loadMode',
+    defaultValue: 'sync'
+});
 ImageBase.clipToBoundsProperty = new Property({ name: 'clipToBounds', defaultValue: true, valueConverter: booleanConverter });
 ImageBase.animatedImageViewProperty = new Property({ name: 'animatedImageView', defaultValue: false, valueConverter: booleanConverter });
 ImageBase.srcProperty.register(ImageBase);
@@ -198,4 +202,5 @@ ImageBase.alwaysFadeProperty.register(ImageBase);
 ImageBase.noCacheProperty.register(ImageBase);
 ImageBase.clipToBoundsProperty.register(ImageBase);
 ImageBase.animatedImageViewProperty.register(ImageBase);
+ImageBase.loadModeProperty.register(ImageBase);
 //# sourceMappingURL=index-common.js.map

package/index.android.d.ts

@@ -62,6 +62,7 @@ export declare class FailureEventData extends EventData {
     set error(value: ImageError);
 }
 export declare const needRequestImage: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
+export declare const needUpdateHierarchy: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
 export declare class Img extends ImageBase {
     nativeViewProtected: com.nativescript.image.DraweeView;
     nativeImageViewProtected: com.nativescript.image.DraweeView;

package/index.android.js

@@ -1,4 +1,4 @@
-var _a, _b, _c, _d;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
 export * from './index-common';
 import { Color, Image, ImageAsset, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { android as androidApp } from '@nativescript/core/application';
@@ -54,13 +54,9 @@ function getUri(src) {
         imagePath = src;
     }
     if (isFileOrResourcePath(imagePath)) {
-        const res = ad.getApplicationContext().getResources();
-        if (!res) {
-            return null;
-        }
         if (imagePath.indexOf(RESOURCE_PREFIX) === 0) {
-            const resName = imagePath.substr(RESOURCE_PREFIX.length);
-            const identifier = res.getIdentifier(resName, 'drawable', ad.getApplication().getPackageName());
+            const resName = imagePath.substring(RESOURCE_PREFIX.length);
+            const identifier = Utils.ad.resources.getDrawableId(resName);
             if (0 < identifier) {
                 uri = new android.net.Uri.Builder().scheme(com.facebook.common.util.UriUtil.LOCAL_RESOURCE_SCHEME).path(java.lang.String.valueOf(identifier)).build();
             }
@@ -219,6 +215,16 @@ export const needRequestImage = function (target, propertyKey, descriptor) {
         return originalMethod.apply(this, args);
     };
 };
+export const needUpdateHierarchy = function (target, propertyKey, descriptor) {
+    const originalMethod = descriptor.value;
+    descriptor.value = function (...args) {
+        if (!this._canUpdateHierarchy) {
+            this._needUpdateHierarchy = true;
+            return;
+        }
+        return originalMethod.apply(this, args);
+    };
+};
 export class Img extends ImageBase {
     constructor() {
         super(...arguments);
@@ -283,64 +289,64 @@ export class Img extends ImageBase {
         this.src = null;
         this.src = src;
     }
-    [ImageBase.placeholderImageUriProperty.setNative]() {
+    [_a = ImageBase.placeholderImageUriProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.failureImageUriProperty.setNative]() {
+    [_b = ImageBase.failureImageUriProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.stretchProperty.setNative]() {
+    [_c = ImageBase.stretchProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.fadeDurationProperty.setNative]() {
+    [_d = ImageBase.fadeDurationProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.backgroundUriProperty.setNative]() {
+    [_e = ImageBase.backgroundUriProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.showProgressBarProperty.setNative]() {
+    [_f = ImageBase.showProgressBarProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.progressBarColorProperty.setNative]() {
+    [_g = ImageBase.progressBarColorProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.roundAsCircleProperty.setNative]() {
+    [_h = ImageBase.roundAsCircleProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.roundTopLeftRadiusProperty.setNative]() {
+    [_j = ImageBase.roundTopLeftRadiusProperty.setNative]() {
         this.updateHierarchy();
     }
     [ImageBase.imageRotationProperty.setNative](value) {
-        var _e;
+        var _u;
         const scaleType = this.nativeImageViewProtected.getHierarchy().getActualImageScaleType();
-        (_e = scaleType['setImageRotation']) === null || _e === void 0 ? void 0 : _e.call(scaleType, value);
+        (_u = scaleType['setImageRotation']) === null || _u === void 0 ? void 0 : _u.call(scaleType, value);
         this.nativeImageViewProtected.invalidate();
     }
-    [ImageBase.roundTopRightRadiusProperty.setNative]() {
+    [_k = ImageBase.roundTopRightRadiusProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.roundBottomLeftRadiusProperty.setNative]() {
+    [_l = ImageBase.roundBottomLeftRadiusProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.roundBottomRightRadiusProperty.setNative]() {
+    [_m = ImageBase.roundBottomRightRadiusProperty.setNative]() {
         this.updateHierarchy();
     }
-    [ImageBase.tintColorProperty.setNative](value) {
+    [_o = ImageBase.tintColorProperty.setNative](value) {
         this.updateHierarchy();
     }
-    [ImageBase.blurRadiusProperty.setNative]() {
+    [_p = ImageBase.blurRadiusProperty.setNative]() {
         this.initImage();
     }
-    [_a = ImageBase.srcProperty.setNative]() {
+    [_q = ImageBase.srcProperty.setNative]() {
         this.initImage();
     }
-    [_b = ImageBase.lowerResSrcProperty.setNative]() {
+    [_r = ImageBase.lowerResSrcProperty.setNative]() {
         this.initImage();
     }
-    [_c = ImageBase.blurDownSamplingProperty.setNative]() {
+    [_s = ImageBase.blurDownSamplingProperty.setNative]() {
         this.initImage();
     }
-    [_d = ImageBase.aspectRatioProperty.setNative]() {
+    [_t = ImageBase.aspectRatioProperty.setNative]() {
         this.initImage();
     }
     async initImage() {
@@ -369,8 +375,12 @@ export class Img extends ImageBase {
                     hierarchy.setImage(drawable, 1, hierarchy.getFadeDuration() === 0);
                     return;
                 }
+                const uri = getUri(src);
+                if (!uri) {
+                    console.log(`Error: 'src' not valid: ${src}`);
+                    return;
+                }
                 if (this.noCache) {
-                    const uri = getUri(src);
                     const imagePipeLine = getImagePipeline();
                     const isInCache = imagePipeLine.isInBitmapMemoryCache(uri);
                     if (isInCache) {
@@ -378,11 +388,6 @@ export class Img extends ImageBase {
                     }
                 }
                 this.isLoading = true;
-                const uri = getUri(src);
-                if (!uri) {
-                    console.log(`Error: 'src' not valid: ${src}`);
-                    return;
-                }
                 let requestBuilder = com.facebook.imagepipeline.request.ImageRequestBuilder.newBuilderWithSource(uri).setRotationOptions(com.facebook.imagepipeline.common.RotationOptions.autoRotate());
                 if (this.progressiveRenderingEnabled === true) {
                     requestBuilder = requestBuilder.setProgressiveRenderingEnabled(this.progressiveRenderingEnabled);
@@ -423,7 +428,7 @@ export class Img extends ImageBase {
                     },
                     onFailure(id, throwable) {
                         if (Trace.isEnabled()) {
-                            CLog(CLogTypes.info, 'onFailure', id, throwable);
+                            CLog(CLogTypes.info, 'onFailure', id, throwable.getLocalizedMessage());
                         }
                         const nativeView = that && that.get();
                         if (nativeView) {
@@ -536,6 +541,7 @@ export class Img extends ImageBase {
                 }
                 const controller = builder.build();
                 this.nativeImageViewProtected.setController(controller);
+                console.log('setController', this, src, uri);
             }
             else {
                 this.nativeImageViewProtected.setController(null);
@@ -661,17 +667,59 @@ export class Img extends ImageBase {
     }
 }
 __decorate([
-    needRequestImage
+    needUpdateHierarchy
 ], Img.prototype, _a, null);
 __decorate([
-    needRequestImage
+    needUpdateHierarchy
 ], Img.prototype, _b, null);
 __decorate([
-    needRequestImage
+    needUpdateHierarchy
 ], Img.prototype, _c, null);
 __decorate([
-    needRequestImage
+    needUpdateHierarchy
 ], Img.prototype, _d, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _e, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _f, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _g, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _h, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _j, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _k, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _l, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _m, null);
+__decorate([
+    needUpdateHierarchy
+], Img.prototype, _o, null);
+__decorate([
+    needRequestImage
+], Img.prototype, _p, null);
+__decorate([
+    needRequestImage
+], Img.prototype, _q, null);
+__decorate([
+    needRequestImage
+], Img.prototype, _r, null);
+__decorate([
+    needRequestImage
+], Img.prototype, _s, null);
+__decorate([
+    needRequestImage
+], Img.prototype, _t, null);
 class GenericDraweeHierarchyBuilder {
     constructor() {
         const res = ad.getApplicationContext().getResources();
@@ -772,24 +820,24 @@ function getScaleType(scaleType) {
     if (isString(scaleType)) {
         switch (scaleType) {
             case ScaleType.Center:
-                return com.nativescript.image.ScalingUtils.ScaleType.CENTER;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeCenter();
             case ScaleType.AspectFill:
             case ScaleType.CenterCrop:
-                return com.nativescript.image.ScalingUtils.ScaleType.CENTER_CROP;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeCenterCrop();
             case ScaleType.CenterInside:
-                return com.nativescript.image.ScalingUtils.ScaleType.CENTER_INSIDE;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeCenterInside();
             case ScaleType.FitCenter:
             case ScaleType.AspectFit:
-                return com.nativescript.image.ScalingUtils.ScaleType.FIT_CENTER;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeFitCenter();
             case ScaleType.FitEnd:
-                return com.nativescript.image.ScalingUtils.ScaleType.FIT_END;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeFitEnd();
             case ScaleType.FitStart:
-                return com.nativescript.image.ScalingUtils.ScaleType.FIT_START;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeFitStart();
             case ScaleType.Fill:
             case ScaleType.FitXY:
-                return com.nativescript.image.ScalingUtils.ScaleType.FIT_XY;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeFitXY();
             case ScaleType.FocusCrop:
-                return com.nativescript.image.ScalingUtils.ScaleType.FOCUS_CROP;
+                return new com.nativescript.image.ScalingUtils.ScaleTypeFocusCrop();
             default:
                 break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.3.0",
+    "version": "4.3.3",
     "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": "33aa9b9b923101c0c3f37f22a3ebaf245d6aa91e"
+    "gitHead": "a216a880fc8c0d1c166e0a52a1c97443913d583e"
 }

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

@@ -144,13 +144,18 @@ public class ScalingUtils {
         float focusY) {
         float sX = (float) parentRect.width() / (float) childWidth;
         float sY = (float) parentRect.height() / (float) childHeight;
-        float rotationDelta = _imageRotation % 180;
-        if (rotationDelta != 0) {
+        float rotationDelta = (90 - (_imageRotation % 180))/90.0f;
+        if (rotationDelta != 1) {
             float destSX = (float) parentRect.width() / (float) childHeight;
             float destSY = (float) parentRect.height() / (float) childWidth;
-            final float pos = Math.abs(rotationDelta)/90.0f;
-            sX = sX + pos * (destSX - sX);
-            sY = sY + pos * (destSY - sY);
+          if (rotationDelta < 0) {
+            sX = destSX + rotationDelta * (destSX - sX);
+            sY = destSY + rotationDelta * (destSY - sY);
+          } else {
+            sX = sX + (1 - rotationDelta) * (destSX - sX);
+            sY = sY + (1 - rotationDelta) * (destSY - sY);
+          }
+            
         }
         getTransformImpl(outTransform, parentRect, childWidth, childHeight, focusX, focusY, sX, sY);
         if (_imageMatrix != null) {
@@ -173,7 +178,7 @@ public class ScalingUtils {
         float scaleY);
   }
 
-  private static class ScaleTypeFitXY extends AbstractScaleType {
+  public static class ScaleTypeFitXY extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFitXY();
 
@@ -199,7 +204,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeFitStart extends AbstractScaleType {
+  public static class ScaleTypeFitStart extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFitStart();
 
@@ -226,7 +231,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeFitBottomStart extends AbstractScaleType {
+  public static class ScaleTypeFitBottomStart extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFitBottomStart();
 
@@ -253,7 +258,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeFitCenter extends AbstractScaleType {
+  public static class ScaleTypeFitCenter extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFitCenter();
 
@@ -280,7 +285,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeFitEnd extends AbstractScaleType {
+  public static class ScaleTypeFitEnd extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFitEnd();
 
@@ -307,7 +312,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeCenter extends AbstractScaleType {
+  public static class ScaleTypeCenter extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeCenter();
 
@@ -332,7 +337,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeCenterInside extends AbstractScaleType {
+  public static class ScaleTypeCenterInside extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeCenterInside();
 
@@ -359,7 +364,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeCenterCrop extends AbstractScaleType {
+  public static class ScaleTypeCenterCrop extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeCenterCrop();
 
@@ -393,7 +398,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeFocusCrop extends AbstractScaleType {
+  public static class ScaleTypeFocusCrop extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFocusCrop();
 
@@ -429,7 +434,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeFitX extends AbstractScaleType {
+  public static class ScaleTypeFitX extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFitX();
 
@@ -457,7 +462,7 @@ public class ScalingUtils {
     }
   }
 
-  private static class ScaleTypeFitY extends AbstractScaleType {
+  public static class ScaleTypeFitY extends AbstractScaleType {
 
     public static final com.facebook.drawee.drawable.ScalingUtils.ScaleType INSTANCE = new ScaleTypeFitY();