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 +-
 .../src/main/res/values-night-v21/style.xml        | 12 ----
 org.fox.ttrss/src/main/res/values-v21/style.xml    | 20 ------
 org.fox.ttrss/src/main/res/values/style.xml        | 79 +---------------------
 9 files changed, 50 insertions(+), 143 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/values-night-v21/style.xml
 delete mode 100755 org.fox.ttrss/src/main/res/values-v21/style.xml

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

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"
diff --git a/org.fox.ttrss/src/main/res/values-night-v21/style.xml b/org.fox.ttrss/src/main/res/values-night-v21/style.xml
deleted file mode 100644
index c154ed8a..00000000
--- a/org.fox.ttrss/src/main/res/values-night-v21/style.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowBackground">@color/window_background_dark</item>
-        <item name="android:navigationBarColor">@android:color/black</item>
-    </style>
-
-    <style name="DarkDialogTheme" parent="android:Theme.Material.Dialog">
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values-v21/style.xml b/org.fox.ttrss/src/main/res/values-v21/style.xml
deleted file mode 100755
index 3e26f96f..00000000
--- a/org.fox.ttrss/src/main/res/values-v21/style.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowBackground">@color/window_background</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <!-- <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowBackground">@color/window_background_dark</item>
-        <item name="android:navigationBarColor">@android:color/black</item>
-    </style> -->
-
-	<style name="DarkDialogTheme" parent="android:Theme.Material.Dialog">
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 033a9492..41b0a3ae 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -1,6 +1,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight">
+    <style name="AppTheme.Base" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -70,83 +70,6 @@
         <item name="drawer_header">@drawable/drawer_header</item>
     </style>
 
-    <!--
-    <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
-
-    </style>
-
-    <style name="AmberTheme" parent="DarkTheme">
-        <item name="colorPrimary">#b87d2c</item>
-        <item name="colorPrimaryDark">#6e4b1a</item>
-        <item name="android:windowBackground">@color/window_background_amber</item>
-        <item name="drawer_header">@drawable/drawer_header_amber</item>
-    </style>
-
-    <style name="DarkTheme" parent="DarkTheme.Base">
-        <item name="windowActionModeOverlay">true</item> -->
-
-        <!-- <item name="statusBarHintColor">?colorPrimary</item> -->
-        <!-- <item name="unreadCounterColor">#909090</item>
-        <item name="feedlistTextColor">@android:color/white</item>
-        <item name="headlineUnreadTextColor">@android:color/white</item>
-        <item name="headlineSelectedTextColor">@android:color/white</item>
-        <item name="headlineExcerptTextColor">#bebebe</item>
-        <item name="headlineSecondaryTextColor">#909090</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
-        <item name="headlineSelectedExcerptTextColor">#bebebe</item>
-        <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
-        <item name="headlineSelectedBackground">#1c1c1c</item>
-        <item name="headlineHeaderBackground">#99000000</item>
-        <item name="headlineUnreadBackground">#101010</item>
-        <item name="linkColor">#2d92c8</item>
-        <item name="loadingBackground">@android:color/black</item>
-        <item name="articleNoteTextColor">#bebebe</item>
-        <item name="articleNoteBackground">#303030</item>
-        <item name="parentBtnBackground">#101010</item>
-        <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-        <item name="feedlistBackground">#1c1d1e</item>
-        <item name="headlinesBackground">#1c1d1e</item>
-        <item name="articleBackground">@android:color/black</item>
-        <item name="feedsSelectedBackground">#1c1c1c</item>
-        <item name="feedlistSelectedTextColor">@android:color/white</item>
-        <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleHeaderTextColor">@android:color/white</item>
-        <item name="floatingActionButtonStyle">@style/FabTheme</item>
-        <item name="articleTextColor">#e0e0e0</item>
-        <item name="headlineFooterColor">?colorPrimary</item>
-        <item name="articleHeaderSeparator">#303030</item>
-
-        <item name="colorPrimary">#1e6286</item>
-        <item name="colorPrimaryDark">#18506e</item>
-        <item name="colorAccent">#D84315</item>
-
-        <item name="ic_rss_box">@drawable/ic_rss_box</item>
-        <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item>
-        <item name="ic_star">@drawable/ic_star</item>
-        <item name="ic_star_outline">@drawable/ic_star_outline</item>
-        <item name="ic_share">@drawable/ic_share</item>
-        <item name="ic_inbox">@drawable/ic_inbox</item>
-        <item name="ic_go_back">@drawable/ic_go_back</item>
-        <item name="ic_settings">@drawable/ic_settings</item>
-        <item name="ic_filter_variant">@drawable/ic_filter_variant</item>
-        <item name="ic_cloud_download">@drawable/ic_cloud_download</item>
-        <item name="ic_cloud_upload">@drawable/ic_cloud_upload</item>
-        <item name="ic_archive">@drawable/ic_archive</item>
-        <item name="ic_fresh">@drawable/ic_fresh</item>
-        <item name="ic_restore">@drawable/ic_restore</item>
-        <item name="ic_folder_outline">@drawable/ic_folder_outline</item>
-        <item name="ic_dots_vertical">@drawable/ic_dots_vertical</item>
-        <item name="ic_dots_vertical_circle">@drawable/ic_dots_vertical_circle</item>
-        <item name="ic_attachment">@drawable/ic_attachment</item>
-        <item name="ic_attachment_vert">@drawable/ic_attachment_vert</item>
-
-        <item name="drawer_header">@drawable/drawer_header_dark</item>
-    </style> -->
-
     <style name="DarkDialogTheme" parent="android:Theme"></style>
 
-    <!-- <style name="FabTheme" parent="FloatingActionButton">
-        <item name="floatingActionButtonColor">?colorPrimaryDark</item>
-    </style> -->
-
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf