@nativescript-community/ui-image 4.3.27 → 4.3.28

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 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

package/index.android.js

@@ -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) {

package/index.ios.js

@@ -379,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();
@@ -446,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.27",
+    "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": "8bcab12e0d0379c7d61036dbed2eb3eb9e3df512"
+    "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());

package/platforms/ios/src/NImage.h

@@ -1,7 +0,0 @@
-#import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
-#import <CoreText/CoreText.h>
-
-#import "NSImageRoundCornerTransformer.h"
-#import "NSImageDecodeSizeTransformer.h"
-#import "NSImageRoundAsCircleTransformer.h"

package/platforms/ios/src/NSImageDecodeSizeTransformer.h

@@ -1,11 +0,0 @@
-#import <SDWebImage/SDImageTransformer.h>
-
-@interface NSImageDecodeSizeTransformer: NSObject <SDImageTransformer>
-
-@property (nonatomic, assign, readonly) CGFloat decodeWidth;
-@property (nonatomic, assign, readonly) CGFloat decodeHeight;
-
-- (nonnull instancetype)init NS_UNAVAILABLE;
-+ (nonnull instancetype)transformerWithDecodeWidth:(CGFloat)decodeWidth decodeHeight:(CGFloat)decodeHeight;
-
-@end

package/platforms/ios/src/NSImageDecodeSizeTransformer.m

@@ -1,44 +0,0 @@
-#import "NSImageDecodeSizeTransformer.h"
-#import <SDWebImage/SDGraphicsImageRenderer.h>
-
-@interface NSImageDecodeSizeTransformer ()
-
-@property (nonatomic, assign) CGFloat decodeWidth;
-@property (nonatomic, assign) CGFloat decodeHeight;
-
-@end
-
-@implementation NSImageDecodeSizeTransformer
-+ (nonnull instancetype)transformerWithDecodeWidth:(CGFloat)decodeWidth decodeHeight:(CGFloat)decodeHeight {
-  NSImageDecodeSizeTransformer *transformer = [NSImageDecodeSizeTransformer new];
-    transformer.decodeWidth = decodeWidth;
-    transformer.decodeHeight = decodeHeight;
-    
-    return transformer;
-}
-
-- (NSString *)transformerKey {
-    return [NSString stringWithFormat:@"NSImageDecodeSizeTransformer(%f,%f)", self.decodeWidth, self.decodeHeight];
-}
-
-- (UIImage *)transformedImageWithImage:(UIImage *)image forKey:(NSString *)key {
-    if (!image) {
-        return nil;
-    }
-    CGFloat widthRatio = 1.0f;
-    CGFloat heightRatio = 1.0f;
-
-    CGFloat width = (CGFloat)image.size.width;
-    CGFloat height = (CGFloat)image.size.height;
-    if (self.decodeWidth && self.decodeHeight) {
-        widthRatio = self.decodeWidth / width;
-        heightRatio = self.decodeHeight / height;
-    } else if (self.decodeWidth > 0) {
-        widthRatio = self.decodeWidth / width;
-    } else {
-        heightRatio = self.decodeHeight / height;
-    }
-    return [image sd_resizedImageWithSize:CGSizeMake(width * widthRatio, height * heightRatio) scaleMode:2];
-}
-
-@end

package/platforms/ios/src/NSImageRoundAsCircleTransformer.h

@@ -1,8 +0,0 @@
-#import <SDWebImage/SDImageTransformer.h>
-
-@interface NSImageRoundAsCircleTransformer: NSObject <SDImageTransformer>
-
-- (nonnull instancetype)init NS_UNAVAILABLE;
-+ (nonnull instancetype)transformer;
-
-@end

package/platforms/ios/src/NSImageRoundAsCircleTransformer.m

@@ -1,40 +0,0 @@
-#import "NSImageRoundAsCircleTransformer.h"
-#import <SDWebImage/SDGraphicsImageRenderer.h>
-
-@interface NSImageRoundAsCircleTransformer ()
-
-@end
-
-@implementation NSImageRoundAsCircleTransformer
-+ (instancetype)transformer {
-
-    NSImageRoundAsCircleTransformer *transformer = [NSImageRoundAsCircleTransformer new];
-    return transformer;
-}
-
-- (NSString *)transformerKey {
-    return [NSString stringWithFormat:@"NSImageRoundAsCircleTransformer"];
-}
-
-- (UIImage *)transformedImageWithImage:(UIImage *)image forKey:(NSString *)key {
-    if (!image) {
-        return nil;
-    }
-
-    CGFloat width = (CGFloat)image.size.width;
-    CGFloat height = (CGFloat)image.size.height;
-    CGFloat minwidth = MIN(width, height);
-    CGFloat cornerRadius = minwidth / 2;
-
-    UIImage * resultImage = [image sd_resizedImageWithSize:CGSizeMake(minwidth, minwidth) scaleMode:SDImageScaleModeAspectFill];
-    resultImage = [resultImage sd_roundedCornerImageWithRadius:cornerRadius corners:UIRectCornerAllCorners borderWidth:0 borderColor:nil];
-    return resultImage;
-    //     const result = (image as any)
-    //         .sd_resizedImageWithSizeScaleMode(CGSizeMake(minwidth, minwidth), SDImageScaleMode.AspectFill)
-    //         .sd_roundedCornerImageWithRadiusCornersBorderWidthBorderColor(cornerRadius, UIRectCorner.BottomLeft | UIRectCorner.BottomRight | UIRectCorner.TopLeft | UIRectCorner.TopRight, 0, null)
-    //         .sd_resizedImageWithSizeScaleMode(CGSizeMake(width, height), SDImageScaleMode.AspectFit);
-    //     return result;
-    // return resultImage;
-}
-
-@end

package/platforms/ios/src/NSImageRoundCornerTransformer.h

@@ -1,13 +0,0 @@
-#import <SDWebImage/SDImageTransformer.h>
-
-@interface NSImageRoundCornerTransformer: NSObject <SDImageTransformer>
-
-@property (nonatomic, assign, readonly) CGFloat topLeftRadius;
-@property (nonatomic, assign, readonly) CGFloat topRightRadius;
-@property (nonatomic, assign, readonly) CGFloat bottomRightRadius;
-@property (nonatomic, assign, readonly) CGFloat bottomLeftRadius;
-
-- (nonnull instancetype)init NS_UNAVAILABLE;
-+ (nonnull instancetype)transformerWithTopLefRadius:(CGFloat)topLeftRadius topRightRadius:(CGFloat)topRightRadius bottomRightRadius:(CGFloat)bottomRightRadius bottomLeftRadius:(CGFloat)bottomLeftRadius;
-
-@end

package/platforms/ios/src/NSImageRoundCornerTransformer.m

@@ -1,59 +0,0 @@
-#import "NSImageRoundCornerTransformer.h"
-#import <SDWebImage/SDGraphicsImageRenderer.h>
-
-@interface NSImageRoundCornerTransformer ()
-
-@property (nonatomic, assign) CGFloat topLeftRadius;
-@property (nonatomic, assign) CGFloat topRightRadius;
-@property (nonatomic, assign) CGFloat bottomRightRadius;
-@property (nonatomic, assign) CGFloat bottomLeftRadius;
-
-@end
-
-@implementation NSImageRoundCornerTransformer
-+ (instancetype)transformerWithTopLefRadius:(CGFloat)topLeftRadius topRightRadius:(CGFloat)topRightRadius bottomRightRadius:(CGFloat)bottomRightRadius bottomLeftRadius:(CGFloat)bottomLeftRadius {
-
-    NSImageRoundCornerTransformer *transformer = [NSImageRoundCornerTransformer new];
-    transformer.topLeftRadius = topLeftRadius;
-    transformer.topRightRadius = topRightRadius;
-    transformer.bottomRightRadius = bottomRightRadius;
-    transformer.bottomLeftRadius = bottomLeftRadius;
-    
-    return transformer;
-}
-
-- (NSString *)transformerKey {
-    return [NSString stringWithFormat:@"NSImageRoundCornerTransformer(%f,%f,%f,%f)", self.topLeftRadius,self.topRightRadius,self.bottomRightRadius,self.bottomLeftRadius];
-}
-
-- (UIImage *)transformedImageWithImage:(UIImage *)image forKey:(NSString *)key {
-    if (!image) {
-        return nil;
-    }
-    
-    SDGraphicsImageRendererFormat *format = [[SDGraphicsImageRendererFormat alloc] init];
-    format.scale = image.scale;
-    SDGraphicsImageRenderer *renderer = [[SDGraphicsImageRenderer alloc] initWithSize:image.size format:format];
-    UIImage *resultImage = [renderer imageWithActions:^(CGContextRef  _Nonnull context) {
-        CGRect rect = CGRectMake(0, 0, image.size.width, image.size.height);
-        
-        UIBezierPath *newPath = [UIBezierPath bezierPath];
-
-        CGFloat left  = M_PI;
-        CGFloat up    = 1.5*M_PI;
-        CGFloat down  = M_PI_2;
-        CGFloat right = 0.0;
-        [newPath addArcWithCenter:CGPointMake( CGRectGetMinX(rect) +  self.topLeftRadius,  CGRectGetMinY( rect) +  self.topLeftRadius) radius:  self.topLeftRadius startAngle: left  endAngle: up    clockwise: true];
-        [newPath addArcWithCenter:CGPointMake( CGRectGetMaxX(rect) - self.topRightRadius,  CGRectGetMinY( rect) + self.topRightRadius) radius: self.topRightRadius startAngle: up   endAngle: right clockwise: true];
-        [newPath addArcWithCenter:CGPointMake( CGRectGetMaxX(rect) - self.bottomRightRadius,  CGRectGetMaxY( rect) - self.bottomRightRadius) radius: self.bottomRightRadius startAngle: right endAngle: down clockwise: true];
-        [newPath addArcWithCenter:CGPointMake(CGRectGetMinX(rect) + self.bottomLeftRadius,  CGRectGetMaxY( rect) - self.bottomLeftRadius) radius: self.bottomLeftRadius startAngle: down  endAngle: left  clockwise: true];
-        [newPath closePath];
-        CGContextSaveGState(context);
-        [newPath addClip];
-        [image drawInRect:rect];
-        CGContextRestoreGState(context);
-    }];
-    return resultImage;
-}
-
-@end

package/platforms/ios/src/module.modulemap

@@ -1,5 +0,0 @@
-module NImage {
-  umbrella header "NImage.h"
-  export *
-  module * { export * }
-}

package/vue/index.mjs

@@ -1,8 +0,0 @@
-import { Img } from '../image';
-const ImagePlugin = {
-    install(Vue) {
-        Vue.registerElement('NSImg', () => Img);
-    }
-};
-export default ImagePlugin;
-//# sourceMappingURL=index.mjs.map