From 1221acb3b833375f54fd332604aad0b371742c61 Mon Sep 17 00:00:00 2001 From: Florens Douwes Date: Tue, 27 May 2014 13:46:26 +0200 Subject: [PATCH] Make the icons in the replies popup light if using a dark theme. Programmatically and not in xml because it already references a style, and this is easier. --- .../chan/ui/fragment/PostRepliesFragment.java | 7 ++ .../org/floens/chan/utils/ThemeHelper.java | 10 +- .../res/drawable-hdpi/ic_action_back_dark.png | Bin 0 -> 296 bytes .../res/drawable-hdpi/ic_action_done_dark.png | Bin 0 -> 392 bytes .../res/drawable-mdpi/ic_action_back_dark.png | Bin 0 -> 272 bytes .../res/drawable-mdpi/ic_action_done_dark.png | Bin 0 -> 246 bytes .../drawable-xhdpi/ic_action_back_dark.png | Bin 0 -> 401 bytes .../drawable-xhdpi/ic_action_done_dark.png | Bin 0 -> 475 bytes .../drawable-xxhdpi/ic_action_back_dark.png | Bin 0 -> 463 bytes .../drawable-xxhdpi/ic_action_done_dark.png | Bin 0 -> 619 bytes .../app/src/main/res/layout/post_replies.xml | 102 +++++++++--------- 11 files changed, 67 insertions(+), 52 deletions(-) create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_action_back_dark.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_action_done_dark.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_action_back_dark.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_action_done_dark.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_action_back_dark.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_action_done_dark.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_action_back_dark.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_action_done_dark.png diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java index 74d7dc38..5cc4e400 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java @@ -25,11 +25,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.ListView; +import android.widget.TextView; import org.floens.chan.R; import org.floens.chan.core.manager.ThreadManager; import org.floens.chan.core.model.Post; import org.floens.chan.ui.view.PostView; +import org.floens.chan.utils.ThemeHelper; import java.util.List; @@ -94,6 +96,11 @@ public class PostRepliesFragment extends DialogFragment { } }); + if (!ThemeHelper.getInstance().getTheme().isLightTheme) { + ((TextView)container.findViewById(R.id.replies_back_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_back_dark, 0, 0, 0); + ((TextView)container.findViewById(R.id.replies_close_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_done_dark, 0, 0, 0); + } + return container; } diff --git a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java index d1b4d8a6..8cab15dc 100644 --- a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java +++ b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java @@ -9,16 +9,18 @@ import org.floens.chan.core.ChanPreferences; public class ThemeHelper { public enum Theme { - LIGHT("light", R.style.AppTheme), - DARK("dark", R.style.AppTheme_Dark), - BLACK("black", R.style.AppTheme_Dark_Black); + LIGHT("light", R.style.AppTheme, true), + DARK("dark", R.style.AppTheme_Dark, false), + BLACK("black", R.style.AppTheme_Dark_Black, false); public String name; public int resValue; + public boolean isLightTheme; - private Theme(String name, int resValue) { + private Theme(String name, int resValue, boolean isLightTheme) { this.name = name; this.resValue = resValue; + this.isLightTheme = isLightTheme; } } diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_action_back_dark.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_back_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..6bb7a0b061abac0a78af841c3306ff270ca5d83f GIT binary patch literal 296 zcmV+@0oVSCP)1kobz)zBFlf)!!^P@ zzMiDnqbLADelMU)!QuW2QT&K0{zfTYWE7(W#V|)PPE#ysD3+8Ii+YM}m6j2=4s+}F u;rQpHKGcL*b92`_BBs0$LWnSY1sDMQ)T=Bp-p}m-0000zqoZ*u&U;`iBfGvDf z11{jB8E^$3#ehrr;09d7uWn>KV70cD$AlLK@SRCNVgk?6OztPc3Akx1@p*cCO!$8C zv^EQzPLo3eN6mx3Qdu@+vXu6i2({+Pv>vvY2wAYSrKn9zXyBiGUhU&$WBfh904=A> zQekW0rNN`Gy@htXRc2>`qu0R8SsIctuwbGO4R6&-%$N|N;jMcijfr6JK3a}O6>@g} majINHe1sDLV`TCKJ?i2R_0000<|{Ln>}1B}lL?PFT_O|NsBbOog``qW1B0oM$LxR!uXU zm~1&=7Uz+y0LAJBGelx#8jgNC?=a`wi4#A1V%QCW4t|QB;==gYAG}1B}lL?P7vu~`SAaLeVl@yw8!b`j2|Tx@*Jk8 zFWUOlAxlkQwPWi!zA5J&Ze6VcFTPZtRc}1?JvSDAtwC4+o{u&F|yKCK+mXwquU}R%>+m>-ZX1@3)pc@%HUHx3vIVCg!05Z{8zw$978H@y_t2Ex5+`kE%MP-Hk|`(InJ*a@ZR3QxA%5~ zSpu_I0;9$3jHEplhu*yVQ=@;gKtZvR-!Wp_YoH}Su;P?O-|7>evZd0cexLX>{d$I! z;?-%(&o&vmxI#!2k_e+#d8wP<;#n7FSnQam)n|HEFFHo=8Ag=W6W sh*rC9Z20@IqqOj{Uq9k@3ze9U9M z)lmL*9cu(5Z$ty@gS0m0_72Y*2ipFaZ*FFOJmGtrEg@N+t&rB zf~VDorivcQ(D+nh5!jo(T)d>t_y-MR|LI)6<2eD96V+>(Eu1DOz27U4CETR)GfdlY zzQB@`+vB))w&30bR>`k#FljU_Wmwf{w1Dx} z0tVx09VdJ~{rf&gJJN$=QuzkKNi$EoPEzp%qm>D_x5XYW-R_e2r~m$H+e4Rf|9pJ- z^ZfGr(^GdcpXj+SmuPwL$6CQ_lY91mx7hcM(;@B8-uH!jD_Nc%+u!ScL7d_7ceWXs ze~K73_r`N29Q$~h;fz%sXT!|n{mf_V>O>CwaAbJQ&e$W*Vo)c5m($Svc>c!o9}k!O zK5xG6*!gWz`!yRra^GR(V(N*v`kmdNuf}taQGm;)N#Tbx4?~L*g8&zUg9Zb`LI#Ew zCVZSfv$Yy-3d)2sB;>IizsfK}df}IawZ;ll>Wtq#(AMXFysKpF literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_done_dark.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_done_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..68c41deccb550fc809319aa8efb46f392c6281c7 GIT binary patch literal 619 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n0P&1978H@y_s{+_ppJ8!{n}P_Jl^g15&Add<^BctYsTm z4>5e_GDLs#>D%YM3-mt2b-{ zQReav(feL9Xr3^aRuKKE#=J!3eoVuaC$qUGEUGbP44Rs+eFZc*?GRW@Ar0{5NQ)mVA*nb!T+$r)Oc&qeP0Zskz@Y3FJFO#+uE1vLFh(0+Ks$ZMkfmrxfS zP1Te9QVMNzE_s!9pjCjHI8;qcJzn3vHZ_l!SQ3-SwA=Ftc~CDzuKzYpZh%^ z^;pvS#m=#u;d_4ln7V&*@>UiOiG?LUyV*Zrda4p1AWHC^m8a)MB(z5>b!WJ^Un6l^l sf0mUm#gi8ZJe2&25@A5j&d - - + android:orientation="vertical"> + + android:layout_width="match_parent" + android:layout_height="match_parent" + android:baselineAligned="false" + android:orientation="horizontal" + android:divider="?android:attr/dividerVertical" + android:showDividers="middle" + android:dividerPadding="12dp"> + + - - - - - - - - - + + - + + + + + + - + android:layout_height="match_parent"/> +