diff options
Diffstat (limited to 'org.fox.ttrss/src/main')
8 files changed, 34 insertions, 0 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 16acae05..b93a34b2 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 @@ -816,11 +816,19 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } + TypedValue tvAccent = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + if (holder.markedView != null) { 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); + + if (article.marked) + holder.markedView.setColorFilter(tvAccent.data); + else + holder.markedView.setColorFilter(null); holder.markedView.setOnClickListener(new OnClickListener() { @@ -840,6 +848,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_activity.getTheme().resolveAttribute(article.published ? R.attr.ic_checkbox_marked : R.attr.ic_rss_box, tv, true); holder.publishedView.setImageResource(tv.resourceId); + + if (article.published) + holder.publishedView.setColorFilter(tvAccent.data); + else + holder.publishedView.setColorFilter(null); holder.publishedView.setOnClickListener(new OnClickListener() { diff --git a/org.fox.ttrss/src/main/res/drawable-v21/ripple.xml b/org.fox.ttrss/src/main/res/drawable-v21/ripple.xml new file mode 100644 index 00000000..015979ba --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-v21/ripple.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<ripple + xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight" />
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/drawable/ripple.xml b/org.fox.ttrss/src/main/res/drawable/ripple.xml new file mode 100644 index 00000000..1999ca08 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/ripple.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- no ripple support before api21 so its a dummy transparent bg --> +<shape + xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> + + <solid android:color="@android:color/transparent" /> + +</shape>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 9798a892..5f18d42d 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -154,6 +154,7 @@ <ImageView android:id="@+id/marked" + android:background="@drawable/ripple" android:layout_width="wrap_content" android:layout_height="24dp" android:paddingLeft="4dp" @@ -164,6 +165,7 @@ <ImageView android:id="@+id/published" + android:background="@drawable/ripple" android:layout_width="wrap_content" android:layout_height="24dp" android:paddingLeft="4dp" @@ -174,6 +176,7 @@ <ImageView android:id="@+id/article_menu_button" + android:background="@drawable/ripple" android:layout_width="wrap_content" android:layout_height="16dp" android:layout_weight="0" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml index fdd60d62..74184cd1 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -106,6 +106,7 @@ <ImageView android:id="@+id/marked" + android:background="@drawable/ripple" android:layout_width="24dp" android:layout_gravity="bottom|right" android:layout_height="24dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml index 669ae168..ad9ba329 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml @@ -108,6 +108,7 @@ <ImageView android:id="@+id/marked" + android:background="@drawable/ripple" android:tint="?headlineFooterColor" android:layout_width="24dp" android:layout_gravity="bottom|right" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index 04bd55da..acfd6988 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -156,6 +156,7 @@ <ImageView android:id="@+id/marked" + android:background="@drawable/ripple" android:layout_width="wrap_content" android:layout_height="24dp" android:paddingLeft="4dp" @@ -166,6 +167,7 @@ <ImageView android:id="@+id/published" + android:background="@drawable/ripple" android:layout_width="wrap_content" android:layout_height="24dp" android:paddingLeft="4dp" @@ -176,6 +178,7 @@ <ImageView android:id="@+id/article_menu_button" + android:background="@drawable/ripple" android:layout_width="wrap_content" android:layout_height="16dp" android:layout_weight="0" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml index 141aae0e..58317014 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml @@ -108,6 +108,7 @@ <ImageView android:id="@+id/marked" + android:background="@drawable/ripple" android:layout_width="24dp" android:layout_gravity="bottom|right" android:layout_height="24dp" |