chore: improvements and cleanup

Author: farfromrefug

src/image/index-common.ts

@@ -1,9 +1,16 @@
 import { Color, CoreTypes, Length, Property, ShorthandProperty, Trace, View, booleanConverter } from '@nativescript/core';
 import { EventData as IEventData } from '@nativescript/core/data/observable';
+// import { colorConverter } from '@nativescript/core/ui/styling/style-properties';
 import { ImageAsset } from '@nativescript/core/image-asset';
 import { ImageSource } from '@nativescript/core/image-source';
 import { isAndroid } from '@nativescript/core/platform';
 
+export function colorConverter(v: string | Color): Color {
+    if (!v || v instanceof Color) {
+        return v as Color;
+    }
+    return new Color(v);
+}
 function isNonNegativeFiniteNumber(value: number): boolean {
     return isFinite(value) && !isNaN(value) && value >= 0;
 }
@@ -163,8 +170,8 @@ export const stretchProperty = new Property<ImageBase, string>({ name: 'stretch'
 export const backgroundUriProperty = new Property<ImageBase, string>({ name: 'backgroundUri' });
 export const progressiveRenderingEnabledProperty = new Property<ImageBase, boolean>({ name: 'progressiveRenderingEnabled', valueConverter: booleanConverter });
 export const localThumbnailPreviewsEnabledProperty = new Property<ImageBase, boolean>({ name: 'localThumbnailPreviewsEnabled', valueConverter: booleanConverter });
-export const showProgressBarProperty = new Property<ImageBase, boolean>({ name: 'showProgressBar', valueConverter: booleanConverter });
-export const progressBarColorProperty = new Property<ImageBase, string>({ name: 'progressBarColor', defaultValue: undefined });
+export const showProgressBarProperty = new Property<ImageBase, boolean>({ name: 'showProgressBar', valueConverter: booleanConverter, defaultValue: false });
+export const progressBarColorProperty = new Property<ImageBase, Color>({ name: 'progressBarColor', valueConverter: colorConverter });
 export const roundAsCircleProperty = new Property<ImageBase, boolean>({ name: 'roundAsCircle', valueConverter: booleanConverter, affectsLayout: isAndroid });
 export const blurRadiusProperty = new Property<ImageBase, number>({ name: 'blurRadius', valueConverter: (v) => parseFloat(v) });
 export const blurDownSamplingProperty = new Property<ImageBase, number>({ name: 'blurDownSampling', valueConverter: (v) => parseFloat(v) });

src/image/index.ios.ts

@@ -524,17 +524,16 @@ export class Img extends ImageBase {
                 }
                 this.mCacheKey = SDWebImageManager.sharedManager.cacheKeyForURLContext(uri, context);
                 if (this.showProgressBar) {
-                    try{
+                    try {
                         if (this.progressBarColor && Color.isValid(this.progressBarColor)) {
                             const indicator = new SDWebImageActivityIndicator();
                             indicator.indicatorView.color = new Color(this.progressBarColor).ios;
                             this.nativeImageViewProtected.sd_imageIndicator = indicator;
                         } else {
                             this.nativeImageViewProtected.sd_imageIndicator = SDWebImageActivityIndicator.grayIndicator;
                         }
-                    }
-                    catch(ex) {
-                        console.error(ex)
+                    } catch (ex) {
+                        console.error(ex);
                     }
                 }
 
@@ -563,23 +562,13 @@ export class Img extends ImageBase {
     }
     placeholderImage: UIImage;
     @needRequestImage
-    [placeholderImageUriProperty.setNative]() {
-        // this.placeholderImage = this.getUIImage(this.placeholderImageUri);
-        // this.initImage();
-    }
-
-    [showProgressBarProperty.getDefault](): boolean {
-        return false;
-    }
+    [placeholderImageUriProperty.setNative]() {}
 
+    @needRequestImage
     [showProgressBarProperty.setNative](value) {
         this.showProgressBar = value;
     }
 
-    [progressBarColorProperty.getDefault](): string {
-        return "";
-    }
-
     [progressBarColorProperty.setNative](value) {
         this.progressBarColor = value;
     }