From e4afee101429b0bcb3fcf0fa1e93e5e729c5d5e2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Jun 2015 14:31:11 +0300 Subject: [PATCH] add separate icon for unread only switchbox --- .../java/org/fox/ttrss/BaseFeedlistFragment.java | 9 +++++++-- .../main/res/drawable-hdpi/ic_filter_variant.png | Bin 0 -> 209 bytes .../res/drawable-hdpi/ic_filter_variant_dark.png | Bin 0 -> 211 bytes .../main/res/drawable-xhdpi/ic_filter_variant.png | Bin 0 -> 293 bytes .../res/drawable-xhdpi/ic_filter_variant_dark.png | Bin 0 -> 305 bytes .../res/drawable-xxhdpi/ic_filter_variant.png | Bin 0 -> 268 bytes .../drawable-xxhdpi/ic_filter_variant_dark.png | Bin 0 -> 270 bytes .../res/drawable-xxxhdpi/ic_filter_variant.png | Bin 0 -> 375 bytes .../drawable-xxxhdpi/ic_filter_variant_dark.png | Bin 0 -> 386 bytes org.fox.ttrss/src/main/res/values/attrs.xml | 1 + org.fox.ttrss/src/main/res/values/style.xml | 2 ++ 11 files changed, 10 insertions(+), 2 deletions(-) create mode 100755 org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png create mode 100755 org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png create mode 100755 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png create mode 100755 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png create mode 100755 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png create mode 100755 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png create mode 100755 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png create mode 100755 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java index 4a4585b6..9f9afe73 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java @@ -64,6 +64,11 @@ public abstract class BaseFeedlistFragment extends Fragment { TextView text = (TextView) footer.findViewById(R.id.title); text.setText(R.string.unread_only); + ImageView icon = (ImageView) footer.findViewById(R.id.icon); + TypedValue tv = new TypedValue(); + getActivity().getTheme().resolveAttribute(R.attr.ic_filter_variant, tv, true); + icon.setImageResource(tv.resourceId); + final SwitchCompat rowSwitch = (SwitchCompat) footer.findViewById(R.id.row_switch); rowSwitch.setChecked(activity.getUnreadOnly()); @@ -88,8 +93,8 @@ public abstract class BaseFeedlistFragment extends Fragment { text = (TextView) footer.findViewById(R.id.title); text.setText(R.string.preferences); - ImageView icon = (ImageView) footer.findViewById(R.id.icon); - TypedValue tv = new TypedValue(); + icon = (ImageView) footer.findViewById(R.id.icon); + tv = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.ic_settings, tv, true); icon.setImageResource(tv.resourceId); diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png new file mode 100755 index 0000000000000000000000000000000000000000..6e25a020d059f5872f968824a97393433526e3c0 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&m z?E%JaC$sH9f@KAc=|CE+pW)oQo^T*1#?!?yB;(%Os|Ps`DDXH0UY@z@Kg->d^SGx9 zcnN;oyI9D>Z@(!+L+#NQi@(>MjeEB-f`Or-GSBb}kC<2IbC4SuJYD@<);T3K0RZJrM8g08 literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png new file mode 100755 index 0000000000000000000000000000000000000000..428b096863b9985cc74d3848eef6d0ac547bd8cc GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&m z?E%JaC$sH9f@KAc=|CE+pW)oQo^T*1&eO#)B;(%Os|Ps`DDXH0zV*<%I&;?){ogYu>M5nRHp7l_4SC^jF5(*qf(qzur5){kwAY#`Q7`8@5|ne<)wL_>tSR_YKSp s-^^kkO$=O_?rpuPhFyk%!C{_so;r`%-&f54fHpCBy85}Sb4q9e04M}Rd;kCd literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png new file mode 100755 index 0000000000000000000000000000000000000000..21e4f18ad26ed7c2d5f609c8f45b5e9f01db2f2e GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE(}A=D7{B`bBLT?R;OXKRQgQ3;^@XBLjyx?7Is26~m>L(bbU7&q zPH9=dqT+hN^+m(kaXfkQ0`D-S@;Bv300#cTi+%vBJ6IsSk&ahqeA0z*FprQxr zm-`p4I&;VKmiX~_!H;pu*M-^xt~y@YYEeD0Bwjh>ckm3RJB)X3iG%E9VEFZuL8VBb TYo6DlMIf%HtDnm{r-UW|x6xus literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png new file mode 100755 index 0000000000000000000000000000000000000000..c2f6257ac232a905213de2bb405dd74daa9af178 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE(}A=D7{B`bBLT?RRLDnI+)BM58 zeJl(NKTdu~UlHz=8J}(Yo*g`c6<4f8In`n7i|Ok-P6_2Wt~$(697^yZg>Cy literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png new file mode 100755 index 0000000000000000000000000000000000000000..929029e86c228152a70aa6b28b8fa3a114c64695 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE(}8pX7+2iB`31^53&Lb8tRS1^v_tve_g!)ro`i&MgIcrf4pPq;1m#6P;>BUm;qK)F!8Bx z#ntusCss?p*V@0(kTHqr2viMNKIX|6--_$+meqV)w)=E`21pxB4a628`5`fXc@~eJ SRN(}8pX7+2iB`31FMGaQgQ3;&C|Sx6&P3@)m1NsWO)T&nIa{y z(R}_)V-Jt&$Fl4|g<$X@J8!l4F^TiPF3!(6_cOw>e!cvk_beTp0>TPv4n7Stz={ec zKJ~4*x;_8IYU%e{`xhEACNUj>ssYQ#Jo(~VasA!0ns3W?pU%$!X@jYO*a9R!r0L7w V=h54ed|*FF%+uA+Wt~$(69A!yQO*DW literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png new file mode 100755 index 0000000000000000000000000000000000000000..b26703c086ff720fb7ad75044346fad973c7a7cc GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE(}8pY7#ln^oW;Pv$mHqb7*cWT?d^@e430dm2Td2rFfn;8;P6_g z(zSqviOb2z@Z-Ca>i>M|R&V~|RILltiwqvT%lh8(}8pY7#ln^oW;Pv$m{9i7*cWT?d^lU%!UGOf%=OkdW0lcEts)n zSpbjh1FlP4M(O9uOtk-ff0tdkF?>U7+0t^ z6fkk9qY~eDJ?we^N)f8H!G2mi+uB!q_lMtKcu8V$$^4|_PA67ne`W2`wS60vs;V=G z;Si?+8gWPRA4^?WJk0igGe0d)Jb$73f5zIqxpv2#NVIJY*3-C1A$D=z^mCee1=}+{k7Ig%*RStDnm{r-UW|mh*ql literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index dd208c91..83b06774 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -37,4 +37,5 @@ + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index a3fe17f7..ffb54b1f 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -45,6 +45,7 @@ @drawable/ic_share_dark @drawable/ic_keyboard_backspace_dark @drawable/ic_settings_dark + @drawable/ic_filter_variant_dark