From cfe69349d4f224b5a4ac65d9381516b6f521c547 Mon Sep 17 00:00:00 2001 From: Floens Date: Wed, 24 Jun 2015 00:18:18 +0200 Subject: [PATCH] Add history list item --- .../org/floens/chan/ui/adapter/PinAdapter.java | 12 ++++++++---- .../ui/controller/RootNavigationController.java | 6 ++++++ .../java/org/floens/chan/ui/theme/DarkTheme.java | 1 + .../java/org/floens/chan/ui/theme/Theme.java | 2 ++ .../res/drawable-hdpi/ic_history_black_24dp.png | Bin 0 -> 493 bytes .../res/drawable-hdpi/ic_history_white_24dp.png | Bin 0 -> 525 bytes .../res/drawable-mdpi/ic_history_black_24dp.png | Bin 0 -> 311 bytes .../res/drawable-mdpi/ic_history_white_24dp.png | Bin 0 -> 340 bytes .../res/drawable-xhdpi/ic_history_black_24dp.png | Bin 0 -> 619 bytes .../res/drawable-xhdpi/ic_history_white_24dp.png | Bin 0 -> 659 bytes .../drawable-xxhdpi/ic_history_black_24dp.png | Bin 0 -> 898 bytes .../drawable-xxhdpi/ic_history_white_24dp.png | Bin 0 -> 971 bytes .../drawable-xxxhdpi/ic_history_black_24dp.png | Bin 0 -> 1212 bytes .../drawable-xxxhdpi/ic_history_white_24dp.png | Bin 0 -> 1311 bytes Clover/app/src/main/res/values/strings.xml | 2 ++ 15 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_history_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_history_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_history_white_24dp.png diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java index 14d27635..86411bc5 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java @@ -44,7 +44,7 @@ import static org.floens.chan.utils.AndroidUtils.setRoundItemBackground; import static org.floens.chan.utils.AndroidUtils.sp; public class PinAdapter extends RecyclerView.Adapter implements SwipeListener.Callback { - private static final int PIN_OFFSET = 1; + private static final int PIN_OFFSET = 2; private static final int TYPE_HEADER = 0; private static final int TYPE_PIN = 1; @@ -92,9 +92,9 @@ public class PinAdapter extends RecyclerView.Adapter im case TYPE_LINK: LinkHolder linkHolder = (LinkHolder) holder; switch (position) { - case 1: - linkHolder.text.setText(R.string.settings_screen); - theme().settingsDrawable.apply(linkHolder.image); + case 0: + linkHolder.text.setText(R.string.history_screen); + theme().historyDrawable.apply(linkHolder.image); break; } break; @@ -123,6 +123,8 @@ public class PinAdapter extends RecyclerView.Adapter im public int getItemViewType(int position) { switch (position) { case 0: + return TYPE_LINK; + case 1: return TYPE_HEADER; default: return TYPE_PIN; @@ -367,5 +369,7 @@ public class PinAdapter extends RecyclerView.Adapter im void onPinRemoved(Pin pin); void onPinLongClocked(Pin pin); + + void openHistory(); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java index f4dd30c0..81402177 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/RootNavigationController.java @@ -51,6 +51,7 @@ import java.util.List; import de.greenrobot.event.EventBus; import static org.floens.chan.ui.theme.ThemeHelper.theme; +import static org.floens.chan.utils.AndroidUtils.ROBOTO_MEDIUM; import static org.floens.chan.utils.AndroidUtils.dp; import static org.floens.chan.utils.AndroidUtils.getAttrColor; @@ -86,6 +87,7 @@ public class RootNavigationController extends NavigationController implements Pi settings = (LinearLayout) view.findViewById(R.id.settings); settings.setOnClickListener(this); theme().settingsDrawable.apply((ImageView) settings.findViewById(R.id.image)); + ((TextView) settings.findViewById(R.id.text)).setTypeface(ROBOTO_MEDIUM); toolbar.setBackgroundColor(ThemeHelper.getInstance().getTheme().primaryColor.color); @@ -249,6 +251,10 @@ public class RootNavigationController extends NavigationController implements Pi dialog.show(); } + @Override + public void openHistory() { + } + public void onEvent(WatchManager.PinAddedMessage message) { pinAdapter.onPinAdded(message.pin); drawerLayout.openDrawer(drawer); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java index d3f969f5..b896bcc5 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java @@ -16,5 +16,6 @@ public class DarkTheme extends Theme { clearDrawable = new ThemeDrawable(R.drawable.ic_clear_white_24dp, 1f); backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_white_24dp, 1f); doneDrawable = new ThemeDrawable(R.drawable.ic_done_white_24dp, 1f); + historyDrawable = new ThemeDrawable(R.drawable.ic_history_white_24dp, 1f); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java index 18b6fd48..589d60b2 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java @@ -61,6 +61,7 @@ public class Theme { public ThemeDrawable clearDrawable; public ThemeDrawable backDrawable; public ThemeDrawable doneDrawable; + public ThemeDrawable historyDrawable; public Theme(String displayName, String name, int resValue, ThemeHelper.PrimaryColor primaryColor) { this.displayName = displayName; @@ -79,6 +80,7 @@ public class Theme { clearDrawable = new ThemeDrawable(R.drawable.ic_clear_black_24dp, 0.54f); backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_black_24dp, 0.54f); doneDrawable = new ThemeDrawable(R.drawable.ic_done_black_24dp, 0.54f); + historyDrawable = new ThemeDrawable(R.drawable.ic_history_black_24dp, 0.54f); } private void resolveSpanColors() { diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_history_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b74e2899c7b0427a9d9508c36ec13bdf72fc24c1 GIT binary patch literal 493 zcmVja=p@p0VaM zNnvFN&+$}!poPl?Tv~k8-5w5+cJofHKjH{6G-6bEtY%|&5h}x5S^Ul^% zcV+1d`v_KIB3pL|bV3$>bBJ(<`6HV(0`z3;;v>C-_+6FmGmQ4jaKdJbpfq2lzZZk1 zjBbEM5Zsi01A~V$I%*koO#1gR7|SSU8I+g)2m?6^5|%*;bubzX4Hxy2yf5eqN&J$F zL4}2=7i>eLBfUQ5(2r(_8u(&hjXLjT(#AodrXM>XYCw)fo4Cd=JZAc}Zt1Vz7&RbE zkUc!0uih%nx8NUSfqP^LmqBn{V!AA;td6!y1cwsA4yZe8MaR5i%4tm2SZ69RL$(m1 zgD3Tb3UM^zRC%gqBZ@?F=;5jQL>rg$xZLKm?snOZl@u45;~8s4gAL36K@Mq<;hz*a j$yv^EhU4sH2`hgALS`00000NkvXXu0mjfQQ6uH literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_history_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..703d30b92583a3fc339d8a4bf341f0853410eb86 GIT binary patch literal 525 zcmV+o0`mQdP)>Nn?6iAcGF)wM*w~dvnPOyv>Jv>8&ic-9^XImeQXovWU#2Fs2AMWR>W&ywN9GOk zb$|+ROL~n6G)~rRhAsdxb&m8A5on#PHl3h$(pN>GI9Vk+K@QSmB2cm^EIL7!WWz|M zsGy?`;P?ibgjEKzW`djA@Lm}_KhaYoL3cBD? zaqD@X1++1Tcto$zGop`q2}~4)TA(1`zb$sOnkBj!UTkwO2Df$vT>M;0%uDv}_%Xzu zMO>xT5X$rw(}q!Y?TD|VCyXE`+Y2(vAokyFv>RO*z##h3fr|hCAK8pg#>GxlSJt?| P00000NkvXXu0mjf&tK(D literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_history_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e77a077ae673bbdfac056d67189feb0c9e25e426 GIT binary patch literal 311 zcmV-70m%M|P){R;-jMpquZ(yRiOT>6nS3QBHh=u-<}=7A@DbDSv`eDUZvJ=_3FdN{&% zIKa_hiEv^;yo3jY39brUb5Gs8Y3TR|dsSeU6~clZO;T#K=(E)E!`Sbg@r(pbbaex4 mZAN;eYi115t;RvTKLbB%G*=izrH=ss0000i>nSfs4Y@Nx*}J5jK7$*W=eA17l|TI?HqUoKv|yd2z~OqFL(zO<+(VD z)eY0K4Bi2-V%D!=wPac*69wEc>rb$ezlXs@0VmD+N380mr6*B9-mHJes$p8vi2^ca z{Wtq4bVR8p0VTfxP>$n~AMr!F{f^K0;x4gy+&%22nAejYC|7BF-pVXf!im^b?vJ>V@bCg^PeGK9K=q!F;(2k!Df2 zI|Rmn{MB8E-{P-RUQ-*i;UU09n%8oBBY2qQ6`c;>UdD6JZ@fmcLy0H@)MWfB8Jyjc zZF`g{(o8=KgwnT37anp{(NZBR+-8Uz0U7cPGff4J6z}Q6Q#T9lpT` zB$whc?<}K3Dx9Z{15jXsB|cMUmtTCN$|B?R^3S!j`~fVlqv&?ci`)PJ002ovPDHLk FV1hgS7IOdq literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_history_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e188d4a37f937699916a3487ea75dc075688afbc GIT binary patch literal 659 zcmV;E0&M+>P)0ngP0KqP9Xa-3&5K zL@efMGznCGT|+k+4NPYnV{D;TB^BZ3ENIv=hjA$!VNJR3*<%wt)R5;DnaiM_7s|h9 z5u8TlDPUX5QqY?vD5(3(`uc3@)u;AAcMa=y>SLB{=5eAHssNPie{} zXz}rHVZnw^sm&!Q`uMNyf)a5Gr5yyFc7YU@@)ATmpwZr15oxskXmdvrHQ zkftaF+Az!ypYfUF+hRlh{bWKQMQVAmpJ&P&$B9}0t}h{wBD1{cW#v!iu-2d%7002ovPDHLkV1ieTF5UnD literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..18519ee5a2018af72a78ac9548e8bf5b682cdb3f GIT binary patch literal 898 zcmV-|1AY97P)230kIZH2+6;G2a~5IWuSNW?tXhbH03L&YUx&OCS&k1k6$-8D^GM ziX2g*#1TbS_?S0%6m_#v+F9f`tTJ`T0#DsUtQbQSuw2$IX`)on%lv|+S^K<5MLa|v z%VVwZAchU_JC=_+;dzWvOk+9JIXNcirilbmq9kadhe=jAcO3sA3Iig1=Ft3GQq*vj zT3+QlhgqKz!6)SqXN?Zr=w!nolERn&F4id-Lbw%Xn6pa@=feQ9*^jiKtCekJm*>21 zbh)#>B90ez+!cL}y&eL2WSo2Ps+zCmx#aCsmWvg~k2>VS4WKE;ui{Z|!LLWeqq3BDTl7q$K~WIrPRK~0Fq`5_K;c@uxRwqu5(u6VeV@d&Me&lrSRh!l zb)Ls1#gT1V%4ndpt@8m2SCZn5USl*+oC{m`R$LjjP04}LK(H!yuPd{*DHFy6Wo_MO z(7uLl|tqO=&V7sM*%NfE!|uC5#8E7k|CEQnF2n8V?k+b-%#*A=9X-GJ&QI z1k#K&31tFVe9ry4OXeri1dha*KNutGTzWZ3>Z!9eSqycH&)_V?gBfX7RPq5)|P;`llZ3DeXZ{bIXSBN2(bITTI2Ze?Y zxPxgU;{K%2qA)Ef{*ARqg#T4NJL3NIW57LlRn0dd&N2qP$2zw>-W?g|m_`$EEG&NF zF?1!7i)GPgAdc;mYLqZ;MHt~68RvZ?aYSv=g&SRbkApIL1DI!#yqT|}1I1iYk4aE%#@i?zDPo5$t{KW-_6v#0{hE@WBKp^1X YKk5muP<%41&Hw-a07*qoM6N<$g6jdMH~;_u literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f44df1afd6e175ebd614b59ef971e68e96134d42 GIT binary patch literal 971 zcmV;+12p`JP)~2+PvkfRBNJ@!qH0YaDtb}4Dr4%hjixAUdG}e#S+IAsS6#81*+FD-( zAAB$Q0P(A7Ehr_~NUc(0Ako@n#rZpazW6YQ44audv+Bd0-}5>A?mhFx94SW9QH){~ zqZnlLF~%9Dm}ikDO%|DFk`H-}N63&+guG zT!hdNM)3pNkwAL6j!`_DS7l7r2Bsq!qbC7;kVTIX&gC-?A`-k0(S?MD}@ z6Nz9mx^P3GLREfIQ+YcQ$-`=T|3oEB=pe>o6lsC^hdR=d*HzAu5TT5Q+ILDxggUsY zZUULV&`yj+Kaxa9cv|Is!e8iuIwT}YNORfBe9l)WW6=s5PAW8FWxhq`C)B4-^o>b{ zI$5={_xcHqSs@chw2)>>uU;RaGgip48OIS27PJk1fDh z{LT?7@srv|>0QJP&oGCvxX!M~W$&SMbe(x|l-n4K&v`I@W2^`2Xdd7*6?2C=8{9W_ z|D(gL^bX?5Q+%%?8|+3DHJbj1t6S*^5cUscY!m|+iya<9O6e^mf)X!L)#c=xr87(BFC@Ijn@C~~Vf58F zL?}zH)2E)XZcq*pN>3NF7>j*KywF_{j}2cdol8i(&^R;PoAd8zoh7>Cg~l-$e&o>{ zb7vN#*o(vpjayf$!*m4f+lN@eC{7}7f^-zu81RZ4;5&?lkC0fQ5*IORxXMV2C#)I= zm~lj%rz6e7`3D#WO(r*-)M36uiN6h#aVW=yTz#~@ffdij%nsu=1*2x tpuq&E8KoBqNBEyn2o*wwP$BeR^EVO!H^rPl0Wtsp002ovPDHLkV1mXxzv}=1 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8a198153b3ddbcba483657ed0b2839a5491ba715 GIT binary patch literal 1212 zcmV;t1Vj6YP)upqBZ}2%6ZN6e7o;YXjbf2t(+J|&_Q{H+K@;PP zk4@FmEir0Sqb<<{Xl zp-?Ck3Mp64({%C~BV1yNMG6#H;06<9IZlQ~B5Y7;4)7yO*u{edzN4EI8%QM`jADC= zReoYGG1lFE9N{Lm&-j~u60DmF`uG<+VBF*YQ7~^8e_|_&D?E=;ReXu9IEJXekgZ(7 z)({tY90Oiuu4o%8T;M3}G*L^EC{dEs(!@SKVU(4k$KK*4G|NzMEx*i3c9Wo(1h4Zo z%dR={w4qU#YvF(BCFx=D?PJ>Y3XwsRj7!Nm4pNC%_t49{%Lr{~@S4k)=Oi`wmEv3Z z7fJoOuvL2ME|MXrw^@>&&X1u`6_b)8*Vu*%4P2LGpP&L&q?fJBq)??!`Ue_9kzLaE zx1iGf(h-_bASSuzxkd`r>c|OoCW#VQujJI-h7Jvq)47L$lH3xKX3(Wms5L`^Kn_dR z{nFfdOzDP&dLIx#B{Pn6x2e%OK%H=Po+5^C?bwbu2wDe#KA~nCzMU7IVJo!{P$m4= z&*4)V+Y!B>eE{eeZtiOE3_e6zbfnpBY=9O= z<#{4_wnMl_j~g4{Ug6oJ5zpRoq__aa27q6KU;T$1DUKQ)V8Bs*5YNsyQnZ^KKzRN> zjb|4fDVmH9(Cnx_j%QPj6tzYNsCQJ);gzt6CXEhIEi9y72@6@&=m6!y3rklPc7U+f ze*myFw2xyANeBE2%~6!4ynP&>UE&CpI!|Itar;P)_=^^u%c!NaeRzedlH-2h311ho zVNf}OMJdYZle~YYN6wc^ zdZ^!zXO@Qc0m|sSV{gSbCDmT#VF)_HA=Ihn3kujQQimumY#up_PnOWWI*p9-Au|0c zUoBdi+6UM~1W`Q;j`nX5BY=-Ngh^S+>&!qR2#oFom?q9$qfxSlqMN%$nw;df&OOWL;?)Y<;p0=EMdwv&^zKTb?%`)jexeuCdCrnx7n$&eIe$th~rh9eio$d7idM3rzp5?IqPQ&rK-kq-S1nV1C3hA7uoc8 zf))}Kvza{%7s-*Q70q5?7Q0B~InMxZ@(d}eD5IQe>S-p!0KZWvdh9GaG2l_gu{FdP zX$*;RoK>aGuX2nSMm003to_S8i+M!oVJ2|%({vMI-6ZH^%6IcQ-Y3qwi_yk8kLN^z zv%En$8^|NP%Lw!T+xl&?yu(9mP!Sr*Fvw{p$T80fdFHsz7^nD@eKb%;K%r156bgkx aq5l9V2a&!HxXqjZ0000pLLP)f0w2(mAKw+C^cJm!`=p~rpYr3ev zodl}c&M?}D1-@qssqzcl#a^zVeex&0WXdN{MGt?Y19FYsB+DVNflFvhT;SPg1!_2i zw#)!kQ3cz9wt0jh+J3#IgcTy*h4kSkUQvR+C!lu z41t$D9-brAp?p%$R~`@2dfNi47M;4Y5gSkbg^TRd;Y8XQc{@^i`1y*wzEf}TB zp1>ir;5_vxOEfO}0}a>`*sy5$ccUzF&!P%#HUv^!k`E8{D9bdG7vqeP3@*?ur>=bV zEzJcvop%Kl$Z}nDnnQ&|rx@!hnP38aGVi07h5i=F={sm5pGi-I}0yW~le#);vGulNr%DRB0S8VR;{0Y1*_WRjL z1ZpX`M&9X9;2W8LA`wtxk9ypXK$2NkHya}pXm^b~O~PDYt=OZdBNMn&oIP611zvY` zaRwEcfZ`{y`Wp)jxVqREsX)JL^aJJs$6Z})jZi?IzX#0)&bhj1jZ~n`HTsCTz__c6 zhDZgPT%+fW1w<0fMk-J%5~-|&(VS(QAm!u{%XkdNarlVLOh71z z@cmOk=YMJ|zFgMW3p`*fAiDVgWsO=sqljjfMwB2eibqcRz1VU@`1WXFnDqCs7L*OjUQI#I2ILHFpA`9#%6>af%8)IlooagCiiofM$ z$yIbfCg>tjz7HTW^e~S0NuGB|m;V!#6djy0oD)S(@+y_L(?>uL@)jq=Wv=7~L%hlT zs9-3. %1$d new posts, %2$d quoting you + History + Settings General Boards