From 2ce23f6868a1205996955f7cbbbb004246ebf9b1 Mon Sep 17 00:00:00 2001 From: bws9000 Date: Tue, 7 Jul 2020 10:55:56 -0400 Subject: [PATCH] Redesign filter dialog --- .../antennapod/dialog/FilterDialog.java | 7 ++- app/src/main/res/layout/filter_dialog_row.xml | 6 +- .../antennapod/core/feed/FeedItemFilter.java | 7 +-- .../res/color/filter_dialog_button_text.xml | 5 ++ .../main/res/color/filter_dialog_close.xml | 5 ++ .../main/res/drawable-hdpi/x_custom_off.png | Bin 1062 -> 0 bytes .../main/res/drawable-hdpi/x_custom_on.png | Bin 1093 -> 0 bytes .../drawable/filter_dialog_button_clear.xml | 5 -- ...ter_close_dark.xml => ic_filter_close.xml} | 7 +-- .../res/drawable/ic_filter_close_light.xml | 55 ------------------ core/src/main/res/values/attrs.xml | 4 +- core/src/main/res/values/colors.xml | 3 + core/src/main/res/values/styles.xml | 22 ++++--- 13 files changed, 42 insertions(+), 84 deletions(-) create mode 100644 core/src/main/res/color/filter_dialog_button_text.xml create mode 100644 core/src/main/res/color/filter_dialog_close.xml delete mode 100644 core/src/main/res/drawable-hdpi/x_custom_off.png delete mode 100644 core/src/main/res/drawable-hdpi/x_custom_on.png delete mode 100644 core/src/main/res/drawable/filter_dialog_button_clear.xml rename core/src/main/res/drawable/{ic_filter_close_dark.xml => ic_filter_close.xml} (84%) delete mode 100644 core/src/main/res/drawable/ic_filter_close_light.xml diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java index 82bdfaafe..a5d024545 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/FilterDialog.java @@ -50,9 +50,7 @@ public abstract class FilterDialog { for (String filterId : filterValues) { if (!TextUtils.isEmpty(filterId)) { - if (layout.findViewWithTag(filterId) != null) { - ((RadioButton) layout.findViewWithTag(filterId)).setChecked(true); - } + ((RadioButton) layout.findViewWithTag(filterId)).setChecked(true); } } @@ -67,6 +65,9 @@ public abstract class FilterDialog { filterValues.add((String) group.getCheckedButton().getTag()); } } + if (filterValues.contains(null)) { + filterValues.clear(); + } updateFilter(filterValues); }); diff --git a/app/src/main/res/layout/filter_dialog_row.xml b/app/src/main/res/layout/filter_dialog_row.xml index 5a92ae8d9..ff26a58cb 100644 --- a/app/src/main/res/layout/filter_dialog_row.xml +++ b/app/src/main/res/layout/filter_dialog_row.xml @@ -30,7 +30,7 @@ android:button="@android:color/transparent" android:checked="false" android:gravity="center" - android:textColor="@drawable/filter_dialog_button_text_light" /> + android:textColor="@color/filter_dialog_button_text" /> + android:textColor="@color/filter_dialog_button_text" /> @@ -49,7 +49,7 @@ android:id="@+id/filter_dialog_clear" android:layout_width="48dp" android:layout_height="48dp" - android:background="?attr/filter_dialog_button_clear" + android:background="@drawable/ic_filter_close" android:button="@android:color/transparent" android:checked="true" /> diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java index 7c707da38..d34e23506 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java @@ -35,10 +35,9 @@ public class FeedItemFilter { public FeedItemFilter(String[] properties) { this.mProperties = properties; - Log.d("***xxx***", Arrays.toString(properties)); for (String property : properties) { // see R.arrays.feed_filter_values - switch ("" + property) { + switch (property) { case "unplayed": showUnplayed = true; break; @@ -76,7 +75,7 @@ public class FeedItemFilter { showNotFavorite = true; break; default: - return; + break; } } } @@ -85,7 +84,7 @@ public class FeedItemFilter { * Run a list of feed items through the filter. */ public List filter(List items) { - if (mProperties.length == 0) return items; + if(mProperties.length == 0) return items; List result = new ArrayList<>(); diff --git a/core/src/main/res/color/filter_dialog_button_text.xml b/core/src/main/res/color/filter_dialog_button_text.xml new file mode 100644 index 000000000..674365424 --- /dev/null +++ b/core/src/main/res/color/filter_dialog_button_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/src/main/res/color/filter_dialog_close.xml b/core/src/main/res/color/filter_dialog_close.xml new file mode 100644 index 000000000..1b059c818 --- /dev/null +++ b/core/src/main/res/color/filter_dialog_close.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/src/main/res/drawable-hdpi/x_custom_off.png b/core/src/main/res/drawable-hdpi/x_custom_off.png deleted file mode 100644 index 2450d2e89eed9bd7de795a75e99dc1f24412b23c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1062 zcmV+>1ljwEP)-z3xW^Qq$na*P<&`q@P-u|#1qkIwNa-08y1^$*|SelBb^U6?7h#LHS?b{vu4dY z1OkCTAP@)y0)apv5D4@FN_>XU*w~oFtPGf<>vLc@P@&IW0FQxNz%^ZO3puQ>ulM?< z%Dk-e;|5*}R0D%@Sbm~wB2WW#0B3-c65K6xm#8XWnFj2`KwuH@HP8&S^afF-zzY33 zmcM{sf$P8nAOrLP1_MKZN?;Z+Ol{nk;pW&RU=Pssp+q@B-vcvZV)g^SWf|BT;GwSH zfrG$IUt^))oFs6uc#^J zS9%hgE{;pUA=zvK`e*SmTkG*pU~86)qE)_;AJ?ZBX+%ZjigL&F*%)AbEEW3#SgGv6 z1&8NZ+IPh^;i;Zu^cFSV+~3Gy66Ugqb&7~_ zs^l9*L3j4*QBiI%r_J-XCLu*Roy!3JP;#1$=(E0N?~3RrpAl!16lUV2Ir*M6#T9pA zty6|jt}LNRIpCW-J}xLC4$}I|Xxi18Q*b8Xp4Kg*UZ{@Hpl3G)pXoew&cn|ob6=v9 zw4Kg-(^i<$ZoaK5ZAH{*DwU`3)n9FE%)2wiRF;a#DBL%B(L8?%?AAh0QY0;vZIjwY zT$JzB6jM#=Qq{+n$cAX6U1CaP_f0P6*3c+z%(g@parQ%($WZ6M05_FAM3Kyio3ASg z8T~rFqL>-cqT|FoRe}a2Z1-I2=R|KTJEK7z29B6N2qxtCgP_gl4}$+afj}S-2m}Iw gKp+qZ1U^21_c&zC|81?Z!2kdN07*qoM6N<$g0kH8y#N3J diff --git a/core/src/main/res/drawable-hdpi/x_custom_on.png b/core/src/main/res/drawable-hdpi/x_custom_on.png deleted file mode 100644 index 07525f9253edfb493b78f3059ac61597bdb319de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1093 zcmV-L1iJf)P)5 z_FfV%5Nlzze`rz(QcI-i-s-fqvi|a2B{* zOkrDFo7XQj%}cs4ZsM&#Gq4~*vQF32Knrja=mz%4;Ic5aOnRDtA>iEt2IZqheTJlC zQW#YQ^ZURoL>8mw#wO4!ulHZpNvLnDbVYQTP~b%tquk)NYX1Uk0`BX6 zIq;;MLm{dq=dPKOyDwcMy06t(6*p?S;!s4pmQTb|1=axt-6TE*E&(3{6Gq1A+F|aS zHD*PPYBX`^=h$*_90PVr=D6H=oK4z~Kgr8Y#NPKxH`3$AthiAThZDTqhw^I96Yh_t zV$TAf1Gj;ffm?a{=cGHr#X2v1jaq5i=M!Yy-q;9yFR%8#p1XZ^RPoJa4_6C}V|Cjx zQ{fwYA2aR20&@QVYk>>ETfjBoO)aPGz?mZBSlvrJ=ji>V=9u=)BC@~Auz!KCfhT~k z6ts&mmM~^2%9YS2;g(>Z-rduFt2n+!-8Su-6!M#aSAoB^)Ll;aP>Oyw)3;-$!q=!_ z({3mt`@C{E7ki$OM|8pVn-s;V)osVDh*1Nk{agXL#ri7F(`^8Llt=7WY}#359IN{W z&pCP<)o0pG3AK;g*e8Mcz&mOqkLWV+-+=ezM3UxY3r0I;DzX?A15S<3lw zodiYsnOlOtD^vKwL(ehOc0cZCvE|&7^@J&F@a@&nmYu)}V0H#wv(&f6JnN1nwO*8x zQEXF!8nFtv47`?7Zg(bZ4d%qjHKl`^+=99}epHt3##A!>V+v)o#?gVae8; z{`*QjNumrVv^iC$-zj^DJXyV};`Wq!M)h?vFF8xO657Km<##0%eo5R?pQYt8h%%q0 zkLw8e1I4OF^9R8^$^2pdAn4QO9ftyeKp+qZ1OkCTAP@)yCOyFaN72cooI-*O00000 LNkvXXu0mjf4#5+W diff --git a/core/src/main/res/drawable/filter_dialog_button_clear.xml b/core/src/main/res/drawable/filter_dialog_button_clear.xml deleted file mode 100644 index 33e3888b9..000000000 --- a/core/src/main/res/drawable/filter_dialog_button_clear.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_filter_close_dark.xml b/core/src/main/res/drawable/ic_filter_close.xml similarity index 84% rename from core/src/main/res/drawable/ic_filter_close_dark.xml rename to core/src/main/res/drawable/ic_filter_close.xml index fb2c5cf81..0cfbbf3f5 100644 --- a/core/src/main/res/drawable/ic_filter_close_dark.xml +++ b/core/src/main/res/drawable/ic_filter_close.xml @@ -10,9 +10,8 @@ + android:color="?attr/filter_dialog_close" /> - @@ -29,7 +28,7 @@ + android:color="?attr/filter_dialog_close" /> @@ -47,7 +46,7 @@ + android:color="?attr/filter_dialog_close" /> diff --git a/core/src/main/res/drawable/ic_filter_close_light.xml b/core/src/main/res/drawable/ic_filter_close_light.xml deleted file mode 100644 index 63e9a29b9..000000000 --- a/core/src/main/res/drawable/ic_filter_close_light.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 998b086c6..5b80840ac 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -1,7 +1,9 @@ + + + - diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 148919db7..bd542a05c 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -40,4 +40,7 @@ #757575 #46C6C6C6 + #FFFFFF + #000000 + diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 1aaa67e2d..adeb7573a 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -9,9 +9,6 @@ @drawable/filter_dialog_button_background_light - @drawable/filter_dialog_button_clear - @color/dialog_filter_clear_active_light - @color/dialog_filter_clear_inactive_light @color/accent_light @color/accent_light @color/accent_light @@ -79,6 +76,12 @@ @drawable/ic_key_black @drawable/ic_volume_adaption_black @drawable/scrollbar_thumb_light + + @color/dialog_filter_text_active + @color/dialog_filter_text_inactive + @color/dialog_filter_clear_active_light + @color/dialog_filter_clear_inactive_light + @color/filter_dialog_close