From 6d9b860c8b05f98b015acbbabb8eb91e4c056191 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 30 May 2019 21:24:03 -0400 Subject: [PATCH] update tabbar --- src/Android/Android.csproj | 7 ++++ src/Android/Effects/TabBarEffect.cs | 31 ++++++++++++++++++ src/Android/Resources/drawable-hdpi/cog.png | Bin 424 -> 781 bytes src/Android/Resources/drawable-hdpi/lock.png | Bin 569 -> 580 bytes .../Resources/drawable-hdpi/refresh.png | Bin 926 -> 945 bytes src/Android/Resources/drawable-xhdpi/cog.png | Bin 541 -> 948 bytes src/Android/Resources/drawable-xhdpi/lock.png | Bin 680 -> 696 bytes .../Resources/drawable-xhdpi/refresh.png | Bin 1110 -> 1135 bytes src/Android/Resources/drawable-xxhdpi/cog.png | Bin 745 -> 1332 bytes .../Resources/drawable-xxhdpi/lock.png | Bin 810 -> 840 bytes .../Resources/drawable-xxhdpi/refresh.png | Bin 1457 -> 1497 bytes .../Resources/drawable-xxxhdpi/cog.png | Bin 1029 -> 1715 bytes .../Resources/drawable-xxxhdpi/lock.png | Bin 1100 -> 1144 bytes .../Resources/drawable-xxxhdpi/refresh.png | Bin 1771 -> 1820 bytes src/Android/Resources/drawable/cog.png | Bin 305 -> 574 bytes src/Android/Resources/drawable/lock.png | Bin 398 -> 404 bytes src/Android/Resources/drawable/refresh.png | Bin 593 -> 606 bytes src/Android/Resources/values/dimens.xml | 5 +++ src/App/Effect/TabBarEffect.cs | 11 +++++++ src/App/Pages/TabsPage.cs | 26 +++++++++------ 20 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 src/Android/Effects/TabBarEffect.cs create mode 100644 src/Android/Resources/values/dimens.xml create mode 100644 src/App/Effect/TabBarEffect.cs diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 2f20f1023..2ff745b0b 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -110,6 +110,7 @@ + @@ -568,5 +569,11 @@ + + + MSBuild:UpdateGeneratedFiles + Designer + + \ No newline at end of file diff --git a/src/Android/Effects/TabBarEffect.cs b/src/Android/Effects/TabBarEffect.cs new file mode 100644 index 000000000..4470b81ea --- /dev/null +++ b/src/Android/Effects/TabBarEffect.cs @@ -0,0 +1,31 @@ +using Android.Support.Design.BottomNavigation; +using Android.Support.Design.Widget; +using Android.Views; +using Bit.Droid.Effects; +using Xamarin.Forms; +using Xamarin.Forms.Platform.Android; + +[assembly: ResolutionGroupName("Bitwarden")] +[assembly: ExportEffect(typeof(TabBarEffect), "TabBarEffect")] +namespace Bit.Droid.Effects +{ + public class TabBarEffect : PlatformEffect + { + protected override void OnAttached() + { + if(!(Container.GetChildAt(0) is ViewGroup layout)) + { + return; + } + if(!(layout.GetChildAt(1) is BottomNavigationView bottomNavigationView)) + { + return; + } + bottomNavigationView.LabelVisibilityMode = LabelVisibilityMode.LabelVisibilityLabeled; + } + + protected override void OnDetached() + { + } + } +} \ No newline at end of file diff --git a/src/Android/Resources/drawable-hdpi/cog.png b/src/Android/Resources/drawable-hdpi/cog.png index f2d698044cef38b73a8dace13b6482dbd886a54a..1022e8a5c08c6524cb3c5bc3ec6323be31c17286 100644 GIT binary patch literal 781 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7oxAfsrY|C&U%V9pT`g-?4qbAP6l9 z@(TtA3Ns5U2PYS|fS{0=xP+9fyn>RJj;Nan-C(fKZfBE{IdrzLde*f|F*WZ5?3V&1sgFDsJ#W6%e z^6kObMVA6Z*e>KV=XM-*x_U2^BS?S24e1MFAp#$RZmBJ}|9gLzqNTIZaQKT zB^5BwP$VbWG+#0^!8F#*@1w<~s^(Tr@FN?ex|DXZK2iTSH>kf=ZEyLiute9IQXo??ZHl^Jlh3@ zEZuj?kE!t~ozp+&7GP6dU+I0gJi&r7dGo>L;i@TTXRb(Gd9I~jXW5R3qM1!P%M=uS z9L0hs2rN_R)^yd`>Ek%Zywy{(QL2ApdBoXoJqs&Y cv$KEjOZ9xvW?LI6uf58U|}PW6nAn5$v&xY(hxv8p018 zP~gUu184T*`Vk;Rgwr`3&yU$gO zQhaho#=UCm$Qp|zFiDmR`pn`}3|SN*pbt;Y3qgq=S0k{Jr|4(1sMm-XnE(LGyS~Pw So!;F50000QYRzKMm6vx}Rjw|_`jcw~G=W_C_NX-!jW$HXbKW-nc} z_4v8-7jNEq@aWmg*YCf6|M~mxEM{qGpm`5GT^vI^j=!CBov+D3z%_7#w$`_M(%WEI`YBRj_ZF(J>@-P zI!(0w8W*?87SU;8O<|1wJRT9JbDTVnPF7S=Y%^;JV)3_{a71Dj-%^8lTkie)@27kD zzEkF^2T}X!0@4&Y{mruFmx?C1=@s$+(fBUJ* b!TUw*r+bdqc7+wmgVKVhtDnm{r-UW|%8Z~C literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z&IkB}xB}^;cV7=1^u%pSCD2PQ zB|(0{42(?7tZeKYT--do0;1xQGO|kgCKfi%E^eOQ{vl!Ek?|Rs**OKJHBGG@6Q|6Y zy>!*qn5CtG=3Vu4aSXBWe>?HGP?Ld(>%=5+!Rq(C zfr2^!Acl7|)HJJr*T^f_H0dS1OYD|Lmjp`&Z-Z0oo$UM?*@3ipE#NKvTpN&E2V|preUpV#f&GJZhh7+Zn>vE zS80PSn@f3FP!@CcqazGXaRn?L$4_#3v`v`SP-HQaNmF1Fi$?e4!WVDedtE)sc_Hjj z5yK*%PxFjR78Uy|zZ6pbsW0>V$N!(x>tc2t^^{dPSvaXdC9KcJdwuf>_5Kezw@ diff --git a/src/Android/Resources/drawable-hdpi/refresh.png b/src/Android/Resources/drawable-hdpi/refresh.png index 799c59138536bfe9b86a63e64dbe4e43c0347f9e..b657d53bca1c913981d646b6e6883d35f1431988 100644 GIT binary patch literal 945 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7oxAfiWq-C&U%V9R)NE0hbFi!+{o* zmIV0)GcYnSv#_#ra`Eu;2?z=ai;77|Nz2H|D<~?fX=>@{>Khmu8Jn1zS=iXxIXbzx zx_kTjhlE8$$Hv7cCa0xmWai`-mXtR%HMh2P_Vi7hG-KAh1&fxgSigPeo_z-oA3bsE z%*D&sZ{E6d@4>SdFW-Lr{Pp|K-+w2~{;(ey-JPB;jv*3~Zx3cV3k6EBJ}_?Hv3OdP zSZ~+ON0X+eE?u-pb(U__6z;av9aDB17X8~_)?Ua~qi=M-QZ6Kv@!_`JVO#d{Io_G| z-}(5<>BkjAo+VDJ+qqIIW_@Av(muI|O&>RjM%7w!O=45pZ^1S<@YKHkc@x(!Fg#Qg z=Umo4@6WraU-I318Z~M>t_MwTg&U#X3YMMzm|~6VH9E4`!V5?Qr4`n$vJ#*(IjA0xIkwy99h@of2q@T=Gfupv}Tb z>s=MjmZ$`t%5jstT@s=3v6quMs=4Gz-U5#~Da!<{j>TKOiTk1QW4Ns!fBwuBA+i5+v?kw;sx`mRvT9YadAqQN{wvQqP_pxM^>bP0l+XkKSJ?tI literal 926 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UH$0z?c-^6XFWw9=-c|6wxjOo>@n) z0ETjDNswPK10xeN3oAP(7Y{F=fS{1DsF;M5w2Yj*f}*mTrk0MbzJZ~Uv5Bdfg^jJ9 zqmzrPySJ}@NLWO4Y+QU|a$0&uW=?)#NqIw4b8A~?Pv68zGiJ?OuxQze_1kyu*>~{p z(G#c6T)ce!=B+#T9z1*T^6kgZU%&tS{ddyr5Bq`9UFPZH7$PBAdyv!lQUb&Ahxgku zR^CW#cb#z~vwWItTj$b}>8{g7rY44^X`cB1yZ!y{jfThOwfnvNd%XDOMaC-YO<%mP zeS7^`^U<8OnrrN?yI*Sz&w1FI!*I?a}rsnjL#w zB;((YfS-%`$}>FkPkk>rvoQ7i)l$}Xmp-}7^OvkS=M%iI+QDs}IA7yR-Je_zo?$Z` z?r&l$eqffeX7`rf9E~S-DXC96pS@FnLT>W>vR2Bn{x)!No0SmntmZFI~dXky_+mHyN{iYHSg&(;a?oYoS2%6EC2 zmbUwmXi-@k@sz9l7Zxh4wCZ^JXWG>n3QJbR_IgLCKds&=em=u>p68nMtlt&Me=a=i zyczn_?DxhytE#NJ^kakhE16!N@7g?9`AqGSy!iHx6YEx9zE--+a(S4@kGiv}_YS;l kE!z6+>EB0J1QP!<*6Imsgyk&w1xx}Ap00i_>zopr0MG+4Q2+n{ diff --git a/src/Android/Resources/drawable-xhdpi/cog.png b/src/Android/Resources/drawable-xhdpi/cog.png index e3ea7ef11732b9906f7ca9a6e0415280ea87de84..3b2eb9b46d0026839bae3b603eddbb3f5179bdbe 100644 GIT binary patch literal 948 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7}WxNLR^8|Q9v*R*sgu~2vn3< z666=mz{teR%Er#g&BMzlASfg%CN3ct8Z#<=jiO>>gMU~;~NkZ z79Nw7oLyR8(a_Y~+R-_2(u{eFm#tW}e#552M=xHze)HCy2aldSd-3x1+xH(ofBpXR z@9voWg23px=@_tYMWP^);yF+H%#w*7>! z7OTs%ZC(P!%tgEl*`{W;Tsyf~s%4twD}Sa6ucw?1huG&?t#eN4Oy76b?ne5dgw%%( z6BqC`TANs}JG4S5;K6&-8GDv`u&Z4a=IZG(*yY{m%CTq3MKzT*`X)D8eWtRho>*ge zF#Gnj)a~UnHgL_f52;}{EO&XzkQTP_;?hUc7lzbm^)FK^n0RfsZI+D64xe8a-(Q=M z>N1!8EMKW}N}?C{EVJMVt(s;gVCq7okE7T!hjc^M$Qen_$;LqHk<;Zgu1!2EKQH*W zLR!)LZDjoc6?RTO)9TxLdP$<;D}JPEq|W!+9=Ijp+w89Q3eSFo)Hy9X%yND!80;Bvlmzw4Uy-gbBTh&WWk+8xw`b z+!Iq>Qqbp{m_a`*S8Ghnu$yWOiUt}a*Yd15fTzFvA!>W3B{f<&%zksg9Q|&Hn)Vg; zC+V=N5nqJ7i&Ar46=}z0_KUQu=0fgJGT}$aJxosNsDc3>L`TEO4U3LG7@%yMXlqgz za@{6HTRWg^uW0LqIxo}hDcCpd2aH15PSMuanh|yRD%#pj*(M)FM?=UBiH;_0R&dl$ zQRyynkCQb$0=XX7|LWC0F4C^(mbxJFOd3&jQ2ep8QU^p$H}vZU-PRN?yHTmG;&uJq zbI*&{^%Jds`@vbO#w{_!uB)}YFo06u^eMP3rn+ZL6uRa?Wq%45_$<6~QXklAyyiHE zzzV0m72fMrX07!)T@p!Wv}@_N*fi}CNh2DwMkKA&m_;IKo(6pqmELL89Z~7FM)er1 f{Koe9Pt5uSX5t-_D@En)00000NkvXXu0mjf$+P=y diff --git a/src/Android/Resources/drawable-xhdpi/lock.png b/src/Android/Resources/drawable-xhdpi/lock.png index 527a6aa93e9caf80766321f7d66564f7b06ea805..ef416be9485a2ad8efc3f42dd270a531004249d5 100644 GIT binary patch literal 696 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAk#=K!A&S0FvoKty}nL!h4nN`m}? z85o(ESy!#U&)A6{b|sJ z88Tdq9FHHbX;PE9QXi1`dkLR|ZBOY!`+M%%Lg_m?cV;t|G%v9@k5o?mlgDm)`LgM$%JWZ){szX29+=EI|EyaDDE)c5`njxg HN@xNAk2b_E literal 680 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sp96eCT!Hk_yRSzSdZov|4(RQG zk|4ie21X`k7FIS6P99!CAz=|waS2H&c?Bh9H4QCYBV!9|TYDEzzmTx-==9wDf|Bz3 zrsmeZ{)tnj&R(!+>H6&l4jw&z;>^|SH*ej0^yKaPufP8$zg(Kdz`!Wt>EamTas2Jn z<3)!IL|l1~I8>Fcy6pL$Z>7ovFD}OU|Nqa@S<=~}ldQYxOYFV!zT=bJl+SNoW)kux zCU}N@RbQjuVzW0*`L&BL%{cSuc-+hLo{0+kZyolzEPo(B;bgSs)c7N_mT%!*{l{Zb z`DQsE{kQ*hpDVfUnEJUYR7^X56X%*gJ#*fzSaoL#_ja!7Nfisq|1H-@*R3&Rd$4pr zZ%aXr;IktcH&@6rRBY$Coz#4$`L4))P1ROs2D!6UF&xUC4|y6^A9=`;sHEw_;F9*1 zJ5fvAX8o@6du$72C3jAn{=3BYx%=*v=YGQP3Qsl(?ecT-<@B@Jy>kNh&JX%dZ&Wh! vBTsvBOcmJmLH<{{>gTe~DWM4fA1H>T diff --git a/src/Android/Resources/drawable-xhdpi/refresh.png b/src/Android/Resources/drawable-xhdpi/refresh.png index 55045f2afd5ef3179e4b157d928f11f106b1ac69..f123db822c5012ded657fa9ceb86f16c5a53833b 100644 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q82bZ!LR^8|Q80Ky;Qx%~1whxd zlmz(&GcYnSv#_#raB}nT^6?7@3JHsdN=nPf$tx%-DXVE{YH1r78X23InweYJ*gH76 zxVm}!_yz=qhK0w(#wDhtrDx~l78Dkjl$KXi*3>sNw{>)O_w@BooHBL#tl4uHELys3 z#j4fow`|?HYtO;MM^BwOcmCql>o;%RdGPGz+xH(ofBpXR_utu()`u7vn7BP%977}| z-yZxM&t1sC{^9)HZSy9~Y8Nqlx-iU1P)+rdz$TTIHZF-;{KCCi-rIlwdHC(r-M8HBE2pN-E}s?9`on)(m9%T?tni3? zhXu+!HyYTy2!EMk+tu`UwM>(C<}9Wx@e9i*EG|&qzx>8lbDbUB;+L$ejM&7_zdT#p z5xeZ@w?Aj^Rs8>;KCOabVY8O6Sk%IayZ2qpl5x@$`)k3q`JK*LIp-ylU5$;_SY>=; zQM#Wg(eB$MCM;m#cbI3*EBni@G+ESEMo&&GOlvpuw3saNDk@>=g*>5ie8Jl}W?!?M z8Wvn&<`8S`)nXOD+GJ+iX3nfnLZ>+A$1ixuI%nyMpA6~~e<=O0=1iB&I;J4-^5==B zNQ={f#j;7J;z2TP#;vnf7l<|;U^8|8pzeECxXAY_*^fQe$e_g`&?RTh4{S1%`x&?#YTsVCJBakz4E&3wllncmC5~I wPKU2;zHGEgJge_3AJ4bB)?v-SNEH9W{B@K3Pqxdq*g=`b)78&qol`;+08;izSO5S3 literal 1110 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_VC)a@32_B-kKTPfiUvst=p>7U z0i&d)B*-tAfsu)sg_WIylbeT^k6%DgNLWNvQd&k%UO`bwSxrMzOWVNE$k@cx%-q7p z-oeSm)y><-Hy|)HEIcMQE-@u7Jv%42ps={4w7jCSroN%Mt)sKMr>}qFl&RBa&7Qkp z(b8orR;^yYW$Vsedk!8xdg{!%^B1pPzj^D-V3(|IUuIJ_JlEpFCY0 zLnI`74|Y3q7c#Jacz;(eS20&kGijQ8E~l%9(kBkh$y;pP61Dm}-L@{hUHiWv`|kU1 zyKmopYbU=W@Im;3Y?a+%iaYlj)oS*o32|Gc&Mv?GQ1NSb@4cfBm9{yh_cN^s6ms-n zE8P{@zc}l^mV07Q+DpgxtZXJlGEKi4@2%ULdev59%J(m+Ol{&{o-=-nS$6c>p|k(4 zJh+i=R?#u5*-CY%pTw1W@3+iy@ts#{-|uuSe9;@uvacKR{8~dNZCZZgYx6SC8$B12 zxI&L-&T0<*!o7Ch!mPGKv$(pAt+&i%TaY1Qm9X?;9@~LLuI>#l&%D}lia}!0gulz%`DN#@6g)?-S_#AN7_}dx!nc+I`3afhh z$)5_Z4q3GZNlVH8aQ~Fg{z~rh7RmOz`*^S22~^mUVUn2{Q93;{BDdAR=j0{DD_hed zzVkM1^11oxXqjlkt!d{1&6t9hxXkwIEc2cqvvR}C`-&(0UVhnjk7>2A^_QTI1A713 z-#rU8;YxeC$c7{y8OTJ;lR%1M3Z0q Y2d2ya6cfr-MK)Pc6v zlmz(&GcYnSv#_$Ub8vET^YZZv35$q|OGrw|$jT`ysi>-{Yieoh8yXp#m|9rc*xK1U zIyt-h`uPV028D!0M90L&C*|fB6joGL*EhFybaqdiF?-&EMN5~hShafn&Ru)<9X@*e z)R}YVFJ8WW^VXev4<0>v_TuI1x9>lG{`&pr@4q*`wB|7|Fn#cJaSV}=e0%VJba1E) z`-krnt0O;i-*y$cYY=F%RA}i#ai7yJjz>2c85QSDohq!pD7fYA-{Z#*-QpDu1 zU09m=<#M^B&#r2IX>VGcuTdtl&Mzp3<=nfV7gBdt9v6vhbV+MwI&a${ zvuyV>jh1IGbJ&vhU%Y7avrwnN`Aw+mF}BYIkl|1 zv|^)Cn?>BkMGVbKy7QFyqNXHn@!~$>*e%qfcY&$!f)e{;8(jf*-5QCXTO4GzG|XJY z`e*^`84)D069+Z?Av&IAG+JZ?wgt`<>saj8&BW8SrJ~isE;jSRiYATFr8l2t9x<6> zUHI|aW8JJg#iUNb^Y7y4+f8X)UB6-{&siH&|L@u-VwSuU`?b>bmDhw*MvH|q|tw*?AS5-fF z7tQsTBVAdvHcZ`q$WjQ7rHnNE$Azfs&DJKtF+V?(aoZkw!4H@=p3=PoyBm{|HQLjHI)Z=2?p z-nGTYzZvqV{FeWD!TtDqp2|MH|AIf24m9jp9l!9onzP)3=cm1$e{4vT{A4>RB;|yq zN~XN?v56{2CnT!8;{1JO!kUw%Ww|o$;Pkn&|M>r(ZSB)5EMD1ya=xdlpUXO@geCwJ CS+s%x literal 745 zcmV@#|35E0*-sMLj700`#D5N%cHw=X|7VlQ0kT&Akb;!{zc=Zx;^g2d%*D{^M z^yXKt=6qL^hNZ~SGSXi%-;ea*Fmt$pSc-D)im1U;obn~hkg?@_$0<)!l?{kfl_iD; z*n=);JQ-+*BG#1*j71l;pGS$T3rb+!iRgWl;6BHWtC))t++wc5EEn=n0gUcpC-Tr9 z?!lxb@>E+4-bD5|%53VAo$vXPY&2jNiqxApjX~!6@eCJxfxgJxIGi>kQ~UXsV2~Rb z+l^C74kKp=d6O_1k)b1`!{7rpB1gG!DUBR$;UkP5U>pi*JQm|oNK<(TJFcNFO0qYw zcmpL_Bd#T~zu1ccnt|1P`|V(p0|itLt2!v4g4mfZ%)hZpi2|xhZ1qq;A7S+=3aBBm zHADe@iq$75p!&pC6$O+UtN&0ym58kn3aA!Vtr2*n%9D#3d(kw2==m$ixw3C?jFs;Sh3mn3Oo} zLdJ4CZU;-7aTWNay4a>{em;M^Os5V73IY!1<#A1}K6t|6mgqZX6)lKFn64@a2BwHVpGfgC-D zSGOQX*WuY_$B?-f_OF6Lc-Iz%)Bx{F*gxL<_#1_EY~J*DkS<;aDG#oN1bsxCF$zY( bC>R9*eRBYjd!Jq(00000NkvXXu0mjfFi%=x diff --git a/src/Android/Resources/drawable-xxhdpi/lock.png b/src/Android/Resources/drawable-xxhdpi/lock.png index 033949599f5cdfda2450e850491bd8eea41aba0f..6ea13d9423415765bb1a747444b49a45bbe6d232 100644 GIT binary patch literal 840 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz3?z5#SpJ`Zfl)BPC&U%V9Rc(9<_Gx3sc%aCUL^^7iu&4UddZOiRzm zEi9?5uBmHkZtLvnpEzmuyakI^Y}vYN-@(JD&R@KI>&dehuiw7^{Pp|qzn2f*>jOqX zkEe@cNXEUlGj0YQau9HxEWr}UD9TcJSoUb`eQ^AbsMJ6`sb)o-oE z=ZCkqtn+j*U3uFyM9I){@4AazTOWHY&tBs8*7E9euDS{0w{I@t+3N=rq@2?t~&KD^4g*YZO{0dSG;og ze{Hgi_k~U8QcmCM^RaLj%xyP2H%Y9;_KljR#;Hp_(}ce5xfXq@Yg43Jcjf=KRb87Z z)wsE<*G2R%(qWcNneeq=r|!F}?4v!ow}RHmcm__ZZ0wn=(l4}W&zc^UX%|;*$yruB zb4$0;1V=WYYB*tgBWc&J`Kr5iR+g16H|ufP_qe#&Ytnx)P(UvD{)h4CRte@vxktdP P!NB0@>gTe~DWM4fhJ*cJ literal 810 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7zG1-LR^8|qjz7AB6tW0&o$8p z21-;(kY6wZBNHjx1WD#cw~HH zT6#uqVM%3mOGF`3XRZ>q1E^PJMK~P^xkaJ zYYtWlrU8$pPO@;$U9ep1T~ArVROP_*BkW~?2GeqDyQ?e{L;I>GyD zR;F)!%|!j*nd>I=8&0lBc*l0+NgKDV(A&8mG#(2X-?N(9@h+xhM%IIe%T&I|Gc93(>ywX&T?=>^obFh@V!Ovrv&ZtSGTD;*cdtFLAmp0h z7M&88E4C-OWG`7{=>}M59G2!e;TACSR^_{}7&epc1vdXHD|j;G93``!bCpU=SggSM zS9C?eZ$?hxJvp;%{X~~Ma{K>)OJQaj%c|2(0y~dXUb^5TF{$i8;DjcTB?_#X9*+Md zU)|1KlK*}2qBWQQthHXUO!RfN{%q*;I>>Qk2+&sJjg2E!AV&W3gGO}{=3W`c9s%q*QS~|LV`UXbECZ=ZQ z7M50a_709t&MvOrzJC4zfgz!hF|l#+iOCt6**Uodg{2jh)phj^P0g)s9i2UW{gbB5 zm^FLuyakIEFI~1`)#|nDH*DIvedn${`wkpDeEh_zGw04J$ zOwuc2X66LdDS`n)VNtv%JQCYXI1@jm?w-HjtmfO3;`4WR-nK0N{_j!oeesDNDngwu za>|PqZq=?`wEunYJLl?Tj*Ij9{PQns+Sl!oOk7c4JWcES`E3db{=JuOCvh>}vOah! zEY96w&E_?E+aw(`;+IbAXZd%%qINHL9Zx{GTH~a7xkXaXlI#QTHRRmo=QGF1+m9@+#X(l=YB_!^z7Wm$RqrX*bv!Fv)d>%fv~~1(r#A zr3oyXJjJ$Oz}E5RCWp|@pF7hZoVH1gUm&&7;giUpif+B*0Y_c!N|YIkH~Q|{)6>Msh)<$d;^H@bh-@#L>Ln;0d8BB$N-aDI4! z>+Y|_7Yw5BzC=w>HP$g_34XpJ=!e$T7NLt%WX=UE-e(9_a@P00zI@%kd0SsTbe-Xy zb78vUkBggp<(ED1-|d?m&RXLomifY+@&2uC87W>1*v@{>e87_>{J(XV8UNz6<}1c` zI~cZ{*}SWIF2{+BrD5AXFKj)~k!)FYdj2~11xLK^-wN3^O^73I&Fjsnr>^Oh9~YeU vW8XV|y*}T6HpZ2iFJ3gVD1ptSpqU427Sb8A~iXHQ@M zq$x9I&7M1N!J@@Wm#tW}dhPlRo3?J>xogk90|yTuKXK~Jx$_q~P2`u*qczlL*(ZCA$)`3oAI}mDd%Cdjm5qILyTH8{%Wsx2G3LrAWfrpwHWW{L+IxM` zoMV-2pQawrzFICG{ov}+1wn=)Th~rn9N?N~xI?^Gqa!BuV6DcYV4lOi47-hDzFVi5 z7W1rp%+nn-;mEVhT&Dl4XDr-nzroYzgXy16-`X14;EJWaQQWn;`L41DR<3*h9m(0O?kH6SrW$f`q7siJk85=zCPQS*RiUQQFr-tHExX+OR`ki z)~-@FiE?qAw90=$d1G3nNX*hCHn!y%+j^RGMA;KIy?(?kwT9`2+tEo4Gb@&tw^~^; zoDG@doSF2VfAyC_#*(0m4V#YqYm~8N_!9U~fkXXY@jN4j?;7698p|s$JXK?;4>ao# zP?G1_slzm3;Txtyom=9P4@xzNo~java{c`xN64XXQ(naH>6<=pF!PPHU$a!Bnj_mj zaGLmrtFA}+Zv5)#I-jt*ugfH-(?&G^@HGk1RQ^}o2DebeVFC;!e^;W%+c z=l8Ug6W2EREXgn`E`Rc?d5d>*`NA&Ui(ck?UWH{QvefnJIq%k6Ab8$*i8NCbuQpGr z%Yg;oES)WwH@}c&+qy?ywbXdV#jGiT<|jYRGgWRl+^v)Q)|gap#@hSpp{dt2*0_{!t1HY*`0?$=ho|!n?@rcuYR{%}Q)Q9ohBv@$%HZkh K=d#Wzp$Pymdrm9> diff --git a/src/Android/Resources/drawable-xxxhdpi/cog.png b/src/Android/Resources/drawable-xxxhdpi/cog.png index 31265c855c70d82b95044ea70736a4083ed74f82..c89e6cfcf6eb34444bceb1c107d66add5b7e2dac 100644 GIT binary patch literal 1715 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Jgdz<4ykC&U%V9R))@1YWMN1;y^P zk|4ie21X`k7FITP4o)s^9$r3v0YM>Q5m9joNhujwIe7&|C1n*=HFXV5EgfAweFH-y zQ!{f5ODh{&J9`Ib7gslTFK-|JkkGL3h?w}qq~wgu?3~>E;_`}``nJyQp8iQwrcR$R zYxcYaixw|kwqn)lwd*%*+OmD;u08t>96WyF)R}YVFJ8WS{pPJZ_Z~fY_TuI1x9>lH z{r>a!Uqg1&CkzZM?4B-;Arg{r4|a!(q{^^8D7TxC=;+e2BE|8#PoS8o=Gk{qm5i4* z`S@NwP^w)-W_j#e_vK0R$jhu=KG${hb`xQw&mA3y$OQWghxG>INh^M zKzr*6E^n^FTVDNQM_zhYEfHLP`in)Ih3}=uOi4>#d^JzH;<277Zr-_a(NlX|ds$Ac zV7|+D&E>6Z(W}xazdEEmr)14lcpsX~yT$HdaI1gdqwFjhr_RHyc3(HJJ=&&Ubkwyq zG<@Yp-muWWXGD`ZIlRRqOfEGn3e4hJ@M5b>x7usPRkKx}U5;4xO)oGxZ+dg;e32h_ zN|;%eM!qv?cvj5)<>URCY71ToowmtrnBf<;Yjbi#W8Gczb6m!+6_+G;Dyd~FE~=d8 zBp2%3VC`$T-?}4jM$1uPl|&@FOKggZy29#i!M(hZ{4cbx&tFx{uw3uz{Kf05 z1*R^Vzfi?XCI9mIG!Ll-ady32FKxcoH7QK5k`$NAYpZ&#@Z4Z4o2bbZg{^#!PK(|i zIQcsG$|;SEl{}@(&dc50=lHO7?R&ejhl!2gt#-e zxH7Xh%19~bNF8Wk1FAJxz<6j;W3vMvl8R;#rllD`jTgEd{+c*Mn4C}w=mV-%^JMY3 z#FChrQNYdEmSNDhVU~Kv1=je?S#KOG-bw$i*0*1_eh;^N-n@TY^?wUYV*ACPUD>+7 zUdw&%Z>}gU=d~-P)%mxmDm+x!S{HmFp!v!#o}z1k@Aq-@n>+87;@IW4w?=7s_s%;RX53X@>-2up1p!1xiZOt zioA(i`*%KaGYy-&?3n19RlAOfcHdUayUT1>ETU?+;F#tVi*xB|(Hq&WC|F)@3wnFy zhrrTp|Ge+5J$lPSevR8qtE?R7nXkTEeY|9GlokTgk@Kq*P-9+uXMZ(zS$i97F6(hy85}Sb4q9e0DWg4 As{jB1 literal 1029 zcmV+g1p51lP)XWZRIz$lQ)(TZF6ml(U(Z!d!<&R^=_WXHx6& zAqwmp)@4##@hTNGvO6fq;uF2MjW~nZ8DoB4Mb2JlA;y@EQ)r0BtHQDr;te!OeR+tL zfg|aOBI?CSOvTFFM_)8aA5(zMQD)6i0kuS#?M9?&_z%^wCQL_^Q&F8ep9pi&9o4yh z%ojDoN}$JaTA86JiPpsBE0jn-;jj-%s6z-e1FcYG-T9h(xrL|rnBFL=_RLI>OHo9h za}KLAz8N`?Pf+cRW?7pHOBm;`I{B?8n-@famafzW5j5 z`LMsh>kH=>)8W;c|A=3wP!Hz*jn09`TvTean>-blQAIf&jK}dPr=eWS)D&P2!z}7$ zJibHZ_a$=^X)V*_zQR%%IA(oqS&IlKG8mb9l~DhfhttR5G850CfOaFq`GFIf83?o# z|D&J=ur^kkQ$<1j&Ef=@o35^D_j*{YEf zLeBaz7XhwE5q-=-%)t0o;cUJ{5nV)(ndyw8>dgl{#Vy>=*Yre@wPHE~9gY%ePyZYs zg}%aN1C&G+R>tWmlt6dmHXr>^o$JnAM7Rjmxs!-89j#Cu`;V!Jw5R=;hCTDWY(Aw{ zBzkiXD=-x&(mV1Sek8Cu57FN+%WztGqRIEaoWv}Qu@G+|XD=~7W6Z&sG@EEDvp5C0 z6OC*LudpSPT9xK+hgVmTuWi5<7__TDi$Q$j>z0#HYeK>+(Z+(j~~)X(Z_YWNasrv<@=197&qpJiecXM0G)invtv@jMv~~ zJ&g?AN3wQChIS-jt8*z==C&_mluD&isZ<&Um_cf5!n~G-00000NkvXXu0mjf;=$?? diff --git a/src/Android/Resources/drawable-xxxhdpi/lock.png b/src/Android/Resources/drawable-xxxhdpi/lock.png index c7cc70ffb50b2c738b194ee98e24f93d1a7898ef..adbf0adb978894ae3a60b8691f2e5966088fcdd1 100644 GIT binary patch literal 1144 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Jgdz?dE26XFWwjsp6G!2kbuz5s2i zC<*clW?*DuW?^Mx=iubx=Hcbz7Z4H_5fzh=lu}SsQdUt@*VNM1(bY3BG&VIex3ILb zwy|?__w@4i4U343iH%E2PRq#7%`Yr2udb_aXlm~4>z_Df>WsPb7A#w_di{p2JNF$p zeEh_j^B1q)ymjZ^gGbL^zJ34s>-V3(|9+{QAHcxC{e64Sj$M;9)t(C+FA$an2)61yVCa&(pMUHkjn&o9&UH@fLt`s{n{UgO_0JwHt- zVLR@~q1Yne#G&{l{<^W<*Sgxz;a`tmKeYMe!E@h|?tK1S-?6<;`>L5=);hPdT727E zFaMnt6=o-Hz5MYxy|89^`g0r71vc5XKZ-z~=$cFs88!O_1 z9+dGNdoXjEKyJy(>UDuDu31g7-C1QJaQ0P|P;{@h_RoniMi0xD_TP=oR@$|IYgX=! z?;m$m2J-ou&j}Dcdwa$C{kgA~)T{hFX8$=xFodT_B7W7cWqhkE*=lFYnaY2z`?Rsr z^nzCWmjzd2mK|c>>@|-k{_~=*PXy~MYyz3?CP&-7FMZ$GTW^XsKuMKBD!uO!3wC1Rc z{ptrVQ?4Jdvrp~2AHpDOAU@^I=kPN>e{(I^vNPeRUHz>&^=lYjnTqS&c;3F{zO-%e zLH6H&8Z76tb0{=0FmWs}YyS4VV){*go_SlP-}G;MzLaHutJ*ft1$V=p>_6;e6?*l( zfg_{w$f{+mHtHT5R2eTsdkUy7Zr<13)aSV)}jT$7adar z1L{jI^ekEa&W$}))zM$JG4FJxm(l-7MKvuo*_oS+pT0PM>)az(c1Vo3T-bjw|KSr>mdKI;Vst0IeBasQ>@~ literal 1100 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wF4y>vjcoWT!Gx9cVCYpI)s40Ze>`JrS8v|BbML{UXD{Er|NQm)&)%IH3WjCx%53@%({`3fRd^i97`r`8RnbrmMpXbd#ZyA4M?_r+b zHys*Qv@L9X@BUx!^Z)-#?)7hPWnRN&cYhDtn#CtIqH9a`GFUCGj(nAE-@Ja)d98Kp zXYFeY@(Qh3_{umTpm5Eke+QXneANvp`>!x%su-Z;$BCCk{$NTw%wp()dhU#KRg){p`gCKtXQ@gFVoU3$MmasMn9#BM?UhH@WEJwQbGf%k?qf-nimB=}TBiF^{g$Lh z!xE{R#yjUP>KEP?m#TbBSy*a`8yAD_g&i07t-e*w@i+0y+_V2!ui7~>+zDrv+*}{= z^}Ha1q3MR~Z{@51m9sc3mbzi~`*!YkQ+M8+nSa-=ve#r_d_mcDlVQ~Kc9SV*P6kk7P~cz@%DjbH9nXBOGs>8%vkf3#o-9IMKbG_3dS{m zcQFg;F9>H~5@=vxQ2?6`GWDRqeEqnor9y3vx}>nyO+0*UqE0`NN8AiL}W~CTzq0ua!OiyW_C_)enDYLX?bOJ zOIRzF?;U31&bChUAAJ?+VvYYZP~hg=dL~b4jw*w{KT1a=PzEq zdj00DJNF(udh+bW%hzu|e*XIX=kLF}-)+Cnz`&y8>Eak7A^G+oXLLv?1KWf5=MHt4 zD0MgpCAB@A6xBA%ZD-oEY1(2Mu8xzYG`Xxi`ABF=S6kzegd-ex-sewyR`<^A`J9=v z&llelZ%dSbpkv;8VIg~~9&fW{x4##(JIm9k$v}0QdCa^=pM%7|>Gmn{h^o84NGpg} zEL#1epzB^yi8x30}Q^p_--V-lzpCh0|wk zb!si`-Brsh%KOE%>TQyH`F(kwRlHnTFJ6{8`!=?^f0{14>ny{*);*TNCDW}8>Qn{Q4g^e<={#^zFh? z#~(NS%4H{r_+GyFhU-V9l~eh1g-mu?-_Qf?Us?B-IQEtH`z`Z+xVWNY-Y&&-=D9aQ zKWx0aZ2NqL^a*~~4oBZ}{bk9ox&DHu_8#5;v-jyaoyxP4*!CdPo_Pn0X8DT+T=O3B zEMhm}da*$E-ZSHlxDyfH?4Ca|k{JF@xaf2-^GDbE-7faw3duc-j94aaU)VoyouiYS zt1^ey#+O`oc^#Z2U8^THTFUcWII5tsX4#9-l(cu(?!R~v?s3DrF;_8})jBVzKvw9M zhD5`ZC+nhX?)iG`aB}Xn|u{xSXGFaq_g3n@+HI6g#0yan{zFNLOF7ef(1>A{QOA=%f zS1s0%SB&zy7|n6frt6%7%QW9cS?7)_jaw}OwN4jfxgS>c^4)W*P%?9UEZFj#N7h8i z_~+WQtQVg6T1B?_Jn5ZyS$bjn)Md>fGLkPIGS4;4xagz4SB&ZQ`Tt9%IkYEPy>bY+ zTJxxwTdL&pMNO7q!^6whi95ww&Ml4NSfFw?{p>ZzSo^tOk3U@f%r5?dZ2PL9T{9wh z&a)rTlqvx)f5!~h%nayI4EO;TiYxnOs5x!5a-(T*{bqrOv zJ+tllk&knpwA+3ukU6zz@t3mQsn5GkU0T#S_4Ku?@iUezugeHX3Z7og`69qQR%@ZV z?bjQuu~93XZNFH$mmXg@@v3Vm?}gVQSLZb3%@1tcEBPyT@s^K4Db7FVPq{4ZUUsBz z3CnMWP0RJp`uv^aV)k^avGU5$6Wdlv^W^+0V6psgER=1Morrs1NXez^7uqO~#v|+wVj_f7mb3>8bC zr#xP}t$2~LmdB&l)a4-BzkydcYyF`0kr~MHU61#t7yrk9?E~^o3~jypnmB+F4ARmD>*(s~8yG^2jG-G~ z8%<2jEG(_y)`(3uws!WL9kwD-j%bXNv&#-F&ehGG;IYfoYq$3v5}D#d^`-gw2Lv*h zK>#Zx^!u;_hd4ikM;<;Bb@V6hvDo7$Po0j7Pe@8mIe#I8FUZclC@c_(CB-FWKbk}-DzoU@96CAl`HP|^*?;{Sfw5ro0yz>rg{Fy?EJ#w(z_2Ut81UWbiHmL z1A)Mw=u|QbZrv(3^kId7bTuE2M&9F+EYpxmV+y|2U}qk0$T&@@Yb23wrb7-$#p8$4 zMJ{4SmjbnZ!eltK}EJ?%6lhR}_P|tL;1&U2j&_ZQ|b`kq@MC z5sMG1KZx1eFX%2gmoCWlju+sZJDT#{$iY41OuBWCf#stG{Hl@rMPSzBp=?<-0IpBY z!!=+N-iEVZDLMnhiH&lW%klZXPAf4w9Yb7#lLGTim$2<+XN|Ya!cml_Vd^GACw_X3=DbNh`d>jnxTCGUo`uwf1?#_s~)ybJ_FCMEopl z;Ir_?p!qz)#^|bjjmBC!iH4H_iq*CbwTJX?OtkMETwR6hBONIX{ZVIo)F|W3AX56z zbR2bYftO*_0XP%{5{vALo+;2GM{s9yij3ES4rg? z{HM}gxeY^Pcw!kYd4@V*)4|i`u`^90i8k8)(45Zb!wo%8FWFM;VZ+LO z2HmcB!U(Ub9!og0Ka!rLP@qZ?0;-S^VhPT#l{)eBk5wY9BCkuF@b|(9(_MyUY}j;6 zW=B`toO^u=*=jks>1+|b>@nYVE!A~b#`*CVpDxpf7bC($G8tbG>1LRvIAjW(VUee5 zliajJ&NOUmK>=_4M3ByCuJj4mD#b#9H|f0!9Rpx)J(bFV4A;v{l&tAFdrnF892@eE i>0%WLzw-O$R2pR}I(OG12=?Q*5d+bE8PrBfMEbwLz2VLP diff --git a/src/Android/Resources/drawable/cog.png b/src/Android/Resources/drawable/cog.png index 2200c139a9b72c1d87ef8d763d385a9a92d933cc..02dd33420ac1d231424ff1473e6564a2e0c7c8d5 100644 GIT binary patch literal 574 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Zjs^IHxB}^60B-&2UIX-oV@Z%- zFaskq3o9EBuYjPCh=in!tek?PlCp}bmbQ+biK(Tny+cT7Y+OcWc4>J}-^58%w{Aar z{KT1ym#^Ns^W@o!?>~S4jqmz518CSYPZ!4!3CX7i)1wYKh_GJxeIVk*ip~`YA{!E2 zC0W;a6n)>X8Gow3#`pl61-tapsgt^6*OYsf_D$WjSoguaS8N<^%Oe)K|C4bEUgarr ze&*bRmltYxKdf5xoN?VVaoPF26+E(vHM!5$2pUe?DbcsVeokOyqmcL4y16-v^-@nR zNQn65EUVqrw4uo=jDO>KfJ$fIP%e(;Z6{539!cbs$lrlO*eQZNm$eqBW)!x<5;wMmIdZLropqI&wc?00000NkvXXu0mjf D^8<(S diff --git a/src/Android/Resources/drawable/lock.png b/src/Android/Resources/drawable/lock.png index 45538ef5acbfb92040e94c16779d4a1f2cf81beb..e286cf31b6722999746986c4edf0ef24ffff20ab 100644 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Zx&nMcT!Hi;0m4ii`aq}XmIV0) zGcYnSv$C;sa`EzuC@3oH=<4ZPx(9`1=aw|ASi5WA!BZD6-?{hX*~|A|zyJQ5EmiFc z)Y#+c;uvCa`t8}1d`%7_E*I6eXq@}pz-6&u(Y^owZN(RG$8T3tTlZmIR^cR}l_7P9 zYXr7>a>)cYl-8(cGC#`goTos_0oALkR^cQOay%&C5y~{1A_ubRA<`aH* R-*^TJTTfR%mvv4FO#m)8Xbb=V literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAbp`l@xB}^;cV7<%RK2N;9q1a} zk|4ie21X`kRyKA{E?#~S1w~~YT|IqE_n?sM+>(YBYj^ECc>Gv&10+xca^)+g5~DW9#~ z^47X?#h5!L^Y@E9eSGWQ-o(`>8RJ$v{QJVxzdm0%LBlg^eq!uFu|=QeIEEeMQ+t}p zaNg<9PnF7spOS39W&8>QnN&_Q8O?F>oV5G$f9)N+FHBZBJNr|Q%3j7xuI3XiO)$>| Px`@Hk)z4*}Q$iB}=Rw&W diff --git a/src/Android/Resources/drawable/refresh.png b/src/Android/Resources/drawable/refresh.png index ad666bce04c934a34869997ebf6579ea3b9410c0..1e4912d4f34c169bb8555ad02216641ffbaf640e 100644 GIT binary patch literal 606 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZZU^{;xB}_n3T*!#;|2Q7qa?^L zn1PXrnT3^&or8;;k6%DYL`+sqT|?i%#MI2z+1D>5G$J}SGdm~0ptz*GqO!WKdD5!& zTefcBv+uysQ)kX!y>;i&lV>mAe*FG3cj3;bKr>%?x;TbNNIpH->BQ*B!1kctJ$dcR zpxmV{FGG}KODre-y8pj(mSL;m8ukyh5n4gHE=-+U3frd(W!}Xat?CyUQC_5 z?uv4_f$Ez}$`83_ncR9hH>T#Zv-hFU1%X@%C)D|tKJ?&S@%FIRMX$qx!Mj^ZkJ~HC zlx7KqZToR7@I+XNZ|(Zt>q%{PCxFuX4p9xmeRP0(%RCM2$P6`)cwM oi^q=XMs|Qr>mdKI;Vst0QJhC!Tp^U+r@mf z?YTLL0-BrLytZwcs`Br9z0&t{DYK>(d(22!{J>b>LiWT?`!Aj!XM6FSc9`k$Ff=p# z;Nq|iMf0N)7}jeqkH4?kYQDcqa)HwFXAftnyKb5wdHR-mSg;QF!ZqGW<+DyWMo&`= zTeDAlQv19me8JhrR72RwqBRjVdh>0F$a8X}u}5>Q=b` + + 15sp + 15sp + diff --git a/src/App/Effect/TabBarEffect.cs b/src/App/Effect/TabBarEffect.cs new file mode 100644 index 000000000..28e7c278d --- /dev/null +++ b/src/App/Effect/TabBarEffect.cs @@ -0,0 +1,11 @@ +using Xamarin.Forms; + +namespace Bit.App.Effect +{ + public class TabBarEffect : RoutingEffect + { + public TabBarEffect() + : base("Bitwarden.TabBarEffect") + { } + } +} diff --git a/src/App/Pages/TabsPage.cs b/src/App/Pages/TabsPage.cs index e1bf67822..575ee8a55 100644 --- a/src/App/Pages/TabsPage.cs +++ b/src/App/Pages/TabsPage.cs @@ -1,4 +1,5 @@ -using Bit.App.Resources; +using Bit.App.Effect; +using Bit.App.Resources; using Xamarin.Forms; namespace Bit.App.Pages @@ -24,18 +25,23 @@ namespace Bit.App.Pages var settingsPage = new NavigationPage(new SettingsPage()) { Title = AppResources.Settings, - Icon = "cogs.png" + Icon = "cog.png" }; Children.Add(settingsPage); - Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetToolbarPlacement(this, - Xamarin.Forms.PlatformConfiguration.AndroidSpecific.ToolbarPlacement.Bottom); - Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSwipePagingEnabled(this, false); - Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSmoothScrollEnabled(this, false); - Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarSelectedItemColor(this, - (Color)Application.Current.Resources["TabBarSelectedItemColor"]); - Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarItemColor(this, - (Color)Application.Current.Resources["TabBarItemColor"]); + if(Device.RuntimePlatform == Device.Android) + { + Effects.Add(new TabBarEffect()); + + Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetToolbarPlacement(this, + Xamarin.Forms.PlatformConfiguration.AndroidSpecific.ToolbarPlacement.Bottom); + Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSwipePagingEnabled(this, false); + Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetIsSmoothScrollEnabled(this, false); + Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarSelectedItemColor(this, + (Color)Application.Current.Resources["TabBarSelectedItemColor"]); + Xamarin.Forms.PlatformConfiguration.AndroidSpecific.TabbedPage.SetBarItemColor(this, + (Color)Application.Current.Resources["TabBarItemColor"]); + } } protected async override void OnCurrentPageChanged()