From 73f8dac69f24ba8e07b08a79b393cd64e13907e9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 13:04:28 +0300
Subject: switch some more imageviews to material buttons and drop hardcoded
 article background preferring material3 default

---
 .../src/main/res/layout/fragment_article.xml          | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 61215a40..cffc7c33 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
-    android:layout_height="match_parent"
-    android:background="?articleBackground">
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/article_fullscreen_video"
@@ -17,7 +16,6 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:background="?articleHeader"
             android:elevation="0dp"
             app:elevation="0dp"
             android:layout_width="match_parent"
@@ -51,7 +49,8 @@
                         android:layout_marginRight="8dp"
                         android:gravity="start" />
 
-                    <ImageView
+                    <com.google.android.material.button.MaterialButton
+                        style="?attr/materialIconButtonStyle"
                         android:id="@+id/score"
                         android:layout_width="wrap_content"
                         android:layout_height="24dp"
@@ -59,10 +58,11 @@
                         android:background="@drawable/ripple"
                         android:clickable="true"
                         android:layout_marginLeft="8dp"
-                        android:src="?ic_action_trending_flat"
+                        app:icon="?ic_action_trending_flat"
                         android:layout_gravity="center_vertical|end" />
 
-                    <ImageView
+                    <com.google.android.material.button.MaterialButton
+                        style="?attr/materialIconButtonStyle"
                         android:id="@+id/attachments"
                         android:background="@drawable/ripple"
                         android:layout_width="wrap_content"
@@ -70,17 +70,18 @@
                         android:layout_weight="0"
                         android:layout_marginLeft="8dp"
                         android:clickable="true"
-                        android:src="?ic_attachment_vert"
+                        app:icon="?ic_attachment_vert"
                         android:layout_gravity="center_vertical|end" />
 
-                    <ImageView
+                    <com.google.android.material.button.MaterialButton
+                        style="?attr/materialIconButtonStyle"
                         android:id="@+id/share"
                         android:background="@drawable/ripple"
                         android:layout_width="wrap_content"
                         android:layout_height="24dp"
                         android:layout_weight="0"
                         android:clickable="true"
-                        android:src="?ic_share"
+                        app:icon="?ic_share"
                         android:layout_gravity="center_vertical|end" />
                 </LinearLayout>
 
-- 
cgit v1.2.3-54-g00ecf


From f1b36d0733c1616b6aad8da8c8c5da2de89ccabf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 16:09:18 +0300
Subject: adjust article fragment header layout oddities

---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index cffc7c33..5e8e98a8 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -45,42 +45,33 @@
                         android:textAlignment="viewStart"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
                         android:textColor="?articleHeaderTextColor"
-                        android:textSize="18sp"
-                        android:layout_marginRight="8dp"
+                        android:textSize="16sp"
                         android:gravity="start" />
 
                     <com.google.android.material.button.MaterialButton
                         style="?attr/materialIconButtonStyle"
                         android:id="@+id/score"
                         android:layout_width="wrap_content"
-                        android:layout_height="24dp"
+                        android:layout_height="wrap_content"
                         android:layout_weight="0"
-                        android:background="@drawable/ripple"
-                        android:clickable="true"
-                        android:layout_marginLeft="8dp"
                         app:icon="?ic_action_trending_flat"
                         android:layout_gravity="center_vertical|end" />
 
                     <com.google.android.material.button.MaterialButton
                         style="?attr/materialIconButtonStyle"
                         android:id="@+id/attachments"
-                        android:background="@drawable/ripple"
                         android:layout_width="wrap_content"
-                        android:layout_height="24dp"
+                        android:layout_height="wrap_content"
                         android:layout_weight="0"
-                        android:layout_marginLeft="8dp"
-                        android:clickable="true"
                         app:icon="?ic_attachment_vert"
                         android:layout_gravity="center_vertical|end" />
 
                     <com.google.android.material.button.MaterialButton
                         style="?attr/materialIconButtonStyle"
                         android:id="@+id/share"
-                        android:background="@drawable/ripple"
                         android:layout_width="wrap_content"
-                        android:layout_height="24dp"
+                        android:layout_height="wrap_content"
                         android:layout_weight="0"
-                        android:clickable="true"
                         app:icon="?ic_share"
                         android:layout_gravity="center_vertical|end" />
                 </LinearLayout>
-- 
cgit v1.2.3-54-g00ecf


From dca0b1c5955003a4a3183a3b03a45dc982b0f453 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 16:34:40 +0300
Subject: drop several more custom color attrs

---
 .../src/main/res/layout/drawer_header.xml          | 10 +++--
 .../src/main/res/layout/fragment_article.xml       | 11 ++---
 .../src/main/res/layout/headlines_row.xml          | 33 +++++---------
 .../src/main/res/layout/headlines_row_compact.xml  | 13 +++---
 .../src/main/res/layout/headlines_row_loadmore.xml |  2 +-
 .../res/layout/headlines_row_selected_compact.xml  | 13 +++---
 .../headlines_row_selected_unread_compact.xml      | 11 +++--
 .../src/main/res/layout/headlines_row_unread.xml   | 50 +++++++++-------------
 .../res/layout/headlines_row_unread_compact.xml    |  7 +--
 org.fox.ttrss/src/main/res/values-night/style.xml  |  8 ----
 org.fox.ttrss/src/main/res/values/attrs.xml        |  7 ---
 org.fox.ttrss/src/main/res/values/style.xml        |  7 ---
 12 files changed, 59 insertions(+), 113 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
index 6779a950..56f7a225 100755
--- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml
+++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="120dp"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:weightSum="1"
     android:clickable="false">
@@ -20,17 +21,18 @@
         android:background="@android:color/transparent"
         android:layout_height="match_parent">
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_settings"
+            app:icon="@drawable/ic_settings"
+            app:iconTint="?colorSurface"
             android:id="@+id/drawer_settings_btn"
             android:layout_gravity="bottom|end"
-            android:clickable="true"
             android:layout_marginBottom="16dp"
             android:layout_marginEnd="12dp"
             android:transitionName="SETTINGS_REVEAL"
-            android:background="@drawable/ripple" />
+            />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 5e8e98a8..32846c0d 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -37,14 +37,12 @@
 
                     <TextView
                         android:id="@+id/title"
-                        android:background="@drawable/ripple"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:layout_marginEnd="8dp"
                         android:textAlignment="viewStart"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
-                        android:textColor="?articleHeaderTextColor"
                         android:textSize="16sp"
                         android:gravity="start" />
 
@@ -86,7 +84,7 @@
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
                     android:paddingTop="8dp"
-                    android:textColor="?headlineSecondaryTextColor"
+                    android:textColor="?colorSecondary"
                     android:textSize="12sp" />
 
                 <TextView
@@ -99,7 +97,7 @@
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
                     android:paddingTop="8dp"
-                    android:textColor="?headlineSecondaryTextColor"
+                    android:textColor="?colorSecondary"
                     android:textSize="12sp"
                     android:visibility="gone"/>
 
@@ -119,7 +117,7 @@
                         android:textAlignment="viewStart"
                         android:singleLine="true"
                         android:fontFamily="sans-serif-light"
-                        android:textColor="?headlineSecondaryTextColor"
+                        android:textColor="?colorSecondary"
                         android:textSize="12sp" />
 
                     <TextView
@@ -128,11 +126,10 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="0.3"
-                        android:gravity=""
                         android:textAlignment="viewEnd"
                         android:fontFamily="sans-serif-light"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="?headlineSecondaryTextColor"
+                        android:textColor="?colorPrimary"
                         android:textSize="12sp" />
 
                 </LinearLayout>
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 f2057b8f..045590ef 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -92,7 +92,6 @@
                             android:maxLines="3"
                             android:paddingBottom="8dp"
                             android:singleLine="false"
-                            android:textColor="?headlineExcerptTextColor"
                             android:textSize="18sp"
                             android:textStyle="normal"
                             tools:text="Sample entry title" />
@@ -115,7 +114,7 @@
                                 android:textAlignment="viewStart"
                                 android:singleLine="true"
                                 tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
-                                android:textColor="?headlineSecondaryTextColor"
+                                android:textColor="?colorSecondary"
                                 android:textSize="12sp" />
 
                             <TextView
@@ -129,7 +128,7 @@
                                 android:textAlignment="viewEnd"
                                 android:singleLine="true"
                                 tools:text="Jan 01, 12:00, 1970"
-                                android:textColor="?headlineSecondaryTextColor"
+                                android:textColor="?colorPrimary"
                                 android:textSize="12sp" />
 
                         </LinearLayout>
@@ -150,7 +149,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:elevation="4dp"
-                    android:tint="?colorAccent"
+                    app:tint="?colorAccent"
                     android:layout_marginBottom="8dp"
                     android:layout_marginStart="8dp" />
 
@@ -166,7 +165,7 @@
                     android:src="@drawable/ic_dots_vertical_circle"
                     android:layout_gravity="bottom|end"
                     android:elevation="4dp"
-                    android:tint="?colorAccent"
+                    app:tint="?colorAccent"
                     android:layout_marginBottom="10dp"
                     tools:targetApi="lollipop" />
 
@@ -188,7 +187,6 @@
                 android:maxLines="5"
                 android:padding="16dp"
                 tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-                android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" />
         </TableRow>
 
@@ -205,7 +203,7 @@
                 android:paddingBottom="8dp"
                 android:paddingLeft="8dp">
 
-                <CheckBox
+                <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/selected"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -223,7 +221,7 @@
                     android:singleLine="true"
                     tools:text="by Author"
                     android:textAlignment="viewStart"
-                    android:textColor="?headlineSecondaryTextColor"
+                    android:textColor="?colorSecondary"
                     android:textSize="12sp"
                     android:textStyle="italic" />
 
@@ -231,10 +229,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/score"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_action_trending_flat" />
@@ -243,10 +239,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/attachments"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_attachment" />
@@ -255,10 +249,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/marked"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_star_outline" />
@@ -267,10 +259,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/published"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_rss_box" />
@@ -279,9 +269,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/article_menu_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_dots_vertical" />
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 6375b574..06d95717 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
@@ -49,7 +49,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textColor="?headlineExcerptTextColor"
+            android:textColor="?colorSecondary"
             android:textSize="18sp"
             android:layout_span="2" />
 
@@ -61,7 +61,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            android:textColor="?headlineExcerptTextColor"
+            android:textColor="?colorSecondary"
             android:textSize="13sp"
             android:layout_span="2"
             android:paddingTop="4dp" />
@@ -81,7 +81,7 @@
                 android:singleLine="true"
                 tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
                 android:textAlignment="viewStart"
-                android:textColor="?headlineSecondaryTextColor"
+                android:textColor="?colorSecondary"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
                 android:paddingTop="4dp" />
@@ -106,7 +106,7 @@
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textColor="?headlineSecondaryTextColor"
+            android:textColor="?colorPrimary"
             android:textSize="12sp"
             />
 
@@ -114,16 +114,13 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
-            android:background="@drawable/ripple"
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_height="24dp"
+            android:layout_height="wrap_content"
             android:layout_weight="0"
             android:clickable="true"
             app:icon="?ic_star_outline" />
 
-
-
     </LinearLayout>
 
     <!-- <ImageView
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml
index 6444bfa5..43e9d8c8 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_loadmore.xml
@@ -19,7 +19,7 @@
             android:id="@+id/loadmore_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?headlineExcerptTextColor"
