From af8ddac007f7d24b362032fa80ee98bd905dc77d Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Mon, 16 Dec 2019 20:14:33 -0800
Subject: [PATCH] AMOLED theme now has dark snackbar

---
 app/src/main/java/eu/kanade/tachiyomi/util/ViewExtensions.kt | 2 +-
 app/src/main/res/drawable/bg_snackbar.xml                    | 2 +-
 app/src/main/res/values-night/themes.xml                     | 4 ++++
 app/src/main/res/values/attrs.xml                            | 2 ++
 app/src/main/res/values/colors.xml                           | 1 +
 app/src/main/res/values/themes.xml                           | 2 ++
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/ViewExtensions.kt
index 3a8a0c852e..3f9fa346c9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/ViewExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/ViewExtensions.kt
@@ -41,7 +41,7 @@ fun View.snack(message: String, length: Int = Snackbar.LENGTH_SHORT, f: (Snackba
 Unit)? = null): Snackbar {
     val snack = Snackbar.make(this, message, length)
     val textView: TextView = snack.view.findViewById(com.google.android.material.R.id.snackbar_text)
-    textView.setTextColor(context.getResourceColor(android.R.attr.textColorPrimaryInverse))
+    textView.setTextColor(context.getResourceColor(R.attr.snackbar_text))
     when {
         Build.VERSION.SDK_INT >= 23 ->  {
             val leftM = if (this is CoordinatorLayout) 0 else rootWindowInsets.systemWindowInsetLeft
diff --git a/app/src/main/res/drawable/bg_snackbar.xml b/app/src/main/res/drawable/bg_snackbar.xml
index ab37d237f8..31128e1590 100644
--- a/app/src/main/res/drawable/bg_snackbar.xml
+++ b/app/src/main/res/drawable/bg_snackbar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/snackbarBackground"/>
+    <solid android:color="?snackbar_background"/>
     <corners android:radius="4dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d4252f2faf..f9842d1d60 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -31,6 +31,8 @@
     <item name="text_color_primary">@color/textColorPrimaryDark</item>
     <item name="background_card">@color/cardBackground</item>
     <item name="icon_color">@color/iconColorDark</item>
+    <item name="snackbar_background">@color/snackbarBackground</item>
+    <item name="snackbar_text">@color/textColorPrimaryLight</item>
     <item name="android:navigationBarColor">@color/oldNavBarBackground</item>
   </style>
 
@@ -54,6 +56,8 @@
     <item name="colorPrimary">@color/colorAmoledPrimary</item>
     <item name="colorPrimaryDark">@color/colorAmoledPrimary</item>
     <item name="android:colorBackground">@color/md_black_1000</item>
+    <item name="snackbar_background">@color/trueSnackbarBackground</item>
+    <item name="snackbar_text">@color/textColorPrimaryDark</item>
 
     <!-- Custom Attributes-->
     <item name="selectable_list_drawable">@drawable/list_item_selector_amoled</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3d0864a354..c66ed577a6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -26,4 +26,6 @@
     <attr name="text_color_primary" format="reference|integer"/>
     <attr name="background_card" format="reference|integer"/>
     <attr name="icon_color" format="reference|integer"/>
+    <attr name="snackbar_background" format="reference|integer"/>
+    <attr name="snackbar_text" format="reference|integer"/>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 10c8cde17a..b7f8d78db5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
     <color name="drawerPrimary">@color/colorPrimary</color>
     <color name="cardBackground">#FFFFFF</color>
     <color name="snackbarBackground">#323232</color>
+    <color name="trueSnackbarBackground">#323232</color>
     <color name="dialogBackground">@color/md_white_1000</color>
     <color name="rippleColor">@color/md_black_1000_12</color>
     <color name="colorAccent">@color/md_blue_A400</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ce52db94c8..df6df16bca 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -38,6 +38,8 @@
         <item name="text_color_primary">@color/textColorPrimaryLight</item>
         <item name="background_card">@color/cardBackground</item>
         <item name="icon_color">@color/iconColorLight</item>
+        <item name="snackbar_background">@color/snackbarBackground</item>
+        <item name="snackbar_text">@color/textColorPrimaryDark</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">#B3000000</item>