From 78155e9c3640b5ada6f2c5982db01fb0ea7e768b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 12:13:14 +0300
Subject: switch to material3 theme, switch some headline imageviews to
 material buttons, theme cleanup

---
 .../src/main/res/layout/headlines_row.xml          | 26 +++++++++++++---------
 .../src/main/res/layout/headlines_row_compact.xml  |  8 ++++---
 .../res/layout/headlines_row_selected_compact.xml  |  9 ++++----
 .../headlines_row_selected_unread_compact.xml      |  9 ++++----
 .../src/main/res/layout/headlines_row_unread.xml   | 26 +++++++++++++---------
 org.fox.ttrss/src/main/res/layout/toolbar.xml      |  4 ++--
 6 files changed, 49 insertions(+), 33 deletions(-)

(limited to 'org.fox.ttrss/src/main/res/layout')

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 2e997e2c..f2057b8f 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
@@ -226,7 +227,8 @@
                     android:textSize="12sp"
                     android:textStyle="italic" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/score"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -235,9 +237,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_action_trending_flat" />
+                    app:icon="?ic_action_trending_flat" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/attachments"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -246,9 +249,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_attachment" />
+                    app:icon="?ic_attachment" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/marked"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -257,9 +261,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_star_outline" />
+                    app:icon="?ic_star_outline" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/published"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -268,9 +273,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_rss_box" />
+                    app:icon="?ic_rss_box" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/article_menu_button"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -278,7 +284,7 @@
                     android:background="@drawable/ripple"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_dots_vertical" />
+                    app:icon="?ic_dots_vertical" />
             </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 d139313e..6375b574 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
@@ -2,6 +2,7 @@
 <LinearLayout
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
     android:padding="@dimen/activity_horizontal_margin"
     android:layout_width="fill_parent"
@@ -110,15 +111,16 @@
             />
 
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
+            style="?attr/materialIconButtonStyle"
             android:background="@drawable/ripple"
-            android:layout_width="24dp"
+            android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="?ic_star_outline" />
+            app:icon="?ic_star_outline" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
index 2e449dbb..da2401eb 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
@@ -2,6 +2,7 @@
 <LinearLayout
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
     android:padding="@dimen/activity_horizontal_margin"
     android:layout_width="fill_parent"
@@ -111,16 +112,16 @@
             />
 
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
-            android:tint="?headlineFooterColor"
+            style="?attr/materialIconButtonStyle"
             android:background="@drawable/ripple"
-            android:layout_width="24dp"
+            android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="?ic_star_outline" />
+            app:icon="?ic_star_outline" />
 
 
 
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 024eb7cf..3b6436fe 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
@@ -2,6 +2,7 @@
 <LinearLayout
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
     android:padding="@dimen/activity_horizontal_margin"
     android:layout_width="fill_parent"
@@ -110,16 +111,16 @@
             />
 
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
+            style="?attr/materialIconButtonStyle"
             android:background="@drawable/ripple"
-            android:tint="?headlineFooterColor"
-            android:layout_width="24dp"
+            android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="?ic_star_outline" />
+            app:icon="?ic_star_outline" />
 
 
 
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 ba70bb89..aafad9a8 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
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -226,7 +227,8 @@
                     android:textSize="12sp"
                     android:textStyle="italic" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/score"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -235,9 +237,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_action_trending_flat" />
+                    app:icon="?ic_action_trending_flat" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/attachments"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -246,9 +249,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_attachment" />
+                    app:icon="?ic_attachment" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/marked"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -257,9 +261,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_star_outline" />
+                    app:icon="?ic_star_outline" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/published"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -268,9 +273,10 @@
                     android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_rss_box" />
+                    app:icon="?ic_rss_box" />
 
-                <ImageView
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialIconButtonStyle"
                     android:id="@+id/article_menu_button"
                     android:layout_width="wrap_content"
                     android:layout_height="24dp"
@@ -278,7 +284,7 @@
                     android:background="@drawable/ripple"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
-                    android:src="?ic_dots_vertical" />
+                    app:icon="?ic_dots_vertical" />
             </LinearLayout>
         </TableRow>
     </TableLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml
index f5fb7654..94aa1eec 100755
--- a/org.fox.ttrss/src/main/res/layout/toolbar.xml
+++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml
@@ -5,8 +5,8 @@
     android:id="@+id/toolbar"
     android:elevation="4dp"
     app:layout_scrollFlags="scroll|enterAlways"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+    android:theme="@style/ThemeOverlay.Material3.Dark.ActionBar"
+    app:popupTheme="@style/ThemeOverlay.Material3.Light"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:minHeight="?attr/actionBarSize"
-- 
cgit v1.2.3-54-g00ecf