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

---
 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 ++------
 6 files changed, 7 insertions(+), 16 deletions(-)

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

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>
 
-- 
cgit v1.2.3-54-g00ecf