From dfde279d0ed9e8e8cb97717a8a3e9d780d6ddfcd Mon Sep 17 00:00:00 2001 From: Floens Date: Sat, 22 Nov 2014 20:56:26 +0100 Subject: [PATCH] Fix dropdown colors and change some toolbar icons --- .../floens/chan/ui/activity/ChanActivity.java | 14 ++++++-- .../main/res/drawable-hdpi/ic_action_chat.png | Bin 294 -> 0 bytes .../res/drawable-hdpi/ic_action_refresh.png | Bin 667 -> 531 bytes .../res/drawable-hdpi/ic_action_write.png | Bin 0 -> 351 bytes .../main/res/drawable-mdpi/ic_action_chat.png | Bin 263 -> 0 bytes .../res/drawable-mdpi/ic_action_refresh.png | Bin 484 -> 346 bytes .../res/drawable-mdpi/ic_action_write.png | Bin 0 -> 272 bytes .../res/drawable-xhdpi/ic_action_chat.png | Bin 307 -> 0 bytes .../res/drawable-xhdpi/ic_action_refresh.png | Bin 876 -> 637 bytes .../res/drawable-xhdpi/ic_action_write.png | Bin 0 -> 378 bytes .../res/drawable-xxhdpi/ic_action_chat.png | Bin 422 -> 0 bytes .../res/drawable-xxhdpi/ic_action_refresh.png | Bin 1241 -> 875 bytes .../res/drawable-xxhdpi/ic_action_write.png | Bin 0 -> 490 bytes .../drawable-xxxhdpi/ic_action_refresh.png | Bin 0 -> 1148 bytes .../res/drawable-xxxhdpi/ic_action_write.png | Bin 0 -> 632 bytes .../main/res/layout/board_select_spinner.xml | 2 +- .../layout/board_select_spinner_dropdown.xml | 31 ++++++++++++++++++ Clover/app/src/main/res/layout/toolbar.xml | 6 +++- Clover/app/src/main/res/menu/base.xml | 29 ++++++++-------- 19 files changed, 64 insertions(+), 18 deletions(-) delete mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_action_write.png delete mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_action_chat.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_action_write.png delete mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_action_chat.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_action_write.png delete mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_action_chat.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_action_write.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_action_refresh.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_action_write.png create mode 100644 Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java index 6e1f4e4b..dc96a172 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java @@ -709,14 +709,24 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele } } + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return createView(position, convertView, parent, true); + } + @Override public View getView(final int position, View convertView, final ViewGroup parent) { + return createView(position, convertView, parent, false); + } + + private View createView(int position, View convertView, ViewGroup parent, boolean dropDown) { if (position == getCount() - 1) { - TextView textView = (TextView) LayoutInflater.from(context).inflate(R.layout.board_select_add, null); + TextView textView = (TextView) LayoutInflater.from(context).inflate(R.layout.board_select_add, parent, false); textView.setText(getItem(position)); return textView; } else { - TextView textView = (TextView) LayoutInflater.from(context).inflate(R.layout.board_select_spinner, null); + TextView textView = (TextView) LayoutInflater.from(context).inflate( + dropDown ? R.layout.board_select_spinner_dropdown : R.layout.board_select_spinner, parent, false); textView.setText(getItem(position)); return textView; } diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_chat.png deleted file mode 100644 index 4d9c098263973cba6f4b267f1e6f5c1ac6b0b561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GCp=voLn>~)nemYGkb!`kaA9Xz@0!Hx9oD7G^&T)-H83w} zf6~s9?Cp#Ed3(o&OC=?1I5Kij+CPQ6cGY_7^8$B*Kj z#WQV6f;9O*7XA7z#~X6=d%}aY6|dRMjz*g;5X!&V;8nA>ciNdvH}|;ro|*Q;Gy7WC z`<1=_)-n2W9*tqTb6|U3!pV!1CM@o4+#Bn0b19Q*Na7@6uHMofU0$9xc?%vRo`ePE n%xd+kPdtc`0Xl>sXA_qJ!@3XP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00E0hL_t(Y$L*H8N&`U@hX07hLJ8QYpqOmZ*^79od;tp^ zb%|K|0D_Rp=xbQncq^;|UIV^E2ncpc1O*Y)CMNkT9HN`dY$94Hc&1o(=bUfn%$f5u z5%e?Gp?}b?040^tsY)uVqFbFQBQG$Y4ZL9=9tTuuv?@EqjmHLjj<93Wyx_7Y77&}z z8nk9YYUJ?o=%SMZKF4*~iFt;C(#EO4Skv4zSAo@qfIO4b89mmd`?zTjv~O0^<0!&r zdn-y(1!|V0J}T7~C<8#wfyp*i&bA9ge9pQ2f VFoeR4ydnSq002ovPDHLkV1j|y+zbE! literal 667 zcmV;M0%ZM(P)&0QM~h$OUo$a)5MC$JJD_tVuEscA7|j(#VLI@W%7;%tTQ@ zKtO;iT(8$;(BwfrZGSiRKt#Zjpa|_z36jTgoK>8Bs`kU@d)Ra7Q~@OY2r@_Fb$iwF z1#$+WN1Z%wxdUM<5IZ2gKoKoop{(+ar2p_tS;@HtfV_ldZTz_{1fjUHh+hSOymFPd znk@yoflfpcaZ#m|zaVZPe*)Qq3*n(XUmq;UuQc*SL!QrU6o{DwQbU0P$j|#wf{YmC z?}^i2_oap!G4@Q&9B*?|_CWzjq|9hY3QUHsfLZJ09rg$kYc6-C1o(g1L07gnzJ9pH z0=)*u0#7y_k^=}EmmM)&=F;(@CPdQ{4atQjPA$;!WI_-ZXEr1YEQm?QFci=R1Uk-5 zX}e8JnO0;Ds*`#J0^FN>OJtxAA5Fbv?%Qz5W3xl`8;u#TjSJ;W@<)!_RCHnba;+8C~XQPc-1KZO@jVtcz#xkv1N`t@>mL+3rrmd0@KP3jeRkP%L zI!y$-WGcI9Q?|H>fgICcn;GeEuyUsxt`x|P&uW@n;?!=6CoULqa#1gN);31p8~|1g2GqJV&afZOpSzyMiZ2`002ovPDHLkV1n4w BCs6|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?xq+X@R~r-W;^-qY;7chg60 z?&cYx!Ygtoy_Mwg^>;29~AGdj*J sn^^*T}1B}pV4FnQGw$lha>ut4@e)0vO=~G=WkKx z$X}z-W_$b!{UqMfxgg+Y2*GnN7D4e#B!a-54~*{Z!wwfd3NoTilU2CuZ0B6Z_UsBP`#&E m+Is1!bIblNdm{hmW&YvE^KNo&|F$0JI|ffzKbLh*2~7YK7l&a0 literal 484 zcmVQKnx8Pzc&C3zyd75 z0LcJdpdFwC1O{M$WPoG<21xr~7Ptj60R5-F$dN4fY{CJJ)W(u^r*Qb$XY=f=RuB2h z()WFOS8&kN(79-&Q3J~wG)Fb$u|;ig-GOGHuTd1WlN|u?7g(Mds3aXZr#cYd81*$8 z4q|a{*mEQ7$2lN?yJ+@2Dm;4tO_&+??tADBYzerFxB_6w*qaA@P+}$e0+xb+yIfk~ zY>CC`lQifn0HY0ws0Q$(lBP@qPzq4XeFpl8+APTzPr~m7*&puV0I&MRL@Gi&Fx7J*cpRNkhZ;~6bqGG&*(rJQUh~JuHEdS4nY2M!X*}NwhL)Sx$>oafl-Yo zO0qu&wPQy{O3S^Kp3iV@6V#5!f+IC=8JU&A^8gkO=lTy0j`QEzGqhBbCL%DrW0lOE z>+ncW(y8?QV;IGX{)c}q9`YOV aEx-VhX`0R>svGkF0000O=~G=WkL+ z;pyTSVsZNH<-NQO3IYy^(>_m^EaBrW-%#LZt!(xzl0(q2DqVfcdvCoK;~Dwa|1d

