From a7f86633ebfb5d82ce51a0ee54615116099f3ec7 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Sun, 17 May 2020 19:06:11 +0300
Subject: [PATCH] customtheme: remove the ugly button backgrounds

---
 patches/customtheme/1144.patch | 69 ++++++++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/patches/customtheme/1144.patch b/patches/customtheme/1144.patch
index 0dca869..e12481d 100644
--- a/patches/customtheme/1144.patch
+++ b/patches/customtheme/1144.patch
@@ -1,6 +1,50 @@
-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-05-11 20:39:37.470401570 +0100
---- to/res/drawable/drawable_overlay_channels_active_dark.xml	2020-05-11 20:41:28.929208631 +0100
+Binary files com.discord-1144-base/build/apk/classes.dex and com.discord-1144/build/apk/classes.dex differ
+Binary files com.discord-1144-base/build/apk/res/drawable/drawable_bg_corners_20dp.xml and com.discord-1144/build/apk/res/drawable/drawable_bg_corners_20dp.xml differ
+Binary files com.discord-1144-base/build/apk/res/drawable/drawable_circle_black.xml and com.discord-1144/build/apk/res/drawable/drawable_circle_black.xml differ
+Binary files com.discord-1144-base/build/apk/res/drawable/drawable_overlay_channels_active_dark.xml and com.discord-1144/build/apk/res/drawable/drawable_overlay_channels_active_dark.xml differ
+Binary files com.discord-1144-base/build/apk/resources.arsc and com.discord-1144/build/apk/resources.arsc differ
+Binary files com.discord-1144-base/dist/com.discord-1144.apk and com.discord-1144/dist/com.discord-1144.apk differ
+diff -crB com.discord-1144-base/res/drawable/drawable_bg_corners_20dp.xml com.discord-1144/res/drawable/drawable_bg_corners_20dp.xml
+*** com.discord-1144-base/res/drawable/drawable_bg_corners_20dp.xml	2020-05-17 16:38:22.678571227 +0300
+--- com.discord-1144/res/drawable/drawable_bg_corners_20dp.xml	2020-05-17 19:04:06.514086772 +0300
+***************
+*** 1,6 ****
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@color/white" />
+      <corners android:radius="20.0dip" />
+  </shape>
+\ No newline at end of file
+--- 1,6 ----
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@android:color/transparent" />
+      <corners android:radius="20.0dip" />
+  </shape>
+\ No newline at end of file
+diff -crB com.discord-1144-base/res/drawable/drawable_circle_black.xml com.discord-1144/res/drawable/drawable_circle_black.xml
+*** com.discord-1144-base/res/drawable/drawable_circle_black.xml	2020-05-17 16:38:24.365248326 +0300
+--- com.discord-1144/res/drawable/drawable_circle_black.xml	2020-05-17 19:04:02.407391325 +0300
+***************
+*** 1,5 ****
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@color/black" />
+  </shape>
+\ No newline at end of file
+--- 1,5 ----
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@android:color/transparent" />
+  </shape>
+\ No newline at end of file
+diff -crB com.discord-1144-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1144/res/drawable/drawable_overlay_channels_active_dark.xml
+*** com.discord-1144-base/res/drawable/drawable_overlay_channels_active_dark.xml	2020-05-17 16:38:23.495242945 +0300
+--- com.discord-1144/res/drawable/drawable_overlay_channels_active_dark.xml	2020-05-17 18:58:10.908222133 +0300
 ***************
 *** 3,9 ****
     xmlns:android="http://schemas.android.com/apk/res/android">
@@ -18,9 +62,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-05-11 20:39:38.822387099 +0100
---- to/res/values/colors.xml	2020-05-11 20:41:28.929208631 +0100
+diff -crB com.discord-1144-base/res/values/colors.xml com.discord-1144/res/values/colors.xml
+*** com.discord-1144-base/res/values/colors.xml	2020-05-17 16:38:25.078586071 +0300
+--- com.discord-1144/res/values/colors.xml	2020-05-17 18:58:10.908222133 +0300
 ***************
 *** 103,112 ****
       <color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
@@ -201,9 +245,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-05-11 20:39:38.744387934 +0100
---- to/res/values/styles.xml	2020-05-11 20:41:28.929208631 +0100
+diff -crB com.discord-1144-base/res/values/styles.xml com.discord-1144/res/values/styles.xml
+*** com.discord-1144-base/res/values/styles.xml	2020-05-17 16:38:25.235253707 +0300
+--- com.discord-1144/res/values/styles.xml	2020-05-17 18:58:10.908222133 +0300
 ***************
 *** 382,388 ****
           <item name="tabTextColor">@color/white_alpha_40</item>
@@ -284,9 +328,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-05-11 20:39:40.942364409 +0100
---- to/smali/com/discord/app/AppActivity$d.smali	2020-05-11 20:41:48.504999113 +0100
+diff -crB com.discord-1144-base/smali/com/discord/app/AppActivity$d.smali com.discord-1144/smali/com/discord/app/AppActivity$d.smali
+*** com.discord-1144-base/smali/com/discord/app/AppActivity$d.smali	2020-05-17 16:38:26.535261747 +0300
+--- com.discord-1144/smali/com/discord/app/AppActivity$d.smali	2020-05-17 18:58:10.908222133 +0300
 ***************
 *** 115,121 ****
       .line 7
@@ -304,3 +348,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
   
+