From 904622913c4bb3cffa4849c285fb227a1125a4e0 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Wed, 23 Jan 2019 14:23:43 +0300
Subject: [PATCH] customtheme: Improved theming on various parts

Full list:
- editing message bar
- blocked message background
- mention backgrounds
---
 patches/customtheme/833.patch | 98 +++++++++++++++++++++++++++++++++++
 patches/customtheme/README.md |  2 -
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/patches/customtheme/833.patch b/patches/customtheme/833.patch
index 8be575f..a56a64f 100644
--- a/patches/customtheme/833.patch
+++ b/patches/customtheme/833.patch
@@ -132,3 +132,101 @@ diff -crB -x dist -x build com.discord-832-base/res/values/colors.xml com.discor
       <color name="purple_brand_dark">#ff697ec4</color>
       <color name="purple_brand_hint">#ffc9d2f0</color>
       <color name="purple_brand_notification">#ff5161ff</color>
+*** com.discord-833-base/res/values/styles.xml  2019-01-23 11:03:45.459028301 +0300
+--- com.discord-833/res/values/styles.xml   2019-01-23 14:16:21.440912048 +0300
+***************
+*** 116,122 ****
+          <item name="colorPrimary">@color/primary_600</item>
+          <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
+          <item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+          <item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
+          <item name="colorPrimaryTabs">@color/black_alpha_05</item>
+          <item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
+--- 116,122 ----
+          <item name="colorPrimary">@color/primary_600</item>
+          <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
+          <item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+          <item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
+          <item name="colorPrimaryTabs">@color/black_alpha_05</item>
+          <item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
+***************
+*** 321,327 ****
+          <item name="tabSelectedTextColor">@color/white</item>
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
+!         <item name="theme_chat_blocked_bg">#ff34373c</item>
+          <item name="theme_chat_blocked_text">@color/grey_unread</item>
+          <item name="theme_chat_code">@color/grey_channels</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+--- 321,327 ----
+          <item name="tabSelectedTextColor">@color/white</item>
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
+!         <item name="theme_chat_blocked_bg">@color/primary_500</item>
+          <item name="theme_chat_blocked_text">@color/grey_unread</item>
+          <item name="theme_chat_code">@color/grey_channels</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+***************
+*** 335,346 ****
+          <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>
+!         <item name="theme_chat_input_edit">#ff3e4145</item>
+          <item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
+          <item name="theme_chat_input_text">@color/white_alpha_70</item>
+          <item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
+          <item name="theme_chat_loading_spinner_color">@color/white</item>
+!         <item name="theme_chat_mentioned_me">#1afaa61a</item>
+          <item name="theme_chat_name">@color/white</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>
+--- 335,346 ----
+          <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>
+!         <item name="theme_chat_input_edit">@color/primary_600</item>
+          <item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
+          <item name="theme_chat_input_text">@color/white_alpha_70</item>
+          <item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
+          <item name="theme_chat_loading_spinner_color">@color/white</item>
+!         <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
+          <item name="theme_chat_name">@color/white</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>
+***************
+*** 405,411 ****
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+      </style>
+      <style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
+          <item name="colorAccent">@color/brand_600</item>
+--- 405,411 ----
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+      </style>
+      <style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
+          <item name="colorAccent">@color/brand_600</item>
+***************
+*** 437,443 ****
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+      </style>
+      <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
+          <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
+--- 437,443 ----
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+      </style>
+      <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
+          <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
+
diff --git a/patches/customtheme/README.md b/patches/customtheme/README.md
index bccb0a5..0eef125 100644
--- a/patches/customtheme/README.md
+++ b/patches/customtheme/README.md
@@ -7,9 +7,7 @@ Copy `asset_loading.png` to root of Discord's extracted folder and run `fixsplas
 #### Bugs / Side effects
 - Not all colors are replaced
 - Ignored channel names aren't visible
-- "x blocked messages" and bg on that is still a mess
 - Top bar isn't changed
-- "editing message" is ugly
 
 #### Available and tested on:
 - 8.3.2