add rss_box icon

3 files changed, 10 insertions, 24 deletions

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);
 				}
 			}