From 6647de817e071f7127a03f266732ab5c4554e00d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 7 May 2025 07:15:30 +0300
Subject: update colorset & drop fab styling

---
 .../src/main/res/layout/activity_detail_phone.xml  |  2 --
 .../src/main/res/layout/activity_master_phone.xml  |  2 --
 org.fox.ttrss/src/main/res/values-night/colors.xml | 42 +++++++++++-----------
 org.fox.ttrss/src/main/res/values/colors.xml       | 30 ++++++++--------
 4 files changed, 36 insertions(+), 40 deletions(-)

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 331164e0..6d2f94ea 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
@@ -15,8 +15,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end|bottom"
             android:visibility="gone"
-            app:tint="@android:color/white"
-            app:backgroundTint="?colorAccent"
             android:src="@drawable/baseline_open_in_browser_24"
             android:layout_margin="16dp" />
 
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 c18bca02..f1c5e9d3 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
@@ -16,8 +16,6 @@
                 android:layout_gravity="end|bottom"
                 android:visibility="gone"
                 android:src="@drawable/baseline_refresh_24"
-                app:tint="@android:color/white"
-                app:backgroundTint="?colorTertiary"
                 android:layout_margin="16dp" />
 
             <com.google.android.material.appbar.AppBarLayout
diff --git a/org.fox.ttrss/src/main/res/values-night/colors.xml b/org.fox.ttrss/src/main/res/values-night/colors.xml
index 8c59ab25..99c049eb 100644
--- a/org.fox.ttrss/src/main/res/values-night/colors.xml
+++ b/org.fox.ttrss/src/main/res/values-night/colors.xml
@@ -7,10 +7,10 @@
     <color name="md_theme_onSecondary">#21323F</color>
     <color name="md_theme_secondaryContainer">#384956</color>
     <color name="md_theme_onSecondaryContainer">#D3E5F5</color>
-    <color name="md_theme_tertiary">#FFB596</color>
-    <color name="md_theme_onTertiary">#542106</color>
-    <color name="md_theme_tertiaryContainer">#71361A</color>
-    <color name="md_theme_onTertiaryContainer">#FFDBCD</color>
+    <color name="md_theme_tertiary">#FFB5A0</color>
+    <color name="md_theme_onTertiary">#561F0F</color>
+    <color name="md_theme_tertiaryContainer">#723523</color>
+    <color name="md_theme_onTertiaryContainer">#FFDBD1</color>
     <color name="md_theme_error">#FFB4AB</color>
     <color name="md_theme_onError">#690005</color>
     <color name="md_theme_errorContainer">#93000A</color>
@@ -35,10 +35,10 @@
     <color name="md_theme_onSecondaryFixed">#0B1D29</color>
     <color name="md_theme_secondaryFixedDim">#B7C9D9</color>
     <color name="md_theme_onSecondaryFixedVariant">#384956</color>
-    <color name="md_theme_tertiaryFixed">#FFDBCD</color>
-    <color name="md_theme_onTertiaryFixed">#360F00</color>
-    <color name="md_theme_tertiaryFixedDim">#FFB596</color>
-    <color name="md_theme_onTertiaryFixedVariant">#71361A</color>
+    <color name="md_theme_tertiaryFixed">#FFDBD1</color>
+    <color name="md_theme_onTertiaryFixed">#3A0B01</color>
+    <color name="md_theme_tertiaryFixedDim">#FFB5A0</color>
+    <color name="md_theme_onTertiaryFixedVariant">#723523</color>
     <color name="md_theme_surfaceDim">#101417</color>
     <color name="md_theme_surfaceBright">#353A3E</color>
     <color name="md_theme_surfaceContainerLowest">#0A0F12</color>
@@ -54,9 +54,9 @@
     <color name="md_theme_onSecondary_mediumContrast">#162733</color>
     <color name="md_theme_secondaryContainer_mediumContrast">#8193A2</color>
     <color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
-    <color name="md_theme_tertiary_mediumContrast">#FFD3C1</color>
-    <color name="md_theme_onTertiary_mediumContrast">#461600</color>
-    <color name="md_theme_tertiaryContainer_mediumContrast">#CA7E5B</color>
+    <color name="md_theme_tertiary_mediumContrast">#FFD2C7</color>
+    <color name="md_theme_onTertiary_mediumContrast">#481506</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#CB7C66</color>
     <color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color>
     <color name="md_theme_error_mediumContrast">#FFD2CC</color>
     <color name="md_theme_onError_mediumContrast">#540003</color>
