From 2122a9b494feaddd953b276b06d8b4d0515d0f27 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 15 May 2025 09:05:34 +0300
Subject: drop no longer useful theme attributes in favor of drawable ids

---
 .../java/org/fox/ttrss/BaseFeedlistFragment.java   |  4 +---
 .../java/org/fox/ttrss/FeedCategoriesFragment.java |  5 +----
 .../main/java/org/fox/ttrss/HeadlinesFragment.java | 17 +++++----------
 .../src/main/res/layout/activity_gallery.xml       |  2 +-
 org.fox.ttrss/src/main/res/layout/feeds_goback.xml |  2 +-
 .../src/main/res/layout/headlines_row.xml          |  8 +++----
 .../src/main/res/layout/headlines_row_compact.xml  |  2 +-
 .../res/layout/headlines_row_compact_active.xml    |  2 +-
 .../layout/headlines_row_compact_active_unread.xml |  2 +-
 .../res/layout/headlines_row_compact_unread.xml    |  2 +-
 .../src/main/res/layout/headlines_row_unread.xml   |  6 +++---
 org.fox.ttrss/src/main/res/values-night/themes.xml | 22 -------------------
 org.fox.ttrss/src/main/res/values/attrs.xml        | 25 ----------------------
 org.fox.ttrss/src/main/res/values/themes.xml       | 22 -------------------
 14 files changed, 20 insertions(+), 101 deletions(-)

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java
index def61209..b37f7386 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java
@@ -62,9 +62,7 @@ public abstract class BaseFeedlistFragment extends androidx.fragment.app.Fragmen
         text.setText(R.string.unread_only);
 
         ImageView icon = rowToggle.findViewById(R.id.icon);
-        TypedValue tv = new TypedValue();
-        getActivity().getTheme().resolveAttribute(R.attr.ic_filter_variant, tv, true);
-        icon.setImageResource(tv.resourceId);
+        icon.setImageResource(R.drawable.baseline_filter_alt_24);
 
         final SwitchCompat rowSwitch = rowToggle.findViewById(R.id.row_switch);
         rowSwitch.setChecked(activity.getUnreadOnly());
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index 1d735490..34127013 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -376,10 +376,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 			ImageView icon = v.findViewById(R.id.icon);
 
 			if (icon != null) {
-				TypedValue tv = new TypedValue();
-
-				m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true);
-				icon.setImageResource(tv.resourceId);
+				icon.setImageResource(R.drawable.baseline_folder_open_24);
 
 			}
 
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 1e22f711..b0a3d2d3 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
@@ -830,11 +830,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, 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.setIconResource(tv.resourceId);
-
+				holder.markedView.setIconResource(article.marked ? R.drawable.baseline_star_24 : R.drawable.baseline_star_outline_24);
 
 				if (article.marked)
 					holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data));
