From 39936489cdf648a5e00e985a4ecf0bddeba169e3 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Thu, 30 Jul 2020 01:27:37 +0300
Subject: [PATCH] betterdmheader: Implement betterdmheader

Closes #73
---
 patches/README.md                 |  1 +
 patches/betterdmheader/1208.patch | 68 +++++++++++++++++++++++++++++++
 patches/betterdmheader/README.md  |  9 ++++
 3 files changed, 78 insertions(+)
 create mode 100644 patches/betterdmheader/1208.patch
 create mode 100644 patches/betterdmheader/README.md

diff --git a/patches/README.md b/patches/README.md
index 8d726b28d6..192996e1d3 100644
--- a/patches/README.md
+++ b/patches/README.md
@@ -6,6 +6,7 @@ The patches with **bold** names are the ones I'm most proud of.
 
 ---
 
+- betterdmheader: Replaces call button on dm header with a search button.
 - **bettertm**: Replaces the :tm: and :registered: emojis with rendered unicode variants, making them look much better.
 
 Before bettertm:
diff --git a/patches/betterdmheader/1208.patch b/patches/betterdmheader/1208.patch
new file mode 100644
index 0000000000..ff4d3ce100
--- /dev/null
+++ b/patches/betterdmheader/1208.patch
@@ -0,0 +1,68 @@
+Only in com.discord: build
+Only in com.discord: dist
+diff --color -crB com.discord-base/res/menu/menu_chat_toolbar.xml com.discord/res/menu/menu_chat_toolbar.xml
+*** com.discord-base/res/menu/menu_chat_toolbar.xml	2020-07-29 21:27:23.586754395 +0300
+--- com.discord/res/menu/menu_chat_toolbar.xml	2020-07-30 01:15:42.119285954 +0300
+***************
+*** 1,10 ****
+  <?xml version="1.0" encoding="utf-8"?>
+  <menu
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+!     <item android:icon="?theme_group_start_call_icon" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:showAsAction="ifRoom" />
+      <item android:icon="@drawable/ic_call_end_red_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:showAsAction="ifRoom" />
+      <item android:icon="?theme_friends_new_group_icon" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:showAsAction="ifRoom" />
+      <item android:icon="?theme_friends_add_icon" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:showAsAction="always" />
+!     <item android:icon="?theme_search_menu_icon" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:showAsAction="ifRoom" />
+      <item android:icon="?theme_chat_header_members" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:showAsAction="always" />
+  </menu>
+\ No newline at end of file
+--- 1,10 ----
+  <?xml version="1.0" encoding="utf-8"?>
+  <menu
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+!     <item android:icon="?theme_group_start_call_icon" android:id="@id/menu_chat_start_call" android:visible="false" android:title="@string/start_call" app:showAsAction="never" />
+      <item android:icon="@drawable/ic_call_end_red_24dp" android:id="@id/menu_chat_stop_call" android:visible="false" android:title="@string/leave_call" app:showAsAction="ifRoom" />
+      <item android:icon="?theme_friends_new_group_icon" android:id="@id/menu_chat_start_group" android:visible="false" android:title="@string/create_group_dm" app:showAsAction="ifRoom" />
+      <item android:icon="?theme_friends_add_icon" android:id="@id/menu_chat_add_friend" android:visible="false" android:title="@string/add_friend" app:showAsAction="always" />
+!     <item android:icon="?theme_search_menu_icon" android:id="@id/menu_chat_search" android:visible="false" android:title="@string/search" app:showAsAction="always" />
+      <item android:icon="?theme_chat_header_members" android:id="@id/menu_chat_side_panel" android:visible="false" android:title="@string/members" app:showAsAction="always" />
+  </menu>
+\ No newline at end of file
+diff --color -crB com.discord-base/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali
+*** com.discord-base/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali	2020-07-29 21:27:28.896785061 +0300
+--- com.discord/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali	2020-07-30 01:22:28.321730038 +0300
+***************
+*** 119,125 ****
+  
+      invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 5
+      invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+--- 119,125 ----
+  
+      invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 5
+      invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+***************
+*** 140,146 ****
+  
+      invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 7
+      invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+--- 140,146 ----
+  
+      invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+!     invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
+  
+      .line 7
+      invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
+
diff --git a/patches/betterdmheader/README.md b/patches/betterdmheader/README.md
new file mode 100644
index 0000000000..839004901c
--- /dev/null
+++ b/patches/betterdmheader/README.md
@@ -0,0 +1,9 @@
+## DisTok CutTheCord: Better DM Header Patch
+
+This patch replaces the call button on DM headers with search button. The call button is still available in the right menu.
+
+![](https://lasagna.cat/i/9njfeecd.png)
+
+#### Available and tested on:
+- 33.1
+