From cafae3b986e8be942f9cbfd6a333ab00c43ce05d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 16 Aug 2019 12:14:41 +0200
Subject: [PATCH] White cards

---
 app/src/main/java/eu/faircode/email/FragmentAccounts.java   | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentAnswers.java    | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentFolders.java    | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentIdentities.java | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentMessages.java   | 5 +++++
 app/src/main/java/eu/faircode/email/FragmentRules.java      | 5 +++++
 app/src/main/res/values/colors.xml                          | 4 +++-
 7 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index 1ee4a8817d..b62daaee4d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -35,6 +35,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -167,6 +168,10 @@ public class FragmentAccounts extends FragmentBase {
         });
 
         // Initialize
+
+        if (cards && !Helper.isDarkTheme(getContext()))
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards));
+
         if (!settings)
             fab.hide();
         fabCompose.hide();
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
index 79670e4bd0..47c926ba57 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
@@ -28,6 +28,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.preference.PreferenceManager;
@@ -97,6 +98,10 @@ public class FragmentAnswers extends FragmentBase {
         });
 
         // Initialize
+
+        if (cards && !Helper.isDarkTheme(getContext()))
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards));
+
         grpReady.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 39b75d86fc..67625736f2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -37,6 +37,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -218,6 +219,10 @@ public class FragmentFolders extends FragmentBase {
             });
 
         // Initialize
+
+        if (cards && !Helper.isDarkTheme(getContext()))
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards));
+
         grpReady.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
         fab.hide();
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentities.java b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
index 5a0bd68a27..cf5010712b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentities.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
@@ -30,6 +30,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.preference.PreferenceManager;
@@ -112,6 +113,10 @@ public class FragmentIdentities extends FragmentBase {
         });
 
         // Initialize
+
+        if (cards && !Helper.isDarkTheme(getContext()))
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards));
+
         grpReady.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5fd6dc79eb..d8e63937e4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -80,6 +80,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.ContextCompat;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -817,6 +818,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         addBackPressedListener(onBackPressedListener);
 
         // Initialize
+
+        if (cards && !Helper.isDarkTheme(getContext()))
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards));
+
         tvNoEmail.setVisibility(View.GONE);
         seekBar.setVisibility(View.GONE);
         ibDown.setVisibility(View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/FragmentRules.java b/app/src/main/java/eu/faircode/email/FragmentRules.java
index 5fb3768a56..823919147e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRules.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRules.java
@@ -28,6 +28,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.preference.PreferenceManager;
@@ -111,6 +112,10 @@ public class FragmentRules extends FragmentBase {
         });
 
         // Initialize
+
+        if (cards && !Helper.isDarkTheme(getContext()))
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards));
+
         grpReady.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 266db4b89f..ea4a4311f5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -26,7 +26,9 @@
     <color name="lightColorDrawerScrim">#99000000</color>
     <color name="lightColorDrawerText">#111</color>
     <color name="lightColorDrawerBackground">#eee</color>
-    <color name="lightColorCardBackground">#eee</color>
+    <color name="lightColorCardBackground">#fff</color>
+
+    <color name="lightColorBackground_cards">#eee</color>
 
     <color name="darkColorUnread">#fff</color>
     <color name="darkColorItemSelected">#444</color>