From b02e1c0e1977d055c1809d0c0ddca427e0fb4b97 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 22 Dec 2018 08:28:14 +0100
Subject: [PATCH] Fix toast colors  #663

---
 app/build.gradle                                   |  2 +-
 .../mastodon/activities/MainApplication.java       | 14 ++++++++++++--
 app/src/main/res/values/colors.xml                 |  5 +++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4127af0af..0158d1daa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,7 +81,7 @@ dependencies {
     implementation 'com.oguzdev:CircularFloatingActionMenu:1.0.2'
     implementation 'com.github.franmontiel:LocaleChanger:0.9.2'
     implementation 'com.github.stom79:SparkButton:1.0.10'
-    implementation 'com.github.GrenderG:Toasty:1.3.0'
+    implementation 'com.github.GrenderG:Toasty:1.3.1'
     implementation 'com.elconfidencial.bubbleshowcase:bubbleshowcase:1.3.1'
     implementation 'com.android.support:multidex:1.0.3'
     playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java
index 691a48852..c1e913216 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainApplication.java
@@ -19,6 +19,7 @@ import android.content.SharedPreferences;
 import android.os.StrictMode;
 import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
+import android.support.v4.content.ContextCompat;
 
 import com.evernote.android.job.JobManager;
 import com.franmontiel.localechanger.LocaleChanger;
@@ -28,6 +29,7 @@ import java.util.List;
 import java.util.Locale;
 
 import es.dmoral.toasty.Toasty;
+import fr.gouv.etalab.mastodon.R;
 import fr.gouv.etalab.mastodon.helper.Helper;
 import fr.gouv.etalab.mastodon.jobs.ApplicationJob;
 import fr.gouv.etalab.mastodon.jobs.NotificationsSyncJob;
@@ -66,8 +68,16 @@ public class MainApplication extends MultiDexApplication {
             }
             LocaleChanger.initialize(getApplicationContext(), SUPPORTED_LOCALES);
         }catch (Exception ignored){ignored.printStackTrace();}
-        Toasty.Config.getInstance().apply();
-    }
+
+        Toasty.Config.getInstance()
+                .setErrorColor(ContextCompat.getColor(getApplicationContext(), R.color.toasty_background))
+                .setInfoColor(ContextCompat.getColor(getApplicationContext(), R.color.toasty_background))
+                .setSuccessColor(ContextCompat.getColor(getApplicationContext(), R.color.toasty_background))
+                .setWarningColor(ContextCompat.getColor(getApplicationContext(), R.color.toasty_background))
+                .setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.toasty_text))
+                .apply(); 
+                    Toasty.Config.getInstance().apply();
+                }
 
 
     @Override
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index fb3be6620..fe21d984e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -99,4 +99,9 @@
     <color name="black_link_toot">#27a7fc</color>
     <color name="dark_link_toot">#27a7fc</color>
     <color name="light_link_toot">#27a7fc</color>
+
+
+    <!-- TOASTY -->
+    <color name="toasty_text">#d0cfcf</color>
+    <color name="toasty_background">#2e2e2e</color>
 </resources>