Merge pull request #8 from lazaromenezes/issue_6

bradmartin · bradmartin · commit 25ad7c140b79 · 2016-02-18T21:06:24.000-06:00
Issue #6: Add null check for not found icons
diff --git a/fab.android.js b/fab.android.js
@@ -34,7 +34,8 @@
 
           if(ImageSource.isFileOrResourcePath(this.icon)){
             iconDrawable = ImageSource.fromFileOrResource(this.icon);
-            this._android.setImageBitmap(iconDrawable.android);
+            if(iconDrawable != null)
+              this._android.setImageBitmap(iconDrawable.android);
           }
           else{
             var drawableId = android.content.res.Resources.getSystem().getIdentifier(this.icon, "drawable", "android");

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@`
`34`	`34`
`35`	`35`	`if(ImageSource.isFileOrResourcePath(this.icon)){`
`36`	`36`	`iconDrawable = ImageSource.fromFileOrResource(this.icon);`
`37`		`- this._android.setImageBitmap(iconDrawable.android);`
	`37`	`+ if(iconDrawable != null)`
	`38`	`+ this._android.setImageBitmap(iconDrawable.android);`
`38`	`39`	`}`
`39`	`40`	`else{`
`40`	`41`	`var drawableId = android.content.res.Resources.getSystem().getIdentifier(this.icon, "drawable", "android");`