From 85c6b4eb2dc40deb93eb421287eedb04941ada35 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 6 Oct 2016 13:57:07 +0200 Subject: [PATCH] Fixed pro icon theming --- .../java/eu/faircode/netguard/ActivityMain.java | 4 +++- .../eu/faircode/netguard/ActivitySettings.java | 4 +++- .../java/eu/faircode/netguard/AdapterRule.java | 4 +++- .../drawable-hdpi/ic_shopping_cart_black_24dp.png | Bin 0 -> 317 bytes .../drawable-mdpi/ic_shopping_cart_black_24dp.png | Bin 0 -> 215 bytes .../ic_shopping_cart_black_24dp.png | Bin 0 -> 375 bytes .../ic_shopping_cart_black_24dp.png | Bin 0 -> 519 bytes .../ic_shopping_cart_black_24dp.png | Bin 0 -> 672 bytes 8 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_shopping_cart_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_shopping_cart_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_shopping_cart_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_shopping_cart_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_shopping_cart_black_24dp.png diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index 816fdb16..1197605c 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -704,8 +704,10 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences private void markPro(MenuItem menu, String sku) { if (sku == null || !IAB.isPurchased(sku, this)) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean dark = prefs.getBoolean("dark_theme", false); SpannableStringBuilder ssb = new SpannableStringBuilder(" " + menu.getTitle()); - ssb.setSpan(new ImageSpan(this, R.drawable.ic_shopping_cart_white_24dp), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + ssb.setSpan(new ImageSpan(this, dark ? R.drawable.ic_shopping_cart_white_24dp : R.drawable.ic_shopping_cart_black_24dp), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); menu.setTitle(ssb); } } diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index f7ebba32..c6063bcd 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -841,8 +841,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere private void markPro(Preference pref, String sku) { if (sku == null || !IAB.isPurchased(sku, this)) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean dark = prefs.getBoolean("dark_theme", false); SpannableStringBuilder ssb = new SpannableStringBuilder(" " + pref.getTitle()); - ssb.setSpan(new ImageSpan(this, R.drawable.ic_shopping_cart_white_24dp), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + ssb.setSpan(new ImageSpan(this, dark ? R.drawable.ic_shopping_cart_white_24dp : R.drawable.ic_shopping_cart_black_24dp), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); pref.setTitle(ssb); } } diff --git a/app/src/main/java/eu/faircode/netguard/AdapterRule.java b/app/src/main/java/eu/faircode/netguard/AdapterRule.java index 3a29c3f1..b985a990 100644 --- a/app/src/main/java/eu/faircode/netguard/AdapterRule.java +++ b/app/src/main/java/eu/faircode/netguard/AdapterRule.java @@ -668,8 +668,10 @@ public class AdapterRule extends RecyclerView.Adapter im private void markPro(MenuItem menu, String sku) { if (sku == null || !IAB.isPurchased(sku, context)) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + boolean dark = prefs.getBoolean("dark_theme", false); SpannableStringBuilder ssb = new SpannableStringBuilder(" " + menu.getTitle()); - ssb.setSpan(new ImageSpan(context, R.drawable.ic_shopping_cart_white_24dp), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + ssb.setSpan(new ImageSpan(context, dark ? R.drawable.ic_shopping_cart_white_24dp : R.drawable.ic_shopping_cart_black_24dp), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); menu.setTitle(ssb); } } diff --git a/app/src/main/res/drawable-hdpi/ic_shopping_cart_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_shopping_cart_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c2422ce0b124988f231d898d9b1202e1814ca395 GIT binary patch literal 317 zcmV-D0mA-?P)08h6JoGk)|Jm7Zg*wy=Lt)1ho5yGGnMn*+D_++iF&(%_!IgctQ{D6R|F5UKk=`kT)^3M#8p~d7z(!Vcvz%B7&o2<`PLWk@;d8 z$weY`fMlV1_>)7Nu^ncS^l@K>PACyR+!iAg+O0ybxa68dE#t*GqH3J$p;T&#J?Yi{ z%N%!fxuv0AZFN4v|8HEo+BWfF8~XJRLld;|)mn_HS6hP{I$Sd&UVGm+tjMe!vofGK P00000NkvXXu0mjfwGfJ_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_shopping_cart_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_shopping_cart_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f56585b31aa8da3422d49a53c35318c956f445c9 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+id7dtgAr*|t3%GyqxA88?syKYW zw@bIZG3vu%;T2MQII?zhPVoxo*rAD-<6TK|tHbe(;yX<@2!TrMbw z$A5#?|C0+kvhj0QnaL=oM* zb0`X5VJuuYcz4b{92mIIQ@{8A!eKxRDbZQz17a!kfkx;9Vva!0k$2Cm@~0Jqe@~>i zLf$=+Vhwp$CPkhbhUzR^VWu6R< zP`5iq2w(yA+8~Gq>UK$vAUdeqHi5KJrmWRNABbp%Jpd6kV&vGrGRp}cw5bz$?JOR- zN#wgTRZ*gv@6OahiDKWKscC%ZwKE-~L>1qismL4Z^-9ruXQD)nn3xJhkKI5R`UQhv V`7{;jV0Hii002ovPDHLkV1nS%oVWl0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_shopping_cart_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_shopping_cart_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f9121f5a372c30995a9af51f62cc793ddb035cbe GIT binary patch literal 519 zcmV+i0{H!jP)xCV(^u?_mn{=F~ZiE?Ym3==!Z50q0arg8`6(hH{4WQ5$?<|I?QkKB8N z!7+X!*AnJ1d5m1UjnN6@*e4EP_6)go6$hu0Q*YUWibf?3w$8U%GZER!Io{y&ulT~-(| zqR#?#`>o9!Z_tj0%=+Kj{)g5G##@69N~vSKHRz#~mW{Utn<%Bke*4c1dWBNz8E*~R zD5bXX)*vuIyILifZw;CZcKu}2erpqce|{wNXcJ7grK?mbzW|>;ux1f-#*zR4002ov JPDHLkV1j>l>YxAs literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shopping_cart_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_shopping_cart_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6edc956f5a65c870ef2a39883c4b39b1df7a0152 GIT binary patch literal 672 zcmV;R0$=@!P)6d<#9m|$TN|8T9&9uAoayHY{mq6i>T%Z5T9Fdg~; zu_yEak3t_Hc7#6QPUr&`83=oTxItj1Q7Zb)JvPyS11L59=xoCOC^b#cfx{>@Rp`J{ z-i18?PNI}_myRsw6G}mg4AP-9CBYGr8T6SRyx5OSI)N7%ULu2@k->{&$e=m;@nVI^7uiGl@Z>yl z*gPM&$v(X4<5$yz-v$CwKn;x$kOAhK{(M_QKqgQ_=LpCy)X+zA1mqfO=qN#%L;v)e z3?XTH1D9DvP-@6)&dr8CpcwjqJoT^#Kq>SAIVQs%069w3k(bQmDNv>w>VPPUwo_!5 z8Z~Aqk~g?#D93oi$7r1rIfHv9ay&&eH%ZRmo`I{VMMdZL3~Z&2T2v=*aL=(Ts7(cf zdyc(AZ7LhwbL=N-Q`P)l9MJwHpE0=S*a&LVsKGtQwy=m=RAg7nGqjB{%2cT`!zhDE-ix9rilV