From 5e03b835a02d15027cb428ab00bcba3d22e7659e Mon Sep 17 00:00:00 2001 From: Tsanie Lily Date: Sat, 23 May 2020 18:41:46 +0800 Subject: [PATCH] fix: iOS tab icon issue --- .../IconBookmark.imageset/Contents.json | 23 ++++++++ .../IconBookmark.imageset/bookmark-solid.png | Bin 0 -> 244 bytes .../bookmark-solid@2x.png | Bin 0 -> 339 bytes .../bookmark-solid@3x.png | Bin 0 -> 458 bytes .../Contents.json | 23 ++++++++ .../bookmark-regular.png | Bin 0 -> 287 bytes .../bookmark-regular@2x.png | Bin 0 -> 432 bytes .../bookmark-regular@3x.png | Bin 0 -> 595 bytes .../IconSort.imageset/Contents.json | 23 ++++++++ .../sort-size-up-alt-solid.png | Bin 0 -> 305 bytes .../sort-size-up-alt-solid@2x.png | Bin 0 -> 491 bytes .../sort-size-up-alt-solid@3x.png | Bin 0 -> 613 bytes .../IconSortRegular.imageset/Contents.json | 23 ++++++++ .../sort-size-up-alt-regular.png | Bin 0 -> 362 bytes .../sort-size-up-alt-regular@2x.png | Bin 0 -> 560 bytes .../sort-size-up-alt-regular@3x.png | Bin 0 -> 711 bytes .../IconSparkles.imageset/Contents.json | 23 ++++++++ .../IconSparkles.imageset/sparkles-solid.png | Bin 0 -> 386 bytes .../sparkles-solid@2x.png | Bin 0 -> 631 bytes .../sparkles-solid@3x.png | Bin 0 -> 903 bytes .../Contents.json | 23 ++++++++ .../sparkles-regular.png | Bin 0 -> 378 bytes .../sparkles-regular@2x.png | Bin 0 -> 624 bytes .../sparkles-regular@3x.png | Bin 0 -> 886 bytes .../IconUser.imageset/Contents.json | 23 ++++++++ .../IconUser.imageset/user-solid.png | Bin 0 -> 342 bytes .../IconUser.imageset/user-solid@2x.png | Bin 0 -> 558 bytes .../IconUser.imageset/user-solid@3x.png | Bin 0 -> 807 bytes .../IconUserRegular.imageset/Contents.json | 23 ++++++++ .../IconUserRegular.imageset/user-regular.png | Bin 0 -> 448 bytes .../user-regular@2x.png | Bin 0 -> 820 bytes .../user-regular@3x.png | Bin 0 -> 1199 bytes Pixiview.iOS/Pixiview.iOS.csproj | 40 ++++++++++++++ Pixiview.iOS/Renderers/AppShellRenderer.cs | 2 +- .../AppShellSection/AppAppearanceTracker.cs | 50 ++++++------------ Pixiview/AppShell.xaml | 12 ++--- Pixiview/UI/Theme/ThemeBase.cs | 8 --- 37 files changed, 244 insertions(+), 52 deletions(-) create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/bookmark-solid.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/bookmark-solid@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/bookmark-solid@3x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/bookmark-regular.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/bookmark-regular@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/bookmark-regular@3x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSort.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconSort.imageset/sort-size-up-alt-solid.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSort.imageset/sort-size-up-alt-solid@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSort.imageset/sort-size-up-alt-solid@3x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSortRegular.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconSortRegular.imageset/sort-size-up-alt-regular.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSortRegular.imageset/sort-size-up-alt-regular@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSortRegular.imageset/sort-size-up-alt-regular@3x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparkles.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparkles.imageset/sparkles-solid.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparkles.imageset/sparkles-solid@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparkles.imageset/sparkles-solid@3x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparklesRegular.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparklesRegular.imageset/sparkles-regular.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparklesRegular.imageset/sparkles-regular@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconSparklesRegular.imageset/sparkles-regular@3x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconUser.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconUser.imageset/user-solid.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconUser.imageset/user-solid@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconUser.imageset/user-solid@3x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/Contents.json create mode 100644 Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/user-regular.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/user-regular@2x.png create mode 100644 Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/user-regular@3x.png diff --git a/Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/Contents.json b/Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/Contents.json new file mode 100644 index 0000000..94f56f8 --- /dev/null +++ b/Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images": [ + { + "filename": "bookmark-solid.png", + "scale": "1x", + "idiom": "universal" + }, + { + "filename": "bookmark-solid@2x.png", + "scale": "2x", + "idiom": "universal" + }, + { + "filename": "bookmark-solid@3x.png", + "scale": "3x", + "idiom": "universal" + } + ], + "info": { + "version": 1, + "author": "xcode" + } +} diff --git a/Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/bookmark-solid.png b/Pixiview.iOS/Assets.xcassets/IconBookmark.imageset/bookmark-solid.png new file mode 100644 index 0000000000000000000000000000000000000000..37bcec8e201d782a042642c07c83d1bd882ac5cc GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3HF=W8NDADVAa<&kznEsNqQI0P;BtJR*yM zbSnrmK6>;2Adn$h;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i`v2r;B5V zMep0o8#$X91XwRDZ(Xus^GQCxCmb6KTh~0`@_T5}w_t`|hZ&nofJwx!hpTp%#}rRk ze7ItR)gGoV9do_q&qVvF|6#xTq3!x%wwp0$#p3pzVb8Y_`^&+4>*^XoW-XiYb>0Dw iem9$5lHK6fRmJqKNJ;Ll;HD^`2h@*RMMKY zP2>n)n)BhjvYR1$>}U4OoSA>`Oo!rm-f1@;tvgcyqV(DCY@~py-923# zLoyoQ-Zb=%P84Z)sBR_dD#Nl+p-Jx_qdEITg;=XsFJ8QgC@d-|6$*C`SNzMkG`iid z&qo=ZV|BE79kdzq489U+D30laC<}GZ!_QF8y|4l|;Cm z?whiP*UB6!+g~RhC@81`$Y|U-{pJSTyAYA1WKi|>!^6DG<+Z`vSM{pdQ zI{Wa+=n2n%d^xwHX!Vbq{GZsYCFG4ZT%M71FRq&P=L!iyW6_7Fe6^pw&(BR^_73f; c+R}2&c%`&E^HkMCpjcz@boFyt=akR{0HDgVPyhe` literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/Contents.json b/Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/Contents.json new file mode 100644 index 0000000..a440013 --- /dev/null +++ b/Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images": [ + { + "filename": "bookmark-regular.png", + "scale": "1x", + "idiom": "universal" + }, + { + "filename": "bookmark-regular@2x.png", + "scale": "2x", + "idiom": "universal" + }, + { + "filename": "bookmark-regular@3x.png", + "scale": "3x", + "idiom": "universal" + } + ], + "info": { + "version": 1, + "author": "xcode" + } +} diff --git a/Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/bookmark-regular.png b/Pixiview.iOS/Assets.xcassets/IconBookmarkRegular.imageset/bookmark-regular.png new file mode 100644 index 0000000000000000000000000000000000000000..0686fab317158d356a5d9759a0d9408a49afce3e GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3HF=W8NDADVAa<&kznEsNqQI0P;BtJR*yM zbSnrmK6>;2Adn$h;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0F|PZ!4! zi{7`FH*y|I5IFiVevQbRoK4NmJDOU#Uofpp$j*H(vXN`1$^_n~vZSQqBoUsCqVjtl zS>OBrnD1Rev(#IM>k;Y}iw~YO(4Ei`|EY1piEWGZ8^r$}yw4UabLge|j@?DVIeYc~ zvReBnPj-*(X3`G%sJD@4df;lM;F5#KKBsJxD7TW@UwX0RpmbmD=Y%%fb^Hd0_pn!7 bm$@n1;%c7ssMS^i=uQStS3j3^P6HK~zYI?bo|X15psh@n1w^A=udX0FoEb%GOwEYZa7K78Y9B z`wG5-tz96Utsr9KrLwfKH6SP^UWz@jIGoMJtQN8#3}@N1GygL?!!k>zZQP=Z&jPKB z8#DsPPQidYYX}+r1?;*KQk@Q2p5jb#s$(l$_eAt&fgmB?cl@b>gAY^*D`6$9gq5%o zR>J-pYy~G_{WaJEj&UIyYA*wHaU9^V>1qZCc#@t6pK*lQgl{u?b|7pGcR7&Q?y>O` z*b-VfLEBglYihq0{D;E!!Yg^nIr(OE@_J6@Z?gLC4}$d)jvXALDy?eR?<9QVc)2zB zFkZLyyY+oQ%;e20td0nYwT$yoV2{`}`In_4`+Ipv!TJTApAZsjPS$X*eOMc{f+4YL aXnz4_mEetPatylw0000gcyqV(DCY@~pyFL=5* zhGaCpy=j9`jB*i>X$jK^-MIYl=|t(Gv);d|UVf+odaH1 z#Y4Y4)hDgl`*pQVuxz5#)QKxkod`)yS!HAtDmimik58!EGA-p`OyR62tTviUZ(rnsc;T=@^){P!@f)2i z@9HLhkb2H9T*>qO<6^~idvZCyzxT;{VsuTJVfE2{s|A0r6aOtIQ7M_P?DvDUyp=uk zijbYF%x}5tw-wfNIG>n5OE~ADrr)YOHvTL3m8>fw6BbXrZEA0IMEgwN!Kt%#zpbyf zwRpFuH~)|6ot`68cdOOi$ZE~8GU#8O$CS~UV}0~$>7jcox0n{OiVHtJb(WLgH~ESC z9m|xMozXu8n*ZpX(Yh?m);CM&*zJ6+3Hw`r{_t_%QMA1EmmtT}V`<;yxP|-S17sn8b z-lvx~@-aG!xINTYx~O3)CDfXJfcxbatB(>|Q-hWU1#oC}PIB^n%Nn-%XxgUi=?gxp zo6nqC{VXNTs7BFtO@Q}H-9pcmg&byu&MmxJj`pWklnSkSB*AdG+~qS*#)qyIEyij) zj%Bx3)bYRnuanC2xKO%O$AD`GXO!me=bnKRzkF^8atzGt>MGkLZ*yqdiWRdjzyJFu s>%Wdy-3etWi=_p|CG#r2&9|Ds-WF;rI;-`wAkgIup00i_>zopr0QKK+zyJUM literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconSort.imageset/sort-size-up-alt-solid@2x.png b/Pixiview.iOS/Assets.xcassets/IconSort.imageset/sort-size-up-alt-solid@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4bb293be15284d9fe3d3a8db083010a1f1f95e36 GIT binary patch literal 491 zcmVX9(IvzrSLpVhfkC=}*hyH z<(aaBW}8F{Q(#K63V0D->!|}IwvpG);fy}_N4wd zGgy?(^f6pvKPIrDyB7U5DPH87c|yMf+eKXVCr8yAzMN=wAQ;002ovPDHLkV1k?B(whJP literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconSort.imageset/sort-size-up-alt-solid@3x.png b/Pixiview.iOS/Assets.xcassets/IconSort.imageset/sort-size-up-alt-solid@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2df04f382374887ab9b2ca3ae885ed81a89df308 GIT binary patch literal 613 zcmV-r0-F7aP)-f@PzP(k}T89kyfxGz7CFBl@s-9uFL)Md_tgf|*J)sLZKO*p< zc4vANzXK)e>R8Akj$^wf@Jf(YzfuL(Ctbi{Y&8V_#o5%v_TgQN&|f&3ir4^8CkXyz zvJN*hvD*RR&$aJPGZDMcVS-0km`Aau4%oKZbjqk=<2qp5YSSsBioNJ@qMulu2eAdL zG+9r`vhsRx<_vHSSF!Zp*b)xZ9QVDdVRmp2@B3WfG+0-^1vUaRqi)5ReCs*yYu!L> zu?=PS?1TGwT{k%BX_B_w!ebl~e(M9DHAoR(3_eyhRbp?&Xk@X}$YQAxTWk?GmF>Fk ztB|6~y@AEp?fx1rO)-B3mr=w%VmmtT}V`<;yxP|s3gm>u%u9MZmcWU-d?`F+~(=|2eJj+9hdX5I*QCGc@ZIaeN}U* zsNm}fe+25JE-n0afc>HM$=Q=9AGSZj*p{IhC(K`Q^2HLqo5$JHDvqRmDPQzm?r(_w z4o}716}{|QcN3Kv=bo!Pn9dc|{dE3Av#RHXcTbot6gd9z+u%QgeK^Af4wN-k(Nu9A45F?si)Z>OrZ zR9#qP`)cv*lW(s&`b#|4{iwD>tWMATZtz3nX~Ojzn(fq{SDowydYQq~)z4*}Q$iB} DZ8eqS literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconSortRegular.imageset/sort-size-up-alt-regular@2x.png b/Pixiview.iOS/Assets.xcassets/IconSortRegular.imageset/sort-size-up-alt-regular@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d4babe27ded586f232a1968f7c024a7b9bc128ca GIT binary patch literal 560 zcmV-00?+-4P)ohVV%F@^0W<6n81&oJkeJ zyMVtCPxiL#0d6G{oxlr>RVdmwdVy3?oGaLAi;^kfnYNaW) zu!`*j=TzBb(}GUtCW!k`U3|h$M*N4^k-I`~aRrk)eXI`N;Bi&*ce}k}re>imGE#lSf-eD+|A7KAK(vX&U(cQ^|iPF0000G?T4*DrNEJ-uR}rw#(oP6Q zQdp!2h>e1Rbt)SX1RJsOqY(r}5v(jM3|eT!LIjIo;RlEyM8jEZ4$gBox3jl%mks-e zfn#RgXXfE%-rbuUYHC&l13CMh!5+-uSKt_-f-($VD`k%0sLVh~0~y zE%9ZRd2A|bYC1*mF4p9XACF|JSq>F3HG#zp!J8P&p)ncR*jT8k6ZqXh^y*4Bwl<~i zxMaDdwY4&h@3`E_T^n<_6&M3&vAaMVI4FFxpI=6AGNu3hf^&P7qBWM)xpkk6NU~mN zrkTN1U`%wH#&+N-wiVDAz%?8#Yf@#9dQ-l>ayE?SS~nl=z+`k4`B)24i?xAZ{q6b3cr2)r0+*=e4Mk#5VRdvi_H> zhSaR?Vm)Jwhb(+^|A zlK-uv5_>5wM%K?9H@304$og5l?PTnI&blmSaW9~M8T`SeJlFb8mmtT}V`<;yxP|<%+7sn8b z-lbP;y__9Ij((J{`?8HoX$PaI%c2y?Wun?|w;0dfaN&^Z4u;DTS1ujWnwyaNmhaD@ z{zIHT>x?~n*q816zUTj(^82$Bi%Jc?_dh?#wXeXU?0_hXTh7^N~K7ax4!s2gYTZQy|MHKA-|77 z4PUM+e=`X7E?j1F;8xWEw-%p=qVu=La#bC7U%PWg+}lczN!4$D*sj+4u#MrS@5|z? zqHS|m3o1-!_5c5QyPN9kv;}T2djC2fN;4{R-dpCP*LJXPqgYnG-Im2y_Pg<^u|AR7 babq9jKf^@-vk#3x0mtC!>gTe~DWM4fO?;rt literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconSparkles.imageset/sparkles-solid@2x.png b/Pixiview.iOS/Assets.xcassets/IconSparkles.imageset/sparkles-solid@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..525826a17962b2c2e200c129a331f5b0ac39b9ae GIT binary patch literal 631 zcmV--0*L*IP)dM5&Z;O2%=&@P+LJeq|iXfCkR+bypSq|SJ<_f8F!fM&b;qj+y@TB!Z~OD`^>zz z;s0w98)LZdNWDWJSI5i&&Y&j&dOcwv%ogZX1vTng-SJ6E$U8GW@h%AHu3 zCh;w;c~}?bymEJ9U0TL>$&?VK89Wv~N_NxynTo#0aU%xgkYpzQ5(qL3>DYhJHdt+tw!vBhDQXJ$ zu@eZgljcuV^qrOLm1^sp>ZPM6S%5?IR5Fl`HGx{G0D2SHXWC#XT51AR<1+$jewS8Ca_emJ7h{3)o3&p0dz9)NgWksiF>tBO zolKn{6yYfDrPok(dX#RWXE~VGJ~lMbX@ht0)tFiSX-xujW!xZ{7L>KO{G0bKFii!%)Zi!6bCL!Fw-UL!0) z1vTWgBL^A)e$fs#-OVP}0cD`z&~un}s0QlPJmhelNbLpwHW$4o^eO^X;3HpoPaa;2P#ruTy<*9=k~bp{qjcU8{itO{z7(b3?N>HIKuGxSm#Unp6@V zU&1b>sCwgoiT$*v71UG;pCWJ`c$X3)T(5!CzzQJ~U`|VVtsMaF0}CCz8^A1Z7uY3% zFf|aBmQ8B9HUbY~yoZ660{=)&#VjgKEzkzc$$bL)1iq1qySDV26s|R4@Vp@Oj8xLJ zT%>kH^O^%z3H&0pkK}2&O6`5f>z2?fQj?^Ea*DQ~=JP?nJf^&!B3+9qa&0z-j@yd(WJ@}$dq8_fPGyA z>I$Gwpv(X(z=s?F=`{~rNASz|OAa97>Z}b^0rj8Bvud^nZUI;nggz42UJ4MAT!Z%ppG5X6YLYp zLed* zZb3bKZGrTfks~RUX-{n;#qqiQR12+NL>7TP79P3#xDIMt(2wRKBSNoSZHE9ge%|5O z)B6UNtTX`pq#f+3&!$}I2JK)cy>{eCgS6gtztSVy`asmmtT}V`<;yxP|H~&$4r)+-2@8nrek=TdK>m$x)nH{>B$hoQAyk=2zcf-8|+ts$_ zw%=Gji1>yY`LUlD{C_BwxnR+8mV)lJI{SN)_oy7WE3--DKIz42H*93 S+pho&0tQc4KbLh*2~7aOg_k`5 literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconSparklesRegular.imageset/sparkles-regular@2x.png b/Pixiview.iOS/Assets.xcassets/IconSparklesRegular.imageset/sparkles-regular@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b6bfd65f8e6e06cac4780358dc8fdb97dd183bf4 GIT binary patch literal 624 zcmV-$0+0QPP)G7O9jCC*sS*%kP*89!X4W0AJF|0VC%f~5%dmIOIs4_@ zf9DR<*9Lks_}^T;MISe2%mJ?Aw*=_*j9I{Q2}~cqaIub{m$8XU5k7Nh<2VD<$4gw8 z1g3?rX|PY}?;@SUHVy)iZ2Ku0zMEBmIzg~bf$bgqC;%DN_G4gLI0*ur$j{PZ3Vc)& zW)JHzKw)+U?dcf5dECXj5x&QGfom}!jLuG(EQRU?zU^3$fx_%O7MG=g?qz%qB&#o4 z=kYBQ=uO(+6`!Sfd`W#CRe^zB|7K$??OzM}cT2|W;Jai?h|(?pk9jw+=?3q6sb7&= zxIHOIUvdVm2DYn)XHzWLShXb^)2NkngaRAS+wvP>yXvy&Gdo^R0zuJ=kU7t0`K?)Ib!6KN4udE<~In9HB_XQG~07f)WuZkoXIN z2yGAv5-lxP3TTmNK!UUcN;*U$AP6ZmgpzQG6hM&Jr5Ial>}T(IX1ueRPnu@!{muL7 zd7kGmtR8xSIpDVMKwNVMXaXz1cF(am2we~9czx0HPu8tn#UaXl^ejXsMA?smxWdx7z5^!O(o6Epekl1W9|_D z5AG%~ZJ@Icm;#n5HYBx0RJGh@;UmMe&`|>z*8G1z@Vrgny6rcPUgA==%4Tg4xj>k< zSN68#Y$daHL{p~@i~_GM47~u(0c&kd4U?a(xIHn@Jq+9j{%#A4#+t-KLGz-8UM_jrnm|1o zpM`6WE&4m2(pm;KSm@=Fm#unqeNwn?o3%FytvePvxfEq9ri!eMC3Fs0=ww)fnv=aJ z8}JfPOWi*q+}A)YL3SAQUkARUW++aG4b71aRLWK|kfogae`02E5ZGASfxt=NWlnI? z*h(XfwPagCy~!4Vsgj1y13e}C z*h6`PTP!?rrD8*A${1V(Hk)>oSGimpN~3FV%tX8=`g1p99N%TS_fh-^Y_jPr$l?)W zQtr=c=z1;pNy-|$P@q)04mMv*~Ei^ABbPihR6yjrR z;B7){%0j1*PH*O%NNH8JnFF2OetRTn8qFbf2zJ910^Q<Y+l!h}+|s%EAE>YzRpOAHDg15Xg`$ag8Vm&QB{TPb^AhC@(M9%goCzPEIUH)ypqRpZ(583aIF^r;B5V zMeou}hJH+rBF8@7U)TCT@JhsMMF;C--OjlOPiYsh2>BoIbf`YW+q3na!;}bzEjJ>a z6UxiP_dW4etNi>w?bE%*5#bdFZGK2jS1sTEr9rgLe2>e1F1v$^7|#9eeO#(=m*d4k z*~$kT+c!2`UZwv?N9;qO@&ntjoIA}*UsGlEXC12Tm2c8h`@ti(I9NPyNy^)rUiX*> z>U(~PWj){F$h}_Tq}kVa|5MW8&l36Wzh!v-?qE)TL#EQ~>YUo-C>6!b^rb&;HP4qn hA-1&n@G=9o`gijZR^%6^`2xMi;OXk;vd$@?2>>+1htdE5 literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconUser.imageset/user-solid@2x.png b/Pixiview.iOS/Assets.xcassets/IconUser.imageset/user-solid@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..becf79b551de8df8f61bda251eab0cd7d3e3c8c6 GIT binary patch literal 558 zcmV+}0@3}6P)J5PPYYXeFq`#)9}) z`~?zGwn)Uv#zG<@QKZF!DzUPlYprV2v=%cb5-~IP-gEAZc#>x^nK|eC%$(nx7y46% zlemoqES3I%TR2fZGZY=bD{MCSCHAL=pTTku@Ze=krh*^E&pzP6D>xDh--b^Ez=J=R zeGIIt5%AzEF#(<=2=KTLQ1{E^im@MwcmY_$c5GBZspY0Tq$>3Q75xFK#x{!dkXu1rz=r?6MCF2D=i$J>f_V>pXL<@KUsPw)`4 zdYsdiab0-Xf@O0>@+MjZOK{*u-+kmJ;(bF w1H6L^+Mk4i&xa&ac&#`@3>&(pSQ*d3FCCk4eHSD^ZU6uP07*qoM6N<$g5gu|N&o-= literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconUser.imageset/user-solid@3x.png b/Pixiview.iOS/Assets.xcassets/IconUser.imageset/user-solid@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e1a9ae966386946a9b7d920f91d79d087d1d2c70 GIT binary patch literal 807 zcmV+?1K9kDP)+c zEM?2iTFJ`BPLX@ct&mu`EU?CmOD-{KGUSZKa}Hy4%=^6OecyAY=3BqbIluEf-(T-} zpUbZ#J4#rNUaUt4I;-FH;SKKKA|7Hm!?_!xgxz>9NF|Bq*j4>)Q|ZEe$;C&h?PajccMQ-`C9a0ZV?5X&q2NxXY!U`jY^IM49od_ zxSF&4Fs|e!KLbMr6!0B0lS-8%3h2S)i2Ss)VN25Fm;#o@yQF4G(!`hoI#P(FrE~0* zKuiI%Qi!BwcGAR{0zRY=Nz41Bi7^GdNg-oGA{%*I0&fKF6 z=bd1JMu>R_W?&;02%A~$;@yW+co8}GLhSQr75XeJsV{I#M(3e2_TswGEvUDu{1lqJ zM}*7&BH?mgqpkW`Pc`R3^*8m#8^Sg05qIGHi>-L_pGlJLu!9Yb@fe$9#7j6V{|;PC zRB%*+r_qKBEg)Pk&iVVV`41;rKys`&Sx^2z3&0Xg8H<~3(E#0L#kS3}rmKV>nAB{O zlvGN>k~D5feN=4~CJJaaWjVI83*d8ExZaId9uTf;t#tcJ8Wn7+RdQ&Y6;Z*#(T`&T lF5^=R2-b^_xFobL!7qN2IjgkUygdK_002ovPDHLkV1nSgb9Vp$ literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/Contents.json b/Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/Contents.json new file mode 100644 index 0000000..08dd898 --- /dev/null +++ b/Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images": [ + { + "filename": "user-regular.png", + "scale": "1x", + "idiom": "universal" + }, + { + "filename": "user-regular@2x.png", + "scale": "2x", + "idiom": "universal" + }, + { + "filename": "user-regular@3x.png", + "scale": "3x", + "idiom": "universal" + } + ], + "info": { + "version": 1, + "author": "xcode" + } +} diff --git a/Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/user-regular.png b/Pixiview.iOS/Assets.xcassets/IconUserRegular.imageset/user-regular.png new file mode 100644 index 0000000000000000000000000000000000000000..6eb70c6c292c0bdaac848dd5d722c3729ea15535 GIT binary patch literal 448 zcmV;x0YCnUP)ns^CJ6h)MU%{E-c8;&31nj!&`q6F=dY^%o9y_79XtfK zG1fp^7X>Wg4Uag$A)X?)7@CGL9>QJpr1HJk3+{KG!7*-7&fv-~85<$2U^#FVxivK9 z83@6Y3{CSpM^y3}&dG)V0000G@L#T4F@k*Ome(; zj=A=Q7v`OFp7(iX&dfV=NV6{Nz!?nSS?~dz4$nFhbGBq1*o`{In|K|&0%l6AOE%(W z#Ic{!!fZ5CISs$!^QeC?^xq2cQfxv`^xj2m#%MDkW%h&Os2*c`iSQbF@lS*~P?fwJ z!?{HF@o5XVWq6Roy}*(x0)A2)$+`sW`Uv}DDtQO)<`P^?O@K=|{2htAVzJ@~zO5i& zXOv^nWG~f9z#m8PjS2!{%)%4_GopB;f`H*D{vbuby(nH5)Pki()0^pO7DD^lVF!6M(Y_oAf_C1>skK#B! zoGS9Xt-ujkotW$REs$sr2<+Uz5uE$doy-mP;d?8!)^JHgyKQ80n5=A$3a>3o2*j43_=F+DD=&hE!LGLulZy61^YEQ*mebi)D_>Vk6>>Z z`S&HDAz2lCoIvzAVrz=fbm9il44WwsYeA z{~d5MaWk5xuga$B9qj9nyTLOktd|{%)AL;$$Q!mV;_8L-xsJM$o68j0OvT^3vo*!a zbwRcZ+GWFmqhTv*Sdi-&Y$JKYhH~wNHN{KDi}xVld9FQcI$mLV=ve(8M6AxWU%?;R ySNWRxb=dYl3izfm6pu6M z`|i2-KL4;L`=0$@|9#HcYwfkp?Nc5uz#UkD#kdADv)_iW7d!D8wqdwL-)-R%yd^|d z3)&Fg#H=3Z9YqB%Xia#%9mR9#>#}y!@JSoO>+K87=$81|__0LsHTwaVc3S*oeBD6A zNqml{#73Tz*=osE_;QT|(E5I=yA2r~4uXNQJmgG1b#_DnKt-`-K zoVS&r_YCym+k~SLJl+QH%8a9)cZZTA(*p@7RlHgP_v<;_%SzxL#m5N;2Qjq-?u&3J z!T&)C++Y%pB^<0R%YjH{sU&w^8RUx+`XY=ToyUDB>2B6k>4{3 z2W6%E2XnZeE`fU#7h^EtDZ_CmdXkgG>opJ4v$4PNYi6f9;Pc!?(I+rdoO|vUegD~_ zS~?(-+h%+zjs-<<8J3H%IUiTzh=^=^un8MQ&S`4_3-AgaR-if(@qW8FA{=(QAn6x9 z((7@%NQliaj8E~hxJfPHLcFVa!s><%;~gz*`Z@S+0tip#i-Bh12gIZAwb(p6B=*ZF z#_oaXqW8ZjXK_Q=AU5lM(XG1?cZ;Irie`7G4u{3}g014?#td--mx(=>R}btG`{+dd z0@mY+#Dr6LTQp&hHV`xyx8f$zwVUPisr0yrGW*1Q5RP;Z0xL_abZ(pY+*%Y-g@lsu$b{+ zUt(-_MKrDI(J0>c3P%!SQ!COZ(rSmrj0Z_glX5QZmwqz6M6y%eCw6#gZR{>%s3N|K zpR3pb_ey8tiEbmftG1FC&#^^};Q9K;ai=(+r&9Jru|e^Fq$M@c{{wv5&rw}F4+j7M N002ovPDHLkV1n5mLCydG literal 0 HcmV?d00001 diff --git a/Pixiview.iOS/Pixiview.iOS.csproj b/Pixiview.iOS/Pixiview.iOS.csproj index cbb3272..e05027a 100644 --- a/Pixiview.iOS/Pixiview.iOS.csproj +++ b/Pixiview.iOS/Pixiview.iOS.csproj @@ -136,6 +136,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -165,6 +197,14 @@ + + + + + + + + diff --git a/Pixiview.iOS/Renderers/AppShellRenderer.cs b/Pixiview.iOS/Renderers/AppShellRenderer.cs index 1dad1f8..aca7a8b 100644 --- a/Pixiview.iOS/Renderers/AppShellRenderer.cs +++ b/Pixiview.iOS/Renderers/AppShellRenderer.cs @@ -32,7 +32,7 @@ namespace Pixiview.iOS.Renderers protected override IShellTabBarAppearanceTracker CreateTabBarAppearanceTracker() { - return new AppShellTabBarAppearanceTracker((AppShell)Element); + return new AppShellTabBarAppearanceTracker(); } protected override IShellNavBarAppearanceTracker CreateNavBarAppearanceTracker() diff --git a/Pixiview.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs b/Pixiview.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs index 4a6fdd6..0aca86e 100644 --- a/Pixiview.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs +++ b/Pixiview.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Diagnostics.CodeAnalysis; using CoreGraphics; using UIKit; using Xamarin.Forms; @@ -100,14 +100,6 @@ namespace Pixiview.iOS.Renderers.AppShellSection UIColor _defaultTint; UIColor _defaultUnselectedTint; - private readonly AppShell appShell; - private bool initIcons; - - public AppShellTabBarAppearanceTracker(AppShell shell) - { - appShell = shell; - } - public void ResetAppearance(UITabBarController controller) { if (_defaultTint == null) @@ -119,6 +111,7 @@ namespace Pixiview.iOS.Renderers.AppShellSection tabBar.UnselectedItemTintColor = _defaultUnselectedTint; } + [SuppressMessage("Code Notifications", "XI0001:Notifies you with advices on how to use Apple APIs", Justification = "")] public void SetAppearance(UITabBarController controller, ShellAppearance appearance) { IShellAppearanceElement appearanceElement = appearance; @@ -127,33 +120,20 @@ namespace Pixiview.iOS.Renderers.AppShellSection var tintColor = appearanceElement.EffectiveTabBarForegroundColor; // appearanceElement.EffectiveTabBarTitleColor; var tabBar = controller.TabBar; - if (tabBar.Items != null && !initIcons) + if (tabBar.Items != null && tabBar.Items.Length == 4) { - initIcons = true; - var sources = appShell.CurrentItem.Items.Select(i => (FontImageSource)i.Icon).ToArray(); - var images = new UIImage[sources.Length]; - var handler = new FontImageSourceHandler(); - for (var i = 0; i < images.Length; i++) - { - var font = sources[i]; - if (font != null) - { - images[i] = handler.LoadImageAsync(new FontImageSource - { - FontFamily = "FontAwesome5Pro-Solid", - Glyph = font.Glyph, - Size = font.Size - }).Result; - } - } - for (var i = 0; i < tabBar.Items.Length; i++) - { - var image = images[i]; - if (image != null) - { - tabBar.Items[i].SelectedImage = image; - } - } + var tabUser = tabBar.Items[0]; + tabUser.Image = UIImage.FromBundle("IconUserRegular"); + tabUser.SelectedImage = UIImage.FromBundle("IconUser"); + var tabRecommend = tabBar.Items[1]; + tabRecommend.Image = UIImage.FromBundle("IconSparklesRegular"); + tabRecommend.SelectedImage = UIImage.FromBundle("IconSparkles"); + var tabRank = tabBar.Items[2]; + tabRank.Image = UIImage.FromBundle("IconSortRegular"); + tabRank.SelectedImage = UIImage.FromBundle("IconSort"); + var tabFavorite = tabBar.Items[3]; + tabFavorite.Image = UIImage.FromBundle("IconBookmarkRegular"); + tabFavorite.SelectedImage = UIImage.FromBundle("IconBookmark"); } if (_defaultTint == null) diff --git a/Pixiview/AppShell.xaml b/Pixiview/AppShell.xaml index 9c6cce6..4d1dd17 100644 --- a/Pixiview/AppShell.xaml +++ b/Pixiview/AppShell.xaml @@ -73,26 +73,22 @@ - - - - diff --git a/Pixiview/UI/Theme/ThemeBase.cs b/Pixiview/UI/Theme/ThemeBase.cs index 7abbd0d..5350c2f 100644 --- a/Pixiview/UI/Theme/ThemeBase.cs +++ b/Pixiview/UI/Theme/ThemeBase.cs @@ -4,10 +4,6 @@ namespace Pixiview.UI.Theme { public abstract class ThemeBase : ResourceDictionary { - public const string FontIconUser = nameof(FontIconUser); - public const string FontIconSparkles = nameof(FontIconSparkles); - public const string FontIconOrder = nameof(FontIconOrder); - public const string FontIconFavorite = nameof(FontIconFavorite); public const string FontIconUserFlyout = nameof(FontIconUserFlyout); public const string FontIconSparklesFlyout = nameof(FontIconSparklesFlyout); public const string FontIconOrderFlyout = nameof(FontIconOrderFlyout); @@ -63,10 +59,6 @@ namespace Pixiview.UI.Theme Add(FontIconOrderFlyout, GetSolidIcon(StyleDefinition.IconOrder, solidFontFamily)); Add(FontIconFavoriteFlyout, GetSolidIcon(StyleDefinition.IconFavorite, solidFontFamily)); Add(FontIconOption, GetSolidIcon(StyleDefinition.IconOption, solidFontFamily)); - Add(FontIconUser, GetSolidIcon(StyleDefinition.IconUser, regularFontFamily)); - Add(FontIconSparkles, GetSolidIcon(StyleDefinition.IconSparkles, regularFontFamily)); - Add(FontIconOrder, GetSolidIcon(StyleDefinition.IconOrder, regularFontFamily)); - Add(FontIconFavorite, GetSolidIcon(StyleDefinition.IconFavorite, regularFontFamily)); #elif __ANDROID__ Add(FontIconUserFlyout, ImageSource.FromFile("ic_user")); Add(FontIconSparklesFlyout, ImageSource.FromFile("ic_sparkles"));