From c81545503a5040ac742a019caeb7950210945dd6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 15 Oct 2013 19:34:45 +0400 Subject: [PATCH] update published/unpublished icons --- res/drawable-hdpi/ic_action_overflow.png | Bin 2935 -> 2863 bytes res/drawable-hdpi/ic_published.png | Bin 0 -> 1248 bytes res/drawable-hdpi/ic_rss.png | Bin 1709 -> 0 bytes res/drawable-hdpi/ic_rss_bw.png | Bin 1264 -> 0 bytes res/drawable-hdpi/ic_star_empty.png | Bin 0 -> 1103 bytes res/drawable-hdpi/ic_star_full.png | Bin 0 -> 744 bytes res/drawable-hdpi/ic_unpublished.png | Bin 0 -> 1069 bytes res/drawable/s_headline_published.svg | 905 ++++++++++++++++++ res/drawable/s_headline_unpublished.svg | 193 ++++ res/drawable/s_marked_bw.svg | 93 ++ res/drawable/s_marked_bw_full.svg | 93 ++ res/layout/feeds_row.xml | 4 +- res/layout/feeds_row_selected.xml | 4 +- res/layout/headlines_row.xml | 9 +- res/layout/headlines_row_selected.xml | 9 +- res/layout/headlines_row_selected_unread.xml | 9 +- res/layout/headlines_row_unread.xml | 9 +- src/org/fox/ttrss/FeedCategoriesFragment.java | 2 +- src/org/fox/ttrss/FeedsFragment.java | 6 +- src/org/fox/ttrss/HeadlinesFragment.java | 4 +- .../OfflineFeedCategoriesFragment.java | 2 +- .../ttrss/offline/OfflineFeedsFragment.java | 6 +- .../offline/OfflineHeadlinesFragment.java | 4 +- 23 files changed, 1322 insertions(+), 30 deletions(-) create mode 100644 res/drawable-hdpi/ic_published.png delete mode 100644 res/drawable-hdpi/ic_rss.png delete mode 100644 res/drawable-hdpi/ic_rss_bw.png create mode 100644 res/drawable-hdpi/ic_star_empty.png create mode 100644 res/drawable-hdpi/ic_star_full.png create mode 100644 res/drawable-hdpi/ic_unpublished.png create mode 100644 res/drawable/s_headline_published.svg create mode 100644 res/drawable/s_headline_unpublished.svg create mode 100644 res/drawable/s_marked_bw.svg create mode 100644 res/drawable/s_marked_bw_full.svg diff --git a/res/drawable-hdpi/ic_action_overflow.png b/res/drawable-hdpi/ic_action_overflow.png index 0612f431e0cd4200098c64763babe8fe9e732fd9..5845b6487658f5068e3c8905817b1a6f4f8d2ebf 100644 GIT binary patch delta 137 zcmew^wq8uJGr-TCmrII^fq{Y7)59eQNQ2li9Be=`Vy~X{M#Ua3E&&DxZUM%%%6m&E zZ|BnVxAJsx46*P}W@yw5UN+}o`@t>;hS@4cZCcVRxmNOTh-~j!c*;#Q>3Bfu7KR&Z koR0;hF6P>p%mxGuJH4L?%t<|{Lp;3SPC3ZQpvc3bdqU`4w)C|k+Z!L=I>{+&NC?Ou=R2eSrb+6wUUCoL z{noq3&K15QnwW?;T=HQ8-WZ5i#u&lGc;ST_H8F7}WL_AIAh1lC2F)1X+ZZ41)^*Tz z?b>tB`*?wz^=va8kn!C0-@gCf^MB9N_q=2n1^^(QNKo$Z#_bTQlYrIC6vjgo5hocK zgc2wGyL!80hQRx8fl z#uEvm?BR_&K)ipcV6I|1q(P`oFgcnq+WdOg-UiN1nw*_5IUO(9!za^fd@%RWK%qJ{ z0#ekt`tLs42t8e>ol_;yxN&)93l=bTa z`YWHbf*G7ivy^$m)GgC<)tu)K;EDxDjWQA+1d)N<@qX3UCna(rU@|A$f-06SyMK2RL&-ictt2C z?V;o8`KbT=OKpK;7OL~DpHh=@S58o&6?h{qud?m7w{Bs5Bn;FFGNcGfZsT zuuVnYpoHd~eU?NJ(bk~0^0`WNp=W|^lhtV7l&oD7pz=E3z28t(gV#QPG_@!otejHU z&t&WiKTTSHeU;$U(6m^#wwyeE2TZ;S4+SEcJ#_pIz~EbdXSDVm5s;+2yAktp@=}Ix zj}+ztOKz!s<(G8f+t&xw@JUz4viZe`YRs^0A~N62a58uSw`Z0RV-*&*MRaA#^u76GyWY8b znFvNS0I+`jV3ad)=lrBVSl2ps#sC1h2}_Ngo0^U2ld@@3Xi-2<*Sn2!)s`>?qF&kl zYD{}#XDtAz!n87v9UKC)lZ1?R$J8Dr;Fjy(=z*0i*U4&zX!StxF`u_qao#FYlzGJ%p0000< KMNUMnLSTZo;9Ld( literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_rss.png b/res/drawable-hdpi/ic_rss.png deleted file mode 100644 index bd03379a1434dc55653b7a70870ff6de0c47768e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1709 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 asQ(`j?YurbETyIZ0000_`&; diff --git a/res/drawable-hdpi/ic_star_empty.png b/res/drawable-hdpi/ic_star_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..057c6c664d36e97a122ee0359e75328c43959b28 GIT binary patch literal 1103 zcmV-V1hD&wP)yF=}=Uluj$G zR4T_sRF)SIL@V}L0keFs(Q9mDh#+cIh`1nM#f$#ezRV_r1zXR*QnyRiFW7e#->yG2BkB^Vv z14wwD_aX2$@VJPes)$JIzr%UX-)dA|Xl%IxfH zcQTp$Tvbm-9^Z(_HDJwJd$W0T2Sv47bt7;ZNUQ28;3WVNsWlpn5m8l^mX?zBdi^qR z3b<{pJy|Fe*5g3hMY&uaG{)3`0TKB+l}e3_j*d1A!06~`!*$&e;3_a+j9Kx0KmC7U zzVD}vF)P3TaBUX`O}lh#Y;4&w7vKz)0A z`-iQH@2Le?!0}uqkD!}~wd~YI= zxB$EZB%{8!JkKiyK`=8hG4W>*1gpjvfVRN4o5u6J4d4lDZ90)ioVM0p1RfO;1wM;p zZ$`hYKa4RS2SISz7_$a!DuVpU?jo>7Fyje4?ta zv}#rLP(GjktJQnoDcxPaD2@QvfeYDecBNStfnSa8sWZUwW)I-oSU{pR5RsdzI-Seq zmfPrn`xoL9p69(GA|I*hP~`C+;J%-Qs`iS=xl}5ZISAGQUQVS_84)?Bs=fPZ{sAIz VxK=?=v#9_8002ovPDHLkV1nv<|HA+P literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_star_full.png b/res/drawable-hdpi/ic_star_full.png new file mode 100644 index 0000000000000000000000000000000000000000..2ad21203603a65ce0408f470eb814a7ea87d4736 GIT binary patch literal 744 zcmVP)4m!g`G$Cgq>%zkz=!aw|nMZ zHT!1X_nU8+VIM^VMWfMZ+ya1ly}nzt_FQ2a0FqDQVPPPPIt+qfn&cM%5Rn<*_xFm_ zt3osYB%h^?bJrJf7z9C;R#fMNwHP zRW`;S2>?i9zy^N-XaP79k(N^G$QaYoTDNMo+HU}05CqQwJOXfepw<72 zp8#H|Fbr2o9*!6Wl80d!u2MwMY&J{ncKa=W+arQ~vTb|LahziX0FL7vTb4BkU}prp zk0&r7aZ5KhH!pNLoi`#fdln>;A8gyce*yy%*W7j8&=@lh;N2PUcE-lW?)AcejCa^< zHqW=)?JWRzhlIViENk9%-7qHGdS0C(a(^(BDmUJU@Ba{&<_ zC&?covQn?tw=&iN_}386G#ZTuBwvWgjacIpF!e}9WSr!pZQGSWumpI^w(SbZMG+ZK aTk{uelJkAD(+%?g0000g_{tP9TE8hz;vlp znlw$503fDm!m_NQh-eWxcr%c7;Ikxc$8r8vzVFL+!T>--4vL8OeP6`$ycYpj+Xc&r zV*nV+D6cA|MoAWfASf!O_5e5}B71KEaL9-UWK~0QWps3OHtSg~m-iJ4g&`4nUPSh7 zg+_AF*yuF6u6q%{#o^)MPX`7DjskdHM0RfmC?dPmW~*$s+mY6Ks@v@z2hfV5DB2X% z^Sqz4N|OHoSP+qU0OxzX-nSDI6W8(*SeA82Db)mU*Oq}f1(4)#09uaY{F(!OKtw*= z$iH0!B)J6OCjcgZheYJgjQtzKFg~c)>wO)U%jG?VLg9>3>Ynw0dH=AhwSG@){Ytmn zJraiDTO`ksyuO-5o(qEDOr=tJJRRh^?z~d!U6R3OfveJPw}WQ0`J>jlM)D1k*J9{^ zQtBhywx3P=HyVv!MC8<#foX9Z=lt^W@(GgXV(4uE^vKA_{#NzIYPEV4Kpg-`E(SsHvg^9@iQTfS!%C^sdBD65cPOP!h=?O1Q?_k? zY}@vIX@^Fm@fFE0;!f{14CDQ@-Eo|mc&ax9>=O|=0N`x3T74m{Us+i>Me=g&^Gvl` zeL8KAqUiH20po;s0I1e#wd09ye0;nIpq6YJl5b{WzR%l2xj>Q&Bu_?BbPPZ%-aH`r zcD-J|Kk?IA&nczO#(+mFmC7TD&2gN6MP$uqHEsYr={U}J@$(bQvU(!&4uBm&5RCf1 z|5|b~gkkt)p-^}U0F+Wk09;6Q`2&Eb*6onw(&FOcOj;L);n%4o2U@Mx!^ykZY+fLF zDSr0-M*vr{`PTqNWM{Ehd@QXq45P2gFbwziN3C|%H_geS=mV1MWR+1AmBz-#_5why zRvQHHY9>(@xDXe6x9hsMrwa8maUJnI?=*nJS!ldFuZYNlIkqJLf2Q8Ml~PG}b0k+{ zy(p!gOoh%E0H*VRa{caD1B-1tks5~di2~q> + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/s_headline_unpublished.svg b/res/drawable/s_headline_unpublished.svg new file mode 100644 index 00000000..3bcbf2a6 --- /dev/null +++ b/res/drawable/s_headline_unpublished.svg @@ -0,0 +1,193 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/s_marked_bw.svg b/res/drawable/s_marked_bw.svg new file mode 100644 index 00000000..df88f4a5 --- /dev/null +++ b/res/drawable/s_marked_bw.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/drawable/s_marked_bw_full.svg b/res/drawable/s_marked_bw_full.svg new file mode 100644 index 00000000..3ccf34c1 --- /dev/null +++ b/res/drawable/s_marked_bw_full.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml index 35cef732..38b854ab 100644 --- a/res/layout/feeds_row.xml +++ b/res/layout/feeds_row.xml @@ -18,7 +18,7 @@ android:layout_height="20dp" android:layout_weight="0" android:scaleType="fitXY" - android:src="@drawable/ic_rss_bw" /> + android:src="@drawable/ic_unpublished" /> diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml index 0d145b23..568f9adb 100644 --- a/res/layout/feeds_row_selected.xml +++ b/res/layout/feeds_row_selected.xml @@ -18,7 +18,7 @@ android:layout_height="20dp" android:layout_weight="0" android:scaleType="fitXY" - android:src="@drawable/ic_rss_bw" /> + android:src="@drawable/ic_unpublished" /> diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 92b0d3cc..92fba271 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -113,8 +113,8 @@ android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:paddingRight="6dp" - android:src="@android:drawable/star_off" /> + android:paddingRight="8dp" + android:src="@drawable/ic_star_empty" /> + android:paddingRight="8dp" + android:src="@drawable/ic_published" /> diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index c88c0a83..4ac82d02 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -108,8 +108,8 @@ android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:paddingRight="6dp" - android:src="@android:drawable/star_off" /> + android:paddingRight="8dp" + android:src="@drawable/ic_star_empty" /> + android:paddingRight="8dp" + android:src="@drawable/ic_published" /> diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml index 764571d4..25574784 100644 --- a/res/layout/headlines_row_selected_unread.xml +++ b/res/layout/headlines_row_selected_unread.xml @@ -109,8 +109,8 @@ android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:paddingRight="6dp" - android:src="@android:drawable/star_off" /> + android:paddingRight="8dp" + android:src="@drawable/ic_star_empty" /> + android:paddingRight="8dp" + android:src="@drawable/ic_published" /> diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 141b1736..2ae08a91 100644 --- a/res/layout/headlines_row_unread.xml +++ b/res/layout/headlines_row_unread.xml @@ -109,8 +109,8 @@ android:layout_height="wrap_content" android:layout_weight="0" android:clickable="true" - android:paddingRight="6dp" - android:src="@android:drawable/star_off" /> + android:paddingRight="8dp" + android:src="@drawable/ic_star_empty" /> + android:paddingRight="8dp" + android:src="@drawable/ic_unpublished" /> diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index f2c6d522..addfc8e2 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -439,7 +439,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe ImageView icon = (ImageView)v.findViewById(R.id.icon); if (icon != null) { - icon.setImageResource(cat.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(cat.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index cc851cd4..19aac645 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -556,14 +556,14 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh icon.setImageBitmap(bmpOrig); } } else { - icon.setImageResource(feed.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } } catch (NullPointerException e) { - icon.setImageResource(feed.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } } else { - icon.setImageResource(feed.unread > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } } diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 0b5bc1ca..f5e62e5b 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -685,7 +685,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, ImageView marked = (ImageView)v.findViewById(R.id.marked); if (marked != null) { - marked.setImageResource(article.marked ? android.R.drawable.star_on : android.R.drawable.star_off); + marked.setImageResource(article.marked ? R.drawable.ic_star_full : R.drawable.ic_star_empty); marked.setOnClickListener(new OnClickListener() { @@ -702,7 +702,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, ImageView published = (ImageView)v.findViewById(R.id.published); if (published != null) { - published.setImageResource(article.published ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + published.setImageResource(article.published ? R.drawable.ic_published : R.drawable.ic_unpublished); published.setOnClickListener(new OnClickListener() { diff --git a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index 682cf3e6..8fde8176 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -282,7 +282,7 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli ImageView icon = (ImageView)v.findViewById(R.id.icon); if (icon != null) { - icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java index 69a07595..8c04d0cd 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -307,14 +307,14 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene icon.setImageBitmap(bmpOrig); } } else { - icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } } catch (NullPointerException e) { - icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } } else { - icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished); } } diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index afa08b40..eae05b8b 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -525,7 +525,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis ImageView marked = (ImageView)v.findViewById(R.id.marked); if (marked != null) { - marked.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? android.R.drawable.star_on : android.R.drawable.star_off); + marked.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_full : R.drawable.ic_star_empty); marked.setOnClickListener(new OnClickListener() { @@ -546,7 +546,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis ImageView published = (ImageView)v.findViewById(R.id.published); if (published != null) { - published.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_rss : R.drawable.ic_rss_bw); + published.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_published : R.drawable.ic_unpublished); published.setOnClickListener(new OnClickListener() {