From 1753603bdb89f05213a556f9d5f27b6baa6ca342 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 9 Sep 2019 18:03:56 +0200
Subject: [PATCH] Styled toast

---
 app/src/main/res/drawable/toast_background.xml |  2 +-
 app/src/main/res/layout/toast.xml              |  2 +-
 app/src/main/res/values/colors.xml             |  3 ---
 app/src/main/res/values/styles.xml             | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/drawable/toast_background.xml b/app/src/main/res/drawable/toast_background.xml
index 561b7660de..0550e2714d 100644
--- a/app/src/main/res/drawable/toast_background.xml
+++ b/app/src/main/res/drawable/toast_background.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="12dp" />
-    <solid android:color="@color/colorToastBackground" />
+    <solid android:color="?attr/colorToastBackground" />
 </shape>
diff --git a/app/src/main/res/layout/toast.xml b/app/src/main/res/layout/toast.xml
index 3e759ede46..b62c0ba42b 100644
--- a/app/src/main/res/layout/toast.xml
+++ b/app/src/main/res/layout/toast.xml
@@ -16,5 +16,5 @@
         android:gravity="center"
         android:text="Message"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/colorToastForeground" />
+        android:textColor="?attr/colorToastForeground" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a304067be6..1a4ad110a2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,9 +22,6 @@
     <color name="colorActionForeground">#fff</color>
     <color name="colorActionForegroundDisabled">#ccc</color>
 
-    <color name="colorToastForeground">#fff</color>
-    <color name="colorToastBackground">#006db3</color>
-
     <color name="colorWidgetForeground">#fff</color>
     <color name="colorWidgetBackground">#7f000000</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index baf586cebe..09649e2edc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,6 +7,8 @@
     <attr name="colorDrawerText" format="reference" />
     <attr name="colorDrawerBackground" format="reference" />
     <attr name="colorCardBackground" format="reference" />
+    <attr name="colorToastForeground" format="reference" />
+    <attr name="colorToastBackground" format="reference" />
     <attr name="activatableItemBackground" format="reference" />
 
     <style name="AppThemeLight" parent="Base.Theme.AppCompat.Light.DarkActionBar">
@@ -27,6 +29,9 @@
 
         <item name="colorCardBackground">@color/lightColorCardBackground</item>
 
+        <item name="colorToastForeground">@android:color/white</item>
+        <item name="colorToastBackground">@color/colorPrimaryDark</item>
+
         <item name="activatableItemBackground">@drawable/activatable_item_background_light</item>
 
         <item name="android:textColorLink">@color/colorAccentDark</item>
@@ -59,6 +64,9 @@
 
         <item name="colorCardBackground">@color/darkColorCardBackground</item>
 
+        <item name="colorToastForeground">@android:color/white</item>
+        <item name="colorToastBackground">@color/colorPrimaryDark</item>
+
         <item name="activatableItemBackground">@drawable/activatable_item_background_dark</item>
 
         <item name="android:checkboxStyle">@style/checkboxStyle</item>
@@ -88,6 +96,9 @@
         <item name="colorAccent">@color/greyAccent</item>
 
         <item name="colorUnread">@color/greyAccent</item>
+
+        <item name="colorToastForeground">@android:color/white</item>
+        <item name="colorToastBackground">@color/greyAccent</item>
     </style>
 
     <style name="AppThemeGreyDark" parent="AppThemeDark">
@@ -99,6 +110,9 @@
         <item name="colorUnread">@color/greyAccent</item>
         <item name="colorSeparator">@color/greyPrimary</item>
 
+        <item name="colorToastForeground">@android:color/white</item>
+        <item name="colorToastBackground">@color/greyAccent</item>
+
         <item name="android:windowBackground">@android:color/black</item>
         <item name="colorDrawerBackground">@android:color/black</item>
     </style>