fix(android/action-bar): process Icon Fonts in NavigationButton the same way as in ActionItem

ycherniavskyi · ycherniavskyi · commit 49d9105f192b · 2019-09-18T17:24:00.000+03:00
diff --git a/tns-core-modules/ui/action-bar/action-bar.android.ts b/tns-core-modules/ui/action-bar/action-bar.android.ts
@@ -227,9 +227,21 @@ export class ActionBar extends ActionBarBase {
                 }
             }
             else if (navButton.icon) {
-                let drawableOrId = getDrawableOrResourceId(navButton.icon, appResources);
-                if (drawableOrId) {
-                    this.nativeViewProtected.setNavigationIcon(drawableOrId);
+                if (isFontIconURI(navButton.icon)) {
+                    const fontIconCode = navButton.icon.split("//")[1];
+                    const font = navButton.style.fontInternal;
+                    const color = navButton.style.color;
+                    const is = fromFontIconCode(fontIconCode, font, color);
+
+                    if (is && is.android) {
+                        const drawable = new android.graphics.drawable.BitmapDrawable(appResources, is.android);
+                        this.nativeViewProtected.setNavigationIcon(drawable);
+                    }
+                } else {
+                    let drawableOrId = getDrawableOrResourceId(navButton.icon, appResources);
+                    if (drawableOrId) {
+                        this.nativeViewProtected.setNavigationIcon(drawableOrId);
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -227,9 +227,21 @@ export class ActionBar extends ActionBarBase {`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`else if (navButton.icon) {`
`230`		`- let drawableOrId = getDrawableOrResourceId(navButton.icon, appResources);`
`231`		`- if (drawableOrId) {`
`232`		`- this.nativeViewProtected.setNavigationIcon(drawableOrId);`
	`230`	`+ if (isFontIconURI(navButton.icon)) {`
	`231`	`+ const fontIconCode = navButton.icon.split("//")[1];`
	`232`	`+ const font = navButton.style.fontInternal;`
	`233`	`+ const color = navButton.style.color;`
	`234`	`+ const is = fromFontIconCode(fontIconCode, font, color);`
	`235`	`+`
	`236`	`+ if (is && is.android) {`
	`237`	`+ const drawable = new android.graphics.drawable.BitmapDrawable(appResources, is.android);`
	`238`	`+ this.nativeViewProtected.setNavigationIcon(drawable);`
	`239`	`+ }`
	`240`	`+ } else {`
	`241`	`+ let drawableOrId = getDrawableOrResourceId(navButton.icon, appResources);`
	`242`	`+ if (drawableOrId) {`
	`243`	`+ this.nativeViewProtected.setNavigationIcon(drawableOrId);`
	`244`	`+ }`
`233`	`245`	`}`
`234`	`246`	`}`
`235`	`247`