From 86b1b62fbb40cbe3c82557ea70004739291fa9ef Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 30 Jul 2016 00:46:17 -0400 Subject: [PATCH] updated icons and architectures config --- src/App/Pages/MainPage.cs | 2 +- src/App/Pages/Vault/VaultListSitesPage.cs | 2 +- src/iOS/Resources/fa-refresh.png | Bin 595 -> 0 bytes src/iOS/Resources/fa-refresh@2x.png | Bin 960 -> 0 bytes src/iOS/Resources/fa-refresh@3x.png | Bin 1269 -> 0 bytes src/iOS/Resources/fa_folder_open.png | Bin 314 -> 0 bytes src/iOS/Resources/fa_folder_open@2x.png | Bin 456 -> 0 bytes src/iOS/Resources/fa_folder_open@3x.png | Bin 623 -> 0 bytes .../Resources/{fa-lock.png => fa_lock.png} | Bin .../{fa-lock@2x.png => fa_lock@2x.png} | Bin .../{fa-lock@3x.png => fa_lock@3x.png} | Bin src/iOS/Resources/folder.png | Bin 0 -> 346 bytes src/iOS/Resources/folder@2x.png | Bin 0 -> 563 bytes src/iOS/Resources/folder@3x.png | Bin 0 -> 734 bytes src/iOS/iOS.csproj | 66 +++++++++++------- 15 files changed, 42 insertions(+), 28 deletions(-) delete mode 100644 src/iOS/Resources/fa-refresh.png delete mode 100644 src/iOS/Resources/fa-refresh@2x.png delete mode 100644 src/iOS/Resources/fa-refresh@3x.png delete mode 100644 src/iOS/Resources/fa_folder_open.png delete mode 100644 src/iOS/Resources/fa_folder_open@2x.png delete mode 100644 src/iOS/Resources/fa_folder_open@3x.png rename src/iOS/Resources/{fa-lock.png => fa_lock.png} (100%) rename src/iOS/Resources/{fa-lock@2x.png => fa_lock@2x.png} (100%) rename src/iOS/Resources/{fa-lock@3x.png => fa_lock@3x.png} (100%) create mode 100644 src/iOS/Resources/folder.png create mode 100644 src/iOS/Resources/folder@2x.png create mode 100644 src/iOS/Resources/folder@3x.png diff --git a/src/App/Pages/MainPage.cs b/src/App/Pages/MainPage.cs index 38fdbd190..39785dc56 100644 --- a/src/App/Pages/MainPage.cs +++ b/src/App/Pages/MainPage.cs @@ -20,7 +20,7 @@ namespace Bit.App.Pages favoritesNavigation.Icon = "star"; vaultNavigation.Title = AppResources.MyVault; - vaultNavigation.Icon = "fa-lock"; + vaultNavigation.Icon = "fa_lock"; toolsNavigation.Title = AppResources.Tools; toolsNavigation.Icon = "tools"; diff --git a/src/App/Pages/Vault/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListSitesPage.cs index 3f6ece2f0..567442ce1 100644 --- a/src/App/Pages/Vault/VaultListSitesPage.cs +++ b/src/App/Pages/Vault/VaultListSitesPage.cs @@ -383,7 +383,7 @@ namespace Bit.App.Pages { var image = new Image { - Source = "fa_folder_open.png", + Source = "folder", VerticalOptions = LayoutOptions.CenterAndExpand }; diff --git a/src/iOS/Resources/fa-refresh.png b/src/iOS/Resources/fa-refresh.png deleted file mode 100644 index 14053d2b5e49d62556e18f812e4b0a4e532b63c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6Zv%WnT!Hk+0eNQEZUcSmR}$nG z%)rRR%)-jS&BMzlC?qT*DlQ=cQ|JCPxO> zi?^AT)dY^}Bs(2!uuKqhW#P&He|n>EXieZ#%bwJ2=c_M0&lElVgmc@kF1u@<@2V<% zdoA`%FX&5&%{zB?jm-a3hgW%3%|1H2VgmDwbyrRbtLR!DShYl`G4mwztV_CqfpP2x znOPF2mi9f|-!*gdu?r>Bd>P|EJ?o5HTI+C+^J3c)CWYrcD?aGPCY*dZ?W5T5OXpRl zHO;=;dg|WdHL@}bP0l+XkK-IJBw diff --git a/src/iOS/Resources/fa-refresh@2x.png b/src/iOS/Resources/fa-refresh@2x.png deleted file mode 100644 index 138dd599c6f9c8f6d7090894ae7ceb042679bb86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 960 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv9xeFa`(sgt!8^qky_0u$Qwb8)#xd zNswPK10xd)D;qlpCpRx2zmSNSgrt;=oV~P2`u*qczrSOqumYoYji-xah=kBxjmyT*>qN9&}Hzna40 zw3F?>hl0Yao{IH)y-(OawZ8nNug1x8&)`e(JvSBO?e23MikcUSN4{92Wy*AE!RZ4` zKH(C=6SR2lIC=FNGR}V-xKe4UTW>@Dyi?m)gL|zQ@2gFfoH5V9kwIe7rumJE=T)Q+ zuxfD|L|R{2dnkSGtS`PP6O`1{k{^rxGoE6%?)bHLibsF$dH1`BWgnZc-+?b3UW|5X z6_yfjn7wp8uIzklFmnvpvn|__c$tQbV-jrHze z=~ZX?}-EP70g2Dg5oTurN`;=TelF{r5}E+BHxNYt diff --git a/src/iOS/Resources/fa-refresh@3x.png b/src/iOS/Resources/fa-refresh@3x.png deleted file mode 100644 index 4558159448ecdf5b646cbb5f7fb15324f0f6eced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1269 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|3?#2~eYnNIz}O$)6XFWwj)K7x0{>?;F95ox zr6kBNn1PXrnT3^&or9B$n}?T=Ur z!q(2g(aGJ@%iGt_KO{6FIyOErDJ>%>H@~2;w7jCauD+qExwW&qr*HbKxeFF8U9ook zhD}?x?%cEQz`?^ukDoYm{^Hf^H*ei}@a)Cwx9>lG{`&pr@4r&Dmvk5ym?nCfyRn#m!>9Jmks3t;Rl;oO~L}^FIsf0i%ZOji>0W3$Lvji_o^Bk z?vb})f335v^!dGa>&|WKmAd9|-~7uekK;bCB8}G$cpZp#{S{5+s;if{HKI0r*Zzs`EzL35)*}q z>8%adzwx~OqPETUycT2sIi=TT(Fwf`tM{JRDo~IUn-K8p*hSgsM<1Wb)*gPpQYoSP z?~?o1Cl^*6@vB)jrQxk=?WNy>mwrwZVlqvCv9&-dXn7Zp;EF7*OOKs}MP@CRR0%M3 z>|ZW5<;!&*ffXK?9&;*5M6z*&>{;@@APy<*#MiCMKJ zY6iX%ypnf$Be&Qo*@mE;&TXo^VqP-?cDo!;o)UPhZ>`~oTVvR`dyT&yr+nDV4Rhj>WbJaA;yY8-w9M)sb-9_a_*_gnRAzSEV}7(? zQcA?DcI~pqdt4=)$wO$*BZ6|n!v)%QFV(ZhwwW dpKNvQV!YJNW3@b-DSJU#*VEO{Wt~$(696vseC_}M diff --git a/src/iOS/Resources/fa_folder_open.png b/src/iOS/Resources/fa_folder_open.png deleted file mode 100644 index 52583578f0e28f0cd37aadcf6330ecab40afae6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCasqrpT!A#*K#9`-RY1#>OM?7@ z85o&ZSlKwZc?6_nRWB+Qj-(2`L-;Z_+3w-E~}KysPb`Vz1`=fJWXXQ5;Q>};OXk;vd$@? F2>@2=Npb)H diff --git a/src/iOS/Resources/fa_folder_open@2x.png b/src/iOS/Resources/fa_folder_open@2x.png deleted file mode 100644 index 38c3cbeee563f9290095c84a887125c2a8f386c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s3?yAI>n{URivoN?T!Hi;2MYvMt$vMBBx5PEM~Wi$b^;ga|s-zW;x%M_R&t-`~>( zeBr_CmhGIuU>=evl(^@`8{y=on-@Qx^l#5suD311tU1ymB9km_Snod8)HoU((50UL z|6jnNOY19{JgXGho~HFZo8H4UX_{bdWb%YfT)L6nLK*)({%R!4GFLszQ%(+7y{`Cc u+Siun%Qo#2VcQgEDJlCU{#)SVvO0$PGVeG4;`K5>@!{#}=d#Wzp$P!fAael# diff --git a/src/iOS/Resources/fa_folder_open@3x.png b/src/iOS/Resources/fa_folder_open@3x.png deleted file mode 100644 index 34c69f4c2b7733ea12d586aaa8c42ad1886166b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmeAS@N?(olHy`uVBq!ia0vp^S|H593?x6vT4n;NCjmYou0VR&1F=J&l!2b~E(!7r zW?*DuW?^Mx=iuVz;pO8O5Ec;?6PJ=#P}b7cHM6jHaB}twi-<|g$S&^dpEzaejCqR| zZ`!(R&%T4l&t1KF=iY-y&tANK`|ZUp##U(Af8$E{-7*l6MbY4?7ef;(Bo^ zLs@IY#)QL7vZ5l@j;uHT|F>uJ=rC|QSDWs4Y`VGp7u_E>PU#-4^RM9%|F!*i>c|rlR~J84r6R756PgN2%Nsg` z^4YuX*pBY|RuJ&S%v)nNf6$qxU#sLcga+>lzEb@D@SSFz&?{f97`c5T_oWBCQ0Lz% zJ~Pa5p;ATZ%x#RGyARCt5p@b;wV3p>OD~p5b*7YEY`NT;l9bB%OVrsf`$pbkO`7RG w(@bK=#LV`_)W~^VDn{3HmsZ%_{~}Rde`h~Kr~k(lM?uNP)78&qol`;+0K9IWeEQaGJMSxF;E08W92w>;3OABbXdP$I9 zFaskK3pWohpRlNmlCr*mp_Q$BKxkTKesNRBg0<^+o;Y>+<=gik|89LT>kCjzmZytj zh=gSC!APMd0}Q&+xpEa|k3?#4J%UA`ZE(Q36xB}_&;RP~`FYE{U%C#iO zFPMRmiG`JolbcsiL{v;dT1Ht_P2I%Q%);8u-P<=LEGaD~x1gk=vTxFqsnci8U9f2F zmhHRt>^pwq+{IgW?mc+<_Vd@DzyBu0tqlblc-qs&F+@W0>cQthha4o@E~=*pZcK7s zbE7(ZL-@D7|Dz|(;1y2)b~@j-eShZ5FYBi7yeECUXwk&=VujjTKRr5MtzP4M#UWMN z<>aSbuQg75i%}0~b!H0vz-bv;_$1`$#9&c(Kjpt)TTgc0=McH$lNg*g+2@s#(1rfc zgm-7OkLfQu!*@k5HPX%b`Gh;Cig+fy%Pvsy)@OW~%d;(|awW5rkF)!<^J>mnhu2I` zo#!Ji^?uVD!6p5h-URQM^t8#zeOhzNp)-?}{v0lwT>oC$DRyNW+fFWCptl%2UHx3v IIVCg!05)Cs1^@s6 literal 0 HcmV?d00001 diff --git a/src/iOS/Resources/folder@3x.png b/src/iOS/Resources/folder@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..27fb0308f0eeb756688965712caf3bf32a1e52db GIT binary patch literal 734 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7oxAfsr-9C&U%VEg$jVpog9?Fd)K8 zg8YIR7@3$^SlQS)IJvla1cb#Tq@-nJmDSX>v~~3iO)M;J9Nav8g2G}GlT$Kt3M(6$ zTe~MsnLTgO;-$+rY~8+d*Pa6hkDfSl?)=5ex9&Z9@$&WCuitkYewH|`d-ez^O;ccJhu_PNJ@^4okku=U6H)st2}>k8ow zdu+~SDSbd`<8pl?iJVunU6a0QIdK=7i6r(}eDB)eE8}XZ*th6O{_3Y?YC<6sFFLCy zZaTGHP-*jQ2LG~5o114JpVVts->oz6&8CV?ryrfv>t3FD7lZ*JLidq$jrF@#>lB#TRdXs0fmso*X zsxj+|3}$uR*`hL*%Q+W3byeFf;<;-*`>S^;MUl=Ezue+tIc`*$v&7}q@yO|(`{o+? zK0b3gZAKT*xfMBSoUgS`r1WmMve}1^$w}zC(atrhIi70mo~!1Zcu?4*zpMY=m&MyZ gUoAPXfBzHN^m+HUN!LVQ0LBl4r>mdKI;Vst06>*QPyhe` literal 0 HcmV?d00001 diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 6c9a3f3a9..8082a32fb 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -21,18 +21,27 @@ prompt 4 false - x86_64 + i386, x86_64 None True 9.3 - - iPhone Developer Entitlements.plist + False + False + False + False + False + False + False + True + Default + HttpClientHandler + False none @@ -54,14 +63,28 @@ prompt 4 false - ARM64 + ARMv7, ARM64 iPhone Developer - true + True Entitlements.plist + 9.3 + SdkOnly + False + False + False + False + False + False + False + True + Default + HttpClientHandler + False + False none @@ -273,22 +296,13 @@ - + - + - - - - - - - - - - + @@ -347,15 +361,6 @@ - - - - - - - - - @@ -536,6 +541,15 @@ + + + + + + + + +