From 9644a0f5925fa09d5677784ba92b6710bfc29d15 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 6 May 2025 15:55:54 +0300
Subject: drop some custom colors, replace with material3 theme stock; some
 tablet fixes

---
 org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml  |  3 +--
 org.fox.ttrss/src/main/res/layout/activity_master_phone.xml  |  6 ++----
 org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml     |  2 +-
 .../src/main/res/layout/headlines_row_selected_compact.xml   |  2 +-
 .../res/layout/headlines_row_selected_unread_compact.xml     |  2 +-
 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml   |  2 +-
 .../src/main/res/layout/headlines_row_unread_compact.xml     | 12 ++++++------
 7 files changed, 13 insertions(+), 16 deletions(-)

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

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 ddffc89e..1d428e5e 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
@@ -40,8 +40,7 @@
         android:id="@+id/headlines_fragment"
         android:visibility="gone"
         android:layout_height="0dp"
-        android:layout_width="0dp"
-        android:background="?headlinesBackground">
+        android:layout_width="0dp">
     </FrameLayout>
 
 </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 6ae5064f..9f47eb24 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
@@ -31,8 +31,7 @@
                 android:id="@+id/headlines_fragment"
                 app:layout_behavior=".util.FabAwareScrollingViewBehavior"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?headlinesBackground" />
+                android:layout_height="wrap_content"/>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -42,7 +41,6 @@
             android:layout_width="300dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
-            android:background="@android:color/white"
             android:elevation="10dp"
             android:fitsSystemWindows="true"
             app:insetForeground="#4000">
@@ -50,7 +48,7 @@
         <FrameLayout
             android:id="@+id/feeds_fragment"
             android:layout_width="match_parent"
-            android:background="?feedlistBackground"
+            android:background="?colorSurfaceContainer"
             android:layout_height="match_parent" >
         </FrameLayout>
 
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 d5b6cb3c..6c7a4b29 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
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="blocksDescendants"
-    android:background="?feedsSelectedBackground"
+    android:background="?colorSurfaceDim"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     android:paddingTop="8dp"
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 da2401eb..bd114157 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
@@ -8,7 +8,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?headlineSelectedBackground"
+    android:background="?colorPrimaryContainer"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
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 3b6436fe..3422fae6 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
@@ -8,7 +8,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?headlineSelectedBackground"
+    android:background="?colorPrimaryContainer"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
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 aafad9a8..5ea05c31 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
@@ -5,7 +5,7 @@
     android:id="@+id/headlines_row"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?headlineUnreadBackground">
+    android:background="?colorSurfaceContainerLowest">
 
     <TableLayout
         android:layout_width="fill_parent"
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 e440188f..f65cee58 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
@@ -2,12 +2,13 @@
 <LinearLayout
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
     android:padding="@dimen/activity_horizontal_margin"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?headlineUnreadBackground"
+    android:background="?colorSurfaceContainerLowest"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
@@ -112,17 +113,16 @@
             />
 
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
+            style="?attr/materialIconButtonStyle"
             android:background="@drawable/ripple"
-            android:layout_width="24dp"
+            android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="?ic_star_outline" />
-
-
+            app:icon="?ic_star_outline" />
 
     </LinearLayout>
 
-- 
cgit v1.2.3-54-g00ecf