From 5c86e042c19df92549ba71dd8ab2a15c7f0df932 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Thu, 9 Jul 2015 13:48:58 +0300
Subject: [PATCH] Fix - nav button with reflection

---
 apps/action-bar-demo/pages/page-title-icon.ts |  18 +++++
 .../action-bar-demo/pages/page-title-icon.xml |   1 +
 apps/action-bar-demo/test-icon.png            | Bin 1091 -> 1304 bytes
 ui/action-bar/action-bar.android.ts           |  69 ++++++++++--------
 4 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/apps/action-bar-demo/pages/page-title-icon.ts b/apps/action-bar-demo/pages/page-title-icon.ts
index 9b3c4762e..18c913276 100644
--- a/apps/action-bar-demo/pages/page-title-icon.ts
+++ b/apps/action-bar-demo/pages/page-title-icon.ts
@@ -18,3 +18,21 @@ export function buttonTap(args: observable.EventData) {
     }
 }
 
+
+var j = 0;
+export function visibilityTap(args: observable.EventData) {
+    var page = <pages.Page>view.getAncestor(<view.View>args.object, "Page")
+
+    if (j % 3 === 0) {
+        page.actionBar.androidIconVisibility = "always";
+    }
+    else if (j % 3 === 1) {
+        page.actionBar.androidIconVisibility = "never";
+    }
+    else if (j % 3 === 2) {
+        page.actionBar.androidIconVisibility = "auto";
+    }
+    j++;
+    console.log("Visibility changed to: " + page.actionBar.androidIconVisibility);
+}
+
diff --git a/apps/action-bar-demo/pages/page-title-icon.xml b/apps/action-bar-demo/pages/page-title-icon.xml
index 6305817da..2edb3ff80 100644
--- a/apps/action-bar-demo/pages/page-title-icon.xml
+++ b/apps/action-bar-demo/pages/page-title-icon.xml
@@ -4,5 +4,6 @@
   </Page.actionBar>
   <StackLayout>
     <Button text="button" tap="buttonTap"/>
+    <Button text="change main icon visibility" tap="visibilityTap"/>
   </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/action-bar-demo/test-icon.png b/apps/action-bar-demo/test-icon.png
