diff options
author | Andrew Dolgov <[email protected]> | 2015-06-01 20:10:12 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-01 20:10:12 +0400 |
commit | 3bb2daaf0e368d2bf5e9e797c1c1d308c9f32ca2 (patch) | |
tree | aad16ef418f7db0713509f8ef3b4a2f63549d6ab /org.fox.ttrss/src/main/java | |
parent | 2c615e430d6ccffd46cf3769a8b7c681b3cdf419 (diff) |
use proper marked/published icons on dark theme headline views
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 21 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 30 |
2 files changed, 30 insertions, 21 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 4a8f7ece..16acae05 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -815,28 +815,31 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } } - - - + if (holder.markedView != null) { - holder.markedView.setImageResource(article.marked ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark); + TypedValue tv = new TypedValue(); + m_activity.getTheme().resolveAttribute(article.marked ? R.attr.ic_star : R.attr.ic_star_outline, tv, true); + + holder.markedView.setImageResource(tv.resourceId); holder.markedView.setOnClickListener(new OnClickListener() { - + @Override public void onClick(View v) { article.marked = !article.marked; m_adapter.notifyDataSetChanged(); - + m_activity.saveArticleMarked(article); } }); } - - + if (holder.publishedView != null) { - holder.publishedView.setImageResource(article.published ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark); + TypedValue tv = new TypedValue(); + m_activity.getTheme().resolveAttribute(article.published ? R.attr.ic_checkbox_marked : R.attr.ic_rss_box, tv, true); + + holder.publishedView.setImageResource(tv.resourceId); holder.publishedView.setOnClickListener(new OnClickListener() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index dcc05097..a32a55a5 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -655,26 +655,32 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis } if (holder.markedView != null) { - holder.markedView.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark); + TypedValue tv = new TypedValue(); + m_activity.getTheme().resolveAttribute(article.getInt(article.getColumnIndex("marked")) == 1 ? R.attr.ic_star : R.attr.ic_star_outline, tv, true); + + holder.markedView.setImageResource(tv.resourceId); holder.markedView.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - SQLiteStatement stmtUpdate = m_activity.getWritableDb().compileStatement("UPDATE articles SET modified = 1, marked = NOT marked " + - "WHERE " + BaseColumns._ID + " = ?"); + @Override + public void onClick(View v) { + SQLiteStatement stmtUpdate = m_activity.getWritableDb().compileStatement("UPDATE articles SET modified = 1, marked = NOT marked " + + "WHERE " + BaseColumns._ID + " = ?"); - stmtUpdate.bindLong(1, articleId); - stmtUpdate.execute(); - stmtUpdate.close(); + stmtUpdate.bindLong(1, articleId); + stmtUpdate.execute(); + stmtUpdate.close(); - refresh(); - } - }); + refresh(); + } + }); } if (holder.publishedView != null) { - holder.publishedView.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark); + TypedValue tv = new TypedValue(); + m_activity.getTheme().resolveAttribute(article.getInt(article.getColumnIndex("published")) == 1 ? R.attr.ic_checkbox_marked : R.attr.ic_rss_box, tv, true); + + holder.publishedView.setImageResource(tv.resourceId); holder.publishedView.setOnClickListener(new OnClickListener() { |