From 2105cacce31e8f9698f8b69ec873650e3bc593b2 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Thu, 14 Nov 2019 19:10:49 +0100
Subject: [PATCH] Fixed fab background color in dark mode

Now it's recognizable from the background
---
 app/src/main/res/layout/fragment_hide_md2.xml     |  2 +-
 app/src/main/res/layout/fragment_module_md2.xml   |  2 +-
 app/src/main/res/values-night/styles_md2.xml      |  1 +
 app/src/main/res/values-night/styles_md2_impl.xml | 11 -----------
 app/src/main/res/values/attrs.xml                 |  1 +
 app/src/main/res/values/styles_md2.xml            |  1 +
 app/src/main/res/values/styles_md2_impl.xml       |  2 +-
 7 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 app/src/main/res/values-night/styles_md2_impl.xml

diff --git a/app/src/main/res/layout/fragment_hide_md2.xml b/app/src/main/res/layout/fragment_hide_md2.xml
index cfab09d06..ecadb72f2 100644
--- a/app/src/main/res/layout/fragment_hide_md2.xml
+++ b/app/src/main/res/layout/fragment_hide_md2.xml
@@ -43,7 +43,7 @@
             android:layout_marginStart="@dimen/l1"
             android:layout_marginEnd="@dimen/l1"
             android:layout_marginBottom="@{viewModel.insets.bottom + (int) @dimen/l1}"
-            app:backgroundTint="?colorSurface"
+            app:backgroundTint="?colorSurfaceSurfaceVariant"
             app:srcCompat="@drawable/ic_filter"
             app:tint="?colorPrimary"
             tools:layout_marginBottom="64dp" />
diff --git a/app/src/main/res/layout/fragment_module_md2.xml b/app/src/main/res/layout/fragment_module_md2.xml
index 814777139..ece026ef5 100644
--- a/app/src/main/res/layout/fragment_module_md2.xml
+++ b/app/src/main/res/layout/fragment_module_md2.xml
@@ -46,7 +46,7 @@
             android:layout_marginStart="@dimen/l1"
             android:layout_marginEnd="@dimen/l1"
             android:layout_marginBottom="@{viewModel.insets.bottom + (int) @dimen/l1}"
-            app:backgroundTint="?colorSurface"
+            app:backgroundTint="?colorSurfaceSurfaceVariant"
             app:srcCompat="@drawable/ic_filter"
             app:tint="?colorPrimary"
             tools:layout_marginBottom="64dp" />
diff --git a/app/src/main/res/values-night/styles_md2.xml b/app/src/main/res/values-night/styles_md2.xml
index 402be7ab1..877e29a6a 100644
--- a/app/src/main/res/values-night/styles_md2.xml
+++ b/app/src/main/res/values-night/styles_md2.xml
@@ -8,6 +8,7 @@
         <item name="colorSecondaryVariant">#8000C853</item>
         <item name="colorSurface">#0D0D0D</item>
         <item name="colorSurfaceVariant">#1F1F1F</item>
+        <item name="colorSurfaceSurfaceVariant">?colorSurfaceVariant</item>
         <item name="colorOnPrimary">#F2F2F2</item>
         <item name="colorOnPrimaryVariant">#D9E6E6E6</item>
         <item name="colorOnSecondary">#F2F2F2</item>
diff --git a/app/src/main/res/values-night/styles_md2_impl.xml b/app/src/main/res/values-night/styles_md2_impl.xml
deleted file mode 100644
index c7c2e1458..000000000
--- a/app/src/main/res/values-night/styles_md2_impl.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="WidgetFoundation.Card.Elevated" parent="Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">?colorSurfaceVariant</item>
-        <item name="cardCornerRadius">@dimen/l_50</item>
-        <item name="cardElevation">@dimen/l_125</item>
-        <item name="cardPreventCornerOverlap">true</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0e48fce00..d07108b6c 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -96,6 +96,7 @@
     <attr name="colorSurfaceVariant" format="color" />
     <attr name="colorOnPrimaryVariant" format="color" />
     <attr name="colorOnSurfaceVariant" format="color" />
+    <attr name="colorSurfaceSurfaceVariant" format="color" />
 
     <!--endregion-->
 
diff --git a/app/src/main/res/values/styles_md2.xml b/app/src/main/res/values/styles_md2.xml
index 36263fc3b..adbef56d6 100644
--- a/app/src/main/res/values/styles_md2.xml
+++ b/app/src/main/res/values/styles_md2.xml
@@ -103,6 +103,7 @@
         <item name="colorSecondaryVariant">#8000C853</item>
         <item name="colorSurface">#F2F2F2</item>
         <item name="colorSurfaceVariant">#E8E8E8</item>
+        <item name="colorSurfaceSurfaceVariant">?colorSurface</item>
         <item name="colorOnPrimary">#F2F2F2</item>
         <item name="colorOnPrimaryVariant">#D9E6E6E6</item>
         <item name="colorOnSecondary">#F2F2F2</item>
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index aa7e3e3fa..08399bcdf 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -37,7 +37,7 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
     </style>
 
     <style name="WidgetFoundation.Card.Elevated" parent="Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">?colorSurface</item>
+        <item name="cardBackgroundColor">?colorSurfaceSurfaceVariant</item>
         <item name="cardCornerRadius">@dimen/l_50</item>
         <item name="cardElevation">@dimen/l_125</item>
         <item name="cardPreventCornerOverlap">true</item>