From e740260921aed6c607043203baf31cdaba2e5fed Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sun, 5 Jul 2020 20:16:38 +0000
Subject: [PATCH] fix FAB icon color in night mode

---
 app/src/main/res/drawable-anydpi-v21/ic_add_white_24dp.xml | 1 -
 app/src/main/res/layout/main_app_layout.xml                | 2 +-
 app/src/main/res/values-night/styles.xml                   | 6 +-----
 app/src/main/res/values/styles.xml                         | 5 -----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/drawable-anydpi-v21/ic_add_white_24dp.xml b/app/src/main/res/drawable-anydpi-v21/ic_add_white_24dp.xml
index 7a743d52..27557a0d 100644
--- a/app/src/main/res/drawable-anydpi-v21/ic_add_white_24dp.xml
+++ b/app/src/main/res/drawable-anydpi-v21/ic_add_white_24dp.xml
@@ -19,7 +19,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?colorOnSecondary"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/layout/main_app_layout.xml b/app/src/main/res/layout/main_app_layout.xml
index 842b867f..e9c7138b 100644
--- a/app/src/main/res/layout/main_app_layout.xml
+++ b/app/src/main/res/layout/main_app_layout.xml
@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:backgroundTint="?colorAccent"
+        app:backgroundTint="?colorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:maxImageSize="36dp"
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index a083c8c7..fd949f97 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -17,9 +17,6 @@
 
 <resources>
 
-    <style name="myFabStyle" parent="Widget.MaterialComponents.FloatingActionButton">
-        <item name="tint" state="disabled">?android:attr/colorBackground</item>
-    </style>
     <!-- Base application theme. -->
     <!-- base hue: 261.2245° -->
     <!-- target primary color: #935FF2 -->
@@ -30,13 +27,12 @@
         <item name="windowNoTitle">true</item>
         <item name="textColor">#ffffff</item>
         <item name="commentColor">#909090</item>
-        <item name="colorOnSecondary">@android:color/white</item>
+        <item name="colorOnSecondary">#dddddd</item>
         <item name="textInputStyle">
             @style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense
         </item>
         <item name="colorError">#FFE1E2</item>
         <item name="colorOnError">#CD1609</item>
-        <item name="floatingActionButtonStyle">@style/myFabStyle</item>
     </style>
 
     <!-- theme list start -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 61e36f72..17fc699f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,10 +16,6 @@
   -->
 
 <resources>
-
-    <style name="myFabStyle" parent="Widget.MaterialComponents.FloatingActionButton">
-        <item name="tint" state="disabled">?android:attr/colorBackground</item>
-    </style>
     <!-- Base application theme. -->
     <!-- base hue: 261.2245° -->
     <!-- target primary color: #935FF2 -->
@@ -36,7 +32,6 @@
         </item>
         <item name="colorError">#FFE1E2</item>
         <item name="colorOnError">#CD1609</item>
-        <item name="floatingActionButtonStyle">@style/myFabStyle</item>
     </style>
 
     <!-- theme list start -->
-- 
2.39.2