Latest droid code

Author: sitefinitysteve

fab-common.js

@@ -12,10 +12,10 @@ var FloatingActionButton = (function (_super) {
 
     Object.defineProperty(FloatingActionButton.prototype, "rippleColor", {
         get: function () {
-            return this.rippleColorProperty;
+            return this._getValue(FloatingActionButton.rippleColorProperty);
         },
-        set: function(value){
-            this.rippleColorProperty = new color.Color(value);
+        set: function (value) {
+            this._setValue(FloatingActionButton.rippleColorProperty, value);
         }
     });
 
@@ -37,9 +37,9 @@ var FloatingActionButton = (function (_super) {
         }
     });
 
-    //Expose for iOS
     FloatingActionButton.backColorProperty = new dObservable.Property("backColor", "FloatingActionButton", new proxy.PropertyMetadata(0, dObservable.PropertyMetadataSettings.AffectsLayout));
     FloatingActionButton.iconProperty = new dObservable.Property("icon", "FloatingActionButton", new proxy.PropertyMetadata(0, dObservable.PropertyMetadataSettings.AffectsLayout));
+    FloatingActionButton.rippleColorProperty = new dObservable.Property("rippleColor", "FloatingActionButton", new proxy.PropertyMetadata(0, dObservable.PropertyMetadataSettings.AffectsLayout));
 
     return FloatingActionButton;
 })(view.View);

fab.android.js

@@ -1,12 +1,13 @@
 /**************************************************************************************
- * Made for the {N} community by Brad Martin @BradWayneMartin
+ * Made for the {N} community by Brad Martin @BradWayneMartin
  * Thanks to Lazaro Danillo for his contributions - https://github.com/lazaromenezes
  * https://twitter.com/BradWayneMartin
  * https://github.com/bradmartin
  * Pull requests are welcome. Enjoy!
  *************************************************************************************/
 
  var common = require("./fab-common");
+ var color = require("color");
  var ImageSource = require("image-source");
 
  require("utils/module-merge").merge(common, module.exports);
@@ -23,26 +24,6 @@
 
          this._android = new android.support.design.widget.FloatingActionButton(this._context);
 
-         if(this.rippleColor)
-            this._android.setRippleColor(this.rippleColor.android);
-
-         if (this.backColor)
-             this._android.setBackgroundTintList(android.content.res.ColorStateList.valueOf(this.backColor.android));
-
-        if(this.icon){
-          var iconDrawable = null;
-
-          if(ImageSource.isFileOrResourcePath(this.icon)){
-            iconDrawable = ImageSource.fromFileOrResource(this.icon);
-            this._android.setImageBitmap(iconDrawable.android);
-          }
-          else{
-            var drawableId = android.content.res.Resources.getSystem().getIdentifier(this.icon, "drawable", "android");
-            iconDrawable = android.content.res.Resources.getSystem().getDrawable(drawableId);
-            this._android.setImageDrawable(iconDrawable);
-          }
-        }
-
          var that = new WeakRef(this);
 
          this._android.setOnClickListener(new android.view.View.OnClickListener({
@@ -69,3 +50,42 @@
  })(common.Fab);
 
  exports.Fab = FloatingActionButton;
+ 
+ /* SETUP PROPERTIES */
+//Background Color
+function onBackColorPropertyChanged(data) {
+    if(color.Color.isValid(data.newValue)){
+        var fab = data.object;
+        var droidColor = new color.Color(data.newValue).android;
+        fab.android.setBackgroundTintList(android.content.res.ColorStateList.valueOf(droidColor));
+    }
+}
+common.Fab.backColorProperty.metadata.onSetNativeValue = onBackColorPropertyChanged;
+
+//Icon
+function onIconPropertyChanged(data) {
+    var fab = data.object;
+    var icon = data.newValue;
+    var iconDrawable = null;
+
+    if(ImageSource.isFileOrResourcePath(icon)){
+        iconDrawable = ImageSource.fromFileOrResource(icon);
+        fab.android.setImageBitmap(iconDrawable.android);
+    }
+    else{
+        var drawableId = android.content.res.Resources.getSystem().getIdentifier(icon, "drawable", "android");
+        iconDrawable = android.content.res.Resources.getSystem().getDrawable(drawableId);
+        fab.android.setImageDrawable(iconDrawable);
+    }
+}
+common.Fab.iconProperty.metadata.onSetNativeValue = onIconPropertyChanged;
+
+//Ripple Color
+function onRippleColorPropertyChanged(data) {
+    if(color.Color.isValid(data.newValue)){
+        var fab = data.object;
+        var droidColor = new color.Color(data.newValue).android;
+        fab.android.setRippleColor(droidColor);
+    }
+}
+common.Fab.rippleColorProperty.metadata.onSetNativeValue = onRippleColorPropertyChanged;