From 0a30df5aaa462376f0defc55b2a3ba5e55de3440 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Dec 2019 21:03:38 +0100
Subject: [PATCH] Swapped red/green

---
 .../java/eu/faircode/email/ActivityBase.java  |  8 ++---
 .../email/FragmentOptionsDisplay.java         | 16 +++++-----
 app/src/main/res/layout/dialog_theme.xml      |  8 ++---
 app/src/main/res/values/colors.xml            | 16 +++++-----
 app/src/main/res/values/strings.xml           |  4 +--
 app/src/main/res/values/styles.xml            | 32 +++++++++----------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index a9ceacde9e..4e0cca7df1 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -94,8 +94,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                 case "yellow_purple_light":
                     setTheme(R.style.AppThemeYellowPurpleLight);
                     break;
-                case "green_red_light":
-                    setTheme(R.style.AppThemeGreenRedLight);
+                case "red_green_light":
+                    setTheme(R.style.AppThemeRedGreenLight);
                     break;
                 case "grey_light":
                     setTheme(R.style.AppThemeGreySteelBlueLight);
@@ -108,8 +108,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                 case "yellow_purple_dark":
                     setTheme(R.style.AppThemeYellowPurpleDark);
                     break;
-                case "green_red_dark":
-                    setTheme(R.style.AppThemeGreenRedDark);
+                case "red_green_dark":
+                    setTheme(R.style.AppThemeRedGreenDark);
                     break;
                 case "grey_dark":
                     setTheme(R.style.AppThemeGreySteelBlueDark);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 928c089a95..8d5bc9f56f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -674,8 +674,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                 case "yellow_purple_light":
                     rgTheme.check(R.id.rbThemeYellowPurpleLight);
                     break;
-                case "green_red_light":
-                    rgTheme.check(R.id.rbThemeGreenRedLight);
+                case "red_green_light":
+                    rgTheme.check(R.id.rbThemeRedGreenLight);
                     break;
                 case "grey_light":
                     rgTheme.check(R.id.rbThemeGreyLight);
@@ -688,8 +688,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                 case "yellow_purple_dark":
                     rgTheme.check(R.id.rbThemeYellowPurpleDark);
                     break;
-                case "green_red_dark":
-                    rgTheme.check(R.id.rbThemeGreenRedDark);
+                case "red_green_dark":
+                    rgTheme.check(R.id.rbThemeRedGreenDark);
                     break;
                 case "grey_dark":
                     rgTheme.check(R.id.rbThemeGreyDark);
@@ -720,8 +720,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                         case R.id.rbThemeYellowPurpleLight:
                             prefs.edit().putString("theme", "yellow_purple_light").apply();
                             break;
-                        case R.id.rbThemeGreenRedLight:
-                            prefs.edit().putString("theme", "green_red_light").apply();
+                        case R.id.rbThemeRedGreenLight:
+                            prefs.edit().putString("theme", "red_green_light").apply();
                             break;
                         case R.id.rbThemeGreyLight:
                             prefs.edit().putString("theme", "grey_light").apply();
@@ -733,8 +733,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                         case R.id.rbThemeYellowPurpleDark:
                             prefs.edit().putString("theme", "yellow_purple_dark").apply();
                             break;
-                        case R.id.rbThemeGreenRedDark:
-                            prefs.edit().putString("theme", "green_red_dark").apply();
+                        case R.id.rbThemeRedGreenDark:
+                            prefs.edit().putString("theme", "red_green_dark").apply();
                             break;
                         case R.id.rbThemeGreyDark:
                             prefs.edit().putString("theme", "grey_dark").apply();
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 7868cdd65e..cae9500ba1 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -45,11 +45,11 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <RadioButton
-                android:id="@+id/rbThemeGreenRedLight"
+                android:id="@+id/rbThemeRedGreenLight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="6dp"
-                android:text="@string/title_setup_green_red_light_theme"
+                android:text="@string/title_setup_red_green_light_theme"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <RadioButton
@@ -77,11 +77,11 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <RadioButton
-                android:id="@+id/rbThemeGreenRedDark"
+                android:id="@+id/rbThemeRedGreenDark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="6dp"
-                android:text="@string/title_setup_green_red_dark_theme"
+                android:text="@string/title_setup_red_green_dark_theme"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <RadioButton
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e8e77936a2..fded933c1f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -77,15 +77,15 @@
     <color name="darkYellowPrimaryDark">#bc5100</color>
     <color name="darkPurpleAccent">#ba68c8</color>
 
-    <!-- Green 600 / Red 600 -->
-    <color name="lightGreenPrimary">#43a047</color>
-    <color name="lightGreenPrimaryDark">#00701a</color>
-    <color name="lightRedAccent">#e53935</color>
+    <!-- Red 600 / Green 600 -->
+    <color name="lightRedPrimary">#e53935</color>
+    <color name="lightRedPrimaryDark">#ab000d</color>
+    <color name="lightGreenAccent">#43a047</color>
 
-    <!-- Green 900 / red 300 -->
-    <color name="darkGreenPrimary">#1b5e20</color>
-    <color name="darkGreenPrimaryDark">#003300</color>
-    <color name="darkRedAccent">#e57373</color>
+    <!-- Red 900 / Green 300 -->
+    <color name="darkRedPrimary">#b71c1c</color>
+    <color name="darkRedPrimaryDark">#7f0000</color>
+    <color name="darkGreenAccent">#81c784</color>
 
     <!-- default: #323232 -->
     <color name="design_snackbar_background_color" tools:override="true">#222</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14221c9b49..774f6cb6d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,12 +203,12 @@
 
     <string name="title_setup_blue_orange_light_theme">Blue/orange light theme</string>
     <string name="title_setup_yellow_purple_light_theme">Yellow/purple light theme</string>
-    <string name="title_setup_green_red_light_theme">Green/red light theme</string>
+    <string name="title_setup_red_green_light_theme">Red/green light theme</string>
     <string name="title_setup_grey_light_theme">Grey light theme</string>
 
     <string name="title_setup_blue_orange_dark_theme">Blue/orange dark theme</string>
     <string name="title_setup_yellow_purple_dark_theme">Yellow/purple dark theme</string>
-    <string name="title_setup_green_red_dark_theme">Green/red dark theme</string>
+    <string name="title_setup_red_green_dark_theme">Red/green dark theme</string>
     <string name="title_setup_grey_dark_theme">Grey dark theme</string>
 
     <string name="title_setup_black_theme">Black theme</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f44713d9c0..e4e62dc965 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -129,19 +129,19 @@
         <item name="android:textColorLink">@color/lightPurpleAccent</item>
     </style>
 
-    <style name="AppThemeGreenRedLight" parent="AppThemeBaseLight">
-        <item name="colorPrimary">@color/lightGreenPrimary</item>
-        <item name="colorPrimaryDark">@color/lightGreenPrimaryDark</item>
-        <item name="colorAccent">@color/lightRedAccent</item>
+    <style name="AppThemeRedGreenLight" parent="AppThemeBaseLight">
+        <item name="colorPrimary">@color/lightRedPrimary</item>
+        <item name="colorPrimaryDark">@color/lightRedPrimaryDark</item>
+        <item name="colorAccent">@color/lightGreenAccent</item>
 
-        <item name="colorUnreadHighlight">@color/lightRedAccent</item>
+        <item name="colorUnreadHighlight">@color/lightGreenAccent</item>
 
-        <item name="colorFabBackground">@color/lightRedAccent</item>
+        <item name="colorFabBackground">@color/lightGreenAccent</item>
 
         <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/lightRedAccent</item>
+        <item name="colorToastBackground">@color/lightGreenAccent</item>
 
-        <item name="android:textColorLink">@color/lightRedAccent</item>
+        <item name="android:textColorLink">@color/lightGreenAccent</item>
     </style>
 
     <style name="AppThemeBlueOrangeDark" parent="AppThemeBaseDark">
@@ -174,19 +174,19 @@
         <item name="android:textColorLink">@color/darkPurpleAccent</item>
     </style>
 
-    <style name="AppThemeGreenRedDark" parent="AppThemeBaseDark">
-        <item name="colorPrimary">@color/darkGreenPrimary</item>
-        <item name="colorPrimaryDark">@color/darkGreenPrimaryDark</item>
-        <item name="colorAccent">@color/darkRedAccent</item>
+    <style name="AppThemeRedGreenDark" parent="AppThemeBaseDark">
+        <item name="colorPrimary">@color/darkRedPrimary</item>
+        <item name="colorPrimaryDark">@color/darkRedPrimaryDark</item>
+        <item name="colorAccent">@color/darkGreenAccent</item>
 
-        <item name="colorUnreadHighlight">@color/darkRedAccent</item>
+        <item name="colorUnreadHighlight">@color/darkGreenAccent</item>
 
-        <item name="colorFabBackground">@color/darkRedAccent</item>
+        <item name="colorFabBackground">@color/darkGreenAccent</item>
 
         <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/darkRedAccent</item>
+        <item name="colorToastBackground">@color/darkGreenAccent</item>
 
-        <item name="android:textColorLink">@color/darkRedAccent</item>
+        <item name="android:textColorLink">@color/darkGreenAccent</item>
     </style>
 
     <style name="AppThemeBlack" parent="AppThemeBlueOrangeDark">