From 6e1ea990c69f72ac0b3e49f46ce620aa8e873422 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 15 May 2025 08:58:39 +0300 Subject: add rss_box icon --- .../src/main/java/org/fox/ttrss/FeedsFragment.java | 27 +++++++--------------- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 5 +--- .../main/java/org/fox/ttrss/OnlineActivity.java | 2 +- org.fox.ttrss/src/main/res/drawable/rss.xml | 1 + org.fox.ttrss/src/main/res/drawable/rss_box.xml | 1 + org.fox.ttrss/src/main/res/layout/feeds_row.xml | 2 +- .../src/main/res/layout/feeds_row_selected.xml | 2 +- .../src/main/res/layout/feeds_row_toggle.xml | 2 +- .../src/main/res/layout/headlines_row.xml | 2 +- .../src/main/res/layout/headlines_row_unread.xml | 4 ++-- org.fox.ttrss/src/main/res/values-night/themes.xml | 1 - org.fox.ttrss/src/main/res/values/attrs.xml | 1 - org.fox.ttrss/src/main/res/values/themes.xml | 1 - 13 files changed, 18 insertions(+), 33 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/drawable/rss.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/rss_box.xml diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index f618b5b1..c198343d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -462,34 +462,23 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi ImageView icon = v.findViewById(R.id.icon); if (icon != null) { - TypedValue tv = new TypedValue(); - if (feed.id == 0 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_archive, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.baseline_archive_24); } else if (feed.id == -1 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_star, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.baseline_star_24); } else if (feed.id == -2 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_rss_box, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.rss); } else if (feed.id == -3 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_fresh, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.baseline_local_fire_department_24); } else if (feed.id == -4 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_inbox, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.baseline_inbox_24); } else if (feed.id == -6 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_restore, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.baseline_restore_24); } else if (feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.baseline_folder_open_24); } else { - m_activity.getTheme().resolveAttribute(R.attr.ic_rss_box, tv, true); - icon.setImageResource(tv.resourceId); + icon.setImageResource(R.drawable.rss); } - } TextView tt = v.findViewById(R.id.title); 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 5eebd65f..1e22f711 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 @@ -896,10 +896,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } if (holder.publishedView != null) { - TypedValue tv = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.ic_rss_box, tv, true); - - holder.publishedView.setIconResource(tv.resourceId); + holder.publishedView.setIconResource(article.published ? R.drawable.rss_box : R.drawable.rss); if (article.published) holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 26dab50d..06503dc5 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -1184,7 +1184,7 @@ article.score = Integer.parseInt(edit.getText().toString()); m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.baseline_star_24 : R.drawable.baseline_star_outline_24); - m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.baseline_check_box_24 : + m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.rss_box : R.drawable.baseline_rss_feed_24); } } diff --git a/org.fox.ttrss/src/main/res/drawable/rss.xml b/org.fox.ttrss/src/main/res/drawable/rss.xml new file mode 100644 index 00000000..f97e14a2 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/rss.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/drawable/rss_box.xml b/org.fox.ttrss/src/main/res/drawable/rss_box.xml new file mode 100644 index 00000000..45b40cea --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/rss_box.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 32e20c26..0f9c4e54 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -23,7 +23,7 @@ android:layout_weight="0" android:scaleType="fitXY" app:tint="?colorOnPrimaryContainer" - android:src="?ic_rss_box" /> + android:src="@drawable/rss" /> + android:src="@drawable/rss" /> + android:src="@drawable/rss_box" /> + app:icon="@drawable/rss" /> + app:icon="@drawable/rss" /> + app:icon="@drawable/baseline_more_vert_24" /> diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml index 7d54a029..5f32a7b3 100644 --- a/org.fox.ttrss/src/main/res/values-night/themes.xml +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -3,7 +3,6 @@ true @style/AppPreferenceThemeOverlay - @drawable/baseline_rss_feed_24 @drawable/baseline_check_box_24 @drawable/baseline_star_24 @drawable/baseline_star_outline_24 diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index daf2323c..e33d1c8a 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -1,6 +1,5 @@ - diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml index 68a57811..9969617c 100644 --- a/org.fox.ttrss/src/main/res/values/themes.xml +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -4,7 +4,6 @@ true @style/AppPreferenceThemeOverlay - @drawable/baseline_rss_feed_24 @drawable/baseline_check_box_24 @drawable/baseline_star_24 @drawable/baseline_star_outline_24 -- cgit v1.2.3-54-g00ecf