From 3be26a0481f7b253f9badb92bf48e9369f6c66f5 Mon Sep 17 00:00:00 2001 From: ylzheng Date: Mon, 16 Nov 2015 21:58:34 +0800 Subject: [PATCH] new icon --- librx/BaiscTabBarController.swift | 1 - librx/Base.lproj/Main.storyboard | 8 +++--- .../Bookmark.imageset/Bookmark-1.png | Bin 307 -> 0 bytes .../Bookmark.imageset/Bookmark-100.png | Bin 0 -> 1149 bytes .../Bookmark.imageset/Bookmark-32.png | Bin 0 -> 372 bytes .../Bookmark.imageset/Bookmark-50.png | Bin 0 -> 533 bytes .../Bookmark.imageset/Bookmark@2x.png | Bin 463 -> 0 bytes .../Bookmark.imageset/Bookmark@3x.png | Bin 1043 -> 0 bytes .../Bookmark.imageset/Contents.json | 6 ++--- .../BookmarkFilled.png | Bin 0 -> 312 bytes .../BookmarkFilled@2x.png | Bin 0 -> 431 bytes .../BookmarkFilled@3x.png | Bin 0 -> 977 bytes .../BookmarkFilled.imageset/Contents.json | 23 ++++++++++++++++++ .../Like.imageset/Contents.json | 12 ++++----- .../Like.imageset/Like-100 (1).png | Bin 0 -> 1662 bytes .../Like.imageset/Like-50 (1)-1.png | Bin 0 -> 1659 bytes .../Like.imageset/Like-50 (1).png | Bin 0 -> 913 bytes librx/Images.xcassets/Like.imageset/Like.png | Bin 563 -> 0 bytes .../Images.xcassets/Like.imageset/Like@2x.png | Bin 2450 -> 0 bytes .../Images.xcassets/Like.imageset/Like@3x.png | Bin 1674 -> 0 bytes .../LikeEmpty.imageset/Contents.json | 12 ++++----- .../Plus.imageset/Contents.json | 12 ++++----- .../Plus.imageset/Plus Math-100.png | Bin 0 -> 898 bytes .../Plus.imageset/Plus Math-32.png | Bin 0 -> 302 bytes .../Plus.imageset/Plus Math-50.png | Bin 0 -> 401 bytes librx/Images.xcassets/Plus.imageset/Plus.png | Bin 826 -> 0 bytes .../Images.xcassets/Plus.imageset/Plus@2x.png | Bin 263 -> 0 bytes .../Images.xcassets/Plus.imageset/Plus@3x.png | Bin 679 -> 0 bytes librx/LibrxService.swift | 2 -- librx/LocalStore.swift | 1 + librx/WebViewController.swift | 2 +- libxShareExt/ShareViewController.swift | 8 +++--- 32 files changed, 53 insertions(+), 34 deletions(-) delete mode 100644 librx/Images.xcassets/Bookmark.imageset/Bookmark-1.png create mode 100644 librx/Images.xcassets/Bookmark.imageset/Bookmark-100.png create mode 100644 librx/Images.xcassets/Bookmark.imageset/Bookmark-32.png create mode 100644 librx/Images.xcassets/Bookmark.imageset/Bookmark-50.png delete mode 100644 librx/Images.xcassets/Bookmark.imageset/Bookmark@2x.png delete mode 100644 librx/Images.xcassets/Bookmark.imageset/Bookmark@3x.png create mode 100644 librx/Images.xcassets/BookmarkFilled.imageset/BookmarkFilled.png create mode 100644 librx/Images.xcassets/BookmarkFilled.imageset/BookmarkFilled@2x.png create mode 100644 librx/Images.xcassets/BookmarkFilled.imageset/BookmarkFilled@3x.png create mode 100644 librx/Images.xcassets/BookmarkFilled.imageset/Contents.json create mode 100644 librx/Images.xcassets/Like.imageset/Like-100 (1).png create mode 100644 librx/Images.xcassets/Like.imageset/Like-50 (1)-1.png create mode 100644 librx/Images.xcassets/Like.imageset/Like-50 (1).png delete mode 100644 librx/Images.xcassets/Like.imageset/Like.png delete mode 100644 librx/Images.xcassets/Like.imageset/Like@2x.png delete mode 100644 librx/Images.xcassets/Like.imageset/Like@3x.png create mode 100644 librx/Images.xcassets/Plus.imageset/Plus Math-100.png create mode 100644 librx/Images.xcassets/Plus.imageset/Plus Math-32.png create mode 100644 librx/Images.xcassets/Plus.imageset/Plus Math-50.png delete mode 100644 librx/Images.xcassets/Plus.imageset/Plus.png delete mode 100644 librx/Images.xcassets/Plus.imageset/Plus@2x.png delete mode 100644 librx/Images.xcassets/Plus.imageset/Plus@3x.png diff --git a/librx/BaiscTabBarController.swift b/librx/BaiscTabBarController.swift index 20198b3..45f8e8c 100644 --- a/librx/BaiscTabBarController.swift +++ b/librx/BaiscTabBarController.swift @@ -16,7 +16,6 @@ class BaiscTabBarController: UITabBarController { UIToolbar.appearance().tintColor = UIColor.blackColor() UIToolbar.appearance().backgroundColor = UIColor.whiteColor() self.tabBar.backgroundColor = UIColor.whiteColor() - } } diff --git a/librx/Base.lproj/Main.storyboard b/librx/Base.lproj/Main.storyboard index 7c59c7f..2266ef2 100644 --- a/librx/Base.lproj/Main.storyboard +++ b/librx/Base.lproj/Main.storyboard @@ -471,8 +471,8 @@ - - + + @@ -1512,8 +1512,8 @@ - - + + diff --git a/librx/Images.xcassets/Bookmark.imageset/Bookmark-1.png b/librx/Images.xcassets/Bookmark.imageset/Bookmark-1.png deleted file mode 100644 index 4a0f70c4e790f145a021448547ecbaab4e755358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmV-30nGl1P)5Jis+WIzZqKn6tcW$=jr5g-F1_%c8SKLj$60d>?+%1XbtV9|Fu)jf0P%q(s< z_^=uuKA*2K&;x#fW`M{Mn3Vbj&<^yTffcZqzySCIHh`PHEBjid_ylay0fAGMpgO1x5l~#D&6|I=?aRzY@K0gzJmY&002ovPDHLk FV1ifcdM5w? diff --git a/librx/Images.xcassets/Bookmark.imageset/Bookmark-100.png b/librx/Images.xcassets/Bookmark.imageset/Bookmark-100.png new file mode 100644 index 0000000000000000000000000000000000000000..44116f7eb82f05a627b39e8b8f1e291c35f91c9d GIT binary patch literal 1149 zcmeAS@N?(olHy`uVBq!ia0vp^DImOj^};w82T}Hj9XpVyB?T8ksVVRuwmejYT&UMJ7o!9yyiR z?jl%Z@}@5AD$fLF4!%h%q6?W{M7Vrfo%X&e*mvr$?+O+^Oa2KiSnT_C|BDH0?w?e! zXg?7r)EyDt@=8MM?Vh{4SH?~Hy1QNA?eP`z>XpBB)?eGNq9R>#UeUrY>PS{$SNEQ) z)|&NwarHafc23B-v6JCRwua>9q@@|my|EhSoUif!IWc?h<((5w=B`o<*B4(rT|=sQ z&)?!HhnzP5`_63Ab?txt9EY#sRU!BGsmV^_wfgS;J?5x#2w$+^#$A$XNiO*c72&%B zm9DL~Iv1V(JLtA-YmHCnF`ollqQ7hl^SJVh+jdgU4M~PeF*-i_pPxl`H1GX)r#ogp zpQ?08{`7msOmEip#tQAMJL<71F?@CIeDmss_wH?9TgO%T`1tXwysnBOkGvbU>%`A{ zX2NBt{DpUcz$lZbaJb>5I9E_X{@DzszlOgzJv-qP*LUZ_?hB8#4sll+rmd0*4>W(L z5is55?Sxy6CQluvztnr(!&qs*KX>K7Rx`V$cB$%F?LO{iqV)=!c3T8~Rm`9F*0*(y zG}p2n4W|rJ4JTSXsVocITxOD3s&S)u`VxCH|3JU)-Hnf`%mRw$PI%5Z`Ro$4sq5+w z#K_Gy->r8==Wr3vYP+o$Z|sbZO8>Zp|K>||^XbyBi>rC3+}&gm9LHZf zTl>`Jyq9)73*K$tzVhAF|Do~$4=NtNxSDn7ON=Ail;%$D_nMx1dR~E5>Yr5lrS!Q|ZaBT#rE(#C{#s$7ua{4T%~PB@{pQhfi=)Z+UWM-Ccde9(yCV5( zn(504_wPpqShk+Z`{^;K{-Ypmq#KW16aL5J*|U7-ochIKH?PW? SFNgvbD-52lelF{r5}E)H90LIW literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Bookmark.imageset/Bookmark-32.png b/librx/Images.xcassets/Bookmark.imageset/Bookmark-32.png new file mode 100644 index 0000000000000000000000000000000000000000..53aae5f63ac6397f68222fb11752af3d05667896 GIT binary patch literal 372 zcmV-)0gL{LP)Bi@A)M-yqq?B9 zJrQ*Fu^E3th1RM1IDz-7W=*Gni`V0}zW>klGoTMidqIZ>{AZ+>fv#VDtos4aAx^mx S@=UJ)0000gOF%(=Y-sZsZ2rMF_+ED}zUt`oKi{aYT71JiNl-3mzh@md|>SERMOUN`oFc-Fsw+ zKsZ|q;j5qFhSW5)t-l6gsPE$B7y;YARWD&sb%MA4%nC9217yqdV>_`UBn>X$bw5r~ zzY?PTn8m?LP~7!Ji0fXGjyRGkLCI)20<(X%xhu+M|Am;0mg`8B>twVXiOFa=f~uCu zXgLy-(Q*VOqje}KdDn6!C$8m4N?gkkl(^QRpv1LY$%$(@k`mW)1SPI@D5&}r1qczc)wIc+grg&QBIb2`fQn$sCRS@|&1Q(k z*ywH!<4xe1x8i1W1h9jo`HRW65%6 zZ)Wy3(#?WK)}j#}B$2=7WRs4Z0=IykHP#F82)r5C1#k)ISz~SB7e|&xqDFx+#*MwW zj{pbmfTf7Yfmh&LFMucDYs;ehz?I?c8CE3znTW{x6F|y6Y)N4J^J}0u5sAMNksqsm zP{D~Ykwaj;3;ZFGs0mht3dK(%6V6gP;uNbBDqG8`mOjhYa*CC$Y+*#cFqI zMcl?m-)r@^{W|Q5u+D?>k!T_%f9dj(l2|FFQeyR7IVXuY>`KIxN0wl!ORThNXNVF- zNtp7zcdKzc2wSz0TC2|x3!t2lRcf>UuvX?sml{W)x%qZTodudfNNL zr9yHmMJzl+d%HQAJ-2c29C4VWIbn@Vc}Js4utKEeI{{|TWe%H)?kKi4*z|U!3w|u9 zO4axq?eeFmLtn6PXHdZE|8*`l=K^Y6Vtm&h{pBvp#PME7;_Fb^CGcja+{rly@K5s$|CDz82oVv^Daa40pZ%47nJu8;m zSDqjAv2!`HJoEl(gTOiI`u~z2hOGL}b32^*Q}VXw|7P+z$v8=}A9(O)$L4^TqrVE( z<}saEVJ)Zns%t4LqsD!4yERe&B^wgFtM2*obF+cn=*{`hP|)HJr`JTzJR2yzoHT6L<0+ zA6vI*)k5#=SF2==Hr?7`SaPu8?zz2rw|~hB`g84g6Y^Hzzz-|QnWi`E50+(}72(k> zohak8l#h{Phh(oz&o`fg4lA2-<@6K`n43?h8&8R0VrusEv6~$H@{;K1X}NK~lUOy@ zhA}kOE6P0kRcK{do3=4JcK7r52@krxudQadJYO^0v;V8*IV%aTZ^>WoZG2_@rMxgL z;dPV#yF8gsvk$#pJyZDmc}+?6@TJRMpPN&`?=suLl-Xbodqn8ov-cGxc1&1sd$Ux^ zy;XaqCYUw8@|)k?y+TXCXT`3|&jq|v6=qzxvsC1LXwk1bXQo}vk1e*plV#uc&T-{E z#Th7 diff --git a/librx/Images.xcassets/Bookmark.imageset/Contents.json b/librx/Images.xcassets/Bookmark.imageset/Contents.json index 0ebca7b..a59af1c 100644 --- a/librx/Images.xcassets/Bookmark.imageset/Contents.json +++ b/librx/Images.xcassets/Bookmark.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "Bookmark-1.png", + "filename" : "Bookmark-32.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "Bookmark@2x.png", + "filename" : "Bookmark-50.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "Bookmark@3x.png", + "filename" : "Bookmark-100.png", "scale" : "3x" } ], diff --git a/librx/Images.xcassets/BookmarkFilled.imageset/BookmarkFilled.png b/librx/Images.xcassets/BookmarkFilled.imageset/BookmarkFilled.png new file mode 100644 index 0000000000000000000000000000000000000000..6047d9d961ab82101063e39e69dd52462b196bac GIT binary patch literal 312 zcmV-80muG{P)02_3I7^Q$H5{Hl+%E38B zk$?R3PBvlSLj(86e*mZ|k3pOOG(v5Rp%OTZQlFC@RC%WT>zT?3}6F>W?e4gvsa#RAywz>7485qe*oa*`-cFC z0Wly3#DEwO17bi7*qQJO(8Oz`3LeS$W&!p9B?AGJq^fj`Xtec$2r|H>UKQ!bX4EYx zt|vkagXTFEzwZutyO6xff>yK69ss@Bw+?;3mIML#HtpvI2e<m<*yQBRSdH*0v0pVmzH1j)#{R3Ke`7|R>*ElSnH-*f?=D;w?DBTrDx-V9+zQP@ zSFW89uuiB}{M73Rll)b;HM@LUHQpKS5^-`^7Yxy%3n literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/BookmarkFilled.imageset/BookmarkFilled@3x.png b/librx/Images.xcassets/BookmarkFilled.imageset/BookmarkFilled@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..0c3b973a415271d6548119e15df396384fdf0ae3 GIT binary patch literal 977 zcmeAS@N?(olHy`uVBq!ia0vp^DIm*3fyN;2!h)7dCYh*OkBj zdh6PCmCNyAY(ZhGFDCgo8dVExbTp-;DQtfFqD8|ajm;>!&kru(!dVm%zI3tpYu2o#`uaCtyj%bAy{~2Ew_f2=`_&4o zlWjf3cZ>h+65Uew2>d!AM)pim680JZEx*Q z|1Y02>BVnP*VwaXgJv%Mu(tctE=~2t?bBWF`)fU0KHa+d+zqXo)2w;jX(spXa|qSg zuUz3T`*qXl-?NMM{Jd=YqfR7c`uk;l*TV!@A4*+t7rU9VAbFli3-0Mcx*NBp1*U}z5Z+K73xH5Vp=25H(k+u zQn7%YeM7iolzmLU&8pSeo4prXy3120@7>{iFmLuZwG(fDEL)KL`JI1+ zebb$O#u}5kYL|2lmrnWNXqIkN)*mN(qv%9R$NMQe9RD1PvaYk~{&+I;;_LYMuo=4S z!q0!t5z_96pLz38RQ5cnF3GH#azktBTMKOKES|mpsSp=!J;TiXzSy4orTN}mqEGye zYWaMMpZ3N%U0}QYvzH1%9lQ6o@@%Rqi<&F8{|(QjWq&&ir~T%Ve)6rc?4IGv;$69u zzTB>Rk?`e)V_N#*~G<8SThJyx~weJ?PpGI+ZBxvXNklHvEIOYyV2m^6U0mt0o2w@QLqM+8%dDyHb{sx}{;wN>Kzjn)f=}CSyzN2$3-UdB5;%I8(7wA#EdLpkxIj^j*#n z=jX0A;zEfH@lzL9Q7)ZKJ$O;giVOfHPh)5EL-jb)Z z$d^`^)d#{atjOX5fbxaZO=H?XhEc*B<`h_{>kcbG`rCruFP?#bk4~=YG@q$0i*Q+* z>nu~Y{a67ajd0R&a&w|25hvXptIGV#457^Kcw#ti zj7E$#AcNCY3k?C{qYukW^N253Cj@ ztwl)quvtp2*cimEEexY*&qP*OGmA@!4q3)}gp5SWH17#k?ysT(NF_q9p-khsM2j;j z>nn9iE10JA3T1CDMU%uAhEWfgmg%tV>Fp%V5*tHCADDM2X~9TzP`}v%@(LwQ7^wo0 z56fG2IBgiI1G&x)i$cTs)jYyw5rcKr=4jJFJk@FMBxn06dzYbP1S69O2_ZQPB|{jQ z0&%kY${0rGK%9btcwR)Tr9EaiF^0G{CC*|tmFdEeG84&ao#GMYXKH(HPrHgic3>oKOB40su7>3gk5(2V(0ywcZeI`*cdT%P}cT;Dr zyrWO(9k^-ToLq-cD%FP~3VYf~NrcNnp|_>_qy@!?G|J>6LSpB?97u)eLd+EqSvk2G z553}%YKNqp){1VgW^)spuDEf^=MG4?R(aQ5lwZ}E^y%8?C9hMnwY@WruyOCnC6LIq zisRE-6{uVTk(K-3QHY$(q@tkY9!P&&864FH)i-fft<#17rviuzLfZ0yf!I>gk{t$O zNl05}7>F$;E!klpmV~rrhJn~p(vlqpVo69_W*CSqB`w+c52A>?gBbS+NB{r;07*qo IM6N<$f=X2X0ssI2 literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Like.imageset/Like-50 (1)-1.png b/librx/Images.xcassets/Like.imageset/Like-50 (1)-1.png new file mode 100644 index 0000000000000000000000000000000000000000..587606ffc549966c50c666903a6fddc82d186f4b GIT binary patch literal 1659 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}oCO|{#S9GG z!XV7ZFl&wkP(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@WME*~?djqe62bX4 z%sV62Rbt+8%bk^`Q^ll;d6z2PzZ~2nCq3S z5*e6Asx&qYfH>JCyuDU#(L#NbV%( z$2Ze1b{0D>Zu77_aP>se#eZx@i?6uH7H;|LWU9z_@xZRVh1spIdbZ3lezvC|P2S9A zQ&9aa!I$TL9@(8W`-4;rQ%rjAR`!=A7nGK&Kl^9UbGiE6omID@{BpX!oZGo-Ws(V( zMAK_Gb)VT`7n=6pKyShwBW{o=XG$44LY7;O@g)|JeTnzBnVY|^7MGj-ClD>Rde$`TV#ZL>XlZo$ib zZi%}y_twt79d+9;(bRmBjKsQUTx}ws)r^hzWEw4ACb(6;C1w|IV1$E)VPVP<|8rZn z-REzs~FeeGX?*P-$w1G#c^(BLs!y|D9)f}-ZRMO)OE)1CUbLyh<5ycK@(EY)SL!;OLlS)uC&jJNIV zK29!u78r6wRfSJ|%~4KaP03g$cBkJbzI|M2{HIW8-LD4>JHn+KOVY}A{8!xZ)y|yD zwZ(Gdp@&zEo%=U?Jv#HV^j7=se!sc`p6F_RB>{nlb3Hu@<%IoOzC9K!DSXW+omD?$ z-q*4)uY^FaHKy$+9M|a-o;%mWz&=Bxv_YHy>;4;ZuKN0s-5w9_rz!_VTk6Sf3^3J? z`G4|=cBb4X)7z=C3KJ$XerTK{D^lvtS1zXGOS}ReoBpUY@$}(AhWK$vOEe3a5&!c%z;3_^=tb r#Qp1ME;YUUW?J0fWT$^^=ly!7t#+oB=XBb9K{bM>tDnm{r-UW|>lNAv literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Like.imageset/Like-50 (1).png b/librx/Images.xcassets/Like.imageset/Like-50 (1).png new file mode 100644 index 0000000000000000000000000000000000000000..a31378c508e9046d56087b70330ec7f3251caec4 GIT binary patch literal 913 zcmV;C18)3@P)<#o?#^O^ovWsuIp=)e`JE}k9a(rsaKIeMta)@ewVo%#$Pm#ga(Rdy1n86N9@?M3cEZR~ z_DC=5Y!ko^B4%U?I4B@0<6y8aGlUZXrnyUq1pYljAxA6`Dc6BIBP{y8JZE!npmIz240A3_$ zgbvXscC|6q*XBTU&>BNVut&OCr-F$27)p{qO7zjLHOHoe>Cl?x9x|jz&`YL(oEI{y zzyGXs0O4Np)JD)iaIv^>nVuXX#hrb&OYl_b<#Y&v%&b==-jD*}Kg?)j6neuK2>-F0 zbJ_^_G(se6KSDs?Qq`vPb{crG8lX}C=ZQ~nVG`Snbg>#z+RZxrp8j4t#UTU|(c4t5 z`N8i<;GNyem#k9;#O)Be^=%b2Kap@HAiRqGa+mA3oi9Oo;XD1xsJt%8%WXh>tdDLV zNknIh3s;$-*OQ?HC65d@^H-HyNq&Xoo}?fY5PmpuFcClm_7R!mJurrGsy)Oaf`|;n zt7J(`$&wcm6~aP?)~HaeU}AuX<&hyE{+`R2S&rQO2`&JkU{@RbtswG><&oIcEJjYm zu3EkYAk18*5rme|8U=P;nz0htG>OhkqJrNL7&gYVgx09ipmBze9ZS~LrfSDl1*9Da zSL}^5?h5~>Y3!kohz^$)u8O)rXb-JP_Qs}W#VJMu^McKR00000NkvXXu0mjfQ!=gJ literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Like.imageset/Like.png b/librx/Images.xcassets/Like.imageset/Like.png deleted file mode 100644 index 71845fe54f22d99cf918cd73e2107a29385df38c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmV-30?hr1P)5Ph8yw|WEJT9$-V+>1Bx2Eqx%6No1ePavK^J%PBF3c<46as=F}Nn0}`kG-jK1mGCp zZ4gzoA36ZvLZsIe1jA{+83Nqx*8si%Xmf6VNKjF#Q?N5oF`}1kByTraP@^Lc0Xn6y z+#dfuK|lw`m0e@<5Z>CMvQ0nk7ZRQXtdEn(2ypaNMauVf!N06jS%AeaHz0a+NWor5 zxsHBwHy!}Am5YF@F>{ah{U9U2(Q^f961n0z`FSFsV7I3-z}>hB(3umEvlE|F=r=Wi z$9@|m$LBXczNFA^{1F0$m!Rk-)Q#Aeb9wMfUGP9*S*`fx7LhAk(<1sB#}+^*uDEu7 zy8B1AlUg8EFcq>Cz8zR@s~BEV9aqI!HPp)11JOoq_(cxPuMq2%k%AgCkm-V)isYlS zG7>8IT2-#zX^wMGGNlizAh96$#1xpar!J%AdSa&L)*1LNhdj?jE4NlKt|5|!=?ohu zVSN>IH*SE@{IM@&$_Y&h{gzD=TN6-wLa%Ij)6E;x7@nw^nr$ALTm-VR7{yELyUnYe zN-zzqF5&cDU$|bWHa*|AM4U2U3vOfgPoVG&d;+7F&LPjsk97b5002ovPDHLkV1m=x B`ZWLm diff --git a/librx/Images.xcassets/Like.imageset/Like@2x.png b/librx/Images.xcassets/Like.imageset/Like@2x.png deleted file mode 100644 index 90dfa902c8ee2844180d0223ed667409b72db039..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2450 zcmY*bc|04~7LGR*vDF&2ClYjwq!ei)i6WMa)V?HIg9@dHATwgE+G=ZwP*uxl?OJLZ zt(MqYomOkFB`u29R$4|SRW*IlnK$pf`}>`H&pG!y-*?Xa>!v%{SxW$wfB*nMf?$Jp z;-3ZwCUS_stC^-X@ehFrCu?&+!=TD4KM#8Jdj2Y45exu@cNt${h5x1Kn{fdS%39O5A^@9 z5;fxQvG@Zb4sH$9zNnU+!-m4B|lif13Gg(r;P* zs5l@7@z1m2fW%&HG5{bvO2C`B1PE<-kOMqjq z$uiOiqS7O952klB@wy<;e5+5&QLvh8ZDUFMO#AGRSYddo$Rnse(d`Gn@aCQd@Vkkbg@;;YMZ5xq73~IrX-Ujo<8k zy6@I;yq|c%>pY1~7BBJJFp5+WuXfig-5KHTL;=H7-RfjR{289^MDdnYO7#(J@0I+C z-z+RZw$20fGE>y8b<34#)aTP*_AD{Sq5WUa+~-_KFy9dow*FcsL#`CRoTY+^&Y$Xi zK0KXNt!s|qRtPRht*9_xy{WFMUPe}zE3jDG9tAcp5`?pF=W9#>V;ZxP?D3nz)Z6 z0kz{^hdVWlTLz#k)Fr0sjHCRmtkBe?{k0;oNBFtCCA_H|tV}283|uGI8`Gq2H9S_{ z4$J1P(g6T=Yisb;L|*BPX|z#i88p@U0qplU=yS$nE|jFd21=K8Ay}+E=p6mh zr^bc~)2nUrGs6T>_xM=3k5);}*l8<|ms!NDPTktAOV2;=EJ_~VJ1VUx1nu)1Q&XIQ zZ9SAVE~y$OXND|CBp*rxb6W~|Mu*Es9>9uH3Y$cpWm=rLt(10m>mD;Wx?t5~8>+6# z&9PC>mGrG=RYCanSRdCTmnU*>FNz%*G*kK|>H zO_?9sUz(gynu>wCQaJRv4#g=*Stb{zuphzBXC{p+on@`ZD9nvEHu$eL){CS|do zreojG(|nW^cCYRS!>h_tUALLPaynXDM~5bB6jeUW=uCa+%I`O`OEA2;Z!Cw&SSDRMX%;CQF zwt}nqyHbr{t0nJ?SYI@}@C~SxD$;p&BRh9sL0YU^2A6XrS+V8e`3r6}ot;2*miAC= zqF@M+NT`@smsM>PFtrK2hL7$>gW0?HYMff8a%{%Giud+iMzKVcSTTVxLK@pL~0y zw37+jbW+&;d*UDea?JPU;@D9e!!_MQx-XyYc<%lDlbkIvpRv}D^R*|01*+kmVZIur8`qz7O`?!aoB&x1 zIL_M|KaQR**J}3tc?7Mv zGeK_i$SNj9acEwqh_Ih5&l7+NDCUz?HaS5vD5sY-qmW4;m?7A!+EWIi>uytlO!UQ%FPY@S@GRhZ@T2Ky^vVisOFuKO9M zrY(9kZ;i|v&~Ssb_Hf|NwRatd=T6En435XGzq;4rIrLQ14lG=7Q6L*^U8t%SCz2aK zUfhse2_CLbP)_oK*~=6U%W4mIfG%`Q*Y6*0sJSCV&94Y%Us9&9_v<+BDV&~i-A7B2 z-Rea!1#4B5YTM;U_;=lITpJu?_Vzo>AgDpavvTtXH6?Srz=+8_RH8G&`y-t3njDx> z?|NqXS-j{UCa~$9iwy~1Y!&>+%{yocvCFe5tQWtvB|YY>|IUoZhI!?>w}v&tqTWKf z(@%?CF<{@yM=nG;=ApfToEP71s!LoARz!6VO!|p^$=2IMPOP`SHE<0}I`}9NEbZ_O I=H7|_29S7B^8f$< diff --git a/librx/Images.xcassets/Like.imageset/Like@3x.png b/librx/Images.xcassets/Like.imageset/Like@3x.png deleted file mode 100644 index da673cc6cf95b83f3f43bc0f80d53a0a0bcfda28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 zcmV;526g#~P)2`ZnU$_Zkhz{*~(EcNAeS?2^% zwvEZ@1N9NvBt?KENJt!Q1p$NkVKA8C5F*IODGiWQ(ugn+AdW2p0U|&g(|}{*h=m9c z$28!WIAS3J#4!yxCXQH$0C7wMj)@}{Qb!>C*YpJl2MFls$^1RO2V(~EC)94ws?-gS z#|Pj>Ym=PxTl0f$8Le0dkEh27&;xT1^bA7cjQ9ae_W)m`5!~1Y6aw(QV}MRTd<4*; zma>`eK{SMiA+?(~TE8)9R2UE*|8t1o>lwhO038^}5Z{z>jRsv&``2OazScV6@!vi8 zdkMtjrAYcr71^tSw1 zV<$1J$0$SUHs@Px%qI~@m}&_4cE{CI&GbBanUo4j1|rsB4;CZQN@9U5GPnQQlSq1o zxBpYzF*qK`-9#k}RYFca)-(`*;))02blhQ0L*;gy5SK)NEYj7V%ayLCqj~-h&ojbN zAfxFC2=8mEqH?FbmiAc=90el&qeLiCKN4pl0}y^MQL6e5#dt^E=95R?F%~jaMFlVF ztEEzB{((BpC(rl=NU8dd3?@LT)xQ97O#fMcjHcq$OT)-l)M-5_Pm*JAY08fqNaxsl zH#rALRU*pAx(4_Sbz1%PVPaAz@|4gzhvfh&viSH2#^N($z}`~{8RFzHo=&2?E~B?Z$6ox#TH#gxiLv68}x#5}g$7#KbmfW=A* zWD?C?J?}iV*g7<_yQwN>ZWSn54ZGq`@PebX*WC1gNYQov1+<}j)M(3EHkPd`50mt* zYT3J%g@oJI{C#xwyj`{~BQ|BpIY z$jK{CrDi9pxE^u=`3A+iul*z6FpIm_GrilS5T_p9zG{9PE(nIwYi)QIumYqeP$uy9Pjqhg(TzVc<+4mVUnC>dwMo17@=vZf zBTa{eIrXH0c$cc_8Sl{W&$9-7X)vs9S&?J$P84uw%T4J(C?uCmbh^BVSw~^E+c*Vel?U@1ed`zCFmBNBPi;os zS>QPbWVMCaa`+BfMJ17XmesQOpAvPmL^0JZj#|am04dB`9Jh+C1G4fhfv18=vwP@E z$k1l7e&-_ftdm&WxUH_ENGbYOB{|+{nR%$JbJ|J^iA}vQ&LdHN7;U4U_AdlQD9=V8 z&YrS#CL2ci{@07u5jotR_AhKaTGf%Kh&EddWaac#K&fh)3jPzyA{1=e$4&q-owUpC z1&CvG1c(4}OaqRIBNie+9Mgbf;)sO^5XUs&m^fk~0>m*5I3|u*hyZa+1CELFKi%k) UgJz^h&j0`b07*qoM6N<$f)&CfVE_OC diff --git a/librx/Images.xcassets/LikeEmpty.imageset/Contents.json b/librx/Images.xcassets/LikeEmpty.imageset/Contents.json index 2699f32..33b521d 100644 --- a/librx/Images.xcassets/LikeEmpty.imageset/Contents.json +++ b/librx/Images.xcassets/LikeEmpty.imageset/Contents.json @@ -2,18 +2,18 @@ "images" : [ { "idiom" : "universal", - "scale" : "1x", - "filename" : "LikeEmpty.png" + "filename" : "LikeEmpty.png", + "scale" : "1x" }, { "idiom" : "universal", - "scale" : "2x", - "filename" : "LikeEmpty@2x.png" + "filename" : "LikeEmpty@2x.png", + "scale" : "2x" }, { "idiom" : "universal", - "scale" : "3x", - "filename" : "LikeEmpty@3x.png" + "filename" : "LikeEmpty@3x.png", + "scale" : "3x" } ], "info" : { diff --git a/librx/Images.xcassets/Plus.imageset/Contents.json b/librx/Images.xcassets/Plus.imageset/Contents.json index bf8ef13..6596267 100644 --- a/librx/Images.xcassets/Plus.imageset/Contents.json +++ b/librx/Images.xcassets/Plus.imageset/Contents.json @@ -2,18 +2,18 @@ "images" : [ { "idiom" : "universal", - "scale" : "1x", - "filename" : "Plus.png" + "filename" : "Plus Math-32.png", + "scale" : "1x" }, { "idiom" : "universal", - "scale" : "2x", - "filename" : "Plus@2x.png" + "filename" : "Plus Math-50.png", + "scale" : "2x" }, { "idiom" : "universal", - "scale" : "3x", - "filename" : "Plus@3x.png" + "filename" : "Plus Math-100.png", + "scale" : "3x" } ], "info" : { diff --git a/librx/Images.xcassets/Plus.imageset/Plus Math-100.png b/librx/Images.xcassets/Plus.imageset/Plus Math-100.png new file mode 100644 index 0000000000000000000000000000000000000000..f83337c0158300709949bed12751ea3d1050c346 GIT binary patch literal 898 zcmeAS@N?(olHy`uVBq!ia0vp^DIm zpS<=jvo}9qYF!oSD%Kt$HZfLqeLc_V&+#W`$jhV$IsH0)b!N!VET)(zcR!@n=0$z( zI67JIQhu2FrIY32s{`YBPk+6()vV%TNlVNcyUr8t>hsSZep$8O?r*l2)3^5@lGQJ+ zeppibC`Ni$kCRj3>$4gz=^{~%iVJsqO%qvU%(ZsGgn&C$##|RATf+i8H1hUJw!Y|b z($-KB*?zCbsl;uesEANkbiSLS)#3|WT%1SOnlBcZ8<@e`+Vbey?7)t58e5vkGgeP= zdwh-EG_A(?^J};@pU&*|Tf5)&)VZzKHm^7l=C<=w&B5C`M@m%>d=4m%c)WuvQE1bC z9p$?h&s%Qbs&4!EtM%!n3BD(u{@xz6+xN!dGYc<9#PgrlKU^z+RP9M(xyd{0%XeP+ zlm}}p*;~hzdH%+gMkk*gx5R@zs*f$>6G=LBb>9r9TgGOk3j~DMeLKqAnq&9n($xI7 z^Ap`bw8+*^gT3qCfALm?EykulaFVilJ`<2Up|5BP@X&ZOS^WP6--@jv`GDIlLDNNO<`O zv?f>_3esR{6B2e&l<3u*fWxh%_j<3gXp<*ga+b~&8?BZS(7#GmZqdbmTV zVfKxACNpJ=zGs;4->&2@c4=yJy`N6<-OfLEBkR(S^zrXcDsuY3QKTB=p(pQzmUs)= u13ZkFP9A&6w{SuV%cS1JvXgvH*f%MzDVZ`;`#CUgF?hQAxvXNkl^K!BJ^8MGaRziuC-&!fMviq1E#;_ zZ^abO*#te?4mU(gKDwbw;aIs^Qao03agT8TFCpTTAu(!AumAu607*qoM6N<$f)sIj A&Hw-a literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Plus.imageset/Plus Math-50.png b/librx/Images.xcassets/Plus.imageset/Plus Math-50.png new file mode 100644 index 0000000000000000000000000000000000000000..afe5d43a3ea76e936888a20011dd2838a2a43137 GIT binary patch literal 401 zcmV;C0dD?@P)Z80YWJwLUfRX3a*1d2Xv6o0lWz|x`;<2`7UA(OJK&| zyRmn7cGn);kjb!2{D2(!ZA^-hV~iB@n}MC2p6~w`KHgud@_us+%Y0A5NbztxL2&b^ zLFUWq`fkA(+lEQw$a4A!;Id)ir)oSK$&rQ#h>^C`D3n@!>UvUv>M>6!W_2EDNGUT5rwv<15l212woCsHjI1%k4EJ)=de#d00000NkvXXu0mjfh&r@% literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Plus.imageset/Plus.png b/librx/Images.xcassets/Plus.imageset/Plus.png deleted file mode 100644 index c69ee12671aa92a21eceeb2b50ab06b02a3c0c41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 826 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIjKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pn}NEkcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5 z!d3~a!V1U+3F|8Y3;nDA{o-C@9zzrKDK}xwt{K19`Se z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5O0c3d|4@L;p!@;Rg)2@K>aPZ!4!58kt3 zj(&#?1agF~6gj+-w)n(+uE71#5#tJGeWyo^F+Uj}T{ADx5)m?HmOFjZVr#Efi)!|@ z-J7lN>GnnF{7WdED&_sbe}imU{LE;#_q*OL%e|eR6nTt)wXTBsBa7#LvzJ*aSIH+U z>diYUG|}SuUHKN7=(4L_FRmS0!@#*!$<_IQSumbtZ_ zXz(MMcTaEnHU0A0%Ku*c*^m1rojM;6towWazqHcI`>%xapG=B$vGJO9YWZ5z0~T!Q zm%snDeKYq~jPlD)e%~{;C(e6*D{kT5&vUqd@7?OWO|1v!zHj08eRO5gSwFpkeTV88 zz6-ASQ<1YJ{0+;FqwAtyd=pD9Ju>Uel{dL|)`8}`b{h2E+*2SH$tQYwr$}&RVoR6` z%c5603jbx?zO0NiT9MF~RSG(5KuqKv;Jh?4jSHx{m yQeEd~R&(;-!imyJE05g&_2d32so6jFUlVUs^8LE}*vT+Zg7$Rvb6Mw<&;$UhTswOJ diff --git a/librx/Images.xcassets/Plus.imageset/Plus@2x.png b/librx/Images.xcassets/Plus.imageset/Plus@2x.png deleted file mode 100644 index df888390102a94105e25ee25c3e8d28b83e7f908..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nETbDl1aAsNnZX9RLJ8wj|VtFNB7 z=W9xr!cn$~k|)?aOtn;OI-3y z0*|65baousFpcBYZrynC()btdWximZIvbSO%1J)$z?icgt5-$CQ39oK`mf*!e(~d3{#B?UJoB-&6xS zocNRrZWQiO-k9JMLKp8fIDPvRw@x#qGb7(YvAR-v6{o?)B4G_>LWv-RV=h#FheO$F%G{}7puZGIwP=D-SC z3-gdIG+QvCC){@J1gl3m4m2_F*SdV>sHUB-g+or;zgfrFDwF1iND5C3nA&BJOD~#m em_w#)PW=k2HK`w`?sNtwKn71&KbLh*2~7aaQWuH< diff --git a/librx/LibrxService.swift b/librx/LibrxService.swift index 5350b39..1c5ae6a 100644 --- a/librx/LibrxService.swift +++ b/librx/LibrxService.swift @@ -191,7 +191,6 @@ struct LibrxService { if !json.isEmpty { for index in 0.. Void in let json = JSON(data: data!) - print(json) handleUserInfo(json, response: response) } diff --git a/librx/LocalStore.swift b/librx/LocalStore.swift index deae7e6..d29142e 100644 --- a/librx/LocalStore.swift +++ b/librx/LocalStore.swift @@ -19,6 +19,7 @@ struct LocalStore { if let _share = userDefaults { // _share.setObject(posts, forKey: postCacheKey) // _share.synchronize() + print("do nothing.") } } diff --git a/librx/WebViewController.swift b/librx/WebViewController.swift index 7eb52e5..acb91bc 100644 --- a/librx/WebViewController.swift +++ b/librx/WebViewController.swift @@ -94,7 +94,7 @@ class WebViewController: UIViewController { self.isBookMarkPost = false }else { LibrxService.bookmarkPost(self.post.id) - self.bookmarkButton.image = UIImage(named: "Like") + self.bookmarkButton.image = UIImage(named: "BookmarkFilled") self.isBookMarkPost = true } diff --git a/libxShareExt/ShareViewController.swift b/libxShareExt/ShareViewController.swift index e70115f..2595d39 100644 --- a/libxShareExt/ShareViewController.swift +++ b/libxShareExt/ShareViewController.swift @@ -26,7 +26,6 @@ class ShareViewController: SLComposeServiceViewController { if let results = list as? NSDictionary { NSOperationQueue.mainQueue().addOperationWithBlock { // We don't actually care about this... - print(results) self.itemLoadCompletedWithPreprocessingResults(results["NSExtensionJavaScriptPreprocessingResultsKey"] as! NSDictionary) } } @@ -39,10 +38,9 @@ class ShareViewController: SLComposeServiceViewController { func itemLoadCompletedWithPreprocessingResults(javaScriptPreprocessingResults: NSDictionary) { if let text = javaScriptPreprocessingResults["baseURI"] as? String { let userDefaults = NSUserDefaults.init(suiteName: "group.librme") - print(">>>>>\(userDefaults!.integerForKey("accessTokenKey"))") - userDefaults!.setValue(text, forKey: "note") - userDefaults!.synchronize() - //self.doneWithResults(["message": "Successfully added to the note app"]) + print(">>>>>\(userDefaults!.integerForKey("accessTokenKey"))\n") + print("share url\(text)\n") + self.doneWithResults(["message": "Successfully added to the note app"]) } }