@@ -82,10 +82,10 @@
     <color name="md_theme_onSecondaryFixed_mediumContrast">#02131E</color>
     <color name="md_theme_secondaryFixedDim_mediumContrast">#B7C9D9</color>
     <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#273845</color>
-    <color name="md_theme_tertiaryFixed_mediumContrast">#FFDBCD</color>
-    <color name="md_theme_onTertiaryFixed_mediumContrast">#250800</color>
-    <color name="md_theme_tertiaryFixedDim_mediumContrast">#FFB596</color>
-    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#5C260B</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#FFDBD1</color>
+    <color name="md_theme_onTertiaryFixed_mediumContrast">#290500</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#FFB5A0</color>
+    <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#5D2514</color>
     <color name="md_theme_surfaceDim_mediumContrast">#101417</color>
     <color name="md_theme_surfaceBright_mediumContrast">#414549</color>
     <color name="md_theme_surfaceContainerLowest_mediumContrast">#05080B</color>
@@ -101,10 +101,10 @@
     <color name="md_theme_onSecondary_highContrast">#000000</color>
     <color name="md_theme_secondaryContainer_highContrast">#B3C5D5</color>
     <color name="md_theme_onSecondaryContainer_highContrast">#000D17</color>
-    <color name="md_theme_tertiary_highContrast">#FFECE5</color>
+    <color name="md_theme_tertiary_highContrast">#FFECE7</color>
     <color name="md_theme_onTertiary_highContrast">#000000</color>
-    <color name="md_theme_tertiaryContainer_highContrast">#FFB08D</color>
-    <color name="md_theme_onTertiaryContainer_highContrast">#1B0500</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#FFAF99</color>
+    <color name="md_theme_onTertiaryContainer_highContrast">#1E0300</color>
     <color name="md_theme_error_highContrast">#FFECE9</color>
     <color name="md_theme_onError_highContrast">#000000</color>
     <color name="md_theme_errorContainer_highContrast">#FFAEA4</color>
@@ -129,10 +129,10 @@
     <color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
     <color name="md_theme_secondaryFixedDim_highContrast">#B7C9D9</color>
     <color name="md_theme_onSecondaryFixedVariant_highContrast">#02131E</color>
-    <color name="md_theme_tertiaryFixed_highContrast">#FFDBCD</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#FFDBD1</color>
     <color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
-    <color name="md_theme_tertiaryFixedDim_highContrast">#FFB596</color>
-    <color name="md_theme_onTertiaryFixedVariant_highContrast">#250800</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#FFB5A0</color>
+    <color name="md_theme_onTertiaryFixedVariant_highContrast">#290500</color>
     <color name="md_theme_surfaceDim_highContrast">#101417</color>
     <color name="md_theme_surfaceBright_highContrast">#4C5055</color>
     <color name="md_theme_surfaceContainerLowest_highContrast">#000000</color>
diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml
index 2a9f1705..f67cc4d4 100644
--- a/org.fox.ttrss/src/main/res/values/colors.xml
+++ b/org.fox.ttrss/src/main/res/values/colors.xml
@@ -7,10 +7,10 @@
     <color name="md_theme_onSecondary">#FFFFFF</color>
     <color name="md_theme_secondaryContainer">#D3E5F5</color>
     <color name="md_theme_onSecondaryContainer">#384956</color>
-    <color name="md_theme_tertiary">#8E4D2F</color>
+    <color name="md_theme_tertiary">#8F4C38</color>
     <color name="md_theme_onTertiary">#FFFFFF</color>
-    <color name="md_theme_tertiaryContainer">#FFDBCD</color>
-    <color name="md_theme_onTertiaryContainer">#71361A</color>
+    <color name="md_theme_tertiaryContainer">#FFDBD1</color>
+    <color name="md_theme_onTertiaryContainer">#723523</color>
     <color name="md_theme_error">#BA1A1A</color>
     <color name="md_theme_onError">#FFFFFF</color>
     <color name="md_theme_errorContainer">#FFDAD6</color>
@@ -35,10 +35,10 @@
     <color name="md_theme_onSecondaryFixed">#0B1D29</color>
     <color name="md_theme_secondaryFixedDim">#B7C9D9</color>
     <color name="md_theme_onSecondaryFixedVariant">#384956</color>
