fix(speeddial): multiple fixes

Author: farfromrefug

src/button/button.android.ts

@@ -4,6 +4,7 @@ import { createStateListAnimator, getColorStateList, getHorizontalGravity, getLa
 import {
     Background,
     Color,
+    CoreTypes,
     Font,
     ImageSource,
     Length,
@@ -12,8 +13,7 @@ import {
     androidElevationProperty,
     backgroundInternalProperty,
     colorProperty,
-    profile,
-    CoreTypes
+    profile
 } from '@nativescript/core';
 import { textAlignmentProperty, textTransformProperty } from '@nativescript/core/ui/text-base';
 import { ButtonBase, imageSourceProperty, srcProperty } from './button-common';
@@ -165,6 +165,9 @@ export class Button extends ButtonBase {
                 if (value.borderTopColor) {
                     view.setStrokeColor(getColorStateList(value.borderTopColor.android));
                 }
+                if (value.image) {
+                    this._createImageSourceFromSrc(value.image as any, false);
+                }
             }
         }
     }
@@ -176,17 +179,34 @@ export class Button extends ButtonBase {
         this.nativeTextViewProtected.setGravity(getHorizontalGravity(this.textAlignment) | getVerticalGravity(value));
     }
 
+    settingImageSourceAsIcon = false;
     [imageSourceProperty.setNative](value: ImageSource) {
         const nativeView = this.nativeViewProtected;
         if (value && value.android) {
-            const fontSize = this.fontSize || nativeView.getTextSize();
-            nativeView.setIconSize(Math.min(value.width, Utils.layout.toDevicePixels(fontSize)));
+            if (this.settingImageSourceAsIcon) {
+                const fontSize = this.fontSize || nativeView.getTextSize();
+                nativeView.setIconSize(Math.min(value.width, Utils.layout.toDevicePixels(fontSize)));
+                // nativeView.setIconGravity(android.view.Gravity.RIGHT);
+                nativeView.setIconPadding(0);
+            } else {
+                // nativeView.setIconGravity(android.view.Gravity.CENTER);
+                nativeView.setIconPadding(0);
+                // nativeView.setPadding(0, 0, 0, 0);
+                nativeView.setIconTint(null);
+                // nativeView.setText(null);
+                nativeView.setIconSize(Math.max(Utils.layout.toDevicePixels(this.getMeasuredWidth()), Utils.layout.toDevicePixels(this.getMeasuredHeight())));
+            }
             nativeView.setIcon(new android.graphics.drawable.BitmapDrawable(value.android));
         } else {
             nativeView.setIcon(null);
         }
     }
 
+    setImageSource(value, asIcon = true) {
+        this.settingImageSourceAsIcon = asIcon;
+        this.imageSource = value;
+    }
+
     [srcProperty.setNative](value: any) {
         this._createImageSourceFromSrc(value);
     }

src/speeddial/index.ts

@@ -78,8 +78,9 @@ export class SpeedDialItemButton extends Button {
     constructor() {
         super();
         this.verticalAlignment = 'middle';
-        this.style['css:font-size'] = 26;
+        this.style['css:font-size'] = 24;
         this.style['css:elevation'] = 6;
+        this.style['css:padding'] = 2;
         // this.style['css:dynamic-elevation-offset'] = 6;
     }
     getDefaultElevation(): number {
@@ -127,6 +128,10 @@ export class SpeedDialItem extends SpeedDialItemBase {
         this.addChild(this.titleView);
         this.addChild(this.button);
     }
+    updateAlignment() {
+        (this as any).columns = this.fabColumns;
+        this.button.col = this.fabButtonCol;
+    }
     initNativeView() {
         super.initNativeView();
         this.titleView.on('tap', this.onButtonTap, this);
@@ -226,12 +231,10 @@ export class SpeedDialItem extends SpeedDialItemBase {
 
     //@ts-ignore
     get backgroundImage() {
-        return this.button && this.button.backgroundImage;
+        return this.button.backgroundImage;
     }
     set backgroundImage(value: string | LinearGradient) {
-        if (this.button) {
-            this.button.backgroundImage = value;
-        }
+        this.button.backgroundImage = value;
     }
     //@ts-ignore
     get color() {
@@ -266,7 +269,6 @@ export class SpeedDial extends SpeedDialItemBase {
     private _fabsHolder: FlexboxLayout;
     rows: string;
     columns: string;
-    rPosition = 'left';
     orientation = 'vertical';
     isActive = false;
     actualActive = false;
@@ -281,7 +283,7 @@ export class SpeedDial extends SpeedDialItemBase {
         this.style['css:padding-right'] = 8;
         this._fabsHolder = new FlexboxLayout();
         this._fabsHolder.row = 2;
-        this._fabsHolder.horizontalAlignment = this.rPosition as HorizontalAlignment;
+        this._fabsHolder.horizontalAlignment = this.horizontalAlignment;
         this.isPassThroughParentEnabled = true;
         if (global.isIOS) {
             this._fabsHolder.isPassThroughParentEnabled = true;
@@ -358,10 +360,10 @@ export class SpeedDial extends SpeedDialItemBase {
     //     }
     // }
     get isLeft() {
-        return this.rPosition === 'left';
+        return this.horizontalAlignment === 'left';
     }
     get isRight() {
-        return this.rPosition === 'right';
+        return this.horizontalAlignment === 'right';
     }
     onButtonTap(args) {
         this.active = !this.active;
@@ -517,6 +519,7 @@ export class SpeedDial extends SpeedDialItemBase {
     }
     set icon(value: string | ImageSource) {
         this._fabMainButton.icon = value;
+        this._fabMainButton.padding = 0;
     }
     get buttonClass() {
         return this._fabMainButton.buttonClass;
@@ -556,6 +559,13 @@ export class SpeedDial extends SpeedDialItemBase {
     }
     set horizontalAlignment(value) {
         this._fabsHolder.horizontalAlignment = value;
+        this._fabMainButton.updateAlignment();
+        this._fabsHolder.eachChild((c) => {
+            if (c instanceof SpeedDialItem) {
+                c.updateAlignment();
+            }
+            return true;
+        });
     }
     //@ts-ignore
     // get backgroundColor() {