@@ -851,17 +847,14 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			}
 
 			if (holder.scoreView != null) {
-				TypedValue tv = new TypedValue();
-				int scoreAttr = R.attr.ic_action_trending_flat;
+				int scoreDrawable = R.drawable.baseline_trending_flat_24;
 
 				if (article.score > 0)
-					scoreAttr = R.attr.ic_action_trending_up;
+					scoreDrawable = R.drawable.baseline_trending_up_24;
 				else if (article.score < 0)
-					scoreAttr = R.attr.ic_action_trending_down;
-
-				m_activity.getTheme().resolveAttribute(scoreAttr, tv, true);
+					scoreDrawable = R.drawable.baseline_trending_down_24;
 
-				holder.scoreView.setIconResource(tv.resourceId);
+				holder.scoreView.setIconResource(scoreDrawable);
 
 				if (article.score > Article.SCORE_HIGH)
 					holder.scoreView.setIconTint(ColorStateList.valueOf(tvTertiary.data));
diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
index f44bb74b..b0f67761 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        app:icon="?ic_dots_vertical"
+        app:icon="@drawable/baseline_more_vert_24"
         android:layout_alignParentRight="true"
         android:layout_marginTop="48dp"
         app:iconTint="?colorTertiary" />
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
index f4c580a3..75ba8fe1 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
@@ -20,7 +20,7 @@
         android:layout_height="21dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
-        android:src="?ic_go_back"
+        android:src="@drawable/baseline_arrow_back_24"
         app:tint="?colorTertiary" />
 
     <TextView
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 bdb38504..3659589d 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -212,7 +212,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_action_trending_flat" />
+                    app:icon="@drawable/baseline_trending_flat_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -222,7 +222,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_attachment" />
+                    app:icon="@drawable/baseline_attachment_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -232,7 +232,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_star_outline" />
+                    app:icon="@drawable/baseline_star_outline_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -252,7 +252,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_dots_vertical" />
+                    app:icon="@drawable/baseline_more_vert_24" />
             </LinearLayout>
         </TableRow>
     </TableLayout>
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 352aad91..7090668a 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
@@ -103,6 +103,6 @@
             android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
index f6483350..72ae99b8 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active.xml
@@ -104,6 +104,6 @@
             android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
index 06813e04..b2b3a21e 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_active_unread.xml
@@ -105,6 +105,6 @@
             android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
index 6aa1bdcd..2fbbe062 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact_unread.xml
@@ -105,6 +105,6 @@
             android:layout_gravity="end"
             android:layout_height="24dp"
             android:layout_weight="0.5"
-            app:icon="?ic_star_outline" />
+            app:icon="@drawable/baseline_star_outline_24" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
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 74f73e14..3365f476 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
@@ -212,7 +212,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_action_trending_flat" />
+                    app:icon="@drawable/baseline_trending_flat_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -222,7 +222,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_attachment" />
+                    app:icon="@drawable/baseline_attachment_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
@@ -232,7 +232,7 @@
                     android:layout_weight="0"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    app:icon="?ic_star_outline" />
+                    app:icon="@drawable/baseline_star_outline_24" />
 
                 <com.google.android.material.button.MaterialButton
                     style="?attr/materialIconButtonStyle"
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 5f32a7b3..e11ef016 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -3,28 +3,6 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
-        <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
-        <item name="ic_star">@drawable/baseline_star_24</item>
-        <item name="ic_star_outline">@drawable/baseline_star_outline_24</item>
-        <item name="ic_share">@drawable/baseline_share_24</item>
-        <item name="ic_inbox">@drawable/baseline_inbox_24</item>
-        <item name="ic_go_back">@drawable/baseline_arrow_back_24</item>
-        <item name="ic_settings">@drawable/baseline_settings_24</item>
-        <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item>
-        <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item>
-        <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item>
-        <item name="ic_archive">@drawable/baseline_archive_24</item>
-        <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item>
-        <item name="ic_restore">@drawable/baseline_restore_24</item>
-        <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item>
-        <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item>
-        <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item>
-        <item name="ic_attachment">@drawable/baseline_attachment_24</item>
-        <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item>
-        <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item>
-        <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item>
-        <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
-
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index e33d1c8a..55344e51 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -1,28 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="ic_checkbox_marked" format="reference" />
-    <attr name="ic_star" format="reference" />
-    <attr name="ic_star_outline" format="reference" />
-    <attr name="ic_share" format="reference" />
-    <attr name="ic_go_back" format="reference" />
-    <attr name="ic_settings" format="reference" />
-    <attr name="ic_filter_variant" format="reference" />
-    <attr name="ic_cloud_download" format="reference" />
-    <attr name="ic_cloud_upload" format="reference" />
-    <attr name="ic_archive" format="reference" />
-    <attr name="ic_fresh" format="reference" />
-    <attr name="ic_folder_outline" format="reference" />
-    <attr name="ic_dots_vertical" format="reference" />
-    <attr name="ic_dots_vertical_circle" format="reference" />
-    <attr name="ic_attachment" format="reference" />
-    <attr name="ic_attachment_vert" format="reference" />
-    <declare-styleable name="ScrimInsetsView">
-        <attr format="reference|color" name="insetForeground">
-        </attr></declare-styleable>
-    <attr name="drawer_header" format="reference" />
-    <attr name="ic_restore" format="reference" />
-    <attr name="ic_inbox" format="reference" />
-    <attr name="ic_action_trending_up" format="reference" />
-    <attr name="ic_action_trending_flat" format="reference" />
-    <attr name="ic_action_trending_down" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index 9969617c..15be8c17 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -4,28 +4,6 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
-        <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
-        <item name="ic_star">@drawable/baseline_star_24</item>
-        <item name="ic_star_outline">@drawable/baseline_star_outline_24</item>
-        <item name="ic_share">@drawable/baseline_share_24</item>
-        <item name="ic_inbox">@drawable/baseline_inbox_24</item>
-        <item name="ic_go_back">@drawable/baseline_arrow_back_24</item>
-        <item name="ic_settings">@drawable/baseline_settings_24</item>
-        <item name="ic_filter_variant">@drawable/baseline_filter_alt_24</item>
-        <item name="ic_cloud_download">@drawable/baseline_cloud_download_24</item>
-        <item name="ic_cloud_upload">@drawable/baseline_cloud_upload_24</item>
-        <item name="ic_archive">@drawable/baseline_archive_24</item>
-        <item name="ic_fresh">@drawable/baseline_local_fire_department_24</item>
-        <item name="ic_restore">@drawable/baseline_restore_24</item>
-        <item name="ic_folder_outline">@drawable/baseline_folder_open_24</item>
-        <item name="ic_dots_vertical">@drawable/baseline_more_vert_24</item>
-        <item name="ic_dots_vertical_circle">@drawable/outline_more_24</item>
-        <item name="ic_attachment">@drawable/baseline_attachment_24</item>
-        <item name="ic_attachment_vert">@drawable/baseline_attach_file_24</item>
-        <item name="ic_action_trending_up">@drawable/baseline_trending_up_24</item>
-        <item name="ic_action_trending_flat">@drawable/baseline_trending_flat_24</item>
-        <item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
-
         <item name="colorPrimary">@color/md_theme_primary</item>
         <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
-- 
cgit v1.2.3-54-g00ecf