From a5e58aab0cc7cbcb6e3ed59a261bca163d48a8a2 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Sun, 12 Jan 2020 12:50:09 +0300
Subject: [PATCH] customtheme: Solve spoiler and muted channel colors on 10.2.0

---
 patches/customtheme/1020.patch | 41 ++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/patches/customtheme/1020.patch b/patches/customtheme/1020.patch
index 2e36c5d..440e1e4 100644
--- a/patches/customtheme/1020.patch
+++ b/patches/customtheme/1020.patch
@@ -1,6 +1,6 @@
-diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml
-*** from/res/drawable/drawable_overlay_channels_active_dark.xml	2020-01-11 15:47:41.441380541 +0000
---- to/res/drawable/drawable_overlay_channels_active_dark.xml	2020-01-11 15:50:12.057734973 +0000
+diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml
+*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml	2020-01-12 11:58:54.830668343 +0300
+--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml	2020-01-12 12:30:53.961941373 +0300
 ***************
 *** 3,9 ****
     xmlns:android="http://schemas.android.com/apk/res/android">
@@ -18,9 +18,9 @@ diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/dra
               <corners android:radius="4.0dip" />
           </shape>
       </item>
-diff -crB from/res/values/colors.xml to/res/values/colors.xml
-*** from/res/values/colors.xml	2020-01-11 15:47:41.764713204 +0000
---- to/res/values/colors.xml	2020-01-11 15:50:12.057734973 +0000
+diff -crB com.discord-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml
+*** com.discord-1020-base/res/values/colors.xml	2020-01-12 11:58:55.320671069 +0300
+--- com.discord-1020/res/values/colors.xml	2020-01-12 12:47:04.817926576 +0300
 ***************
 *** 52,58 ****
       <color name="cardview_shadow_start_color">#37000000</color>
@@ -116,7 +116,7 @@ diff -crB from/res/values/colors.xml to/res/values/colors.xml
       <color name="primary_400">#ff72767d</color>
       <color name="primary_400_alpha_30">#4d72767d</color>
       <color name="primary_400_alpha_60">#9972767d</color>
-!     <color name="primary_500">#ff0f0f0f</color>
+!     <color name="primary_500">#ff333333</color>
 !     <color name="primary_500_alpha_20">#330f0f0f</color>
 !     <color name="primary_500_alpha_30">#4d0f0f0f</color>
 !     <color name="primary_500_alpha_32">#510f0f0f</color>
@@ -171,9 +171,9 @@ diff -crB from/res/values/colors.xml to/res/values/colors.xml
       <color name="tooltip_background_light">#e6ffffff</color>
       <color name="transparent">@android:color/transparent</color>
       <color name="twitch">#ff593695</color>
-diff -crB from/res/values/styles.xml to/res/values/styles.xml
-*** from/res/values/styles.xml	2020-01-11 15:47:42.174712356 +0000
---- to/res/values/styles.xml	2020-01-11 15:50:12.057734973 +0000
+diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml
+*** com.discord-1020-base/res/values/styles.xml	2020-01-12 11:58:55.240670624 +0300
+--- com.discord-1020/res/values/styles.xml	2020-01-12 12:46:14.510949392 +0300
 ***************
 *** 392,398 ****
           <item name="tabTextColor">@color/white_alpha_40</item>
@@ -192,7 +192,7 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml
           <item name="theme_chat_code">@color/primary_630</item>
           <item name="theme_chat_codeblock_border">@color/grey_account</item>
 ***************
-*** 404,415 ****
+*** 404,418 ****
           <item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
           <item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
           <item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
@@ -204,8 +204,11 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml
 !         <item name="theme_chat_mentioned_me">#1afaa61a</item>
           <item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
           <item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
-          <item name="theme_chat_spoiler_bg">@color/primary_700</item>
---- 404,415 ----
+!         <item name="theme_chat_spoiler_bg">@color/primary_700</item>
+          <item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
+          <item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
+          <item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
+--- 404,418 ----
           <item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
           <item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
           <item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
@@ -217,7 +220,10 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml
 !         <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
           <item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
           <item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
-          <item name="theme_chat_spoiler_bg">@color/primary_700</item>
+!         <item name="theme_chat_spoiler_bg">@color/primary_500</item>
+          <item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
+          <item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
+          <item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
 ***************
 *** 471,477 ****
           <item name="colorControlActivated">@color/brand_500</item>
@@ -252,9 +258,9 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml
       </style>
       <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
           <item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
-diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/app/AppActivity$d.smali
-*** from/smali/com/discord/app/AppActivity$d.smali	2020-01-11 15:47:43.741375775 +0000
---- to/smali/com/discord/app/AppActivity$d.smali	2020-01-11 15:50:12.057734973 +0000
+diff -crB com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali com.discord-1020/smali/com/discord/app/AppActivity$d.smali
+*** com.discord-1020-base/smali/com/discord/app/AppActivity$d.smali	2020-01-12 11:58:56.794012599 +0300
+--- com.discord-1020/smali/com/discord/app/AppActivity$d.smali	2020-01-12 12:30:53.965274726 +0300
 ***************
 *** 115,121 ****
       .line 7
@@ -272,3 +278,4 @@ diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/ap
   
       invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
   
+