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(-)

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