+            android:textColor="?colorSecondary"
             android:text="@string/loading_message" />
 
 </LinearLayout>
\ No newline at end of file
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 bd114157..84e24736 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
@@ -50,7 +50,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textColor="?headlineSelectedTextColor"
+            android:textColor="?colorOnPrimaryContainer"
             android:textSize="18sp"
             android:layout_span="2" />
 
@@ -62,7 +62,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textColor="?colorOnPrimaryContainer"
             android:textSize="13sp"
             android:layout_span="2"
             android:paddingTop="4dp" />
@@ -82,7 +82,7 @@
                 android:singleLine="true"
                 tools:text="Example Feed"
                 android:textAlignment="viewStart"
-                android:textColor="?headlineSelectedSecondaryTextColor"
+                android:textColor="?colorOnPrimaryContainer"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
                 android:paddingTop="4dp" />
@@ -107,7 +107,7 @@
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textColor="?colorPrimary"
             android:textSize="12sp"
             />
 
@@ -115,16 +115,13 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
-            android:background="@drawable/ripple"
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_height="24dp"
+            android:layout_height="wrap_content"
             android:layout_weight="0"
             android:clickable="true"
             app:icon="?ic_star_outline" />
 
-
-
     </LinearLayout>
 
     <!-- <ImageView
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 3422fae6..1de5e99c 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
@@ -48,7 +48,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textColor="?headlineSelectedTextColor"
+            android:textColor="?colorOnPrimaryContainer"
             android:textStyle="bold"
             android:textSize="18sp"
             android:layout_span="2" />
@@ -61,7 +61,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textColor="?colorOnPrimaryContainer"
             android:textSize="13sp"
             android:layout_span="2"
             android:paddingTop="4dp" />
@@ -81,7 +81,7 @@
                 android:singleLine="true"
                 tools:text="Example Feed"
                 android:textAlignment="viewStart"
-                android:textColor="?headlineSelectedSecondaryTextColor"
+                android:textColor="?colorOnPrimaryContainer"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
                 android:paddingTop="4dp" />
@@ -106,7 +106,7 @@
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textColor="?colorPrimary"
             android:textSize="12sp"
             />
 
@@ -114,10 +114,9 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
-            android:background="@drawable/ripple"
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_height="24dp"
+            android:layout_height="wrap_content"
             android:layout_weight="0"
             android:clickable="true"
             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 5ea05c31..d63f6a90 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
@@ -3,9 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
+    android:background="?colorSurfaceContainerLowest"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="?colorSurfaceContainerLowest">
+    android:layout_height="wrap_content">
 
     <TableLayout
         android:layout_width="fill_parent"
@@ -14,6 +14,7 @@
         android:shrinkColumns="0,1"
         android:stretchColumns="0,1">
 
+
         <TableRow
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
@@ -85,15 +86,13 @@
                             android:id="@+id/title"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_span="2"
                             android:background="@drawable/ripple"
                             android:ellipsize="end"
+                            android:textAlignment="viewStart"
                             android:gravity="center_vertical"
                             android:maxLines="3"
                             android:paddingBottom="8dp"
                             android:singleLine="false"
-                            android:textAlignment="viewStart"
-                            android:textColor="?headlineUnreadTextColor"
                             android:textSize="18sp"
                             android:textStyle="bold"
                             tools:text="Sample entry title" />
@@ -115,8 +114,8 @@
                                 android:gravity="center_vertical"
                                 android:textAlignment="viewStart"
                                 android:singleLine="true"
-                                tools:text="Example Feed"
-                                android:textColor="?headlineSecondaryTextColor"
+                                tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                                android:textColor="?colorSecondary"
                                 android:textSize="12sp" />
 
                             <TextView
@@ -130,7 +129,7 @@
                                 android:textAlignment="viewEnd"
                                 android:singleLine="true"
                                 tools:text="Jan 01, 12:00, 1970"
-                                android:textColor="?headlineSecondaryTextColor"
+                                android:textColor="?colorPrimary"
                                 android:textSize="12sp" />
 
                         </LinearLayout>
@@ -143,16 +142,17 @@
                     android:id="@+id/flavor_video_kind"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|start"
+                    android:layout_gravity="start|bottom"
                     android:scaleType="fitXY"
                     android:src="@drawable/ic_play_circle"
                     android:visibility="visible"
                     android:layout_below="@+id/headline_header"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
-                    android:tint="?colorAccent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginBottom="8dp" />
+                    android:elevation="4dp"
+                    app:tint="?colorAccent"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginStart="8dp" />
 
                 <ImageView
                     android:id="@+id/gallery_overflow"
@@ -166,7 +166,7 @@
                     android:src="@drawable/ic_dots_vertical_circle"
                     android:layout_gravity="bottom|end"
                     android:elevation="4dp"
-                    android:tint="?colorAccent"
+                    app:tint="?colorAccent"
                     android:layout_marginBottom="10dp"
                     tools:targetApi="lollipop" />
 
@@ -188,7 +188,6 @@
                 android:maxLines="5"
                 android:padding="16dp"
                 tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-                android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" />
         </TableRow>
 
@@ -205,7 +204,7 @@
                 android:paddingBottom="8dp"
                 android:paddingLeft="8dp">
 
-                <CheckBox
+                <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/selected"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -223,7 +222,7 @@
                     android:singleLine="true"
                     tools:text="by Author"
                     android:textAlignment="viewStart"
-                    android:textColor="?headlineSecondaryTextColor"
+                    android:textColor="?colorSecondary"
                     android:textSize="12sp"
                     android:textStyle="italic" />
 
@@ -231,10 +230,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/score"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_action_trending_flat" />
@@ -243,10 +240,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/attachments"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_attachment" />
@@ -255,10 +250,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/marked"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_star_outline" />
@@ -267,10 +260,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/published"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
-                    android:clickable="true"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_rss_box" />
@@ -279,9 +270,8 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/article_menu_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="24dp"
+                    android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:background="@drawable/ripple"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     app:icon="?ic_dots_vertical" />
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
index f65cee58..dc829710 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -50,7 +50,6 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textColor="?headlineUnreadTextColor"
             android:textStyle="bold"
             android:textSize="18sp"
             android:layout_span="2" />
@@ -63,7 +62,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
-            android:textColor="?headlineExcerptTextColor"
             android:textSize="13sp"
             android:layout_span="2"
             android:paddingTop="4dp" />
@@ -83,7 +81,6 @@
                 android:singleLine="true"
                 tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
                 android:textAlignment="viewStart"
-                android:textColor="?headlineSecondaryTextColor"
                 android:textSize="12sp"
                 android:layout_weight="0.5"
                 android:paddingTop="4dp" />
@@ -104,11 +101,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
+            android:textColor="?colorPrimary"
             android:singleLine="true"
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textColor="?headlineSecondaryTextColor"
             android:textSize="12sp"
             />
 
@@ -119,7 +116,7 @@
             android:background="@drawable/ripple"
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_height="24dp"
+            android:layout_height="wrap_content"
             android:layout_weight="0"
             android:clickable="true"
             app:icon="?ic_star_outline" />
diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml
index f000a8ed..868dd398 100644
--- a/org.fox.ttrss/src/main/res/values-night/style.xml
+++ b/org.fox.ttrss/src/main/res/values-night/style.xml
@@ -4,13 +4,7 @@
         <item name="windowActionModeOverlay">true</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="headlineHeaderBackground">#99000000</item>
         <item name="linkColor">#2d92c8</item>
         <item name="loadingBackground">@android:color/black</item>
@@ -20,8 +14,6 @@
         <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</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>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index 4282657b..7a3bdc88 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -4,12 +4,6 @@
     <attr name="feedlistTextColor" format="reference|color" />
     <attr name="feedlistSelectedTextColor" format="reference|color" />
     <attr name="headlineHeaderBackground" format="reference|color" />
-    <attr name="headlineUnreadTextColor" format="reference|color" />
-    <attr name="headlineSelectedTextColor" format="reference|color" />    
-    <attr name="headlineExcerptTextColor" format="reference|color" />
-    <attr name="headlineSecondaryTextColor" format="reference|color" />
-    <attr name="headlineSelectedSecondaryTextColor" format="reference|color" />
-    <attr name="headlineSelectedExcerptTextColor" format="reference|color" />
     <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
     <attr name="linkColor" format="reference|color" />
     <attr name="loadingBackground" format="reference|color" />
@@ -18,7 +12,6 @@
     <!-- <attr name="statusBarHintColor" format="reference|color" /> -->
     <attr name="parentBtnBackground" format="reference|color" />
     <attr name="articleHeader" format="reference|color" />
-    <attr name="articleHeaderTextColor" format="reference|color" />
     <attr name="articleTextColor" format="reference|color" />
     <attr name="headlineFooterColor" format="reference|color" />
     <attr name="articleHeaderSeparator" format="reference|color" />
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index bc447681..5c93d95b 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -13,12 +13,6 @@
         <item name="headlineHeaderBackground">#ccffffff</item>
         <item name="feedlistTextColor">@android:color/black</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
-        <item name="headlineUnreadTextColor">@android:color/black</item>
-        <item name="headlineSelectedTextColor">@android:color/black</item>
-        <item name="headlineExcerptTextColor">#323232</item>
-        <item name="headlineSecondaryTextColor">#909090</item>
-        <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
-        <item name="headlineSelectedExcerptTextColor">#323232</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
         <item name="linkColor">?colorPrimary</item>
         <item name="loadingBackground">@android:color/white</item>
@@ -26,7 +20,6 @@
         <item name="articleNoteBackground">#fff7d5</item>
         <item name="parentBtnBackground">#dddddd</item>
         <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleHeaderTextColor">@android:color/black</item>
         <item name="articleTextColor">@android:color/black</item>
         <!-- <item name="floatingActionButtonStyle">@style/FabTheme</item> -->
         <item name="headlineFooterColor">?colorPrimary</item>
-- 
cgit v1.2.3-54-g00ecf


From 3546500269f5c99ba63ca2c3edb6b168d31f4761 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 16:53:57 +0300
Subject: further color tweaks for dark mode

---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml              | 2 +-
 org.fox.ttrss/src/main/res/layout/headlines_row.xml                 | 2 +-
 .../src/main/res/layout/headlines_row_selected_compact.xml          | 2 +-
 .../src/main/res/layout/headlines_row_selected_unread_compact.xml   | 2 +-
 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml          | 4 +++-
 org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml  | 2 +-
 org.fox.ttrss/src/main/res/values-v11/style.xml                     | 6 ------
 org.fox.ttrss/src/main/res/values/style.xml                         | 2 +-
 8 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/values-v11/style.xml

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 32846c0d..8bc80d28 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -129,7 +129,7 @@
                         android:textAlignment="viewEnd"
                         android:fontFamily="sans-serif-light"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="?colorPrimary"
+                        android:textColor="?colorSecondary"
                         android:textSize="12sp" />
 
                 </LinearLayout>
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 045590ef..89302cfb 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -128,7 +128,7 @@
                                 android:textAlignment="viewEnd"
                                 android:singleLine="true"
                                 tools:text="Jan 01, 12:00, 1970"