index 865d858aea55186f3ef37d0f08ad732bf3fd4023..bf42af4aea371e83cb0f0ce668628bfa7ea080fa 100644
GIT binary patch
literal 1304
zcmV+z1?T#SP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000EvNkl<ZcmeI(
zOK4QrAHeZ1={(~DyD8{sV%k~}O3`XaUn*&8v*<1usTdPcl%%4?C{m@0s9hC{#;9Nm
ze?)7o5^2#o3tfm65&pC#FoM+@oBF8H#AG^&<0Q`fy2_&0x%Zxv%(;#*pYK|e3%_$c
z=Uk+qpumVA^_--WK?dohjXHunM?U5bV(B)EcrFxi0I{i+BJ$n=#G%&wA0Bb3mOK{Z
z4&u@+0_3fFM4=_*t&@mCC&*i!h(b5X3$xkHZzRaj$7Oah4H!feN&(Z@!DZrPNboCP
zF%wUf@)Key%{QbFg_8V_G-ByTrr?oEdJzNlFc%NJ#UsQ}{mjO&ar}iCtb<~V`T{ZB
zRtyUA5HZ|+d>Hc~;z9E<W)tE;>oKMUQS32?sG$TueoCm}Fpm+%c45q3M5*tXgjIy&
z1|Gn`2&HMn&T7(#Yt0z*0peOCPF5qX&Bd4i-LAvq!gY}T<^>Ge=CX7r;byYSmhUr+
z8bb$S+aXjOL2Ub-5Qe=;0<ozE6$=rY`gk1=yu*DYYbB_dYCHYqcw{2S$RJqrqaui4
zEyK6Ggl8h0Kyv&5$C!vm-lKa|BUEO)4}BXClru2OMO=&6^bfNzY%G5wwjD;rQN*?z
z6l2s5mw(72xG5opIJ5<W0`wq`eUF<q#IY`X7_$IzZ8c8T=KqN-?eGYnk~VN6GjO0e
z&Sb1gXftr2F?OU(afF3TB}kAmYB@>@$;%U&ftt-PVzbRN{~9%v`PV4yL=5*iMvbKt
zG1wo3J=@F~D8Vc|Fwf9Rc)+`OWC}kZmWJ4`czu}UYn~vM+KAw(ne5^h;-u-}XSPzR
z^^xyowsVPxq>1x?zT}PP=`(8wo){v@Jz_*@rHKmsxNB3~DY*+!K@<Ck5~GVGDYPY#
z|MZBntfLesb%;WXaZ<*5&RKst{b;*~WbGo$2$Nlq+lWh@1jsJTaxNiRyNkA%;|p&a
z6Ub%};!+LSyvTOPi{o~*MG?n(*+_t=wIUAf;b}oO(T6y83T>^3Yu9-nt0IR#xtk)a
z7H|V`Z4cU-5Ty=Kj8!eSvdn%BR%1AbD76x86^LS2n2uF|C7j?UDN=NBoW%sNn!!~>
zu{mh-^9WHaPBpqdB7rE@j}LvEMU)$&0UaxNf+%-}5m|?5l%Ww-pO8T`TEmExB3fl=
zK*b6&ntyME5xR(IHAJ<->_0)YI?sqLLo|!?8ct@AKr~y*h=qB8Xci-koiSWRG`mO0
z$ai6f_G9NDqTOajWdgm3c9l817VBmlqqGsx?ivBCg4}pE*Nj1~Bie1q$-U}T{Nz9t
zqFoQ;E&KgGM6(R@4gaSGjc;As5$*PpGsRp%H0vV7urS?-X6=N?q3OgC&FUGp9MP<o
zSIDtyh7heTFzgbd)gV<E(4f5un+!mi_TsI>kVef%SPQ^<&0l{d1~q66QWSu5TEkO^
zVbvPTc>o^)k{V053J**thA37}g~p5XRXh@AKcdtsniMC$g%F;q<Qn2y3;UGzJoCYO
z0XFauaqKiv*9~(sex8}}Y~jA+T*n+wTbmijGZ&(s3uJ7r#k*`~{ya+wkw>PmmM8<(
z7ipGH6=zsOggoV=oK>`Nns)9oK#COo+@+mU>|rHy@R2hG1qB5K1^)tOypHj&Ah#O;
O0000<MNUMnLSTY+D_SxD

literal 1091
zcmV-J1ibr+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CENkl<ZSVygw
zO;Q_I6ot=eDW0Mopv+R0Ad5mCBd-9l0>}zztsr6rYOlcZ3L>und5j#|kW^(Bu>z#2
zkou(V>mRH219an_QR>(4-1okF&V_j8^XrY@tVB4G&;(E;*v@}aQvo4>3Bhn)(dT~;
zgGu@h%kJM8ch3Oz0M-S30}xW0hzKQ2vkg4d8KEw+NjQ=FkirP){{1c(l@f3;_CFFl
zg%r%I7_3(GTtRkX-jY6nGf}@67VyiBUw^aYf06XwDtK<gUB5TJ`aXn<!UBG~_S+tL
z1*&&@6kL`O(7f?$%O&~*&&vw{W`G_52J2w$66KD6fin{40B!HR(gNlc{rqN0A3(=}
zg^YIFf65rftRvFyFkmSS4OW7GmKJc^>St?RWf7W2yX~&D6^SV&YeCqCj}?R|u<2En
z7O<@7@SnrLeZ0(b@YO%3__4GAJ92>jZL9yOhyVjHif{qJ2UsgFK)M8t0ZG8f-8q@H
zWkk(9anFfcqDD_mV<KT;CSYh@kP~ol-8})+2GQKK)HQ>J24=0GDA63wobK(e(~$55
z#01drt`!V(3^c~w3qW=xb$gM}NFFANY(f4ZQKQgItknchK?JLwU}jZapkA#a3=f0M
zmRG-&320pVJ&=Duy7a0Db}iUenKP6K9g2aVtGiZk`Vt-zBQiVhurc-@M0D?tg277`
zZ+j=L#=POFTsZivdyJ(zIU{O}yRvlhs(4?d`c%lOt=f0Q?@5>?qEG`JCveG01rVmr
zh@1dttJo7XfH-`t>f2M5xJ?&4Hei!#Z2i7~PZr6s@vxbiko_G2qg5upGcfMTl8qkf
z5IY1;Qssg+(k{+)*3xQ74LlEnXvv2n37Hv@oxu9SII~eV+Sl(q?T+;*-u9hc;KoM8
zp8XzQ0oA=d3WC={Xc4_?Mi~Q^5tOxfYDD({h5#;724MI9SixnH>1N$lpD17^A#`pD
zjdDhmK=@%LRws$IP82ajB~LY_wjvuo(N4&|kEv$A2m>1s+MT)ycY%%(453Eic!L3J
zBiBM28QCcdFJ-{K=T2^cD}gh21x1wa1nZeD$Xb`OPU{G~k19Hk8IZzx6{kh+f2$Ee
zc72=qvD&&8N}dL(^QI6QmHP%F!O^^;FHecFu=#1hw@9i1xM4)OlkzZ)B81zf=<EtC
z<q%J)Hpj&|zE%-eEHyEr&!C1@P1&p5%7DSh1!`U_CifV4s$#l6j=e^}#M<ab7}0ZS
zxD8;Yo^1CYRq&z6py~cgig0GOYC&|@>Yo>NQ#X>CDG=<%eeXzit_5*o-oM3C<D7^i
z_Fh!4>^za136qLCZpIVpqzj`2$OOxHwsZ6TvWj7m6Wew={{yiXxryZYMb-cS002ov
JPDHLkV1im={j&f7

diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts
index 8d74042c4..52dad6d48 100644
--- a/ui/action-bar/action-bar.android.ts
+++ b/ui/action-bar/action-bar.android.ts
@@ -29,7 +29,7 @@ export class ActionBar extends common.ActionBar {
         }
     }
 
-    public _onAndroidItemSelected(itemId: number): boolean{
+    public _onAndroidItemSelected(itemId: number): boolean {
         var menuItem = this.actionItems.getItemAt(itemId - ACTION_ITEM_ID_OFFSET);
         if (menuItem) {
             menuItem._raiseTap();
@@ -66,34 +66,12 @@ export class ActionBar extends common.ActionBar {
         if (navButton) {
             // No API to set the icon in pre-lvl 18 
             if (API_LVL >= 18) {
-                try {
-                    // TODO: Find a better way to set the icon instead of using reflection
-                    var drawableOrId = getDrawableOrResourceId(navButton.icon, this._appResources);
-                    if (!drawableOrId) {
-                        drawableOrId = 0;
-                    }
-
-                    var arr, arr2, method;
-                    if (types.isNumber(drawableOrId)) {
-                        arr[0] = java.lang.Integer.TYPE;
-                        method = actionBar.getClass().getMethod("setHomeAsUpIndicator", arr);
-
-                        arr2 = java.lang.reflect.Array.newInstance(java.lang.Object.class, 1);
-                        arr2[0] = new java.lang.Integer(drawableOrId);
-                        method.invoke(actionBar, arr2);
-                    } else {
-                        arr = java.lang.reflect.Array.newInstance(java.lang.Class.class, 1);
-                        arr[0] = android.graphics.drawable.Drawable.class;
-                        method = actionBar.getClass().getMethod("setHomeAsUpIndicator", arr);
-
-                        arr2 = java.lang.reflect.Array.newInstance(java.lang.Object.class, 1);
-                        arr2[0] = drawableOrId;
-                        method.invoke(actionBar, arr2);
-                    }
-                }
-                catch (e) {
-                    trace.write("Failed to set navigation icon: " + e, trace.categories.Error, trace.messageType.error);
+                var drawableOrId = getDrawableOrResourceId(navButton.icon, this._appResources);
+                if (!drawableOrId) {
+                    drawableOrId = 0;
                 }
+
+                setHomeAsUpIndicator(actionBar, drawableOrId);
             }
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
@@ -163,7 +141,40 @@ export class ActionBar extends common.ActionBar {
         if (frame.topmost().currentPage === this.page) {
             this._updateIcon(frame.topmost().android.actionBar);
         }
-    } 
+    }
+}
+
+var setHomeAsUpIndicatorWithResoruceId: java.lang.reflect.Method;
+var setHomeAsUpIndicatorWithDrawable: java.lang.reflect.Method;
+function setHomeAsUpIndicator(actionBar: android.app.ActionBar, drawableOrId: any) {
+    try {
+        // TODO: Remove reflection as soon as AppCopmat libs are available
+        var paramsArr = java.lang.reflect.Array.newInstance(java.lang.Object.class, 1);
+        if (types.isNumber(drawableOrId)) {
+            if (!setHomeAsUpIndicatorWithResoruceId) {
+                // get setHomeAsUpIndicator(resourceId: number) method with reflection and cache it
+                let typeArr = java.lang.reflect.Array.newInstance(java.lang.Class.class, 1);
+                typeArr[0] = java.lang.Integer.TYPE;
+                setHomeAsUpIndicatorWithResoruceId = actionBar.getClass().getMethod("setHomeAsUpIndicator", typeArr);
+            }
+
+            paramsArr[0] = new java.lang.Integer(drawableOrId);
+            setHomeAsUpIndicatorWithResoruceId.invoke(actionBar, paramsArr);
+        } else {
+            if (!setHomeAsUpIndicatorWithDrawable) {
+                // get setHomeAsUpIndicator(drawable) method with reflection and cache it
+                let typeArr = java.lang.reflect.Array.newInstance(java.lang.Class.class, 1);
+                typeArr[0] = android.graphics.drawable.Drawable.class;
+                setHomeAsUpIndicatorWithDrawable = actionBar.getClass().getMethod("setHomeAsUpIndicator", typeArr);
+            }
+
+            paramsArr[0] = drawableOrId;
+            setHomeAsUpIndicatorWithDrawable.invoke(actionBar, paramsArr);
+        }
+    }
+    catch (e) {
+        trace.write("Failed to set navigation icon: " + e, trace.categories.Error, trace.messageType.error);
+    }
 }
 
 function getDrawableOrResourceId(icon: string, resources: android.content.res.Resources): any {