From 3738253cd611eeb41dad967a47a88384be1a9ce9 Mon Sep 17 00:00:00 2001 From: ylzheng Date: Tue, 17 Nov 2015 22:43:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home.imageset/Contents.json | 12 +++--- .../Home.imageset/Home Filled-100.png | Bin 0 -> 1179 bytes .../Home.imageset/Home Filled-32.png | Bin 0 -> 429 bytes .../Home.imageset/Home Filled-50.png | Bin 0 -> 603 bytes librx/Images.xcassets/Home.imageset/Home.png | Bin 328 -> 0 bytes .../Images.xcassets/Home.imageset/Home@2x.png | Bin 474 -> 0 bytes .../Images.xcassets/Home.imageset/Home@3x.png | Bin 973 -> 0 bytes .../Home_Selected.imageset/Contents.json | 12 +++--- .../Home Filled-100.png | Bin 0 -> 1179 bytes .../Home_Selected.imageset/Home Filled-32.png | Bin 0 -> 429 bytes .../Home_Selected.imageset/Home Filled-50.png | Bin 0 -> 603 bytes .../Home_Selected.imageset/Home_Selected.png | Bin 395 -> 0 bytes .../Home_Selected@2x.png | Bin 2052 -> 0 bytes .../Home_Selected@3x.png | Bin 1080 -> 0 bytes .../Binoculars Filled-100.png | Bin 0 -> 2833 bytes .../Binoculars Filled-32.png | Bin 0 -> 934 bytes .../Binoculars Filled-50.png | Bin 0 -> 1290 bytes .../Lightning.imageset/Contents.json | 12 +++--- .../Lightning.imageset/Lightning.png | Bin 447 -> 0 bytes .../Lightning.imageset/Lightning@2x.png | Bin 1868 -> 0 bytes .../Lightning.imageset/Lightning@3x.png | Bin 1140 -> 0 bytes .../Binoculars Filled-100.png | Bin 0 -> 2833 bytes .../Binoculars Filled-32.png | Bin 0 -> 934 bytes .../Binoculars Filled-50.png | Bin 0 -> 1290 bytes .../Lightning_Selected.imageset/Contents.json | 12 +++--- .../Lightning_Selected.png | Bin 556 -> 0 bytes .../Lightning_Selected@2x.png | Bin 2622 -> 0 bytes .../Lightning_Selected@3x.png | Bin 1298 -> 0 bytes .../UserMale.imageset/Contents.json | 12 +++--- .../User Male Filled-100.png | Bin 0 -> 1541 bytes .../UserMale.imageset/User Male Filled-32.png | Bin 0 -> 507 bytes .../UserMale.imageset/User Male Filled-50.png | Bin 0 -> 753 bytes .../UserMale.imageset/UserMale.png | Bin 431 -> 0 bytes .../UserMale.imageset/UserMale@2x.png | Bin 1823 -> 0 bytes .../UserMale.imageset/UserMale@3x.png | Bin 1319 -> 0 bytes librx/LibrxService.swift | 25 +++++++------ librx/PostsLoader.swift | 10 ++--- librx/StorysTableViewController.swift | 35 ++++++++++-------- 38 files changed, 67 insertions(+), 63 deletions(-) create mode 100644 librx/Images.xcassets/Home.imageset/Home Filled-100.png create mode 100644 librx/Images.xcassets/Home.imageset/Home Filled-32.png create mode 100644 librx/Images.xcassets/Home.imageset/Home Filled-50.png delete mode 100644 librx/Images.xcassets/Home.imageset/Home.png delete mode 100644 librx/Images.xcassets/Home.imageset/Home@2x.png delete mode 100644 librx/Images.xcassets/Home.imageset/Home@3x.png create mode 100644 librx/Images.xcassets/Home_Selected.imageset/Home Filled-100.png create mode 100644 librx/Images.xcassets/Home_Selected.imageset/Home Filled-32.png create mode 100644 librx/Images.xcassets/Home_Selected.imageset/Home Filled-50.png delete mode 100644 librx/Images.xcassets/Home_Selected.imageset/Home_Selected.png delete mode 100644 librx/Images.xcassets/Home_Selected.imageset/Home_Selected@2x.png delete mode 100644 librx/Images.xcassets/Home_Selected.imageset/Home_Selected@3x.png create mode 100644 librx/Images.xcassets/Lightning.imageset/Binoculars Filled-100.png create mode 100644 librx/Images.xcassets/Lightning.imageset/Binoculars Filled-32.png create mode 100644 librx/Images.xcassets/Lightning.imageset/Binoculars Filled-50.png delete mode 100644 librx/Images.xcassets/Lightning.imageset/Lightning.png delete mode 100644 librx/Images.xcassets/Lightning.imageset/Lightning@2x.png delete mode 100644 librx/Images.xcassets/Lightning.imageset/Lightning@3x.png create mode 100644 librx/Images.xcassets/Lightning_Selected.imageset/Binoculars Filled-100.png create mode 100644 librx/Images.xcassets/Lightning_Selected.imageset/Binoculars Filled-32.png create mode 100644 librx/Images.xcassets/Lightning_Selected.imageset/Binoculars Filled-50.png delete mode 100644 librx/Images.xcassets/Lightning_Selected.imageset/Lightning_Selected.png delete mode 100644 librx/Images.xcassets/Lightning_Selected.imageset/Lightning_Selected@2x.png delete mode 100644 librx/Images.xcassets/Lightning_Selected.imageset/Lightning_Selected@3x.png create mode 100644 librx/Images.xcassets/UserMale.imageset/User Male Filled-100.png create mode 100644 librx/Images.xcassets/UserMale.imageset/User Male Filled-32.png create mode 100644 librx/Images.xcassets/UserMale.imageset/User Male Filled-50.png delete mode 100644 librx/Images.xcassets/UserMale.imageset/UserMale.png delete mode 100644 librx/Images.xcassets/UserMale.imageset/UserMale@2x.png delete mode 100644 librx/Images.xcassets/UserMale.imageset/UserMale@3x.png diff --git a/librx/Images.xcassets/Home.imageset/Contents.json b/librx/Images.xcassets/Home.imageset/Contents.json index 9551e72..45aed85 100644 --- a/librx/Images.xcassets/Home.imageset/Contents.json +++ b/librx/Images.xcassets/Home.imageset/Contents.json @@ -2,18 +2,18 @@ "images" : [ { "idiom" : "universal", - "scale" : "1x", - "filename" : "Home.png" + "filename" : "Home Filled-32.png", + "scale" : "1x" }, { "idiom" : "universal", - "scale" : "2x", - "filename" : "Home@2x.png" + "filename" : "Home Filled-50.png", + "scale" : "2x" }, { "idiom" : "universal", - "scale" : "3x", - "filename" : "Home@3x.png" + "filename" : "Home Filled-100.png", + "scale" : "3x" } ], "info" : { diff --git a/librx/Images.xcassets/Home.imageset/Home Filled-100.png b/librx/Images.xcassets/Home.imageset/Home Filled-100.png new file mode 100644 index 0000000000000000000000000000000000000000..ab79448e6263b2dee777445ce8faba47d212d17f GIT binary patch literal 1179 zcmeAS@N?(olHy`uVBq!ia0vp^DImWE6j1IVtUNFU~i*G?X~jmqULRJ2P&9eaXw(HVyS6gvwz#RC7#<(s#qtg|NVTb zWY(GO*4~LticjM&K6z{?`8&5#`dZA9!}{g3@=s>$`yuL9{%W6Up&r^+64vS9yRyJbaZ=UXUlW|8*eE<4K55Lw%W@y|GXWn$k zVvnNp@imVkcPanAaJ^{}(-N~|%W7Xba>^|+Y%`j&z;REah7+gQ5oS>GdLDXy#koIIL|NL{r}#CvY`&PT^ed!PbemB6 z3ne@0`1SW!zw!&@7pnblpm2NkmY|e(vuC78%&(nW6cEzP(z`M2#KN8=rK;DPLb(?) zEoMmldAs@E!8s@P=s5*)F5+tLT*T+1%Es&}>S408XGMBl!TD{$_uKelmxq z8pYC+s~a;PR2}Q~jzB(|RgjW^Y|_BKfWSrhfH(Y#;YD zbnvUT=shm9+GKd*UUJT@>GNNna8o#NA}5yLdZ`(QflTcdMK4`}gefvvyaBHoecZRd zInLx{KchB&{?en%zuTGXN~^3`$nx&)HraS1*~k)09f5=^0;!8a*cjb-dzSluv3}lh zd8T$F!(v7@;iV!h5^@F-8rF^t4+R%1bqTwC4QO(Z-Mj3}nVPBd6c2oe`u8Y>Z^|7$ z%_AGWOy}8~@z7}ZZ!uR>9fzAtg-H>`UbfY@?`CZ+Nbj_a{PWg!`vzkTX@T_FUMuAJ zj~BmV*3rGQXw~)zpQRShF9&IO3#hwk2`HTXb3NH9b*tIMloBu7T_^X(*8Q6O^-kI5 z)9>%CzFZu=d)LIyw8fT!dv9tv9!zYOy_7RCh5eSUNZ;suTee!RTq zm?FQpKey~e&t)&w+b>OL5csd4IpwIm=Z@u15(9qiUh_3|3+tn7w{2NJop$Rt82mr! z6Z#@2=4vaOK*O83x_q&bX~3N%RCYuFfej#W;#>wa+=ayd21Def(C|`NXE1sCEgRy^~(xL zSU4~oTEk!*vumlx^W%J+JTeLliD3tYyp;F30i?rfvG^C1O=bfXLp^k0>BDl1sQxtBY;8i4g^o5X8=!?poA-eb!H7PNxW|N9g+kXwzB{fb}Ck!_{oFhUoy%% zTL-MfOUfpM4Zu<2U5Fo+8=Zk!#2XOe?k(xtzTOnfDn0^n0B{oV0f-g=k0YlQoykYu zV4|e!=7m%N@c8ixB)1^CFj&rfs#4!j%q<}bfU}9$w`B!EwKzTjx&&}z-j-3t4p2E1 zZnYD{(=Z2+32)=`G}3qV$pM77c6b`wk4KUn}E`!}i*E*Nxo3&7&Q;=tm-;=tm-WCwl$ XOmH@wclUbl00000NkvXXu0mjfj8U{g literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Home.imageset/Home Filled-50.png b/librx/Images.xcassets/Home.imageset/Home Filled-50.png new file mode 100644 index 0000000000000000000000000000000000000000..08d1b5b4eba0a24677d0c7be5f249ccaa2237216 GIT binary patch literal 603 zcmV-h0;K(kP)OfY>16gMH5^HGyg@vJaQ6HBXH#Q+k~B&a<}xw*;IJ zEtsoAPC{5PSB0E~XkgTQS^zX|R)KhFsi*V-27kEa*V&HnsPD6x4I>IsPv0jnQSJq? z?S!gC-~TR}7%_+lq5~rW5k<6MyhAR6IKrf*9%pf13A4|Uiy{s%SXG*H(PTkXK2?b5 z{W^Z>Plb_Ava)a3UWm$n+<~fR5Z(55Ci1;8Z!pnFCqEZm{dYpHj@TcVy_imbbnn|%g=~Dm36>37*a*LetU`m^MYy>udf4b|J3}=%A95AAl)v0+x+cUx5wqOmQO>K;jo*Ziw80RSHB3fJ6@+ z;*LoWYKNY|iUp9kRxSr(N^Ou6L5LUt^;$iT6?cGw(4NrVFe?PGt89;1wKYcV&?)g& z7eEeiCu%}i0QECIWcBrLy;W3uhg!WpzL)*9;g1meSIy0#F<%4*Zt`>*^9>o#{R~pv%d*IbrBRlKFSgo~{6l a?!X)6NJ=3VzNIt(0000tL-N0$~MzApf80K#A*L3RM%2P*LTBSM)d5US9X)NtNZ zh3dG5H^>seX91#{JYlu~PF^&gAcXh@uo6!00N}+7#tTFX(XqP0cz{p=DnS@au)L@Y zq0G?=(hAW{ycwnigk6aX+p5Gc`-EWwFnNs?q;GWQa+r9~WSka|F{AT_Q5&Zgq-1p7 zFe>Aef=G=n0!Cz<5)i9LctMH0rUo)MgxEMsAYLBfrA*Olra*2DqH3IDAl^pjrAQy< z$~bFlgb)7#c=n!+@_l;%>(Vm`qReRP?WssVgW5H61hA<{@CD#WA=501R0lOQkm@@l z7JGHj1S!;FDpE*JmR3u0vb0*Vmt8Bn)_(@HTa@ftE$dFwwYUM~(Wo>c6yX;kH=2_n z0pUpsVTxa9y%BhPBia2*|D&+9hrjTyfFvMNC1$-ZL1s<=$l$3+DiV}|GnFHCGqkL7 QnE(I)07*qoM6N<$g8eJVO8@`> diff --git a/librx/Images.xcassets/Home.imageset/Home@3x.png b/librx/Images.xcassets/Home.imageset/Home@3x.png deleted file mode 100644 index 8f8c49fa9e41a9cf02aa89d57428f267f42d7d82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 973 zcmV;;12X)HP)EFD#dfRHIbmX0b! zK!zyr>Js(mkmwVG9-%@U#s5gyh3OVBrA}Ih7Sd!#Gy5ij6hmE1_}_JS78G(69%P$WCGITF;JC4<5gIItb{>j zAXfv)8a`BolsL-`&G3zY0x^&XAV=^RC_rfgnFS&kk5Q(eWPlve zW1uRf+d%dL5sW&zE+|nTM>l+RnPVfu-#|uyoW=0PB(IMS8OT;3XES_tnPVfGUtw(l za#q6^le|8<$w0OMsr@N8g=N!aZS2uM_jiU<`x^xWJ4FNpt7kfzfTShF1`rUep6O@; zl9mt~KtQm1rlSc+T0(4q(*XHpW*?Ksy{v8$ItQga(4V*i*(55HjonA|PZ6kfoyv5fCy3$kI`T v2nd-1Wa+3v1cXchvUF4-0z#$$Svvm!3_$5+=$+TL00000NkvXXu0mjfz=NIN diff --git a/librx/Images.xcassets/Home_Selected.imageset/Contents.json b/librx/Images.xcassets/Home_Selected.imageset/Contents.json index ec59863..45aed85 100644 --- a/librx/Images.xcassets/Home_Selected.imageset/Contents.json +++ b/librx/Images.xcassets/Home_Selected.imageset/Contents.json @@ -2,18 +2,18 @@ "images" : [ { "idiom" : "universal", - "scale" : "1x", - "filename" : "Home_Selected.png" + "filename" : "Home Filled-32.png", + "scale" : "1x" }, { "idiom" : "universal", - "scale" : "2x", - "filename" : "Home_Selected@2x.png" + "filename" : "Home Filled-50.png", + "scale" : "2x" }, { "idiom" : "universal", - "scale" : "3x", - "filename" : "Home_Selected@3x.png" + "filename" : "Home Filled-100.png", + "scale" : "3x" } ], "info" : { diff --git a/librx/Images.xcassets/Home_Selected.imageset/Home Filled-100.png b/librx/Images.xcassets/Home_Selected.imageset/Home Filled-100.png new file mode 100644 index 0000000000000000000000000000000000000000..ab79448e6263b2dee777445ce8faba47d212d17f GIT binary patch literal 1179 zcmeAS@N?(olHy`uVBq!ia0vp^DImWE6j1IVtUNFU~i*G?X~jmqULRJ2P&9eaXw(HVyS6gvwz#RC7#<(s#qtg|NVTb zWY(GO*4~LticjM&K6z{?`8&5#`dZA9!}{g3@=s>$`yuL9{%W6Up&r^+64vS9yRyJbaZ=UXUlW|8*eE<4K55Lw%W@y|GXWn$k zVvnNp@imVkcPanAaJ^{}(-N~|%W7Xba>^|+Y%`j&z;REah7+gQ5oS>GdLDXy#koIIL|NL{r}#CvY`&PT^ed!PbemB6 z3ne@0`1SW!zw!&@7pnblpm2NkmY|e(vuC78%&(nW6cEzP(z`M2#KN8=rK;DPLb(?) zEoMmldAs@E!8s@P=s5*)F5+tLT*T+1%Es&}>S408XGMBl!TD{$_uKelmxq z8pYC+s~a;PR2}Q~jzB(|RgjW^Y|_BKfWSrhfH(Y#;YD zbnvUT=shm9+GKd*UUJT@>GNNna8o#NA}5yLdZ`(QflTcdMK4`}gefvvyaBHoecZRd zInLx{KchB&{?en%zuTGXN~^3`$nx&)HraS1*~k)09f5=^0;!8a*cjb-dzSluv3}lh zd8T$F!(v7@;iV!h5^@F-8rF^t4+R%1bqTwC4QO(Z-Mj3}nVPBd6c2oe`u8Y>Z^|7$ z%_AGWOy}8~@z7}ZZ!uR>9fzAtg-H>`UbfY@?`CZ+Nbj_a{PWg!`vzkTX@T_FUMuAJ zj~BmV*3rGQXw~)zpQRShF9&IO3#hwk2`HTXb3NH9b*tIMloBu7T_^X(*8Q6O^-kI5 z)9>%CzFZu=d)LIyw8fT!dv9tv9!zYOy_7RCh5eSUNZ;suTee!RTq zm?FQpKey~e&t)&w+b>OL5csd4IpwIm=Z@u15(9qiUh_3|3+tn7w{2NJop$Rt82mr! z6Z#@2=4vaOK*O83x_q&bX~3N%RCYuFfej#W;#>wa+=ayd21Def(C|`NXE1sCEgRy^~(xL zSU4~oTEk!*vumlx^W%J+JTeLliD3tYyp;F30i?rfvG^C1O=bfXLp^k0>BDl1sQxtBY;8i4g^o5X8=!?poA-eb!H7PNxW|N9g+kXwzB{fb}Ck!_{oFhUoy%% zTL-MfOUfpM4Zu<2U5Fo+8=Zk!#2XOe?k(xtzTOnfDn0^n0B{oV0f-g=k0YlQoykYu zV4|e!=7m%N@c8ixB)1^CFj&rfs#4!j%q<}bfU}9$w`B!EwKzTjx&&}z-j-3t4p2E1 zZnYD{(=Z2+32)=`G}3qV$pM77c6b`wk4KUn}E`!}i*E*Nxo3&7&Q;=tm-;=tm-WCwl$ XOmH@wclUbl00000NkvXXu0mjfj8U{g literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Home_Selected.imageset/Home Filled-50.png b/librx/Images.xcassets/Home_Selected.imageset/Home Filled-50.png new file mode 100644 index 0000000000000000000000000000000000000000..08d1b5b4eba0a24677d0c7be5f249ccaa2237216 GIT binary patch literal 603 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 literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Lightning.imageset/Binoculars Filled-32.png b/librx/Images.xcassets/Lightning.imageset/Binoculars Filled-32.png new file mode 100644 index 0000000000000000000000000000000000000000..14c5437f7512fb5ca43a5e329337421888d0b179 GIT binary patch literal 934 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 diff --git a/librx/Images.xcassets/Lightning.imageset/Lightning@3x.png b/librx/Images.xcassets/Lightning.imageset/Lightning@3x.png deleted file mode 100644 index bdd0559d1677b8b441adf9c11f19c46a986b6227..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1140 zcmXw(eK6a19LIl2l!&LWv9XF6rWM8NOigQ9Xh=*-nqPiJQ?-R2n{-H|t6CFB%a~>A zXLHO`9}miS7{$=JidiNK^LWcMILtP(|P@;?Y5?FQ)JLgEblRH$9Tc{v!&7i zo^;oBT|xpkodPcuQ7eIeCiF887ku4fpYQ!8G}7DlEFZD@RYMv7X&|xYi*`&t{e-ap z?SnAK1Lfx;oSxJ(94(&RUo56?tZ3AjcnvqoF)B;ppFK+bQ4L1BteWSP#ln8sDpXD# zk<2o~&42JSq&~ zX_PYhm?_@3?O%XA{hqo;>6s{Sdy4-M#8cXe^BEO(B2-V|J2=xL{BrE3;lfuDnT7%+X*1abqtM$iKjy<$LMtyL)LM=%ss2 z`hIl`tPX2LY{I_#XuUGED+j5NZmz}iIT~|0M7C!L`dl>LX0s5zzqS(Odh-~hjttyH zICSqt>%3%h43;AoXJn*~Vh-$L0Ej}Vl7kw&tAbMC8{<`QoeQzA?gl)3CB_tw!%waT zV@u3rg(^>uru7zIm~hv_og6MosQVvpp$fcS;(n(R@z#Y4!3>=buD6a>x{9n#F0N8b zSBJQurR_-wnnu!qL$FOyY$J!LGm&R{uIQ*MtIYLd=Zs~aI-LxK*bSDx>g$^>QMcN_#v2%&3(Cju#JG4F-Z=A!- z{RB-;F5;>6!Uq9h6KBwwm%;`KR7-90eS{69g+b*YjFpvlIII|~E%V!t1L*=@+%D13 t^P3*7zn9y3KQi}uP1_$P`TrR-aC2WepODF~4?uqtfN_=;qM}{S{tx8n`_BLX diff --git a/librx/Images.xcassets/Lightning_Selected.imageset/Binoculars Filled-100.png b/librx/Images.xcassets/Lightning_Selected.imageset/Binoculars Filled-100.png new file mode 100644 index 0000000000000000000000000000000000000000..680c463eec18cebcbf497d0bd61a974ec02e977e GIT binary patch literal 2833 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 literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/Lightning_Selected.imageset/Binoculars Filled-32.png b/librx/Images.xcassets/Lightning_Selected.imageset/Binoculars Filled-32.png new file mode 100644 index 0000000000000000000000000000000000000000..14c5437f7512fb5ca43a5e329337421888d0b179 GIT binary patch literal 934 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%0A+&v{$KI6I)bpv% z6JK=8H`kDE~FfKFSYgvBaJWr;my4}U6dy?o|?mlK3L(4v-QeUniHP68eJ@v)?I!` zdAac9AX55BuowI%dlMynCbV@b8QsF9wb+sgJ$XTzPA(afu#4ia38s#mRNTYMhbaPc zR(H;^ewcnvo`$ z4ELzcFuRHiV|lN3I!=qNb>F#aApfevd}DfOm*X_wWLmp)S=B%~C)tRM>9RaDYrl;9 z#b=hapIKBbkhi0(o6O9J>w&cr`|7M$Tyw2owys(r?cw0i5Pjr$V3z3nB+d6Z)~;Gp zC6MkY+nCSHRn^V;{`+lWxBm8usqgtA=cxqJIn6S%CJ(vsvU9DaUz2{m!?Cu@nmU0D zvkM}_@&+`w_Ps>^v4o`#NPC#=8Ztjze%m~b5qZ^pc%2G?42}%Z2aktcd5SgmV6t5t zRvyTBfGQwwM%m_znYmzk9yjAOj~KuBU8O1@o#CJ$qECLeT5*<8Bl!5LlmX$&t>~te z*iDH>P%RM7+)A<$R11VNw~}lGRRZD6tt`>cNt*An>`NYts@Ov~b1UgaP+f&^=2n*I z_ax1E;(L$kSeyc1A*{I-KqIKGLOOi8m3U0@R1rZ}2y1Qy(g>=mkoJ%*w}NQ|)c|46 zt-g-aJoDUlSxcHiFOFc6;HDip@zeCZ%^?G?hA zTLl9Fm}Xo%5U$)R6b8y9yZ{is5B-NgK}m%LfD9JjA@Vxp;YB|eKviO!`n!{Cr)A9I z!}$Bp}Io* z#-Hb2{gnU-(v_OehCoa%x-^O*y3(R5HG4>it~9Ai5fE=(sZy01AilcNrYaRce03!~ z%Hy&xmK_8AmgPD7D>ii)0zyTFcaf;8d~~H*Rqz$!p)1v@f(Np)u9T|^8px`; zs)MS)fvnaHN)JfK*vz4UtfVWzQJxS$aDB)sxe3;_XKA*;Myp-mmu5{R>|YNjg4 z3USp{9aRMi#O>{>j;ewL;-ssZstOK>qpnnp@`P;eFt5EXZ&&D3han)~D#Sro@KcAi z0pg&m+N%nxLaKDt1XV!+snAs;R0RX1LRXDZ6%df}W>D)WPsrvj{@PonD~(f!As`?s zbycTPo{-I5?6tQu z99$F8%lnJ3#nfR42=NNJ|K6;{|6FiAw|4)$UmVA{A?<720Rd~bgG$zSO#lD@07*qo IM6N<$f|XijZU6uP diff --git a/librx/Images.xcassets/UserMale.imageset/Contents.json b/librx/Images.xcassets/UserMale.imageset/Contents.json index 7c55063..620c281 100644 --- a/librx/Images.xcassets/UserMale.imageset/Contents.json +++ b/librx/Images.xcassets/UserMale.imageset/Contents.json @@ -2,18 +2,18 @@ "images" : [ { "idiom" : "universal", - "scale" : "1x", - "filename" : "UserMale.png" + "filename" : "User Male Filled-32.png", + "scale" : "1x" }, { "idiom" : "universal", - "scale" : "2x", - "filename" : "UserMale@2x.png" + "filename" : "User Male Filled-50.png", + "scale" : "2x" }, { "idiom" : "universal", - "scale" : "3x", - "filename" : "UserMale@3x.png" + "filename" : "User Male Filled-100.png", + "scale" : "3x" } ], "info" : { diff --git a/librx/Images.xcassets/UserMale.imageset/User Male Filled-100.png b/librx/Images.xcassets/UserMale.imageset/User Male Filled-100.png new file mode 100644 index 0000000000000000000000000000000000000000..01b0ec148ebdbfc11c729bd63f303c0164539a1f GIT binary patch literal 1541 zcmV+g2KxDlP)SATMeq+R1&~!~d||)?VfGPtARY)a1(+4bTZjk3OaW%a z@fPBNm{A~@j)vI(=@*$gE&sg}@nmi$C$p&@oP|`v_xf*%;2i)C0p;(Ghv*&vW{5Dm z470+llzLJ>7$B#`I3&UmARM)NbqR+s7I8Xj72i@M_CSJZ@(z%ufH>5mNeL&Mp|A!L z6v;UNeAEKsArYcE0Op8vOXc#4TV2BzNRW@ERYY20Y)gzN2U>m-@kG`)&L5UQg3rka z2>!OFjcO8Pu3W{+KfMLC8hC`H#*RHIDmxbixZ-Ds9u-x^@ zBb7+iO{t#?{@Nicffv-fE2Kwc$PmvE0+fChl+7R7~D0@>cpZ*YhfE0=Bk;|Sr zi${d16K$Mix=rz*NaUd3TNX5AAskig9>}gQz|kP22jYQjSAe0*l0A0o1CHK8c36n7 z)R|T49tf*uFMSnZre}syvDwJUWpV0<{3F72_u>gfkyV280m5RWcO%^=5vF>ljvG>8 z1Y|UX-r!5aa+?i?Wh_4Ym7C3Ed+Ka}$l?V>LM}vjmS?$e(&Uxp;0A=j@QJ$$og)wi z6}z7?+<1&&Iu4+RmrmVQNvAGXpYU>7w$@_pp9{%Fl*O(-3N}Dk%@{fw>19=iuvy?x znTET1gpY;r8q4xM^`J=PGS2s|eD{y}dJB=ALIzDd?0v<~a(JF==n9v3dilQ|&#Yy}FzcM+xT7kP6Ve*Xc8)vXEc`W=U3A)kMbfO=Ca z7UFP*@L+&cb%_nP#mHT;t<*OyE-Srvx)5PDvSNu1GGSY(Z(3V8xHne06MP3+3|(zs z+s21AkP3>~jXchl`|L6n_CQucDkk=h(47dgb_dxsa6N5<90rh8M^O&XYueC5U!hzc zadK4;01pDl+Ddc|&pVrdso1+UA_1F2KU^8X%)Wx?yR^FZnpvi$!c z0nxb-+qbg1erTFIhaN~5Ak_>a_P=O7Dahd-kbPPlgv&CrW{XIOC_C-)p_quv9!Owz zqRJ00s(e*O&h33#0D_5#(leEEnGDO)LRP0)!@0G?FbQsf;EcnG*Q|iZgZ2UY=T;6- z-u9Uj2_U?135Erb(;|6K1oEJLC!6)3u_1Y*0_84lRB#5QvWDIu1fodWLHoL$ySz~W zF^6(d*g6@=I*^q$R1lmTGTE9LkwC=!GEA>pr_msy6(Fmnq5Tjlx1{OXi3TrcBuHg7 zFoAL@tw#GTK1PA8*XaHRL=psxrJC9x$z#b8Cr~afbb>JkWOXABOkNy_XZ;wOBf>~m z13){FRnv7aWz%BPW)d|C5zK%Vao5UUE0F4{2`sN)yjARCQ{Ar6JLz)eg*G6D$DC|^ z=X&z#uy|Vw5LTx!=#jL0DlNChbq2B??zs8ix~aYHYk90%r*sG6@iA^;2B(j`S<8@%|fpED|&9btsvLl*{ zD0|%`ZfhV-68B-$74SgRH8UE+12HPEdg304x@JaWcpygQRZrXlQP<393=hPpyy}U2 rAnKYKjp2b9l~+A+4@6xvqcQ#ik#0hRkVIPP00000NkvXXu0mjfMP1X4 literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/UserMale.imageset/User Male Filled-32.png b/librx/Images.xcassets/UserMale.imageset/User Male Filled-32.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ca41708cbdf86a0ea0f360b54853a50d93123e GIT binary patch literal 507 zcmVoK^a;{)M$0H!T`MOqB@ zFbB}C<9FrwZIj@sjl2T+g%p=Iqu~nP0Ez)LRS;!=R0S>oxhSc9f~Zm0Xoh!yxChd} zWYr#+5tatucx8^j>#>O{(l((z88kulK9Fg^;;hSNE|X{Uc1W0%0{oQv6+}JLnJ(9f zn1g9pbUPLTB-&2`#=HctTf4pS2O#^=urQPO7257e xwE_UohD8IRQ-L`zloM?IYo|cq`6$y1z&CQkxFPaBDjEO)002ovPDHLkV1jTz<7)r_ literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/UserMale.imageset/User Male Filled-50.png b/librx/Images.xcassets/UserMale.imageset/User Male Filled-50.png new file mode 100644 index 0000000000000000000000000000000000000000..b4cf4dff9374a3d7d2f4a8d2067b756d0e336e22 GIT binary patch literal 753 zcmV#BnTnFggA(w zMrR=Ig2>UK;QLF}8IHAVN(PC6_*Wm=U@tXx zh%`nn1+le1)`p8t`&slIgwuZ?B<~lg^kfe}_GN43A|T&X z5HFWA1`^A}NFEIUTo}x|W@sJKZ`$|a(X|r@O*<~9yNn`5q3GeO6UY?rR3|RdxYZ{E zl1B=_dn*tA7~QBK-dr(P{9Fn|;y|oLunQ}F^i@Q#6A%r6on^EmXa zN)`U8f~4t~D8xaA0Cmlr;!71Ip_$Flb1$`p=9uO6v_I(bb4Ga z&4#USE&nPC!T6%L(lyLlkKM+`1qfz`8*>JJ=(#quowwEuz-x5D9O`VRwMrHJU!ozV zvxc@+hu#|G>G>c4k#(DM15^g4-1N3+4ARQ`0W$_5axU~rKJTVzUu`Q)T00000NkvXXu0mjf3)5K~ literal 0 HcmV?d00001 diff --git a/librx/Images.xcassets/UserMale.imageset/UserMale.png b/librx/Images.xcassets/UserMale.imageset/UserMale.png deleted file mode 100644 index e08c5b5b92ba922a1772932883db36a9f81f1a07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 zcmV;g0Z{&lP)rKNz5QM)}0CWHq03C!10u=-*04hkR0MY>^&;g`_Pyx^Z9e_r%Eywu0yN6Htla(z0 zxW~*sZgwZ^*d{y1XAA;U;IsO|{^Sri1a5(A;JAe-5?8<`!XipQ;IF{h0LTk)?~O>5 zz!F$EJXADJ9Q(pGpzxl0E(R`uH*0S+0zcM;t#zg0$=Y9%zyqL^4O&S8dJ!tfQ3*t9 z;N0^hqY-!p=9X8$S4Sg~N1_D2fddBtZ7C9g2!SHcP|r#-Y}vb^md*KS3Uts@h(~~; zWm*maOODroI;6{T2&f@R>r=((%6-i)hk(weq7d?47wrk;L_jt00qEant{#w60|J~? zEj9&S-z&*hH&n6yyBTTjt7kw9xC^FkxEdNvhEgD~$7=Yr9I@6l8EHWIGq9!z$ZHLs z?WxxS@vPqfN{=bU9=Y`ZcK1l0)g_zS=!<}4RNj}etx>Iyz$I{33cad>=KdTV7?sTQ diff --git a/librx/Images.xcassets/UserMale.imageset/UserMale@2x.png b/librx/Images.xcassets/UserMale.imageset/UserMale@2x.png deleted file mode 100644 index c94cfed5e92c80b77df9aa4264ad42691b54f291..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1823 zcmY*adpy%?82?ceiNm6pX{K@;n@KU3PKmp%hl29nrgccZ#cEVVFFBe3nun-1=ibf!!qM~%8^mQpT0z%Ko$OwT%Ay6nC z0YZoVE17|h)*;i?zLEUHg9)Ms(1=t9kwS(FdGV(x5e!opOepkYee07!4E|S%O#eQX zU_gZM2BD{mMEu|ul$r>$XnPtlNT4j_H`6ouiu_;hyN(G$DE^;jzD@cyD;U*G(ggA2 z*~}zuyVN}ZK+MkubKE6F>_hR1EN|DJdS{0q7PhbuIkjJ;dQw+q_v}ql^@oYepGzXg z#Q{ZagZ-(yhEk`y5;gK7tQA7{JxbM(mBvMT+H7chECMMtQ&Ur%C4$LEIoGTzA8moY}WZUtoWylkSu+`&US~y$FrpKXh5&@ zqhiMg%F7+D3_s-EbM0*(!P=9U$wtpN>%j8-^z`)9NO~jBLNVL+=k*!Mw)Amh?U7NQ z9!L{0c~u#oJl&oDE+x43OsEZRS>_c)S(5FLIfMBCw4TP~i(#qLBC3f6SJ2P{3poQl z9~!H2vdfrNZY8J*Ebxnk!w9SbsOgK0Uwo z%jY+a?2{U+3A=uf@HPV>h8S+%)4E}`1-_kNH?p2-P&wpbMC%Jba{543Q%gMalYL5^ z+nsE+Oiy62X>~BTu)S@F@nw0A9~8-Am%OzEW91ew%i2nIxY};qAEz!e*_JWycnC+sCNAdAB9y zk3ku?qGD8=u<^)F=^9Z!rn_jy^33OPxlw8B%S>jU@~XspG&-)`xeh}!AFz3=?$&Qb z!fxyUw`FS>c5&9O)_SMOoMOuK;@&A zK(Q2l6^(_IQ&{Fo+E)4N)y-B`gPso>)~(^L+;Di=o0aq?uNy@uxue0aGZs@1idV^0 zZ%M4TJsUs#i5ZoBo<$JtczL6*i1(#QLmn=>vvYNWE=!1fxK;-Bmo~hmvNqvGX*~Mp zAJUOiybN-{wOHTAlU;mO&@50(@vRsWxiZS}OmF6&>}}jq%2{`gXyO?|)`)6OX`VwS z%8tP%#=f|1)o~+e5II^Ur}4A;j_{-k>xE{=H_rW#kF<+9cXi@s+eZ&Qj@V9EfztE) z?$sMC>?JwhVygY5Wx<%}ZfNH3zhlNF6ctT^0(qS$PtTp7Z-bP8u_cGWDL$nxlu07f zi!~Ry!mieO*)s-FoNMyYJ~0szwCMA!fOTkSO`*D;&15^PsCBJWgPbD!6GJ9azx4In zkGz~!;ap(v$IoX4`f*Chf)1==;ZKK|g^ zSLm^id6lMxEi!I4vqlA6y0K%4mgyF*%=Wh=OZyZrf787wnu~=ns?u;mZo%1+o{A}X ziD83P8TT087S>WRw{@8JG&sYY=1CGq9!1(_btdRlL`Aa0emN-owQMYLn0j;nq`v`* CcQa1_ diff --git a/librx/Images.xcassets/UserMale.imageset/UserMale@3x.png b/librx/Images.xcassets/UserMale.imageset/UserMale@3x.png deleted file mode 100644 index 0ac6741044220cd5e880ca1bd6a3d9daf557ee19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1319 zcmV+?1=#wDP)S z%Ma4eYi1A4?COc19ys?0I44%& z|JW9QU;!@&Yv`fKO=T$RKpvaflO7ay>L9kfGPBQS_D(I;*&{Q1p3x5_APVkkWWf03_WuqfI@LX< zH)9fldw5Z@5Ju#T%vDN?HYtrxD9)@bv$!fHC9oHeY5XaZkOicGOe&z}vIy$o6OLse z(-xAVO-iF13F;}@q%=AKL@Dk4-f@MpDQheshvoX1HRG%VL}}`T6~x|4$BQgQ2?$$y zzAoyu|C?AnWac@%C;{Qa{|;B+aDyo+FI`asqA(Uo3+ReK6f&(^G2HPQtUy_xBlom% z$CfOFLo-Y^MwGM_!Yu)ba$7R)N;S*c{nA7%SiKl-h={Pn**27eI-MumVzB5H+_4Te zSIAscqYeZpo(Fl-=B%bnWeY&)yT{Z#1Hn@-vYB-~r@mn;KyY1*pnDzYVZI6&GOlU_ zxD_Duw`YJ)TY#FgoB}eZQ1I&oBv|md<_gH1Lcy;WkYK^*nkyi43I)HuB_KV=B9&!z z_@Wh%4kGrdf`K82d3xRyly(N>m?&FuSv?1ZqaKX>+37A-wgAL)p{gbq8^4Yo_xA30 zfs4wxuuP(;S_u2IfN|_z_nrcBsWMPV98!xK5EhF7k#z|rafKDcG%zYa*!9jrRFp-` zSph)U^%DMz3YkE#25un58u(kWuzWm%3Aq_40|?dtgp^ArS5U{D0f!4R-AWV?26W@^ zf2dl+QjxI~GBey+_Z3HPAb@x<#D|`v?4{y)z7H6HAqnUP#uEq@L5Ke}5c`mUK|<0c z0q_8VOJWPCO2*`ACA)Q#nXx5xRq*c(gq<8*rvI;7#S~<$g#$kfG*2o$fq2e2o%G=n zA3AySb}t|bN6`}XKiKq1N8@?`A!cxT_J4I#$J`gEd7ENN4nz=qvKwRZ*ue^Y?Yv%ey0dbYLz48Lmu9@o-1;ka}_R0%LyJoIW6cAT=+bb_1 d?V7nh@dw&pyJh7rlm`F+002ovPDHLkV1m5{ROA2v diff --git a/librx/LibrxService.swift b/librx/LibrxService.swift index 29c754a..aede95b 100644 --- a/librx/LibrxService.swift +++ b/librx/LibrxService.swift @@ -44,9 +44,9 @@ struct LibrxService { case TimeLineHotest(page: Int) case Me case User(userId: Int) - case UserPosts(userId: Int) - case UserLikedPosts(userId: Int) - case UserBookMarkPosts(userId: Int) + case UserPosts(page: Int, userId: Int) + case UserLikedPosts(page :Int, userId: Int) + case UserBookMarkPosts(page :Int, userId: Int) case UserData(userId: Int) case Callback @@ -73,9 +73,9 @@ struct LibrxService { case .Me: return "/api/v1/users/me" case .User(let userId): return "/api/v1/users/\(userId)" case .UserData(let userId): return "/api/v1/users/\(userId)/stats" - case .UserPosts(let userId): return "/api/v1/users/\(userId)/posts" - case .UserLikedPosts(let userId): return "/api/v1/users/\(userId)/posts/liked" - case .UserBookMarkPosts(let userId): return "/api/v1/users/\(userId)/posts/bookmarked" + case .UserPosts(let page, let userId): return "/api/v1/users/\(userId)/posts?page=\(page)" + case .UserLikedPosts(let page, let userId): return "/api/v1/users/\(userId)/posts/liked?page=\(page)" + case .UserBookMarkPosts(let page, let userId): return "/api/v1/users/\(userId)/posts/bookmarked?page=\(page)" case .Callback: return "/api/v1/users/auth/callback" default: return "" } @@ -129,26 +129,27 @@ struct LibrxService { } - static func postsForUser(userId: Int, response: ([Post], error: String?) -> ()) { + static func postsForUser(page: Int, userId: Int, response: ([Post], error: String?) -> ()) { - let urlString = baseURL + ResourcePath.UserPosts(userId: userId).description + let urlString = baseURL + ResourcePath.UserPosts(page: page, userId: userId).description let headers: [String:String] = buildHttpRequestHeader() loadPostsByUrl(urlString, headers: headers, response: response) } - static func postsForUserBookMark(userId: Int, response: ([Post], error: String?) -> ()) { + static func postsForUserBookMark(page: Int, userId: Int, response: ([Post], error: String?) -> ()) { - let urlString = baseURL + ResourcePath.UserBookMarkPosts(userId: userId).description + let urlString = baseURL + ResourcePath.UserBookMarkPosts(page: page, userId: userId).description let headers: [String:String] = buildHttpRequestHeader() loadPostsByUrl(urlString, headers: headers, response: response) } - static func postsForUserLiked(userId: Int, response: ([Post], error: String?) -> ()) { + static func postsForUserLiked(page: Int, userId: Int, response: ([Post], error: String?) -> ()) { - let urlString = baseURL + ResourcePath.UserLikedPosts(userId: userId).description + let urlString = baseURL + ResourcePath.UserLikedPosts(page: page, userId: userId).description + print(urlString) let headers: [String:String] = buildHttpRequestHeader() loadPostsByUrl(urlString, headers: headers, response: response) diff --git a/librx/PostsLoader.swift b/librx/PostsLoader.swift index fe88ec0..a472991 100644 --- a/librx/PostsLoader.swift +++ b/librx/PostsLoader.swift @@ -125,7 +125,7 @@ class PostsLoader { func postsByUser(page: Int=1, userId: Int, completion: PostfixLoadCompetion) { - LibrxService.postsForUser(userId){ [weak self] (posts, error) in + LibrxService.postsForUser(page, userId: userId){ [weak self] (posts, error) in if let storongSelf = self { storongSelf.isLoading = false completion(posts: posts, error: error) @@ -152,7 +152,7 @@ class PostsLoader { func postsByMeLiked(page: Int=1,completion: PostfixLoadCompetion) { let userId = LocalStore.accessUserId() - LibrxService.postsForUserLiked(userId!){ [weak self] (posts, error) in + LibrxService.postsForUserLiked(page, userId: userId!){ [weak self] (posts, error) in if let storongSelf = self { storongSelf.isLoading = false completion(posts: posts, error: error) @@ -164,7 +164,7 @@ class PostsLoader { func postsByUserLiked(page: Int=1, userId: Int, completion: PostfixLoadCompetion) { - LibrxService.postsForUserLiked(userId){ [weak self] (posts, error) in + LibrxService.postsForUserLiked(page, userId: userId){ [weak self] (posts, error) in if let storongSelf = self { storongSelf.isLoading = false completion(posts: posts, error: error) @@ -177,7 +177,7 @@ class PostsLoader { func postsByMeBookMark(page: Int=1, completion: PostfixLoadCompetion) { let userId = LocalStore.accessUserId() - LibrxService.postsForUserBookMark(userId!){ [weak self] (posts, error) in + LibrxService.postsForUserBookMark(page, userId: userId!){ [weak self] (posts, error) in if let storongSelf = self { storongSelf.isLoading = false completion(posts: posts, error: error) @@ -189,7 +189,7 @@ class PostsLoader { func postsByUserBookMark(page: Int=1, userId: Int, completion: PostfixLoadCompetion) { - LibrxService.postsForUserBookMark(userId){ [weak self] (posts, error) in + LibrxService.postsForUserBookMark(page, userId: userId){ [weak self] (posts, error) in if let storongSelf = self { storongSelf.isLoading = false completion(posts: posts, error: error) diff --git a/librx/StorysTableViewController.swift b/librx/StorysTableViewController.swift index 64725eb..f841556 100644 --- a/librx/StorysTableViewController.swift +++ b/librx/StorysTableViewController.swift @@ -23,6 +23,8 @@ class StorysTableViewController: UITableViewController { private var posts:[Post] = [] private var currentPage:Int = 1 + private var isFirstTime = true + private var activityView: UIActivityIndicatorView? var postSection : PostsLoader.PostSection = .Default { @@ -51,13 +53,6 @@ class StorysTableViewController: UITableViewController { self.tableView.rowHeight = UITableViewAutomaticDimension self.tableView.backgroundColor = UIColor(white: 0.97, alpha: 1) - // reload data from cache - self.posts = self.getLocalCachePosts() - self.tableView.reloadData() - // mark start refreshing - self.refreshControl?.beginRefreshing() - refresh() - } @@ -83,8 +78,18 @@ class StorysTableViewController: UITableViewController { if self.refreshControl?.refreshing == false{ self.refreshControl?.beginRefreshing() } - // reload data when view did appear + + // reload data from cache + self.posts = self.getLocalCachePosts() self.tableView.reloadData() + + if isFirstTime { + // mark start refreshing + self.refreshControl?.beginRefreshing() + refresh() + self.isFirstTime = false + } + } @@ -184,13 +189,11 @@ class StorysTableViewController: UITableViewController { } func loadMore() { - print("load more data") postsLoader.load(currentPage+1, completion: { [weak self] (posts, error) in - if let selfView = self { - if posts.count == 0 { print("没有数据了") + selfView.activityView?.stopAnimating() } else{ selfView.posts += posts selfView.currentPage += 1 @@ -205,12 +208,12 @@ class StorysTableViewController: UITableViewController { let cell = UITableViewCell.init(style: UITableViewCellStyle.Default, reuseIdentifier: "moretag") cell.backgroundColor = UIColor.clearColor() - let activityView = UIActivityIndicatorView.init(frame: CGRectMake(0, 10 ,self.view.frame.width,30.0)) - activityView.activityIndicatorViewStyle = UIActivityIndicatorViewStyle.Gray - activityView.hidesWhenStopped = false - activityView.startAnimating() + self.activityView = UIActivityIndicatorView.init(frame: CGRectMake(0, 10 ,self.view.frame.width,30.0)) + self.activityView?.activityIndicatorViewStyle = UIActivityIndicatorViewStyle.Gray + self.activityView?.hidesWhenStopped = false + self.activityView?.startAnimating() - cell.contentView.addSubview(activityView) + cell.contentView.addSubview(activityView!) return cell }