-                                android:textColor="?colorPrimary"
+                                android:textColor="?colorSecondary"
                                 android:textSize="12sp" />
 
                         </LinearLayout>
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 84e24736..9b7db471 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
@@ -107,7 +107,7 @@
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textColor="?colorPrimary"
+            android:textColor="?colorSecondary"
             android:textSize="12sp"
             />
 
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 1de5e99c..5daace2a 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
@@ -106,7 +106,7 @@
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textColor="?colorPrimary"
+            android:textColor="?colorSecondary"
             android:textSize="12sp"
             />
 
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 d63f6a90..ffeadb7a 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
@@ -94,6 +94,7 @@
                             android:paddingBottom="8dp"
                             android:singleLine="false"
                             android:textSize="18sp"
+                            android:textColor="?colorOnSurface"
                             android:textStyle="bold"
                             tools:text="Sample entry title" />
 
@@ -129,7 +130,7 @@
                                 android:textAlignment="viewEnd"
                                 android:singleLine="true"
                                 tools:text="Jan 01, 12:00, 1970"
-                                android:textColor="?colorPrimary"
+                                android:textColor="?colorSecondary"
                                 android:textSize="12sp" />
 
                         </LinearLayout>
@@ -188,6 +189,7 @@
                 android:maxLines="5"
                 android:padding="16dp"
                 tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+                android:textColor="?colorOnSurface"
                 android:textSize="13sp" />
         </TableRow>
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
index dc829710..d4e274f2 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -101,7 +101,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
-            android:textColor="?colorPrimary"
+            android:textColor="?colorSecondary"
             android:singleLine="true"
             android:ellipsize="none"
             android:layout_weight="1"
diff --git a/org.fox.ttrss/src/main/res/values-v11/style.xml b/org.fox.ttrss/src/main/res/values-v11/style.xml
deleted file mode 100644
index 54a7530e..00000000
--- a/org.fox.ttrss/src/main/res/values-v11/style.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-	
-	<style name="DarkDialogTheme" parent="android:Theme.Holo.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 5c93d95b..4bfc41a0 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -25,7 +25,7 @@
         <item name="headlineFooterColor">?colorPrimary</item>
         <item name="articleHeaderSeparator">#cccccc</item>
 
-        <item name="colorPrimary">#257eae</item>
+        <item name="colorPrimary">#2786BA</item>
         <item name="colorPrimaryDark">#216d96</item>
         <item name="colorAccent">#F4511E</item>
 
-- 
cgit v1.2.3-54-g00ecf


From d1f120f246fbc51bacd7c7b751b80f8526174277 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 21:57:17 +0300
Subject: set color control normal on some missed menu icons

---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml    | 1 +
 org.fox.ttrss/src/main/res/layout/toolbar.xml             | 1 +
 org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml | 4 +++-
 org.fox.ttrss/src/main/res/menu/activity_logcat.xml       | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 8bc80d28..db407a22 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -18,6 +18,7 @@
         <com.google.android.material.appbar.AppBarLayout
             android:elevation="0dp"
             app:elevation="0dp"
+            android:backgroundTint="?colorSurfaceContainerLow"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml
index 2937cde6..c256e587 100755
--- a/org.fox.ttrss/src/main/res/layout/toolbar.xml
+++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml
@@ -8,4 +8,5 @@
     app:titleTextAppearance="?attr/textAppearanceTitleMedium"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    android:background="?colorSurfaceContainerLow"
     android:minHeight="?attr/actionBarSize"/>
diff --git a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
index 0e0f5792..35981c01 100644
--- a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
+++ b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml
@@ -3,19 +3,21 @@
     <item
         android:id="@+id/selection_toggle_unread"
         app:showAsAction="always"
-
+        app:iconTint="?attr/colorControlNormal"
         android:icon="@drawable/baseline_mark_as_unread_24"
         android:title="@string/selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
         android:icon="@drawable/baseline_star_outline_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always"
         android:title="@string/selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
         android:icon="@drawable/baseline_rss_feed_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="always"
         android:title="@string/selection_toggle_published"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
index 1241f72f..66734665 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml
@@ -3,12 +3,14 @@
     <item
         android:id="@+id/logcat_refresh"
         android:icon="@drawable/baseline_refresh_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_refresh"/>
 
     <item
         android:id="@+id/logcat_copy"
         android:icon="@drawable/baseline_content_copy_24"
+        app:iconTint="?attr/colorControlNormal"
         app:showAsAction="ifRoom"
         android:title="@string/logcat_copy"/>
 
-- 
cgit v1.2.3-54-g00ecf


From a94ba6713757434ec42595c9a652f1bd5dd93237 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 22:07:03 +0300
Subject: adjust some dynamic icons and article toolbar padding

---
 .../main/java/org/fox/ttrss/OnlineActivity.java    |   4 +-
 .../org/fox/ttrss/offline/OfflineActivity.java     |   4 +-
 .../org/fox/ttrss/util/ScrimInsetsFrameLayout.java | 142 ---------------------
 .../src/main/res/layout/fragment_article.xml       |   8 +-
 4 files changed, 9 insertions(+), 149 deletions(-)
 delete mode 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java

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

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 d9550ef8..807b133b 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
@@ -1409,8 +1409,8 @@ public class OnlineActivity extends CommonActivity {
 						m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.baseline_check_box_24 :
 								R.drawable.baseline_rss_feed_24);
 
-						m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_email_24 :
-								R.drawable.baseline_mark_as_unread_24);
+						m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_mark_as_unread_24 :
+								R.drawable.baseline_email_24);
 					}
 				}
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index f2320a00..4da85e76 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -611,8 +611,8 @@ public class OfflineActivity extends CommonActivity {
 					m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.baseline_check_box_24 :
 						R.drawable.baseline_rss_feed_24);
 
-					m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.baseline_email_24 :
-							R.drawable.baseline_mark_as_unread_24);
+					m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.baseline_mark_as_unread_24 :
+							R.drawable.baseline_email_24);
 
 					article.close();
 				}				
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java
deleted file mode 100755
index d3a5ab27..00000000
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.fox.ttrss.util;
-/*
- * Copyright 2014 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.widget.FrameLayout;
-
-import org.fox.ttrss.R;
-
-import androidx.core.view.ViewCompat;
-
-/**
- * A layout that draws something in the insets passed to {@link #fitSystemWindows(Rect)}, i.e. the area above UI chrome
- * (status and navigation bars, overlay action bars).
- */
-public class ScrimInsetsFrameLayout extends FrameLayout {
-    private Drawable mInsetForeground;
-
-    private Rect mInsets;
-    private Rect mTempRect = new Rect();
-    private OnInsetsCallback mOnInsetsCallback;
-
-    public ScrimInsetsFrameLayout(Context context) {
-        super(context);
-        init(context, null, 0);
-    }
-
-    public ScrimInsetsFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs, 0);
-    }
-
-    public ScrimInsetsFrameLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init(context, attrs, defStyle);
-    }
-
-    private void init(Context context, AttributeSet attrs, int defStyle) {
-        final TypedArray a = context.obtainStyledAttributes(attrs,
-                R.styleable.ScrimInsetsView, defStyle, 0);
-        if (a == null) {
-            return;
-        }
-        mInsetForeground = a.getDrawable(R.styleable.ScrimInsetsView_insetForeground);
-        a.recycle();
-
-        setWillNotDraw(true);
-    }
-
-    @Override
-    protected boolean fitSystemWindows(Rect insets) {
-        mInsets = new Rect(insets);
-        setWillNotDraw(mInsetForeground == null);
-        ViewCompat.postInvalidateOnAnimation(this);
-        if (mOnInsetsCallback != null) {
-            mOnInsetsCallback.onInsetsChanged(insets);
-        }
-        return true; // consume insets
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        super.draw(canvas);
-
-        int width = getWidth();
-        int height = getHeight();
-        if (mInsets != null && mInsetForeground != null) {
-            int sc = canvas.save();
-            canvas.translate(getScrollX(), getScrollY());
-
-            // Top
-            mTempRect.set(0, 0, width, mInsets.top);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
-
-            // Bottom
-            mTempRect.set(0, height - mInsets.bottom, width, height);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
-
-            // Left
-            mTempRect.set(0, mInsets.top, mInsets.left, height - mInsets.bottom);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
-
-            // Right
-            mTempRect.set(width - mInsets.right, mInsets.top, width, height - mInsets.bottom);
-            mInsetForeground.setBounds(mTempRect);
-            mInsetForeground.draw(canvas);
-
-            canvas.restoreToCount(sc);
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        if (mInsetForeground != null) {
-            mInsetForeground.setCallback(this);
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        if (mInsetForeground != null) {
-            mInsetForeground.setCallback(null);
-        }
-    }
-
-    /**
-     * Allows the calling container to specify a callback for custom processing when insets change (i.e. when
-     * {@link #fitSystemWindows(Rect)} is called. This is useful for setting padding on UI elements based on
-     * UI chrome insets (e.g. a Google Map or a ListView). When using with ListView or GridView, remember to set
-     * clipToPadding to false.
-     */
-    public void setOnInsetsCallback(OnInsetsCallback onInsetsCallback) {
-        mOnInsetsCallback = onInsetsCallback;
-    }
-
-    public interface OnInsetsCallback {
-        void onInsetsChanged(Rect insets);
-    }
-}
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index db407a22..f71ab5cc 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -24,12 +24,14 @@
 
             <LinearLayout
                 app:layout_scrollFlags="scroll|enterAlways"
-                android:padding="16dp"
+                android:paddingTop="0dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="0dp"
+                android:paddingBottom="8dp"
                 android:id="@+id/article_header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="6dp">
+                android:orientation="vertical">
 
                 <LinearLayout
                     android:orientation="horizontal"
-- 
cgit v1.2.3-54-g00ecf


From 471404bfb1d01616f91037ea42fea72296f0652a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 07:18:20 +0300
Subject: drop linkColor & fix article header padding

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java      | 6 +++---
 .../src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java | 6 +++---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml              | 2 +-
 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 -
 6 files changed, 7 insertions(+), 10 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 86a68d5b..729aa7fd 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -485,10 +485,10 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         String cssOverride = "body { color : "+textColor+"; }";
 
-        TypedValue tvLinkColor = new TypedValue();
-        getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true);
+        TypedValue tvColorPrimary = new TypedValue();
+        getActivity().getTheme().resolveAttribute(R.attr.colorPrimary, tvColorPrimary, true);
 
-        String linkHexColor = String.format("#%06X", (0xFFFFFF & tvLinkColor.data));
+        String linkHexColor = String.format("#%06X", (0xFFFFFF & tvColorPrimary.data));
         cssOverride += " a:link {color: "+linkHexColor+";} a:visited { color: "+linkHexColor+";}";
 
         String articleContent = m_article.content != null ? m_article.content : "";
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 465c461d..aac19b51 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -333,10 +333,10 @@ public class OfflineArticleFragment extends Fragment {
 
                 String cssOverride = "body { color : "+textColor+"; }";
 
-                TypedValue tvLinkColor = new TypedValue();
-                getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true);
+                TypedValue tvColorPrimary = new TypedValue();
+                getActivity().getTheme().resolveAttribute(R.attr.colorPrimary, tvColorPrimary, true);
 
-                String linkHexColor = String.format("#%06X", (0xFFFFFF & tvLinkColor.data));
+                String linkHexColor = String.format("#%06X", (0xFFFFFF & tvColorPrimary.data));
                 cssOverride += " a:link {color: "+linkHexColor+";} a:visited { color: "+linkHexColor+";}";
 
 				String articleContent = m_cursor.getString(m_cursor.getColumnIndex("content"));
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index f71ab5cc..ea244873 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -26,7 +26,7 @@
                 app:layout_scrollFlags="scroll|enterAlways"
                 android:paddingTop="0dp"
                 android:paddingStart="16dp"
-                android:paddingEnd="0dp"
+                android:paddingEnd="8dp"
                 android:paddingBottom="8dp"
                 android:id="@+id/article_header"
                 android:layout_width="match_parent"
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 e5f738e1..a84ed131 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -29,7 +29,6 @@
         <item name="feedlistTextColor">@android:color/white</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
         <item name="headlineHeaderBackground">#99000000</item>
-        <item name="linkColor">#2d92c8</item>
         <item name="articleNoteTextColor">#bebebe</item>
         <item name="articleNoteBackground">#303030</item>
         <item name="parentBtnBackground">#101010</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index d0886639..f5fac361 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -5,7 +5,6 @@
     <attr name="feedlistSelectedTextColor" format="reference|color" />
     <attr name="headlineHeaderBackground" format="reference|color" />
     <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
-    <attr name="linkColor" format="reference|color" />
     <attr name="articleNoteBackground" format="reference|color" />
     <attr name="articleNoteTextColor" format="reference|color" />
     <attr name="parentBtnBackground" format="reference|color" />
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index 54613ad9..1e348393 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -28,7 +28,6 @@
         <item name="feedlistTextColor">@android:color/black</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-        <item name="linkColor">?colorPrimary</item>
         <item name="articleNoteTextColor">#9a8c59</item>
         <item name="articleNoteBackground">#fff7d5</item>
         <item name="parentBtnBackground">#dddddd</item>
-- 
cgit v1.2.3-54-g00ecf


From 850baf5aab2945961f9e0e8c16b7e09de5e8a874 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 08:52:16 +0300
Subject: adjust some heading colors

---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml      | 1 +
 org.fox.ttrss/src/main/res/layout/headlines_row.xml         | 1 +
 org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index ea244873..0c2593ab 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -45,6 +45,7 @@
                         android:layout_weight="1"
                         android:layout_marginEnd="8dp"
                         android:textAlignment="viewStart"
+                        android:textColor="?colorPrimary"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
                         android:textSize="16sp"
                         android:gravity="start" />
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 c5372044..d41e5b37 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -90,6 +90,7 @@
                             android:gravity="center_vertical"
                             android:maxLines="3"
                             android:paddingBottom="8dp"
+                            android:textColor="?colorPrimary"
                             android:singleLine="false"
                             android:textSize="18sp"
                             android:textStyle="normal"
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 06d95717..fd328276 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
@@ -49,7 +49,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Sample entry title"
-            android:textColor="?colorSecondary"
+            android:textColor="?colorPrimary"
             android:textSize="18sp"
             android:layout_span="2" />
 
-- 
cgit v1.2.3-54-g00ecf


From 9c98f64e6bed0787a9f267f3a4ea2a3ceb506bdf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 12:27:25 +0300
Subject: drop some ripples and update compact headline views

---
 .../main/java/org/fox/ttrss/HeadlinesFragment.java | 34 +++++++++++++---------
 .../src/main/res/layout/fragment_article.xml       |  2 --
 .../headlines_row_selected_unread_compact.xml      |  7 +----
 .../res/layout/headlines_row_unread_compact.xml    | 17 +----------
 4 files changed, 23 insertions(+), 37 deletions(-)

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

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 6cc92d87..2b92283d 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
@@ -72,6 +72,7 @@ import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
 import com.bumptech.glide.request.target.Target;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.divider.MaterialDividerItemDecoration;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.gson.JsonElement;
 
@@ -361,6 +362,13 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 		m_list.setLayoutManager(m_layoutManager);
 		m_list.setItemAnimator(new DefaultItemAnimator());
 
+		if (m_compactLayoutMode) {
+			MaterialDividerItemDecoration materialDivider = new MaterialDividerItemDecoration(m_list.getContext(), m_layoutManager.getOrientation());
+			materialDivider.setDividerInsetStart(dpToPx(80));
+
+			m_list.addItemDecoration(materialDivider);
+		}
+
 		ArticleListAdapter adapter = new ArticleListAdapter(getActivity(), R.layout.headlines_row, m_articles);
 
 		m_adapter = new HeaderViewRecyclerAdapter(adapter);
@@ -1675,18 +1683,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			}
 		}
 
-		public int pxToDp(int px) {
-			DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
-			int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
-			return dp;
-		}
-
-		public int dpToPx(int dp) {
-			DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
-			int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
-			return px;
-		}
-
 		private void adjustTitleTextView(int score, TextView tv, int position) {
 			int viewType = getItemViewType(position);
 			if (origTitleColors[viewType] == null)
@@ -1839,7 +1835,19 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
         m_adapter.notifyDataSetChanged();
     }
 
-    @Override
+	public int pxToDp(int px) {
+		DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
+		int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
+		return dp;
+	}
+
+	public int dpToPx(int dp) {
+		DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
+		int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
+		return px;
+	}
+
+	@Override
 	public void onPause() {
 		super.onPause();
 
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 0c2593ab..3bca35de 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -81,7 +81,6 @@
                 <TextView
                     android:id="@+id/comments"
                     tools:text="comments"
-                    android:background="@drawable/ripple"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
@@ -94,7 +93,6 @@
                 <TextView
                     android:id="@+id/host"
                     tools:text="host"
-                    android:background="@drawable/ripple"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
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 5daace2a..7d083908 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
@@ -107,9 +107,7 @@
             android:layout_weight="1"
             tools:text="Jan 01"
             android:textColor="?colorSecondary"
-            android:textSize="12sp"
-            />
-
+            android:textSize="12sp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
@@ -118,11 +116,8 @@
             android:layout_gravity="bottom|end"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:clickable="true"
             app:icon="?ic_star_outline" />
 
-
-
     </LinearLayout>
 
     <!-- <ImageView
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
index d4e274f2..222d19d1 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -106,32 +106,17 @@
             android:ellipsize="none"
             android:layout_weight="1"
             tools:text="Jan 01"
-            android:textSize="12sp"
-            />
-
+            android:textSize="12sp" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
             style="?attr/materialIconButtonStyle"
-            android:background="@drawable/ripple"
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:clickable="true"
             app:icon="?ic_star_outline" />
 
     </LinearLayout>
 
-    <!-- <ImageView
-        android:id="@+id/article_menu_button"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:layout_weight="0"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:src="@drawable/ic_action_overflow" /> -->
-
-
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From db7ee817acf63360ac0dbf0422f95f7673392440 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 17:55:18 +0300
Subject: drop articleNote-specific colors

---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml | 4 ++--
 org.fox.ttrss/src/main/res/values-night/themes.xml     | 2 --
 org.fox.ttrss/src/main/res/values/attrs.xml            | 2 --
 org.fox.ttrss/src/main/res/values/themes.xml           | 2 --
 4 files changed, 2 insertions(+), 8 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 3bca35de..ed8f2958 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -165,8 +165,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="?articleNoteBackground"
-                    android:textColor="?articleNoteTextColor"
+                    android:background="?colorSecondaryContainer"
+                    android:textColor="?colorOnSecondaryContainer"
                     android:textSize="12sp"
                     android:paddingLeft="16dp"
                     android:paddingTop="8dp"
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 119a9e0d..f072def8 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -28,8 +28,6 @@
 
         <item name="feedlistTextColor">@android:color/white</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</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="feedlistSelectedTextColor">@android:color/white</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index 4b469913..49daa405 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -4,8 +4,6 @@
     <attr name="feedlistTextColor" format="reference|color" />
     <attr name="feedlistSelectedTextColor" format="reference|color" />
     <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
-    <attr name="articleNoteBackground" format="reference|color" />
-    <attr name="articleNoteTextColor" format="reference|color" />
     <attr name="parentBtnBackground" format="reference|color" />
     <attr name="articleHeader" format="reference|color" />
     <attr name="articleTextColor" format="reference|color" />
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index 16b29c9e..f9186c3e 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -30,8 +30,6 @@
         <item name="feedlistTextColor">@android:color/black</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-        <item name="articleNoteTextColor">#9a8c59</item>
-        <item name="articleNoteBackground">#fff7d5</item>
         <item name="parentBtnBackground">#dddddd</item>
         <item name="articleHeader">@android:color/transparent</item>
         <item name="articleTextColor">@android:color/black</item>
-- 
cgit v1.2.3-54-g00ecf


From f88aa097dfa381c63812c12c22f67dd3e97206a5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 18:10:22 +0300
Subject: drop all custom/hardcoded color refs, replace with m3 theme
 alternatives

---
 .../src/main/java/org/fox/ttrss/ArticleFragment.java         | 12 +-----------
 .../src/main/java/org/fox/ttrss/HeadlinesFragment.java       |  9 ---------
 .../java/org/fox/ttrss/offline/OfflineArticleFragment.java   |  2 +-
 .../java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java |  9 ---------
 org.fox.ttrss/src/main/res/layout/drawer_divider.xml         |  8 +++-----
 org.fox.ttrss/src/main/res/layout/feeds_goback.xml           |  1 -
 org.fox.ttrss/src/main/res/layout/feeds_row.xml              |  1 -
 org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml     |  2 +-
 org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml       |  3 +--
 org.fox.ttrss/src/main/res/layout/fragment_article.xml       |  8 ++------
 org.fox.ttrss/src/main/res/values-night/themes.xml           |  9 ---------
 org.fox.ttrss/src/main/res/values/attrs.xml                  |  8 --------
 org.fox.ttrss/src/main/res/values/themes.xml                 |  9 ---------
 13 files changed, 9 insertions(+), 72 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 0d9a37c2..621238c1 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -457,18 +457,8 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         scoreView.setIconResource(tv.resourceId);
 
-        Resources.Theme theme = m_activity.getTheme();
-        TypedValue tvColorHighScore = new TypedValue();
-        theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tvColorHighScore, true);
-
         TypedValue tvPrimary = new TypedValue();
         m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true);
-
-        if (m_article.score > Article.SCORE_HIGH)
-            scoreView.setIconTint(ColorStateList.valueOf(tvColorHighScore.data));
-        else
-            scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data));
-
     }
 
     protected void renderContent(Bundle savedInstanceState) {
@@ -480,7 +470,7 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
         ws.setSupportZoom(false);
 
         TypedValue tvTextColor = new TypedValue();
-        getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true);
+        getActivity().getTheme().resolveAttribute(R.attr.colorOnSurface, tvTextColor, true);
 
         String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data));
 
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 2b92283d..b0ffa853 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
@@ -857,7 +857,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 		public static final int VIEW_COUNT = VIEW_AMR_FOOTER + 1;
 
 		private final Integer[] origTitleColors = new Integer[VIEW_COUNT];
-		private final int titleHighScoreUnreadColor;
 
         private ColorGenerator m_colorGenerator = ColorGenerator.DEFAULT;
         private TextDrawable.IBuilder m_drawableBuilder = TextDrawable.builder().round();
@@ -900,11 +899,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			flavorImageEnabled = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode);
 
 			m_cmgr = (ConnectivityManager) m_activity.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-			Theme theme = context.getTheme();
-			TypedValue tv = new TypedValue();
-			theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true);
-			titleHighScoreUnreadColor = tv.data;
 		}
 
 		@Override
@@ -1691,9 +1685,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 
 			if (score < Article.SCORE_LOW) {
 				tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-			} else if (score > Article.SCORE_HIGH) {
-				tv.setTextColor(titleHighScoreUnreadColor);
-				tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
 			} else {
 				tv.setTextColor(origTitleColors[viewType].intValue());
 				tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index aac19b51..9451f8f6 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -327,7 +327,7 @@ public class OfflineArticleFragment extends Fragment {
 				}
 
                 TypedValue tvTextColor = new TypedValue();
-                getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true);
+                getActivity().getTheme().resolveAttribute(R.attr.colorOnSurface, tvTextColor, true);
 
                 String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data));
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index cad9e028..bde4f52f 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -566,7 +566,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		public static final int VIEW_COUNT = VIEW_LOADMORE+1;
 		
 		private final Integer[] origTitleColors = new Integer[VIEW_COUNT];
-		private final int titleHighScoreUnreadColor;
 
         private ColorGenerator m_colorGenerator = ColorGenerator.DEFAULT;
         private TextDrawable.IBuilder m_drawableBuilder = TextDrawable.builder().round();
@@ -578,11 +577,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				String[] from, int[] to, int flags) {
 			super(context, layout, c, from, to, flags);
 			
-			Theme theme = context.getTheme();
-			TypedValue tv = new TypedValue();
-			theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true);
-			titleHighScoreUnreadColor = tv.data;
-
 			String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT");
 			showFlavorImage = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode);
 
@@ -1194,9 +1188,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 
 			if (score < -500) {
 				tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-			} else if (score > 500) {
-				tv.setTextColor(titleHighScoreUnreadColor);
-				tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
 			} else {
 				tv.setTextColor(origTitleColors[viewType].intValue());
 				tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml
index 1e0166e8..3b4ab6fc 100644
--- a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml
+++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml
@@ -4,11 +4,9 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <View
-        android:layout_gravity="top|center_horizontal"
-        android:layout_marginTop="10dp"
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?colorOutlineVariant"/>
+        android:layout_marginTop="8dp"
+        android:layout_height="wrap_content"/>
 
 </FrameLayout>
\ No newline at end of file
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 d826da41..f4c580a3 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
@@ -33,7 +33,6 @@
         android:paddingStart="16dp"
         android:singleLine="true"
         android:text=".."
-        android:textColor="?feedlistTextColor"
         android:textSize="14sp" />
 
 </LinearLayout>
\ 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 3ebcf0eb..32e20c26 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -37,7 +37,6 @@
             android:paddingEnd="16dp"
             android:singleLine="true"
             tools:text="Feed title"
-            android:textColor="?feedlistTextColor"
             android:textSize="14sp" />
 
         <TextView
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
index 7cad355d..3e9255b5 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -43,7 +43,7 @@
             android:paddingEnd="16dp"
             android:singleLine="true"
             tools:text="Feed title"
-            android:textColor="?feedlistSelectedTextColor"
+            android:textColor="?colorPrimary"
             android:textSize="14sp" />
 
         <TextView
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
index 15f88849..3b76fc79 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml
@@ -35,8 +35,7 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:singleLine="true"
-        tools:text="Unread only"
-        android:textColor="?feedlistTextColor"
+        tools:text="@string/unread_only"
         android:textSize="14sp" />
 
     <com.google.android.material.materialswitch.MaterialSwitch
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index ed8f2958..e8fe04aa 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -16,8 +16,6 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:elevation="0dp"
-            app:elevation="0dp"
             android:backgroundTint="?colorSurfaceContainerLow"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -138,11 +136,9 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_gravity="top|center_horizontal"
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?articleHeaderSeparator"/>
+                android:layout_height="wrap_content"/>
 
         </com.google.android.material.appbar.AppBarLayout>
 
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 f072def8..196b4ad4 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -26,15 +26,6 @@
         <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="feedlistTextColor">@android:color/white</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
-        <item name="parentBtnBackground">#101010</item>
-        <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-        <item name="feedlistSelectedTextColor">@android:color/white</item>
-        <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleTextColor">#e0e0e0</item>
-        <item name="articleHeaderSeparator">#303030</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 49daa405..daf2323c 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="ttrssHorizontalDivider" format="reference|color" />
-    <attr name="feedlistTextColor" format="reference|color" />
-    <attr name="feedlistSelectedTextColor" format="reference|color" />
-    <attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
-    <attr name="parentBtnBackground" format="reference|color" />
-    <attr name="articleHeader" format="reference|color" />
-    <attr name="articleTextColor" format="reference|color" />
-    <attr name="articleHeaderSeparator" format="reference|color" />
     <attr name="ic_rss_box" format="reference"/>
     <attr name="ic_checkbox_marked" format="reference" />
     <attr name="ic_star" format="reference" />
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index f9186c3e..4cc0d590 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -26,15 +26,6 @@
         <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="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
-        <item name="feedlistTextColor">@android:color/black</item>
-        <item name="feedlistSelectedTextColor">@android:color/black</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-        <item name="parentBtnBackground">#dddddd</item>
-        <item name="articleHeader">@android:color/transparent</item>
-        <item name="articleTextColor">@android:color/black</item>
-        <item name="articleHeaderSeparator">#cccccc</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


From a354d2a348099be7e3cacc0441dd5c19944cd7a6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 18:59:22 +0300
Subject: add m3 edge-to-edge

---
 org.fox.ttrss/build.gradle                         |  1 +
 .../main/java/org/fox/ttrss/CommonActivity.java    |  2 +
 .../res/layout-sw600dp-land/activity_master.xml    | 13 ++++-
 .../res/layout-sw600dp-port/activity_master.xml    | 61 +++-------------------
 .../src/main/res/layout/activity_detail_phone.xml  |  1 +
 .../src/main/res/layout/activity_master.xml        |  2 +-
 .../src/main/res/layout/activity_master_phone.xml  | 61 +++-------------------
 .../src/main/res/layout/drawer_header.xml          |  2 +-
 .../src/main/res/layout/fragment_article.xml       |  2 +-
 .../src/main/res/layout/master_drawer_layout.xml   | 54 +++++++++++++++++++
 org.fox.ttrss/src/main/res/layout/toolbar.xml      |  2 -
 org.fox.ttrss/src/main/res/values-night/themes.xml |  3 --
 org.fox.ttrss/src/main/res/values/themes.xml       |  3 --
 13 files changed, 87 insertions(+), 120 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml

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

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index 9f130852..34d31f9c 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -110,6 +110,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:3.8.0'
     implementation files('libs/glide-transformations-2.0.2.jar')
     implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'androidx.activity:activity:1.10.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.appcompat:appcompat-resources:1.7.0'
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 31824310..4eb5b6f0 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -33,6 +33,7 @@ import android.view.Display;
 import android.view.View;
 import android.widget.CheckBox;
 
+import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.browser.customtabs.CustomTabsCallback;
@@ -231,6 +232,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		EdgeToEdge.enable(this);
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 			NotificationManager nmgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
index 6976c873..f44e0e4a 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
@@ -1,6 +1,7 @@
 <RelativeLayout
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -46,7 +47,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+                <com.google.android.material.appbar.MaterialToolbar
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    xmlns:app="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/toolbar"
+                    app:layout_scrollFlags="scroll|enterAlways"
+                    app:titleTextAppearance="?attr/textAppearanceTitleMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:background="?colorSurfaceContainer"
+                    android:minHeight="?attr/actionBarSize"/>
+
 
             </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
index fa1612f8..9bb837cb 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
@@ -1,57 +1,8 @@
-<!-- we don't hide actionbar on tablets even in portrait so this is a bit different from activity_master_phone.xml -->
-
-<androidx.drawerlayout.widget.DrawerLayout
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_drawer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_below="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/master_fab"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                android:visibility="gone"
-                android:src="@drawable/baseline_refresh_24"
-                android:layout_margin="16dp" />
-
-            <FrameLayout
-                android:id="@+id/headlines_fragment"
-                app:layout_behavior=".util.FabAwareScrollingViewBehavior"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    </RelativeLayout>
-
-    <com.google.android.material.navigation.NavigationView
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/navigationView"
-        android:layout_width="300dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:elevation="8dp">
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="match_parent"
-            android:background="?colorSurfaceContainer"
-            android:layout_height="match_parent" >
-        </FrameLayout>
-
-    </com.google.android.material.navigation.NavigationView>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-</androidx.drawerlayout.widget.DrawerLayout>
+    <include layout="@layout/master_drawer_layout" />
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
index 6d2f94ea..56500d38 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
@@ -1,6 +1,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/headlines"
     android:animateLayoutChanges="true"
+    android:fitsSystemWindows="true"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml
index 9bb9bff5..9bb837cb 100755
--- a/org.fox.ttrss/src/main/res/layout/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml
@@ -4,5 +4,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/activity_master_phone" />
+    <include layout="@layout/master_drawer_layout" />
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
index f1c5e9d3..9bb837cb 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
@@ -1,53 +1,8 @@
-    <androidx.drawerlayout.widget.DrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/headlines_drawer"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/master_fab"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                android:visibility="gone"
-                android:src="@drawable/baseline_refresh_24"
-                android:layout_margin="16dp" />
-
-            <com.google.android.material.appbar.AppBarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-            </com.google.android.material.appbar.AppBarLayout>
-
-            <FrameLayout
-                android:id="@+id/headlines_fragment"
-                app:layout_behavior=".util.FabAwareScrollingViewBehavior"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-        <com.google.android.material.navigation.NavigationView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/navigationView"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="start">
-
-            <FrameLayout
-                android:id="@+id/feeds_fragment"
-                android:layout_width="match_parent"
-                android:background="?colorSurfaceContainer"
-                android:layout_height="match_parent" >
-            </FrameLayout>
-
-        </com.google.android.material.navigation.NavigationView>
-
-    </androidx.drawerlayout.widget.DrawerLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/master_drawer_layout" />
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
index f4954259..3540c094 100755
--- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml
+++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="72dp"
+    android:layout_height="96dp"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index e8fe04aa..0b1f1f0e 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
+    android:background="?colorSurfaceContainer"
     android:layout_height="match_parent">
 
     <FrameLayout
@@ -16,7 +17,6 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.AppBarLayout
-            android:backgroundTint="?colorSurfaceContainerLow"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml
new file mode 100644
index 00000000..4ce1249a
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml
@@ -0,0 +1,54 @@
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines_drawer"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:fitsSystemWindows="true"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/master_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:visibility="gone"
+            android:src="@drawable/baseline_refresh_24"
+            android:layout_margin="16dp" />
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <FrameLayout
+            android:id="@+id/headlines_fragment"
+            app:layout_behavior=".util.FabAwareScrollingViewBehavior"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <com.google.android.material.navigation.NavigationView
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/navigationView"
+        android:layout_width="300dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start">
+
+        <FrameLayout
+            android:id="@+id/feeds_fragment"
+            android:layout_width="match_parent"
+            android:background="?colorSurfaceContainer"
+            android:layout_height="match_parent" >
+        </FrameLayout>
+
+    </com.google.android.material.navigation.NavigationView>
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml
index c256e587..989292b2 100755
--- a/org.fox.ttrss/src/main/res/layout/toolbar.xml
+++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml
@@ -3,10 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
-    android:elevation="4dp"
     app:layout_scrollFlags="scroll|enterAlways"
     app:titleTextAppearance="?attr/textAppearanceTitleMedium"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:background="?colorSurfaceContainerLow"
     android:minHeight="?attr/actionBarSize"/>
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 196b4ad4..83268f38 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -1,8 +1,5 @@
 <resources>
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="android:statusBarColor">?colorSurfaceContainerLow</item>
-        <item name="android:windowLightStatusBar">false</item>
-
         <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item>
         <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
         <item name="ic_star">@drawable/baseline_star_24</item>
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index 4cc0d590..ae4ba058 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -1,8 +1,5 @@
 <resources>
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
-        <item name="android:statusBarColor">?colorSurfaceContainerLow</item>
-        <item name="android:windowLightStatusBar">true</item>
-
         <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item>
         <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
         <item name="ic_star">@drawable/baseline_star_24</item>
-- 
cgit v1.2.3-54-g00ecf


From bbb1d54575c74213f70e2f88bac0f541c1724488 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 23:12:33 +0300
Subject: attempt to simplify article view a bit

---
 org.fox.ttrss/build.gradle                         |  2 +-
 .../main/java/org/fox/ttrss/ArticleFragment.java   |  7 +-
 .../src/main/java/org/fox/ttrss/ArticlePager.java  |  2 +-
 .../fox/ttrss/offline/OfflineArticleFragment.java  |  9 +-
 .../org/fox/ttrss/offline/OfflineArticlePager.java |  2 +-
 .../src/main/res/layout/article_pager.xml          |  7 --
 .../src/main/res/layout/fragment_article.xml       | 99 ++++++++++------------
 .../src/main/res/layout/fragment_article_pager.xml |  6 ++
 .../src/main/res/layout/layout_detail_phone.xml    | 57 ++++++-------
 9 files changed, 90 insertions(+), 101 deletions(-)
 delete mode 100755 org.fox.ttrss/src/main/res/layout/article_pager.xml
 create mode 100755 org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml

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

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index 34d31f9c..39fdb5ae 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -123,7 +123,7 @@ dependencies {
     implementation 'me.relex:circleindicator:1.2.2@aar'
     implementation 'com.nineoldandroids:library:2.4.0'
     implementation 'com.github.amulyakhare:TextDrawable:558677ea31'
-
+    implementation 'com.telefonica:nestedscrollwebview:0.1.6'
 }
 java {
     toolchain {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 621238c1..959ef7bf 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -179,7 +179,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
             view.findViewById(R.id.article_scrollview).setVisibility(View.INVISIBLE);
         } */
 
-        m_contentView = view.findViewById(R.id.article_scrollview);
         m_customViewContainer = view.findViewById(R.id.article_fullscreen_video);
 
         /* if (m_article.id == HeadlinesFragment.ARTICLE_SPECIAL_TOP_CHANGED) {
@@ -346,8 +345,12 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
                     host.setText(outhost.replaceFirst("^www\\.", ""));
                     host.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_articleSmallFontSize);
                     host.setVisibility(View.VISIBLE);
+                } else {
+                    host.setVisibility(View.GONE);
                 }
-            } catch (MalformedURLException ignored) {}
+            } catch (MalformedURLException ignored) {
+                host.setVisibility(View.GONE);
+            }
         }
 
         TextView note = view.findViewById(R.id.note);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
index cdaca2dd..c94f0c3a 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
@@ -135,7 +135,7 @@ public class ArticlePager extends androidx.fragment.app.Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
-		View view = inflater.inflate(R.layout.article_pager, container, false);
+		View view = inflater.inflate(R.layout.fragment_article_pager, container, false);
 	
 		if (savedInstanceState != null) {
 			if (m_activity instanceof DetailActivity) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 9451f8f6..3b199d2a 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -199,7 +199,6 @@ public class OfflineArticleFragment extends Fragment {
 		m_cursor.moveToFirst();
 		
 		if (m_cursor.isFirst()) {
-			m_contentView = view.findViewById(R.id.article_scrollview);
 			m_customViewContainer = view.findViewById(R.id.article_fullscreen_video);
 
             final String link = m_cursor.getString(m_cursor.getColumnIndex("link"));
@@ -265,7 +264,13 @@ public class OfflineArticleFragment extends Fragment {
 			if (comments != null) {
 				comments.setVisibility(View.GONE);
 			}
-			
+
+			View host = view.findViewById(R.id.host);
+
+			if (host != null) {
+				host.setVisibility(View.GONE);
+			}
+
 			TextView note = view.findViewById(R.id.note);
 			
 			if (note != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java
index 20c2fd0c..ce4f6f72 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java
@@ -136,7 +136,7 @@ public class OfflineArticlePager extends Fragment {
 	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
-		View view = inflater.inflate(R.layout.article_pager, container, false);
+		View view = inflater.inflate(R.layout.fragment_article_pager, container, false);
 	
 		if (savedInstanceState != null) {
 			m_articleId = savedInstanceState.getInt("articleId", 0);
diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/article_pager.xml
deleted file mode 100755
index 62b3fea4..00000000
--- a/org.fox.ttrss/src/main/res/layout/article_pager.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.viewpager.widget.ViewPager
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/article_pager"
-    android:background="?android:colorBackground"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"/>
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 0b1f1f0e..0f156245 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -22,17 +22,16 @@
 
             <LinearLayout
                 app:layout_scrollFlags="scroll|enterAlways"
-                android:paddingTop="0dp"
-                android:paddingStart="16dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="8dp"
                 android:id="@+id/article_header"
+                android:background="?colorSurface"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <LinearLayout
                     android:orientation="horizontal"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
@@ -41,7 +40,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:layout_marginEnd="8dp"
                         android:textAlignment="viewStart"
                         android:textColor="?colorPrimary"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
@@ -78,34 +76,40 @@
 
                 <TextView
                     android:id="@+id/comments"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     tools:text="comments"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
-                    android:paddingTop="8dp"
+                    android:layout_marginTop="8dp"
                     android:textColor="?colorSecondary"
                     android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/host"
                     tools:text="host"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="viewStart"
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
-                    android:paddingTop="8dp"
+                    android:layout_marginTop="8dp"
                     android:textColor="?colorSecondary"
-                    android:textSize="12sp"
-                    android:visibility="gone"/>
+                    android:textSize="12sp" />
+
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:paddingTop="8dp">
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp">
 
                     <TextView
                         android:id="@+id/tags"
@@ -134,58 +138,41 @@
 
                 </LinearLayout>
 
-            </LinearLayout>
+                <com.google.android.material.divider.MaterialDivider
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
 
-            <com.google.android.material.divider.MaterialDivider
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?colorSurfaceContainer">
+
+                    <TextView
+                        android:id="@+id/note"
+                        tools:text="Article note (if any...)"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="?colorSecondaryContainer"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
+                        android:padding="8dp"
+                        android:textColor="?colorOnSecondaryContainer"
+                        android:textSize="12sp"/>
+                </LinearLayout>
+            </LinearLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/article_scrollview"
-            android:scrollbars="vertical|horizontal"
+        <com.telefonica.nestedscrollwebview.NestedScrollWebView
+            android:id="@+id/article_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:descendantFocusability="blocksDescendants"
-                android:orientation="vertical" >
-
-                <TextView
-                    android:id="@+id/note"
-                    tools:text="Article note (if any...)"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="?colorSecondaryContainer"
-                    android:textColor="?colorOnSecondaryContainer"
-                    android:textSize="12sp"
-                    android:paddingLeft="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingRight="16dp"
-                    android:paddingBottom="8dp" />
-
-                <org.fox.ttrss.util.LessBrokenWebView
-                    android:layout_margin="16dp"
-                    android:id="@+id/article_content"
-                    android:scrollbars="none"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
+            android:layout_height="wrap_content" />
 
     </com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/article_status_message"
-        android:gravity="center"
-        android:visibility="gone" />
-
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml
new file mode 100755
index 00000000..1a687b1d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article_pager.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.viewpager.widget.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/article_pager"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"/>
diff --git a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
index 9421f008..429b27c0 100644
--- a/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/layout_detail_phone.xml
@@ -1,38 +1,32 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/detail_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:visibility="gone"
+        android:src="@drawable/baseline_open_in_browser_24"
+        android:layout_margin="16dp" />
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/detail_fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:visibility="gone"
-            android:src="@drawable/baseline_open_in_browser_24"
-            android:layout_margin="16dp" />
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+        android:layout_height="wrap_content">
 
-        </com.google.android.material.appbar.AppBarLayout>
+        <include layout="@layout/toolbar" android:id="@+id/toolbar" />
 
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        </FrameLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    <FrameLayout
+        android:id="@+id/article_fragment"
+        app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/headlines_fragment"
@@ -41,4 +35,5 @@
         android:layout_width="0dp">
     </FrameLayout>
 
-</FrameLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
-- 
cgit v1.2.3-54-g00ecf


From 862d99586c3c9de5d41bddb45e7330eab3cd40d3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 8 May 2025 16:18:54 +0300
Subject: update note view in article

---
 .../main/java/org/fox/ttrss/ArticleFragment.java   |  9 ++---
 .../src/main/res/drawable/baseline_note_24.xml     |  5 +++
 .../src/main/res/layout/fragment_article.xml       | 42 ++++++++++++++++------
 3 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml

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

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 959ef7bf..aa623b6c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -354,15 +354,16 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
         }
 
         TextView note = view.findViewById(R.id.note);
+        View noteContainer = view.findViewById(R.id.note_container);
 
-        if (note != null) {
-            if (m_article.note != null && !"".equals(m_article.note)) {
+        if (note != null && noteContainer != null) {
+            if (m_article.note != null && m_article.note.length() > 0) {
                 note.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_articleSmallFontSize);
                 note.setText(m_article.note);
+                noteContainer.setVisibility(View.VISIBLE);
             } else {
-                note.setVisibility(View.GONE);
+                noteContainer.setVisibility(View.GONE);
             }
-
         }
 
         TextView dv = view.findViewById(R.id.date);
diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml
new file mode 100644
index 00000000..1e502e2f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M22,10l-6,-6L4,4c-1.1,0 -2,0.9 -2,2v12.01c0,1.1 0.9,1.99 2,1.99l16,-0.01c1.1,0 2,-0.89 2,-1.99v-8zM15,5.5l5.5,5.5L15,11L15,5.5z"/>
+    
+</vector>
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 0f156245..197a8077 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -147,18 +147,42 @@
                     android:layout_height="wrap_content"
                     android:background="?colorSurfaceContainer">
 
-                    <TextView
-                        android:id="@+id/note"
-                        tools:text="Article note (if any...)"
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/note_container"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?colorSecondaryContainer"
+                        app:cardBackgroundColor="?colorTertiaryContainer"
                         android:layout_marginTop="8dp"
                         android:layout_marginStart="8dp"
                         android:layout_marginEnd="8dp"
-                        android:padding="8dp"
-                        android:textColor="?colorOnSecondaryContainer"
-                        android:textSize="12sp"/>
+                        app:strokeWidth="0dp"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_margin="8dp"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:id="@+id/note"
+                                tools:text="Article note (if any...)"
+                                android:layout_gravity="center_vertical"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="8dp"
+                                android:textColor="?colorOnTertiaryContainer"
+                                android:layout_weight="1"
+                                android:textSize="12sp"/>
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                app:tint="?colorOnTertiaryContainer"
+                                android:src="@drawable/baseline_note_24"/>
+
+                        </LinearLayout>
+                    </com.google.android.material.card.MaterialCardView>
+
                 </LinearLayout>
             </LinearLayout>
 
@@ -167,8 +191,6 @@
         <com.telefonica.nestedscrollwebview.NestedScrollWebView
             android:id="@+id/article_content"
             android:layout_marginTop="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-- 
cgit v1.2.3-54-g00ecf


From 30e5f028f7ade469d87b12f0f68d228be511ed2e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 8 May 2025 16:23:38 +0300
Subject: try setting margins inside webview content so scrollbar is properly
 positioned

---
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 5 +++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java  | 7 +++++++
 org.fox.ttrss/src/main/res/layout/fragment_article.xml         | 1 -
 3 files changed, 10 insertions(+), 3 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index aa623b6c..7344480f 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -497,7 +497,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
         ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         ws.setMediaPlaybackRequiresUserGesture(true);
 
-
         if (m_prefs.getBoolean("justify_article_text", true)) {
             cssOverride += "body { text-align : justify; } ";
         }
@@ -506,12 +505,14 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         ws.setDefaultFontSize(m_articleFontSize);
 
+        int margin8dp = CommonActivity.dpToPx(getContext(), 8);
+
         StringBuilder content = new StringBuilder("<html>" +
                 "<head>" +
                 "<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" +
                 "<meta name=\"viewport\" content=\"width=device-width, user-scalable=no\" />" +
                 "<style type=\"text/css\">" +
-                "body { padding : 0px; margin : 0px; line-height : 1.3; word-wrap: break-word; }" +
+                "body { padding : 0px; margin : "+margin8dp+"px; line-height : 1.3; word-wrap: break-word; }" +
                 "h1, h2, h3, h4, h5, h6 { line-height: 1; text-align: initial; }" +
                 "img, video, iframe { max-width : 100%; width : auto; height : auto; }" +
                 " table { width : 100%; }" +
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 4eb5b6f0..fad4f8ef 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -27,6 +27,7 @@ import android.os.Bundle;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Display;
@@ -652,5 +653,11 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 		JobIntentService.enqueueWork(context.getApplicationContext(), WidgetUpdateService.class, 0, new Intent());
 	}
 
+	static public int dpToPx(Context context, int dp) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
+		return px;
+	}
+
 }
 
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 197a8077..e78ab258 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -190,7 +190,6 @@
 
         <com.telefonica.nestedscrollwebview.NestedScrollWebView
             android:id="@+id/article_content"
-            android:layout_marginTop="8dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-- 
cgit v1.2.3-54-g00ecf


From 20c4ac9393faa5cd6318e8644864e8b6195288bb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 8 May 2025 17:02:50 +0300
Subject: remove additional buttons from article header, limit buttons to
 toolbar

---
 .../main/java/org/fox/ttrss/ArticleFragment.java   | 81 ----------------------
 .../main/java/org/fox/ttrss/DetailActivity.java    |  4 +-
 .../main/java/org/fox/ttrss/OnlineActivity.java    | 66 ++++++++++++++----
 .../org/fox/ttrss/offline/OfflineActivity.java     | 11 ++-
 .../fox/ttrss/offline/OfflineArticleFragment.java  |  5 +-
 .../src/main/res/layout/fragment_article.xml       | 28 +-------
 org.fox.ttrss/src/main/res/menu/activity_main.xml  | 17 +++--
 7 files changed, 74 insertions(+), 138 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 7344480f..128d0484 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -224,87 +224,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         }
 
-        final MaterialButton scoreView = view.findViewById(R.id.score);
-
-        if (scoreView != null) {
-            setScoreImage(scoreView, m_article.score);
-
-            if (m_activity.getApiLevel() >= 16) {
-                scoreView.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        final EditText edit = new EditText(getActivity());
-                        edit.setText(String.valueOf(m_article.score));
-
-                        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
-                                .setTitle(R.string.score_for_this_article)
-                                .setPositiveButton(R.string.set_score,
-                                        new DialogInterface.OnClickListener() {
-
-                                            @Override
-                                            public void onClick(DialogInterface dialog,
-                                                                int which) {
-
-                                                try {
-                                                    int newScore = Integer.parseInt(edit.getText().toString());
-
-                                                    m_article.score = newScore;
-
-                                                    m_activity.saveArticleScore(m_article);
-
-                                                    setScoreImage(scoreView, newScore);
-                                                } catch (NumberFormatException e) {
-                                                    m_activity.toast(R.string.score_invalid);
-                                                    e.printStackTrace();
-                                                }
-                                            }
-                                        })
-                                .setNegativeButton(getString(R.string.cancel),
-                                        new DialogInterface.OnClickListener() {
-
-                                            @Override
-                                            public void onClick(DialogInterface dialog,
-                                                                int which) {
-
-                                                //
-
-                                            }
-                                        }).setView(edit);
-
-                        Dialog dialog = builder.create();
-                        dialog.show();
-                    }
-                });
-            }
-        }
-
-        MaterialButton attachments = view.findViewById(R.id.attachments);
-
-        if (attachments != null) {
-            if (m_article.attachments != null && m_article.attachments.size() > 0) {
-                attachments.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        m_activity.displayAttachments(m_article);
-                    }
-                });
-
-            } else {
-                attachments.setVisibility(View.GONE);
-            }
-        }
-
-        MaterialButton share = view.findViewById(R.id.share);
-
-        if (share != null) {
-            share.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    m_activity.shareArticle(m_article);
-                }
-            });
-        }
-
         TextView comments = view.findViewById(R.id.comments);
 
         if (comments != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index eda894dc..0edd6c10 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -212,12 +212,12 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 					/* if (!isCompatMode() && (isSmallScreen() || !isPortrait())) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 					} */
-					//m_menu.findItem(R.id.toggle_attachments).setVisible(true);
+					m_menu.findItem(R.id.toggle_attachments).setVisible(true);
 				} else {
 					/* if (!isCompatMode()) {
 						m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
 					} */
-					//m_menu.findItem(R.id.toggle_attachments).setVisible(false);
+					m_menu.findItem(R.id.toggle_attachments).setVisible(false);
 				}
 			}
 			
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 b8680c71..3af78ddf 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
@@ -531,18 +531,16 @@ public class OnlineActivity extends CommonActivity {
 
         int itemId = item.getItemId();
         if (itemId == R.id.subscribe_to_feed) {
-            Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class);
-            startActivityForResult(subscribe, 0);
-            return true;
-		/*case R.id.toggle_attachments:
-			if (true) {
-				Article article = ap.getSelectedArticle();
+			Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class);
+			startActivityForResult(subscribe, 0);
+			return true;
+		} else if (itemId ==  R.id.toggle_attachments) {
+			Article article = ap.getSelectedArticle();
 
-				if (article != null) {
-					displayAttachments(article);
-				}
+			if (article != null) {
+				displayAttachments(article);
 			}
-			return true; */
+			return true;
 		/*case R.id.logout:
 			logout();
 			return true;*/
@@ -748,11 +746,16 @@ public class OnlineActivity extends CommonActivity {
                 dialog.show();
             }
             return true;
-		/* case R.id.share_article:
+		} else if (itemId == R.id.share_article) {
 			if (ap != null) {
 				shareArticle(ap.getSelectedArticle());
 			}
-			return true; */
+			return true;
+		} else if (itemId == R.id.article_set_score) {
+			if (ap != null) {
+				setArticleScore(ap.getSelectedArticle());
+			}
+			return true;
         } else if (itemId == R.id.toggle_marked) {
             if (ap != null && ap.getSelectedArticle() != null) {
                 Article a = ap.getSelectedArticle();
@@ -1231,6 +1234,45 @@ public class OnlineActivity extends CommonActivity {
 		}
 	}
 
+	public void setArticleScore(Article article) {
+		final EditText edit = new EditText(this);
+		edit.setText(String.valueOf(article.score));
+
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+				.setTitle(R.string.score_for_this_article)
+				.setPositiveButton(R.string.set_score,
+						new DialogInterface.OnClickListener() {
+
+							@Override
+							public void onClick(DialogInterface dialog,
+												int which) {
+
+								try {
+                                    article.score = Integer.parseInt(edit.getText().toString());
+
+									saveArticleScore(article);
+								} catch (NumberFormatException e) {
+									toast(R.string.score_invalid);
+									e.printStackTrace();
+								}
+							}
+						})
+				.setNegativeButton(getString(R.string.cancel),
+						new DialogInterface.OnClickListener() {
+
+							@Override
+							public void onClick(DialogInterface dialog,
+												int which) {
+
+								//
+
+							}
+						}).setView(edit);
+
+		Dialog dialog = builder.create();
+		dialog.show();
+	}
+
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {		
 		ArticlePager ap = (ArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index d7f487a1..96e0ee34 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -421,13 +421,12 @@ public class OfflineActivity extends CommonActivity {
                 }
             }
             return true;
-		/* case R.id.share_article:
-			if (true) {
-				int articleId = oap.getSelectedArticleId();
+        } else if (itemId == R.id.share_article) {
+            int articleId = oap.getSelectedArticleId();
 
-				shareArticle(articleId);
-			}
-			return true; */
+            shareArticle(articleId);
+
+			return true;
         } else if (itemId == R.id.toggle_marked) {
             if (oap != null) {
                 int articleId = oap.getSelectedArticleId();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 3b199d2a..5483cf60 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -235,7 +235,7 @@ public class OfflineArticleFragment extends Fragment {
 
 			}
 
-			MaterialButton score = view.findViewById(R.id.score);
+			/* MaterialButton score = view.findViewById(R.id.score);
 
 			if (score != null) {
 				score.setVisibility(View.GONE);
@@ -256,8 +256,7 @@ public class OfflineArticleFragment extends Fragment {
 						m_activity.shareArticle(m_articleId);
 					}
 				});
-			}
-
+			} */
 
 			TextView comments = view.findViewById(R.id.comments);
 			
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index e78ab258..990ede49 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -43,35 +43,9 @@
                         android:textAlignment="viewStart"
                         android:textColor="?colorPrimary"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
-                        android:textSize="16sp"
+                        android:textSize="18sp"
                         android:gravity="start" />
 
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/score"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_action_trending_flat"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/attachments"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_attachment_vert"
-                        android:layout_gravity="center_vertical|end" />
-
-                    <com.google.android.material.button.MaterialButton
-                        style="?attr/materialIconButtonStyle"
-                        android:id="@+id/share"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        app:icon="?ic_share"
-                        android:layout_gravity="center_vertical|end" />
                 </LinearLayout>
 
                 <TextView
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
index 21676f17..f983e224 100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -64,18 +64,17 @@
                 android:id="@+id/toggle_unread"
                 android:icon="@drawable/baseline_email_24"
                 app:iconTint="?attr/colorControlNormal"
-                app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_unread"/>
-            <!-- <item
+            <item
                 android:id="@+id/toggle_attachments"
-                android:icon="@drawable/ic_attachment"
+                android:icon="@drawable/baseline_attach_file_24"
                 app:showAsAction=""
-                android:title="@string/attachments_prompt"/> -->
-            <!-- <item
+                android:title="@string/attachments_prompt"/>
+            <item
                 android:id="@+id/share_article"
-                android:icon="@drawable/ic_share"
+                android:icon="@drawable/baseline_share_24"
                 app:showAsAction="ifRoom"
-                android:title="@string/share_article"/> -->
+                android:title="@string/share_article"/>
             <item
                 android:id="@+id/set_labels"
                 app:showAsAction=""
@@ -84,6 +83,10 @@
                 android:id="@+id/article_set_note"
                 app:showAsAction=""
                 android:title="@string/article_set_note"/>
+            <item
+                android:id="@+id/article_set_score"
+                app:showAsAction=""
+                android:title="@string/set_score"/>
 
             <item
                 android:id="@+id/catchup_above"
-- 
cgit v1.2.3-54-g00ecf


From b8d52ed6cf0a1cdf3a670811534d4689380cc622 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 9 May 2025 09:37:01 +0300
Subject: add some corners to article header

---
 .../src/main/res/layout/fragment_article.xml       | 24 +++++++++++-----------
 org.fox.ttrss/src/main/res/values/style.xml        |  9 ++++++++
 org.fox.ttrss/src/main/res/values/themes.xml       |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/values/style.xml

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 990ede49..a4fbc70c 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -18,12 +18,18 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
+            android:background="?colorSurfaceContainer"
             android:layout_height="match_parent">
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 app:layout_scrollFlags="scroll|enterAlways"
+                app:strokeWidth="0dp"
+                app:shapeAppearance="@style/shape_appearance_article_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            <LinearLayout
                 android:id="@+id/article_header"
-                android:background="?colorSurface"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -59,7 +65,7 @@
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-light"
                     android:layout_marginTop="8dp"
-                    android:textColor="?colorSecondary"
+                    android:textColor="?colorPrimary"
                     android:textSize="12sp" />
 
                 <TextView
@@ -112,22 +118,15 @@
 
                 </LinearLayout>
 
-                <com.google.android.material.divider.MaterialDivider
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
-
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?colorSurfaceContainer">
+                    android:layout_height="wrap_content">
 
                     <com.google.android.material.card.MaterialCardView
                         android:id="@+id/note_container"
                         android:layout_width="match_parent"
                         app:cardBackgroundColor="?colorTertiaryContainer"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginEnd="8dp"
+                        android:layout_margin="8dp"
                         app:strokeWidth="0dp"
                         android:layout_height="match_parent">
 
@@ -159,6 +158,7 @@
 
                 </LinearLayout>
             </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
 
         </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
new file mode 100644
index 00000000..d97daff5
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -0,0 +1,9 @@
+<resources>
+    <style name="shape_appearance_article_header">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopLeft">0dp</item>
+        <item name="cornerSizeTopRight">0dp</item>
+        <item name="cornerSizeBottomLeft">16dp</item>
+        <item name="cornerSizeBottomRight">16dp</item>
+    </style>
+</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 9a8e3121..56899235 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -1,4 +1,5 @@
 <resources>
+
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="windowActionModeOverlay">true</item>
 
-- 
cgit v1.2.3-54-g00ecf


From d24a0ad25a0c5dd7d3c9e5e4cb5ea0f8d5144977 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 9 May 2025 09:38:32 +0300
Subject: drop host from article header because of opaque rules for its
 appearance

---
 .../src/main/java/org/fox/ttrss/ArticleFragment.java  | 19 -------------------
 .../org/fox/ttrss/offline/OfflineArticleFragment.java |  6 ------
 .../src/main/res/layout/fragment_article.xml          | 15 ---------------
 3 files changed, 40 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 128d0484..ac162a3e 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -253,25 +253,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
             }
         }
 
-        TextView host = view.findViewById(R.id.host);
-        if (host != null) {
-            try {
-                URL inurl = new URL(m_article.site_url != null ? m_article.site_url : m_article.comments_link);
-                URL outurl = new URL(m_article.link);
-                String inhost = inurl.getHost();
-                String outhost = outurl.getHost();
-                if (!inhost.equals(outhost)) {
-                    host.setText(outhost.replaceFirst("^www\\.", ""));
-                    host.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_articleSmallFontSize);
-                    host.setVisibility(View.VISIBLE);
-                } else {
-                    host.setVisibility(View.GONE);
-                }
-            } catch (MalformedURLException ignored) {
-                host.setVisibility(View.GONE);
-            }
-        }
-
         TextView note = view.findViewById(R.id.note);
         View noteContainer = view.findViewById(R.id.note_container);
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 5483cf60..dfc47131 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -264,12 +264,6 @@ public class OfflineArticleFragment extends Fragment {
 				comments.setVisibility(View.GONE);
 			}
 
-			View host = view.findViewById(R.id.host);
-
-			if (host != null) {
-				host.setVisibility(View.GONE);
-			}
-
 			TextView note = view.findViewById(R.id.note);
 			
 			if (note != null) {
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index a4fbc70c..52d348bc 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -68,21 +68,6 @@
                     android:textColor="?colorPrimary"
                     android:textSize="12sp" />
 
-                <TextView
-                    android:id="@+id/host"
-                    tools:text="host"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="viewStart"
-                    android:layout_weight="1"
-                    android:fontFamily="sans-serif-light"
-                    android:layout_marginTop="8dp"
-                    android:textColor="?colorSecondary"
-                    android:textSize="12sp" />
-
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-- 
cgit v1.2.3-54-g00ecf


From 6fbb10aeddda42ad1737ad9c773de6f9764656a8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 9 May 2025 09:41:37 +0300
Subject: drop unused attribute

---
 org.fox.ttrss/src/main/res/layout/fragment_article.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 52d348bc..71cf89ce 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -46,7 +46,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:textAlignment="viewStart"
                         android:textColor="?colorPrimary"
                         tools:text="Unreasonably long article title blah blah blah blah blah blah"
                         android:textSize="18sp"
-- 
cgit v1.2.3-54-g00ecf


From 4ad6971caf93f481155d3f1923b8de97e49a0621 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 9 May 2025 11:04:20 +0300
Subject: add hack for material switches in preferences

---
 .../src/main/res/layout/fragment_article.xml       |  2 +-
 .../main/res/layout/preference_material_switch.xml |  9 +++++
 org.fox.ttrss/src/main/res/values-night/themes.xml |  1 +
 org.fox.ttrss/src/main/res/values/style.xml        | 11 ++++-
 org.fox.ttrss/src/main/res/values/themes.xml       |  1 +
 org.fox.ttrss/src/main/res/xml/preferences.xml     | 47 ++++++++++------------
 6 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/preference_material_switch.xml

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

diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 71cf89ce..e75980b0 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -24,7 +24,7 @@
             <com.google.android.material.card.MaterialCardView
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:strokeWidth="0dp"
-                app:shapeAppearance="@style/shape_appearance_article_header"
+                app:shapeAppearance="@style/ShapeAppearanceArticleHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
diff --git a/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml b/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml
new file mode 100644
index 00000000..94d654f0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/preference_material_switch.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />
\ No newline at end of file
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 4d06182b..7d54a029 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -1,6 +1,7 @@
 <resources>
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
         <item name="windowActionModeOverlay">true</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
         <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item>
         <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index d97daff5..0b43f1d9 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -1,9 +1,18 @@
 <resources>
-    <style name="shape_appearance_article_header">
+    <style name="ShapeAppearanceArticleHeader">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSizeTopLeft">0dp</item>
         <item name="cornerSizeTopRight">0dp</item>
         <item name="cornerSizeBottomLeft">16dp</item>
         <item name="cornerSizeBottomRight">16dp</item>
     </style>
+
+    <!-- https://stackoverflow.com/a/73782598 -->
+    <style name="AppPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
+        <item name="switchPreferenceCompatStyle">@style/AppSwitchPreference</item>
+    </style>
+
+    <style name="AppSwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/preference_material_switch</item>
+    </style>
 </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 56899235..68a57811 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -2,6 +2,7 @@
 
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="windowActionModeOverlay">true</item>
+        <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
 
         <item name="ic_rss_box">@drawable/baseline_rss_feed_24</item>
         <item name="ic_checkbox_marked">@drawable/baseline_check_box_24</item>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 7c85bac2..3c422e7e 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -38,20 +38,17 @@
             android:key="theme"
             android:title="@string/pref_theme" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="sort_feeds_by_unread"
             android:title="@string/sort_feeds_by_unread" />
-        <!-- <SwitchPreference
-            android:defaultValue="false"
-            android:key="download_feed_icons"
-            android:title="@string/download_feed_icons" /> -->
-        <SwitchPreference
+
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="enable_cats"
             android:title="@string/enable_cats" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:dependency="enable_cats"
             android:key="browse_cats_like_feeds"
@@ -65,7 +62,7 @@
             android:key="open_on_startup"
             android:title="@string/open_on_startup" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="force_phone_layout"
             android:summary="@string/force_phone_layout_summary"
@@ -92,24 +89,24 @@
             android:summary="@string/prefs_headline_display_mode_long"
             android:title="@string/prefs_headline_display_mode" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="headline_images_wifi_only"
             android:summary="@string/prefs_headline_images_wifi_only_long"
             android:title="@string/prefs_headline_images_wifi_only" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="headlines_show_content"
             android:title="@string/pref_headlines_show_content" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:disableDependentsState="true"
             android:key="headlines_mark_read_scroll"
             android:title="@string/pref_headlines_mark_read_scroll" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:dependency="headlines_mark_read_scroll"
             android:key="headlines_swipe_to_dismiss"
@@ -124,20 +121,20 @@
             android:summary="@string/prefs_headline_request_size_long"
             android:title="@string/prefs_headline_request_size" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="enable_image_downsampling"
             android:title="@string/prefs_enable_image_downsampling"
             android:summary="@string/prefs_enable_image_downsampling_long" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="always_downsample_images"
             android:dependency="enable_image_downsampling"
             android:title="@string/prefs_always_downsample_images"
             android:summary="@string/prefs_always_downsample_images_long" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="inline_video_player"
             android:summary="@string/prefs_inline_video_player"
@@ -153,32 +150,32 @@
             app:showSeekBarValue="true"
             app:key="article_font_size_sp_int"
             android:title="@string/pref_font_size" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="justify_article_text"
             android:title="@string/justify_article_text" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="use_volume_keys"
             android:summary="@string/use_volume_keys_long"
             android:title="@string/use_volume_keys" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="enable_article_fab"
             android:summary="@string/prefs_enable_fab_long"
             android:title="@string/prefs_enable_fab" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/prefs_opening_links" >
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="enable_custom_tabs"
             android:summary="@string/prefs_custom_tabs_summary"
             android:title="@string/prefs_use_custom_tabs" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="custom_tabs_ask_always"
             android:title="@string/ask_me_every_time" />
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="always_open_uri"
             android:summary="@string/prefs_always_open_uri_summary"
@@ -193,12 +190,12 @@
             android:summary="@string/offline_articles_to_download_long"
             android:title="@string/offline_articles_to_download" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="offline_sort_by_feed"
             android:title="@string/prefs_offline_sort_by_feed" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="offline_image_cache_enabled"
             android:summary="@string/offline_media_cache_enabled_summary"
@@ -220,7 +217,7 @@
             android:key="widget_background"
             android:title="@string/pref_widget_background" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="widget_show_fresh"
             android:title="@string/prefs_widget_show_fresh"
@@ -232,7 +229,7 @@
             android:key="show_logcat"
             android:title="@string/logcat_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="transport_debugging"
             android:title="@string/transport_debugging" />
-- 
cgit v1.2.3-54-g00ecf