-    <color name="md_theme_tertiaryFixed">#FFDBCD</color>
-    <color name="md_theme_onTertiaryFixed">#360F00</color>
-    <color name="md_theme_tertiaryFixedDim">#FFB596</color>
-    <color name="md_theme_onTertiaryFixedVariant">#71361A</color>
+    <color name="md_theme_tertiaryFixed">#FFDBD1</color>
+    <color name="md_theme_onTertiaryFixed">#3A0B01</color>
+    <color name="md_theme_tertiaryFixedDim">#FFB5A0</color>
+    <color name="md_theme_onTertiaryFixedVariant">#723523</color>
     <color name="md_theme_surfaceDim">#D7DADF</color>
     <color name="md_theme_surfaceBright">#F6F9FE</color>
     <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
@@ -54,9 +54,9 @@
     <color name="md_theme_onSecondary_mediumContrast">#FFFFFF</color>
     <color name="md_theme_secondaryContainer_mediumContrast">#5E6F7D</color>
     <color name="md_theme_onSecondaryContainer_mediumContrast">#FFFFFF</color>
-    <color name="md_theme_tertiary_mediumContrast">#5C260B</color>
+    <color name="md_theme_tertiary_mediumContrast">#5D2514</color>
     <color name="md_theme_onTertiary_mediumContrast">#FFFFFF</color>
-    <color name="md_theme_tertiaryContainer_mediumContrast">#9F5B3C</color>
+    <color name="md_theme_tertiaryContainer_mediumContrast">#A15A45</color>
     <color name="md_theme_onTertiaryContainer_mediumContrast">#FFFFFF</color>
     <color name="md_theme_error_mediumContrast">#740006</color>
     <color name="md_theme_onError_mediumContrast">#FFFFFF</color>
@@ -82,9 +82,9 @@
     <color name="md_theme_onSecondaryFixed_mediumContrast">#FFFFFF</color>
     <color name="md_theme_secondaryFixedDim_mediumContrast">#465764</color>
     <color name="md_theme_onSecondaryFixedVariant_mediumContrast">#FFFFFF</color>
-    <color name="md_theme_tertiaryFixed_mediumContrast">#9F5B3C</color>
+    <color name="md_theme_tertiaryFixed_mediumContrast">#A15A45</color>
     <color name="md_theme_onTertiaryFixed_mediumContrast">#FFFFFF</color>
-    <color name="md_theme_tertiaryFixedDim_mediumContrast">#824426</color>
+    <color name="md_theme_tertiaryFixedDim_mediumContrast">#84422F</color>
     <color name="md_theme_onTertiaryFixedVariant_mediumContrast">#FFFFFF</color>
     <color name="md_theme_surfaceDim_mediumContrast">#C3C7CB</color>
     <color name="md_theme_surfaceBright_mediumContrast">#F6F9FE</color>
@@ -101,9 +101,9 @@
     <color name="md_theme_onSecondary_highContrast">#FFFFFF</color>
     <color name="md_theme_secondaryContainer_highContrast">#3A4B58</color>
     <color name="md_theme_onSecondaryContainer_highContrast">#FFFFFF</color>
-    <color name="md_theme_tertiary_highContrast">#4F1D03</color>
+    <color name="md_theme_tertiary_highContrast">#501B0B</color>
     <color name="md_theme_onTertiary_highContrast">#FFFFFF</color>
-    <color name="md_theme_tertiaryContainer_highContrast">#74391C</color>
+    <color name="md_theme_tertiaryContainer_highContrast">#753725</color>
     <color name="md_theme_onTertiaryContainer_highContrast">#FFFFFF</color>
     <color name="md_theme_error_highContrast">#600004</color>
     <color name="md_theme_onError_highContrast">#FFFFFF</color>
@@ -129,9 +129,9 @@
     <color name="md_theme_onSecondaryFixed_highContrast">#FFFFFF</color>
     <color name="md_theme_secondaryFixedDim_highContrast">#243541</color>
     <color name="md_theme_onSecondaryFixedVariant_highContrast">#FFFFFF</color>
-    <color name="md_theme_tertiaryFixed_highContrast">#74391C</color>
+    <color name="md_theme_tertiaryFixed_highContrast">#753725</color>
     <color name="md_theme_onTertiaryFixed_highContrast">#FFFFFF</color>
-    <color name="md_theme_tertiaryFixedDim_highContrast">#572307</color>
+    <color name="md_theme_tertiaryFixedDim_highContrast">#592111</color>
     <color name="md_theme_onTertiaryFixedVariant_highContrast">#FFFFFF</color>
     <color name="md_theme_surfaceDim_highContrast">#B5B9BE</color>
     <color name="md_theme_surfaceBright_highContrast">#F6F9FE</color>
-- 
cgit v1.2.3-54-g00ecf