From 1b99304a052ba78cf13d942945aebdf72c8a68dc Mon Sep 17 00:00:00 2001 From: Ave Date: Sun, 21 Feb 2021 22:12:13 +0300 Subject: [PATCH] Revert "Start up work on 1387" This reverts commit c60d13a69065af31f8003a830d2f248941b283fe. --- README.md | 2 +- patches/betterdmheader/1387.patch | 66 - patches/betterdmheader/README.md | 112 - patches/betterrotation/1387.patch | 22 - patches/betterrotation/README.md | 112 - patches/branding/1387.patch | 243 - patches/branding/README.md | 64 - patches/customtheme/1387.patch | 395 - patches/customtheme/README.md | 64 - patches/customversion/1387.patch | 23 - patches/customversion/README.md | 64 - patches/disable-mobileindicator/1387.patch | 95 - patches/disable-mobileindicator/README.md | 64 - patches/embedlinks/1387.patch | 94 - patches/embedlinks/README.md | 64 - patches/experiments/1387.patch | 104 - patches/experiments/README.md | 64 - patches/hideunusableemojis/1387.patch | 21 - patches/hideunusableemojis/README.md | 64 - patches/hqavatars/1387.patch | 20 - patches/hqavatars/README.md | 64 - patches/litecord/1387.patch | 328 - patches/litecord/README.md | 64 - patches/mutant/1387.patch | 56773 ------------------- patches/mutant/README.md | 64 - patches/necessary/1387.patch | 14 - patches/noblocked/1387.patch | 18 - patches/noblocked/README.md | 48 - patches/nocamerabutton/1387.patch | 40 - patches/nocamerabutton/README.md | 48 - patches/noemojibutton/1387.patch | 20 - patches/noemojibutton/README.md | 48 - patches/nonearby/1387.patch | 99 - patches/nonearby/README.md | 48 - patches/noprofilestrip/1387.patch | 49 - patches/noprofilestrip/README.md | 48 - patches/nospoiler/1387.patch | 69 - patches/nospoiler/README.md | 48 - patches/notrack/1387-post.sh | 2 - patches/notrack/README.md | 48 - patches/nozlib/1387.patch | 34 - patches/nozlib/README.md | 48 - patches/profilemention/1387.patch | 65 - patches/profilemention/README.md | 48 - patches/pseudonitro-viewer/1387.patch | 21 - patches/pseudonitro-viewer/README.md | 48 - patches/showtag/1387.patch | 34 - patches/showtag/README.md | 48 - patches/slashcommands/README.md | 44 - patches/squareavatars/1387.patch | 41 - patches/squareavatars/README.md | 44 - patches/supplemental/1387.patch | 529 - patches/supplemental/README.md | 44 - patches/tokenlogin/1387.patch | 37 - patches/tokenlogin/README.md | 44 - patchport-state.json | 2 +- 56 files changed, 2 insertions(+), 60826 deletions(-) delete mode 100644 patches/betterdmheader/1387.patch delete mode 100644 patches/betterrotation/1387.patch delete mode 100644 patches/branding/1387.patch delete mode 100644 patches/customtheme/1387.patch delete mode 100644 patches/customversion/1387.patch delete mode 100644 patches/disable-mobileindicator/1387.patch delete mode 100644 patches/embedlinks/1387.patch delete mode 100644 patches/experiments/1387.patch delete mode 100644 patches/hideunusableemojis/1387.patch delete mode 100644 patches/hqavatars/1387.patch delete mode 100644 patches/litecord/1387.patch delete mode 100644 patches/mutant/1387.patch delete mode 100644 patches/necessary/1387.patch delete mode 100644 patches/noblocked/1387.patch delete mode 100644 patches/nocamerabutton/1387.patch delete mode 100644 patches/noemojibutton/1387.patch delete mode 100644 patches/nonearby/1387.patch delete mode 100644 patches/noprofilestrip/1387.patch delete mode 100644 patches/nospoiler/1387.patch delete mode 100644 patches/notrack/1387-post.sh delete mode 100644 patches/nozlib/1387.patch delete mode 100644 patches/profilemention/1387.patch delete mode 100644 patches/pseudonitro-viewer/1387.patch delete mode 100644 patches/showtag/1387.patch delete mode 100644 patches/squareavatars/1387.patch delete mode 100644 patches/supplemental/1387.patch delete mode 100644 patches/tokenlogin/1387.patch diff --git a/README.md b/README.md index 51e6ffee65..661a1bf4a4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 57.11 (1387), released on 2021-01-10. +**Latest supported Discord Android version:** 56.0 (1371), released on 2021-01-05. New patch development will be done for the latest supported version. diff --git a/patches/betterdmheader/1387.patch b/patches/betterdmheader/1387.patch deleted file mode 100644 index 20e2a16b3a..0000000000 --- a/patches/betterdmheader/1387.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml -*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 ---- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 -*************** -*** 1,11 **** - - -! - - - -! -! - -! -\ No newline at end of file ---- 1,11 ---- - - -! - - - -! -! - -! -diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali -*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 ---- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 -*************** -*** 119,125 **** - - invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(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}, Ly/m/c/j;->checkNotNullExpressionValue(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}, Ly/m/c/j;->checkNotNullExpressionValue(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}, Ly/m/c/j;->checkNotNullExpressionValue(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 index f7618f8b14..dc52b81db4 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -46,643 +46,531 @@ This patch replaces the call button on DM headers with search button. The call b - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 diff --git a/patches/betterrotation/1387.patch b/patches/betterrotation/1387.patch deleted file mode 100644 index 94bb3fb138..0000000000 --- a/patches/betterrotation/1387.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 ---- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 -*************** -*** 30,37 **** - - - -! -! - - - ---- 30,37 ---- - - - -! -! - - - diff --git a/patches/betterrotation/README.md b/patches/betterrotation/README.md index 871ea3e6c3..06af3bb9e0 100644 --- a/patches/betterrotation/README.md +++ b/patches/betterrotation/README.md @@ -13,643 +13,531 @@ Contributed by [clienthax](https://gitdab.com/clienthax). - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 diff --git a/patches/branding/1387.patch b/patches/branding/1387.patch deleted file mode 100644 index 195d27fe70..0000000000 --- a/patches/branding/1387.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff --color -crB com.discord-base/AndroidManifest.xml com.discord/AndroidManifest.xml -*** com.discord-base/AndroidManifest.xml 2021-01-10 03:46:20.558000000 +0300 ---- com.discord/AndroidManifest.xml 2021-01-10 05:19:59.766305528 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 21,34 **** - - - -! - - - - - - -! - - - ---- 21,34 ---- - - - -! - - - - - - -! - - - -*************** -*** 132,138 **** - - - -! - - - ---- 132,138 ---- - - - -! - - - -*************** -*** 156,162 **** - - - -! - - - ---- 156,162 ---- - - - -! - - - -*************** -*** 165,171 **** - - - -! - - - ---- 165,171 ---- - - - -! - - - -*************** -*** 206,214 **** - - - -! - -! - - - ---- 206,214 ---- - - - -! - -! - - - -*************** -*** 263,266 **** - - - -! -\ No newline at end of file ---- 263,266 ---- - - - -! -Only in com.discord: AndroidManifest.xml.orig -diff --color -crB com.discord-base/apktool.yml com.discord/apktool.yml -*** com.discord-base/apktool.yml 2021-01-10 03:45:27.504438220 +0300 ---- com.discord/apktool.yml 2021-01-10 05:19:59.766305528 +0300 -*************** -*** 85,89 **** - tag: null - version: 2.4.2-83a459-SNAPSHOT - versionInfo: -! versionCode: '1387' -! versionName: '57.11' ---- 85,89 ---- - tag: null - version: 2.4.2-83a459-SNAPSHOT - versionInfo: -! versionCode: '1387CTCBUILD' -! versionName: '57.11-cutthecord-CTCBUILD' -Only in com.discord: apktool.yml.orig -diff --color -crB com.discord-base/res/values/strings.xml com.discord/res/values/strings.xml -*** com.discord-base/res/values/strings.xml 2021-01-10 03:45:22.801070512 +0300 ---- com.discord/res/values/strings.xml 2021-01-10 05:19:59.772972239 +0300 -*************** -*** 1874,1880 **** - Disconnect !!%1$s!! - Disconnect from Voice - User has been disconnected from voice. -! Discord - Join over 100 million people who use Discord to talk and hang out with communities and friends. - Your place to talk - discord.gg/ ---- 1874,1880 ---- - Disconnect !!%1$s!! - Disconnect from Voice - User has been disconnected from voice. -! CTCNAME - Join over 100 million people who use Discord to talk and hang out with communities and friends. - Your place to talk - discord.gg/ -*************** -*** 4893,4899 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Notifications - Notifications, muted ---- 4893,4899 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Notifications - Notifications, muted -*************** -*** 6653,6659 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds ---- 6653,6659 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds -Only in com.discord/res/values: strings.xml.orig -diff --color -crB com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-10 03:45:24.504416295 +0300 ---- com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-10 05:19:59.772972239 +0300 -*************** -*** 78,84 **** - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discord.com/app" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 78,84 ---- - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; -diff --color -crB com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.smali com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.smali -*** com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.smali 2021-01-10 03:45:25.444423164 +0300 ---- com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$18.smali 2021-01-10 05:21:01.770054299 +0300 -*************** -*** 63,69 **** - - invoke-static {v1, p1}, Lu/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://support.discord.com" - - const/4 v3, 0x0 - ---- 63,69 ---- - - invoke-static {v1, p1}, Lu/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://gitdab.com/distok/cutthecord" - - const/4 v3, 0x0 - - diff --git a/patches/branding/README.md b/patches/branding/README.md index f292860c92..a86ea19661 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -227,367 +227,303 @@ You can use the following line to patch authorities: - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.1 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.3 - 54.0 - 55.1 - 56.0 -- 57.11 - 53.6 - 53.8 - 54.0 - 55.1 - 56.0 -- 57.11 diff --git a/patches/customtheme/1387.patch b/patches/customtheme/1387.patch deleted file mode 100644 index b68bd7026f..0000000000 --- a/patches/customtheme/1387.patch +++ /dev/null @@ -1,395 +0,0 @@ -diff --color -crB com.discord-base/res/drawable/drawable_circle_black.xml com.discord/res/drawable/drawable_circle_black.xml -*** com.discord-base/res/drawable/drawable_circle_black.xml 2021-01-10 03:45:19.417712451 +0300 ---- com.discord/res/drawable/drawable_circle_black.xml 2021-01-10 05:30:02.320253465 +0300 -*************** -*** 1,5 **** - - -! - -\ No newline at end of file ---- 1,5 ---- - - -! - -\ No newline at end of file -diff --color -crB com.discord-base/res/drawable/drawable_flex_input_bg.xml com.discord/res/drawable/drawable_flex_input_bg.xml -*** com.discord-base/res/drawable/drawable_flex_input_bg.xml 2021-01-10 03:45:19.417712451 +0300 ---- com.discord/res/drawable/drawable_flex_input_bg.xml 2021-01-10 05:30:02.320253465 +0300 -*************** -*** 1,6 **** - - -! - - -\ No newline at end of file ---- 1,6 ---- - - -! - - -\ No newline at end of file -diff --color -crB com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord/res/drawable/drawable_overlay_channels_active_dark.xml -*** com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml 2021-01-10 03:45:20.024383551 +0300 ---- com.discord/res/drawable/drawable_overlay_channels_active_dark.xml 2021-01-10 05:30:02.320253465 +0300 -*************** -*** 3,9 **** - xmlns:android="http://schemas.android.com/apk/res/android"> - - -! - - - ---- 3,9 ---- - xmlns:android="http://schemas.android.com/apk/res/android"> - - -! - - - -diff --color -crB com.discord-base/res/layout/widget_chat_input.xml com.discord/res/layout/widget_chat_input.xml -*** com.discord-base/res/layout/widget_chat_input.xml 2021-01-10 03:45:20.031050267 +0300 ---- com.discord/res/layout/widget_chat_input.xml 2021-01-10 05:30:02.323586818 +0300 -*************** -*** 7,13 **** - - - -! - - - ---- 7,13 ---- - - - -! - - - -*************** -*** 17,20 **** - - - -! -\ No newline at end of file ---- 17,20 ---- - - - -! -diff --color -crB com.discord-base/res/values/colors.xml com.discord/res/values/colors.xml -*** com.discord-base/res/values/colors.xml 2021-01-10 03:45:21.897730576 +0300 ---- com.discord/res/values/colors.xml 2021-01-10 05:30:22.537043794 +0300 -*************** -*** 107,116 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 -! #ff121212 - #ffcf6679 - #ffffffff - #ff000000 ---- 107,116 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 -! #ff000000 - #ffcf6679 - #ffffffff - #ff000000 -*************** -*** 122,128 **** - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff121212 - #ffffffff - #ffb00020 - #ff000000 ---- 122,128 ---- - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff000000 - #ffffffff - #ffb00020 - #ff000000 -*************** -*** 171,177 **** - #4d737f8d - #ff949494 - #0d4f545c -! #ff8a8e94 - #6680cbc4 - #66009688 - #ff9c84ef ---- 171,177 ---- - #4d737f8d - #ff949494 - #0d4f545c -! #ff000000 - #6680cbc4 - #66009688 - #ff9c84ef -*************** -*** 181,187 **** - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff00b0f4 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd ---- 181,187 ---- - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff50f148 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd -*************** -*** 293,314 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #334f545c -! #4d4f545c -! #514f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 -! #ff292b2f -! #e6292b2f -! #ff202225 -! #80202225 -! #99202225 - #ff18191c - #8018191c - #9918191c ---- 293,314 ---- - #ff72767d - #4d72767d - #9972767d -! #ff333333 -! #330f0f0f -! #4d0f0f0f -! #510f0f0f -! #990f0f0f - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 -! #ff000000 -! #e6000000 -! #ff000000 -! #80000000 -! #990f0f0f - #ff18191c - #8018191c - #9918191c -*************** -*** 333,342 **** - #ff4f545c - #ff484c54 - #ff40444b -! #ff36393f -! #ff2f3136 - #ff292b2f -! #ff202225 - #ff1e1f22 - #ff1b1d20 - #ff18191c ---- 333,342 ---- - #ff4f545c - #ff484c54 - #ff40444b -! #ff000000 -! #ff000000 - #ff292b2f -! #ff000000 - #ff1e1f22 - #ff1b1d20 - #ff18191c -*************** -*** 380,388 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 380,388 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -*************** -*** 517,523 **** - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6616161 - #e6ffffff - @android:color/transparent - #ff593695 ---- 517,523 ---- - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6000000 - #e6ffffff - @android:color/transparent - #ff593695 -Only in com.discord/res/values: colors.xml.orig -Only in com.discord/res/values: colors.xml.rej -diff --color -crB com.discord-base/res/values/styles.xml com.discord/res/values/styles.xml -*** com.discord-base/res/values/styles.xml 2021-01-10 03:45:22.717736570 +0300 ---- com.discord/res/values/styles.xml 2021-01-10 05:30:02.330253526 +0300 -*************** -*** 423,429 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/primary_630 - @color/primary_660 ---- 423,429 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/primary_630 - @color/primary_660 -*************** -*** 439,445 **** - #1afaa61a - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark -! @color/primary_700 - @color/white_alpha_10 - @color/primary_600 - @drawable/img_empty_server_settings_emoji_dark ---- 439,445 ---- - #1afaa61a - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark -! @color/primary_500 - @color/white_alpha_10 - @color/primary_600 - @drawable/img_empty_server_settings_emoji_dark -*************** -*** 677,686 **** - #ffe5e5e5 - @drawable/ic_img_selected_light_theme - @color/purple_brand -! #33faa61a - @drawable/drawable_bg_reaction_light - @drawable/drawable_reaction_text_color_light -! @color/primary_300 - @color/black_alpha_10 - @color/primary_300 - @drawable/img_empty_server_settings_emoji_light ---- 677,686 ---- - #ffe5e5e5 - @drawable/ic_img_selected_light_theme - @color/purple_brand -! @color/purple_brand_alpha_10 - @drawable/drawable_bg_reaction_light - @drawable/drawable_reaction_text_color_light -! @color/primary_500 - @color/black_alpha_10 - @color/primary_300 - @drawable/img_empty_server_settings_emoji_light -*************** -*** 784,790 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -