From b94dd226bdd7bd38546b9897e32d507244ee2940 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Thu, 25 Apr 2019 14:57:36 +0300
Subject: [PATCH] fix top bar

---
 patches/customtheme/884.patch | 49 ++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/patches/customtheme/884.patch b/patches/customtheme/884.patch
index fd35b6fe25..5582440e7b 100644
--- a/patches/customtheme/884.patch
+++ b/patches/customtheme/884.patch
@@ -1,6 +1,23 @@
-diff -crB -x dist -x build com.discord-876-base/res/values/colors.xml com.discord-876/res/values/colors.xml
-*** com.discord-876-base/res/values/colors.xml	2019-04-25 11:32:32.232915774 +0300
---- com.discord-876/res/values/colors.xml	2019-04-25 11:41:17.261090022 +0300
+diff -crB -x dist -x build com.discord-884-base/res/values/colors.xml com.discord-884/res/values/colors.xml
+*** com.discord-884-base/res/values/colors.xml	2019-04-25 13:19:16.449838586 +0300
+--- com.discord-884/res/values/colors.xml	2019-04-25 14:54:49.884085106 +0300
+***************
+*** 52,58 ****
+      <color name="cardview_shadow_start_color">#37000000</color>
+      <color name="code">#ff657b83</color>
+      <color name="colorPrimary">#ff333333</color>
+!     <color name="colorPrimaryDark">#ff1d1d1d</color>
+      <color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
+      <color name="common_google_signin_btn_text_dark_disabled">#1f000000</color>
+      <color name="common_google_signin_btn_text_dark_focused">@android:color/black</color>
+--- 52,58 ----
+      <color name="cardview_shadow_start_color">#37000000</color>
+      <color name="code">#ff657b83</color>
+      <color name="colorPrimary">#ff333333</color>
+!     <color name="colorPrimaryDark">#ff000000</color>
+      <color name="common_google_signin_btn_text_dark_default">@android:color/white</color>
+      <color name="common_google_signin_btn_text_dark_disabled">#1f000000</color>
+      <color name="common_google_signin_btn_text_dark_focused">@android:color/black</color>
 ***************
 *** 61,68 ****
       <color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
@@ -134,9 +151,9 @@ diff -crB -x dist -x build com.discord-876-base/res/values/colors.xml com.discor
       <color name="purple_brand_hint">#ffc9d2f0</color>
       <color name="purple_brand_notification">#ff5161ff</color>
       <color name="reaction_background_me_dark">#4d5c6a9e</color>
-diff -crB -x dist -x build com.discord-876-base/res/values/styles.xml com.discord-876/res/values/styles.xml
-*** com.discord-876-base/res/values/styles.xml	2019-04-25 11:32:32.109582104 +0300
---- com.discord-876/res/values/styles.xml	2019-04-25 11:44:13.935296023 +0300
+diff -crB -x dist -x build com.discord-884-base/res/values/styles.xml com.discord-884/res/values/styles.xml
+*** com.discord-884-base/res/values/styles.xml	2019-04-25 13:19:16.536505628 +0300
+--- com.discord-884/res/values/styles.xml	2019-04-25 14:54:38.540689354 +0300
 ***************
 *** 116,122 ****
           <item name="colorPrimary">@color/primary_600</item>
@@ -232,4 +249,24 @@ diff -crB -x dist -x build com.discord-876-base/res/values/styles.xml com.discor
       </style>
       <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
           <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
+diff -crB -x dist -x build com.discord-884-base/smali/com/discord/app/AppActivity$d.smali com.discord-884/smali/com/discord/app/AppActivity$d.smali
+*** com.discord-884-base/smali/com/discord/app/AppActivity$d.smali	2019-04-25 13:19:17.513176522 +0300
+--- com.discord-884/smali/com/discord/app/AppActivity$d.smali	2019-04-25 14:55:11.870872756 +0300
+***************
+*** 125,131 ****
+  
+      check-cast v0, Landroid/app/Activity;
+  
+!     const v1, 0x7f06013a
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
+  
+--- 125,131 ----
+  
+      check-cast v0, Landroid/app/Activity;
+  
+!     const v1, 0x7f060021
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
+