2t?+KF{Qd1XyO;N07-#Y)VLhOn84k!38d7PJee$l{xLDlK^ z4`%H)@o$_F->B5@xbmd`gl9XyL{I(6IpwFU1=n3B&Cm63N{Y&-Y+m_udZ|Cq3k(dN Lu6{1-oD!Me^&fJ2zR?%m#Rt^Mz@RW=OWC3+Mdc>Xb(faJS#9M0puC<>Uh%-~ zhkMz7SnPSu5PG|uKK)931z^LpD}?BDTi*H@?9hCna- zD4+bV&m zG+n!I8O>&~k%>itfsw<3fk^=DBnF21SE>gXu34*g9Pd2y2qfm|>gTe~DWM4f!ya^a diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_refresh.png index 6aa33d59ac15bce59056e13f6334d2f4b4087c0d..5f89fc257b71bee3b3e6ca55d89e57a3f3b2d4d4 100644 GIT binary patch literal 637 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 SvK4y(0000. android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="16sp" - android:textColor="#FFF3F3F3" + android:textColor="#ffffffff" android:gravity="center_vertical" android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" android:paddingRight="?android:attr/listPreferredItemPaddingRight" diff --git a/Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml b/Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml new file mode 100644 index 00000000..1ab963d9 --- /dev/null +++ b/Clover/app/src/main/res/layout/board_select_spinner_dropdown.xml @@ -0,0 +1,31 @@ + + + diff --git a/Clover/app/src/main/res/layout/toolbar.xml b/Clover/app/src/main/res/layout/toolbar.xml index 36580b19..b33b9d27 100644 --- a/Clover/app/src/main/res/layout/toolbar.xml +++ b/Clover/app/src/main/res/layout/toolbar.xml @@ -16,7 +16,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> + android:minHeight="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> diff --git a/Clover/app/src/main/res/menu/base.xml b/Clover/app/src/main/res/menu/base.xml index f05d05dc..81cac650 100644 --- a/Clover/app/src/main/res/menu/base.xml +++ b/Clover/app/src/main/res/menu/base.xml @@ -15,12 +15,13 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . --> -

+ . android:id="@+id/action_reload_board" android:icon="@drawable/ic_action_refresh" android:orderInCategory="1" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_reload_board" /> . android:id="@+id/action_reload_thread" android:icon="@drawable/ic_action_refresh" android:orderInCategory="5" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_reload" /> . . android:id="@+id/action_share" android:actionProviderClass="android.widget.ShareActionProvider" android:orderInCategory="7" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_share" /> @@ -131,7 +132,7 @@ along with this program. If not, see .