@nativescript-community/ui-image 4.1.8 → 4.3.0

package/{image.android.js → index.android.js}

@@ -1,15 +1,15 @@
 var _a, _b, _c, _d;
-export * from './image-common';
-import { ImageAsset, ImageSource, Trace, knownFolders, path } from '@nativescript/core';
+export * from './index-common';
+import { Color, Image, ImageAsset, ImageSource, Trace, Utils, knownFolders, path } from '@nativescript/core';
 import { android as androidApp } from '@nativescript/core/application';
 import { isString } from '@nativescript/core/utils/types';
 import { RESOURCE_PREFIX, ad, isFileOrResourcePath, isFontIconURI } from '@nativescript/core/utils/utils';
-import { CLog, CLogTypes, EventData, ImageBase, ScaleType } from './image-common';
+import { CLog, CLogTypes, EventData, ImageBase, ScaleType } from './index-common';
 let initialized = false;
 let initializeConfig;
 export function initialize(config) {
     if (!initialized) {
-        const context = androidApp.context;
+        const context = ad.getApplicationContext();
         if (!context) {
             initializeConfig = config;
             return;
@@ -128,7 +128,7 @@ export class ImagePipeline {
                 }
                 datasource.subscribe(new com.nativescript.image.BaseDataSubscriber(new com.nativescript.image.BaseDataSubscriberListener({
                     onFailure: reject,
-                    onNewResult: resolve,
+                    onNewResult: resolve
                 })), com.facebook.common.executors.CallerThreadExecutor.getInstance());
             }
             catch (error) {
@@ -251,7 +251,7 @@ export class Img extends ImageBase {
         return view;
     }
     updateViewSize(imageInfo) {
-        const draweeView = this.nativeViewProtected;
+        const draweeView = this.nativeImageViewProtected;
         if (!draweeView) {
             return;
         }
@@ -310,6 +310,12 @@ export class Img extends ImageBase {
     [ImageBase.roundTopLeftRadiusProperty.setNative]() {
         this.updateHierarchy();
     }
+    [ImageBase.imageRotationProperty.setNative](value) {
+        var _e;
+        const scaleType = this.nativeImageViewProtected.getHierarchy().getActualImageScaleType();
+        (_e = scaleType['setImageRotation']) === null || _e === void 0 ? void 0 : _e.call(scaleType, value);
+        this.nativeImageViewProtected.invalidate();
+    }
     [ImageBase.roundTopRightRadiusProperty.setNative]() {
         this.updateHierarchy();
     }
@@ -338,7 +344,7 @@ export class Img extends ImageBase {
         this.initImage();
     }
     async initImage() {
-        if (this.nativeViewProtected) {
+        if (this.nativeImageViewProtected) {
             const src = this.src;
             if (src instanceof Promise) {
                 this.src = await src;
@@ -359,7 +365,7 @@ export class Img extends ImageBase {
                     }
                 }
                 if (drawable) {
-                    const hierarchy = this.nativeViewProtected.getHierarchy();
+                    const hierarchy = this.nativeImageViewProtected.getHierarchy();
                     hierarchy.setImage(drawable, 1, hierarchy.getFadeDuration() === 0);
                     return;
                 }
@@ -407,7 +413,7 @@ export class Img extends ImageBase {
                                 eventName: ImageBase.finalImageSetEvent,
                                 object: nativeView,
                                 imageInfo: info,
-                                animatable: animatable,
+                                animatable: animatable
                             };
                             nativeView.notify(args);
                         }
@@ -426,7 +432,7 @@ export class Img extends ImageBase {
                             const args = {
                                 eventName: ImageBase.failureEvent,
                                 object: nativeView,
-                                error: imageError,
+                                error: imageError
                             };
                             that.get().notify(args);
                         }
@@ -444,7 +450,7 @@ export class Img extends ImageBase {
                             const args = {
                                 eventName: ImageBase.intermediateImageFailedEvent,
                                 object: nativeView,
-                                error: imageError,
+                                error: imageError
                             };
                             that.get().notify(args);
                         }
@@ -463,7 +469,7 @@ export class Img extends ImageBase {
                             const args = {
                                 eventName: ImageBase.intermediateImageSetEvent,
                                 object: nativeView,
-                                imageInfo: info,
+                                imageInfo: info
                             };
                             that.get().notify(args);
                         }
@@ -479,7 +485,7 @@ export class Img extends ImageBase {
                         if (nativeView) {
                             const args = {
                                 eventName: ImageBase.releaseEvent,
-                                object: nativeView,
+                                object: nativeView
                             };
                             that.get().notify(args);
                         }
@@ -495,20 +501,20 @@ export class Img extends ImageBase {
                         if (nativeView) {
                             const args = {
                                 eventName: ImageBase.submitEvent,
-                                object: nativeView,
+                                object: nativeView
                             };
                             that.get().notify(args);
                         }
                         else {
                             console.log("Warning: WeakRef<Image> was GC and no 'submitEvent' callback will be raised.");
                         }
-                    },
+                    }
                 });
                 const builder = com.facebook.drawee.backends.pipeline.Fresco.newDraweeControllerBuilder();
                 builder.setImageRequest(request);
                 builder.setCallerContext(src);
                 builder.setControllerListener(listener);
-                builder.setOldController(this.nativeViewProtected.getController());
+                builder.setOldController(this.nativeImageViewProtected.getController());
                 if (Trace.isEnabled()) {
                     builder.setPerfDataListener(new com.facebook.drawee.backends.pipeline.info.ImagePerfDataListener({
                         onImageLoadStatusUpdated(param0, param1) {
@@ -516,7 +522,7 @@ export class Img extends ImageBase {
                         },
                         onImageVisibilityUpdated(param0, param1) {
                             CLog(CLogTypes.info, 'onImageVisibilityUpdated', param0, param1);
-                        },
+                        }
                     }));
                 }
                 if (this.lowerResSrc) {
@@ -529,11 +535,11 @@ export class Img extends ImageBase {
                     builder.setTapToRetryEnabled(this.tapToRetryEnabled);
                 }
                 const controller = builder.build();
-                this.nativeViewProtected.setController(controller);
+                this.nativeImageViewProtected.setController(controller);
             }
             else {
-                this.nativeViewProtected.setController(null);
-                this.nativeViewProtected.setImageBitmap(null);
+                this.nativeImageViewProtected.setController(null);
+                this.nativeImageViewProtected.setImageBitmap(null);
             }
         }
     }
@@ -542,7 +548,7 @@ export class Img extends ImageBase {
             this._needUpdateHierarchy = true;
             return;
         }
-        if (this.nativeViewProtected) {
+        if (this.nativeImageViewProtected) {
             let failureImageDrawable;
             let placeholderImageDrawable;
             let backgroundDrawable;
@@ -566,7 +572,7 @@ export class Img extends ImageBase {
                 builder.setPlaceholderImage(placeholderImageDrawable, this.stretch);
             }
             if (this.stretch) {
-                builder.setActualImageScaleType(this.stretch);
+                builder.setActualImageScaleType(this.stretch, this.imageRotation);
             }
             if (this.fadeDuration) {
                 builder.setFadeDuration(this.fadeDuration);
@@ -591,14 +597,14 @@ export class Img extends ImageBase {
                 builder.setCornersRadii(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius);
             }
             const hierarchy = builder.build();
-            this.nativeViewProtected.setHierarchy(hierarchy);
+            this.nativeImageViewProtected.setHierarchy(hierarchy);
         }
     }
     getDrawable(path) {
         let drawable;
         if (typeof path === 'string') {
             if (isFontIconURI(path)) {
-                const fontIconCode = (path).split('//')[1];
+                const fontIconCode = path.split('//')[1];
                 if (fontIconCode !== undefined) {
                     const font = this.style.fontInternal;
                     const color = this.style.color;
@@ -632,8 +638,8 @@ export class Img extends ImageBase {
         return identifier;
     }
     startAnimating() {
-        if (this.nativeViewProtected) {
-            const controller = this.nativeViewProtected.getController();
+        if (this.nativeImageViewProtected) {
+            const controller = this.nativeImageViewProtected.getController();
             if (controller) {
                 const animatable = controller.getAnimatable();
                 if (animatable) {
@@ -643,8 +649,8 @@ export class Img extends ImageBase {
         }
     }
     stopAnimating() {
-        if (this.nativeViewProtected) {
-            const controller = this.nativeViewProtected.getController();
+        if (this.nativeImageViewProtected) {
+            const controller = this.nativeImageViewProtected.getController();
             if (controller) {
                 const animatable = controller.getAnimatable();
                 if (animatable) {
@@ -668,7 +674,7 @@ __decorate([
 ], Img.prototype, _d, null);
 class GenericDraweeHierarchyBuilder {
     constructor() {
-        const res = androidApp.context.getResources();
+        const res = ad.getApplicationContext().getResources();
         this.nativeBuilder = new com.facebook.drawee.generic.GenericDraweeHierarchyBuilder(res);
     }
     setPlaceholderImage(drawable, scaleType) {
@@ -702,11 +708,15 @@ class GenericDraweeHierarchyBuilder {
         }
         return this;
     }
-    setActualImageScaleType(scaleType) {
+    setActualImageScaleType(scaleType, imageRotation) {
         if (!this.nativeBuilder) {
             return this;
         }
-        this.nativeBuilder.setActualImageScaleType(getScaleType(scaleType));
+        const nativeScaleType = getScaleType(scaleType);
+        if (nativeScaleType['setImageRotation']) {
+            nativeScaleType['setImageRotation'](imageRotation);
+        }
+        this.nativeBuilder.setActualImageScaleType(nativeScaleType);
         return this;
     }
     build() {
@@ -762,28 +772,28 @@ function getScaleType(scaleType) {
     if (isString(scaleType)) {
         switch (scaleType) {
             case ScaleType.Center:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.CENTER;
+                return com.nativescript.image.ScalingUtils.ScaleType.CENTER;
             case ScaleType.AspectFill:
             case ScaleType.CenterCrop:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.CENTER_CROP;
+                return com.nativescript.image.ScalingUtils.ScaleType.CENTER_CROP;
             case ScaleType.CenterInside:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.CENTER_INSIDE;
+                return com.nativescript.image.ScalingUtils.ScaleType.CENTER_INSIDE;
             case ScaleType.FitCenter:
             case ScaleType.AspectFit:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.FIT_CENTER;
+                return com.nativescript.image.ScalingUtils.ScaleType.FIT_CENTER;
             case ScaleType.FitEnd:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.FIT_END;
+                return com.nativescript.image.ScalingUtils.ScaleType.FIT_END;
             case ScaleType.FitStart:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.FIT_START;
+                return com.nativescript.image.ScalingUtils.ScaleType.FIT_START;
             case ScaleType.Fill:
             case ScaleType.FitXY:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.FIT_XY;
+                return com.nativescript.image.ScalingUtils.ScaleType.FIT_XY;
             case ScaleType.FocusCrop:
-                return com.facebook.drawee.drawable.ScalingUtils.ScaleType.FOCUS_CROP;
+                return com.nativescript.image.ScalingUtils.ScaleType.FOCUS_CROP;
             default:
                 break;
         }
     }
     return null;
 }
-//# sourceMappingURL=image.android.js.map
+//# sourceMappingURL=index.android.js.map

package/{image.d.ts → index.d.ts}

@@ -1,6 +1,5 @@
 import { ImageAsset, ImageSource, View } from '@nativescript/core';
 
-
 /**
  * When called, initializes the android Image library. Calling this method is required.
  * A good place to call it is at the application onLaunch() method.
@@ -75,7 +74,7 @@ export class Img extends View {
     /**
      * String value used for the image URI.
      */
-    src: string | ImageSource | ImageAsset | Promise<string | ImageSource | ImageAsset> ;
+    src: string | ImageSource | ImageAsset | Promise<string | ImageSource | ImageAsset>;
 
     /**
      * String value used for the lower res image URI.
@@ -429,7 +428,7 @@ export enum ScaleType {
     /**
      * Scales the child so that both dimensions will be greater than or equal to the corresponding dimension of the parent.
      */
-    focusCrop,
+    focusCrop
 }
 
 /**
@@ -439,3 +438,4 @@ export enum ScaleType {
 export interface ImagePipelineConfigSetting {
     isDownsampleEnabled?: boolean;
 }
+export const ImageViewTraceCategory;

package/{image.ios.d.ts → index.ios.d.ts}

@@ -1,5 +1,5 @@
-export * from './image-common';
-import { EventData, ImageBase, ImageInfo as ImageInfoBase, ImagePipelineConfigSetting } from './image-common';
+export * from './index-common';
+import { EventData, ImageBase, ImageInfo as ImageInfoBase, ImagePipelineConfigSetting } from './index-common';
 export declare class ImageInfo implements ImageInfoBase {
     private width;
     private height;
@@ -32,6 +32,7 @@ export declare class ImagePipeline {
 export declare function getImagePipeline(): ImagePipeline;
 export declare class Img extends ImageBase {
     nativeViewProtected: SDAnimatedImageView | UIImageView;
+    nativeImageViewProtected: SDAnimatedImageView | UIImageView;
     isLoading: boolean;
     private _imageSourceAffectsLayout;
     createNativeView(): UIImageView;

package/{image.ios.js → index.ios.js}

@@ -1,8 +1,8 @@
-export * from './image-common';
+export * from './index-common';
 import { ImageAsset, ImageSource, Screen, Trace, knownFolders, path } from '@nativescript/core';
 import { isString } from '@nativescript/core/utils/types';
 import { RESOURCE_PREFIX, isFileOrResourcePath, isFontIconURI, layout } from '@nativescript/core/utils/utils';
-import { CLog, CLogTypes, ImageBase, ScaleType } from './image-common';
+import { CLog, CLogTypes, EventData, ImageBase, ScaleType } from './index-common';
 export class ImageInfo {
     constructor(width, height) {
         this.width = width;
@@ -173,13 +173,13 @@ export class Img extends ImageBase {
                 this._setNativeImage(image, animate);
             }
             if (!this.autoPlayAnimations) {
-                this.nativeViewProtected.stopAnimating();
+                this.nativeImageViewProtected.stopAnimating();
             }
             if (error) {
                 const args = {
                     eventName: Img.failureEvent,
                     object: this,
-                    error,
+                    error
                 };
                 this.notify(args);
                 if (this.failureImageUri) {
@@ -192,7 +192,7 @@ export class Img extends ImageBase {
                     eventName: ImageBase.finalImageSetEvent,
                     object: this,
                     imageInfo: new ImageInfo(image.size.width, image.size.height),
-                    ios: image,
+                    ios: image
                 };
                 this.notify(args);
             }
@@ -218,7 +218,7 @@ export class Img extends ImageBase {
         const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
         const height = layout.getMeasureSpecSize(heightMeasureSpec);
         const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
-        const image = this.nativeViewProtected.image;
+        const image = this.nativeImageViewProtected.image;
         const finiteWidth = widthMode === layout.EXACTLY;
         const finiteHeight = heightMode === layout.EXACTLY;
         this._imageSourceAffectsLayout = !finiteWidth || !finiteHeight;
@@ -257,14 +257,14 @@ export class Img extends ImageBase {
     }
     _setNativeImage(nativeImage, animated = true) {
         if (animated) {
-            this.nativeViewProtected.alpha = 0.0;
-            this.nativeViewProtected.image = nativeImage;
+            this.nativeImageViewProtected.alpha = 0.0;
+            this.nativeImageViewProtected.image = nativeImage;
             UIView.animateWithDurationAnimations(this.fadeDuration / 1000, () => {
-                this.nativeViewProtected.alpha = this.opacity;
+                this.nativeImageViewProtected.alpha = this.opacity;
             });
         }
         else {
-            this.nativeViewProtected.image = nativeImage;
+            this.nativeImageViewProtected.image = nativeImage;
         }
         if (this._imageSourceAffectsLayout) {
             this._imageSourceAffectsLayout = false;
@@ -278,11 +278,11 @@ export class Img extends ImageBase {
         let image;
         if (typeof imagePath === 'string') {
             if (isFontIconURI(imagePath)) {
-                const fontIconCode = (imagePath).split('//')[1];
+                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);
+                    image = ImageSource.fromFontIconCodeSync(fontIconCode, font, color).ios;
                 }
             }
             if (!image && isFileOrResourcePath(imagePath)) {
@@ -312,7 +312,7 @@ export class Img extends ImageBase {
                 }
                 else if (typeof src === 'string') {
                     if (isFontIconURI(src)) {
-                        const fontIconCode = (src).split('//')[1];
+                        const fontIconCode = src.split('//')[1];
                         if (fontIconCode !== undefined) {
                             const font = this.style.fontInternal;
                             const color = this.style.color;
@@ -361,7 +361,7 @@ export class Img extends ImageBase {
                     }
                     context.setValueForKey(SDImagePipelineTransformer.transformerWithTransformers(transformers), SDWebImageContextImageTransformer);
                 }
-                this.nativeViewProtected.sd_setImageWithURLPlaceholderImageOptionsContextProgressCompleted(uri, this.placeholderImage, options, context, this.onLoadProgress, this.handleImageLoaded);
+                this.nativeImageViewProtected.sd_setImageWithURLPlaceholderImageOptionsContextProgressCompleted(uri, this.placeholderImage, options, context, this.onLoadProgress, this.handleImageLoaded);
             }
             else if (this.placeholderImage) {
                 this._setNativeImage(this.placeholderImage);
@@ -384,13 +384,13 @@ export class Img extends ImageBase {
         if (!this.nativeView) {
             return;
         }
-        this.nativeViewProtected.contentMode = getUIImageScaleType(value);
+        this.nativeImageViewProtected.contentMode = getUIImageScaleType(value);
     }
     startAnimating() {
-        this.nativeViewProtected.startAnimating();
+        this.nativeImageViewProtected.startAnimating();
     }
     stopAnimating() {
-        this.nativeViewProtected.stopAnimating();
+        this.nativeImageViewProtected.stopAnimating();
     }
 }
-//# sourceMappingURL=image.ios.js.map
+//# sourceMappingURL=index.ios.js.map

package/package.json

@@ -1,10 +1,18 @@
 {
     "name": "@nativescript-community/ui-image",
-    "version": "4.1.8",
+    "version": "4.3.0",
     "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",
+    "main": "./index",
     "sideEffects": false,
-    "typings": "./image.d.ts",
+    "typings": "./index.d.ts",
+    "scripts": {
+        "build": "npm run tsc && npm run readme",
+        "build.all": "npm run build && npm run build.angular",
+        "build.angular": "../../node_modules/.bin/ng-packagr -p ../../src/image/angular/ng-package.json -c ../../src/image/angular/tsconfig.json",
+        "readme": "../../node_modules/.bin/readme generate -c ../../tools/readme/blueprint.json",
+        "tsc": "../../node_modules/.bin/cpy '**/*.d.ts' '../../packages/image' --parents --cwd=../../src/image && ../../node_modules/.bin/tsc -skipLibCheck -d",
+        "clean": "../../node_modules/.bin/rimraf ./*.d.ts ./*.js ./*.js.map"
+    },
     "nativescript": {
         "platforms": {
             "android": "6.0.0",
@@ -36,5 +44,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "41453b620cf3be6a305c67cfbd7e4cd2d1df8377"
+    "gitHead": "33aa9b9b923101c0c3f37f22a3ebaf245d6aa91e"
 }

package/platforms/android/include.gradle

@@ -1,6 +1,6 @@
 import groovy.json.JsonSlurper
 dependencies {
-	def frescoVersion =  project.hasProperty("frescoVersion") ? project.frescoVersion : "2.3.0"
+	def frescoVersion =  project.hasProperty("frescoVersion") ? project.frescoVersion : "2.6.0"
 
 	implementation("com.facebook.fresco:fresco:$frescoVersion") {
         exclude group: 'com.facebook.soloader', module: 'soloader'
@@ -17,13 +17,12 @@ dependencies {
 
 repositories {
 	mavenCentral()
-	def appDir = "$rootDir/../../.."
-    def widgetsDir = "$appDir/node_modules/@nativescript/core/platforms/android"
-    def appPackageJsonFile = file("$appDir/package.json")
+	def widgetsDir = "$USER_PROJECT_ROOT/node_modules/@nativescript/core/platforms/android"
+    def appPackageJsonFile = file("$USER_PROJECT_ROOT/package.json")
     if (appPackageJsonFile.exists()) {
         def appPackageJson = new JsonSlurper().parseText(appPackageJsonFile.text)
-        if (appPackageJson.dependencies !=null && appPackageJson.dependencies["@akylas/nativescript"] != null) {
-            widgetsDir = "$appDir/node_modules/@akylas/nativescript/platforms/android"
+        if (appPackageJson.dependencies['@akylas/nativescript'] != null) {
+            widgetsDir = "$USER_PROJECT_ROOT/node_modules/@akylas/nativescript/platforms/android"
         }
     }
     flatDir {

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

@@ -11,7 +11,6 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import com.facebook.common.internal.Preconditions;
 import com.facebook.common.references.CloseableReference;
 import com.facebook.imagepipeline.bitmaps.PlatformBitmapFactory;
 import com.facebook.imagepipeline.nativecode.NativeBlurFilter;
@@ -32,7 +31,6 @@ public class ScalingBlurPostprocessor extends BasePostprocessor {
   private final int mScaleRatio;
 
   public ScalingBlurPostprocessor(int iterations, int blurRadius, int scaleRatio) {
-    Preconditions.checkArgument(scaleRatio > 0);
 
     mIterations = iterations;
     mBlurRadius = blurRadius;