From 3a3a87e5b04ee5f730cedfc2cc9d93215127f16f Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Sat, 22 Aug 2020 13:28:40 +0300 Subject: [PATCH] 36.5 (1246) --- README.md | 2 +- patches/betterdmheader/1246.patch | 66 + patches/betterdmheader/README.md | 1 + patches/branding/1246.patch | 247 + patches/branding/README.md | 1 + patches/customtheme/1246.patch | 344 + patches/customtheme/README.md | 1 + patches/customversion/1246.patch | 21 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/1246.patch | 96 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/1246.patch | 143 + patches/experiments/README.md | 1 + patches/hideunusableemojis/1246.patch | 21 + patches/hideunusableemojis/README.md | 1 + patches/hqavatars/1246.patch | 20 + patches/hqavatars/README.md | 1 + patches/litecord/1246.patch | 328 + patches/litecord/README.md | 1 + patches/mutant/1246.patch | 52093 +++++++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/1246.patch | 14 + patches/noblocked/1246.patch | 18 + patches/noblocked/README.md | 1 + patches/nocamerabutton/1246.patch | 57 + patches/nocamerabutton/README.md | 1 + patches/noemojibutton/1246.patch | 20 + patches/noemojibutton/README.md | 1 + patches/nonearby/1246.patch | 179 + patches/nonearby/README.md | 1 + patches/noprofilestrip/1246.patch | 49 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/1246.patch | 69 + patches/nospoiler/README.md | 1 + patches/notrack/1246-post.sh | 2 + patches/notrack/1246.patch | 1222 + patches/notrack/README.md | 1 + patches/nozlib/1246.patch | 34 + patches/nozlib/README.md | 1 + patches/profilemention/1246.patch | 65 + patches/profilemention/README.md | 1 + patches/pseudonitro-viewer/1246.patch | 21 + patches/pseudonitro-viewer/README.md | 1 + patches/showtag/1246.patch | 34 + patches/showtag/README.md | 1 + patches/slashcommands/1246.patch | 3686 ++ patches/slashcommands/README.md | 1 + patches/squareavatars/1246.patch | 55 + patches/squareavatars/README.md | 1 + patches/supplemental/1246.patch | 540 + patches/supplemental/README.md | 1 + patches/tokenlogin/1246.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 54 files changed, 59504 insertions(+), 2 deletions(-) create mode 100644 patches/betterdmheader/1246.patch create mode 100644 patches/branding/1246.patch create mode 100644 patches/customtheme/1246.patch create mode 100644 patches/customversion/1246.patch create mode 100644 patches/disable-mobileindicator/1246.patch create mode 100644 patches/experiments/1246.patch create mode 100644 patches/hideunusableemojis/1246.patch create mode 100644 patches/hqavatars/1246.patch create mode 100644 patches/litecord/1246.patch create mode 100644 patches/mutant/1246.patch create mode 100644 patches/necessary/1246.patch create mode 100644 patches/noblocked/1246.patch create mode 100644 patches/nocamerabutton/1246.patch create mode 100644 patches/noemojibutton/1246.patch create mode 100644 patches/nonearby/1246.patch create mode 100644 patches/noprofilestrip/1246.patch create mode 100644 patches/nospoiler/1246.patch create mode 100644 patches/notrack/1246-post.sh create mode 100644 patches/notrack/1246.patch create mode 100644 patches/nozlib/1246.patch create mode 100644 patches/profilemention/1246.patch create mode 100644 patches/pseudonitro-viewer/1246.patch create mode 100644 patches/showtag/1246.patch create mode 100644 patches/slashcommands/1246.patch create mode 100644 patches/squareavatars/1246.patch create mode 100644 patches/supplemental/1246.patch create mode 100644 patches/tokenlogin/1246.patch diff --git a/README.md b/README.md index 414d0a8..160f953 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 36.3 (1243), released on 2020-08-20. +**Latest supported Discord Android version:** 36.5 (1246), released on 2020-08-22. New patch development will be done for the latest supported version. diff --git a/patches/betterdmheader/1246.patch b/patches/betterdmheader/1246.patch new file mode 100644 index 0000000..0fb0079 --- /dev/null +++ b/patches/betterdmheader/1246.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300 +--- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300 +--- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +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 index 9ae7694..9fdf5b4 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -11,4 +11,5 @@ This patch replaces the call button on DM headers with search button. The call b - 34.3 - 35.0-alpha1 - 36.3 +- 36.5 diff --git a/patches/branding/1246.patch b/patches/branding/1246.patch new file mode 100644 index 0000000..a9fbda4 --- /dev/null +++ b/patches/branding/1246.patch @@ -0,0 +1,247 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-08-22 13:27:00.060000000 +0300 +--- to/AndroidManifest.xml 2020-08-22 13:27:13.820000000 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,33 **** + + + +! + + + + + +! + + + +--- 21,33 ---- + + + +! + + + + + +! + + + +*************** +*** 126,132 **** + + + +! + + + +--- 126,132 ---- + + + +! + + + +*************** +*** 150,156 **** + + + +! + + + +--- 150,156 ---- + + + +! + + + +*************** +*** 170,176 **** + + + +! + + + +--- 170,176 ---- + + + +! + + + +*************** +*** 188,201 **** + + + +! + + + + + + +! + + + +--- 188,201 ---- + + + +! + + + + + + +! + + + +*************** +*** 243,246 **** + + + +! +\ No newline at end of file +--- 243,246 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-08-22 13:24:28.700000000 +0300 +--- to/apktool.yml 2020-08-22 13:27:13.820000000 +0300 +*************** +*** 3106,3110 **** + tag: null + version: 2.4.2-662d58-SNAPSHOT + versionInfo: +! versionCode: '1246' +! versionName: '36.5' +--- 3106,3110 ---- + tag: null + version: 2.4.2-662d58-SNAPSHOT + versionInfo: +! versionCode: '1246CTCBUILD' +! versionName: '36.5-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-08-22 13:24:21.290000000 +0300 +--- to/res/values/strings.xml 2020-08-22 13:27:13.820000000 +0300 +*************** +*** 1478,1484 **** + 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/ +--- 1478,1484 ---- + 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/ +*************** +*** 4137,4143 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4137,4143 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 5481,5487 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 5481,5487 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-08-22 13:24:23.970000000 +0300 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-08-22 13:27:13.820000000 +0300 +*************** +*** 76,82 **** + .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; +--- 76,82 ---- + .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 -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-08-22 13:24:25.510000000 +0300 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-08-22 13:27:13.820000000 +0300 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(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 686371e..c1b8dbf 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -192,4 +192,5 @@ You can use the following line to patch authorities: - 34.3 - 35.0-alpha1 - 36.3 +- 36.5 diff --git a/patches/customtheme/1246.patch b/patches/customtheme/1246.patch new file mode 100644 index 0000000..16f0adc --- /dev/null +++ b/patches/customtheme/1246.patch @@ -0,0 +1,344 @@ +diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml +*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:50:14.660000000 +0300 +--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-08-20 11:53:34.390000000 +0300 +*************** +*** 1,6 **** + + +! + + +\ No newline at end of file +--- 1,6 ---- + + +! + + +\ No newline at end of file +diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml +*** from/res/drawable/drawable_circle_black.xml 2020-08-20 11:50:14.110000000 +0300 +--- to/res/drawable/drawable_circle_black.xml 2020-08-20 11:53:34.390000000 +0300 +*************** +*** 1,5 **** + + +! + +\ No newline at end of file +--- 1,5 ---- + + +! + +\ No newline at end of file +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-08-20 11:50:14.340000000 +0300 +--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-08-20 11:53:34.390000000 +0300 +*************** +*** 3,9 **** + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +--- 3,9 ---- + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +diff -crB from/res/values/colors.xml to/res/values/colors.xml +*** from/res/values/colors.xml 2020-08-20 11:50:16.030000000 +0300 +--- to/res/values/colors.xml 2020-08-20 11:53:34.390000000 +0300 +*************** +*** 105,114 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 +! #ff121212 + #ffcf6679 + #ffffffff + #ff000000 +--- 105,114 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 +! #ff000000 + #ffcf6679 + #ffffffff + #ff000000 +*************** +*** 120,126 **** + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff121212 + #ffffffff + #ffb00020 + #ff000000 +--- 120,126 ---- + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff000000 + #ffffffff + #ffb00020 + #ff000000 +*************** +*** 167,174 **** + #4d737f8d + #ff949494 + #0d4f545c +! #ff282b30 +! #ff8a8e94 + #6680cbc4 + #66009688 + #ff9c84ef +--- 167,174 ---- + #4d737f8d + #ff949494 + #0d4f545c +! #ff000000 +! #ff000000 + #6680cbc4 + #66009688 + #ff9c84ef +*************** +*** 178,184 **** + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +--- 178,184 ---- + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +*************** +*** 291,310 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #334f545c +! #4d4f545c +! #514f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 +! #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #8018191c + #9918191c +--- 291,310 ---- + #ff72767d + #4d72767d + #9972767d +! #ff333333 +! #330f0f0f +! #4d0f0f0f +! #510f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 +! #ff000000 +! #ff000000 +! #990f0f0f + #ff18191c + #8018191c + #9918191c +*************** +*** 329,338 **** + #ff4f545c + #ff484c54 + #ff40444b +! #ff36393f +! #ff2f3136 + #ff292b2f +! #ff202225 + #ff1e1f22 + #ff1b1d20 + #ff18191c +--- 329,338 ---- + #ff4f545c + #ff484c54 + #ff40444b +! #ff000000 +! #ff000000 + #ff292b2f +! #ff000000 + #ff1e1f22 + #ff1b1d20 + #ff18191c +*************** +*** 378,386 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 378,386 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 519,525 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 519,525 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +diff -crB from/res/values/styles.xml to/res/values/styles.xml +*** from/res/values/styles.xml 2020-08-20 11:50:15.940000000 +0300 +--- to/res/values/styles.xml 2020-08-20 11:53:34.400000000 +0300 +*************** +*** 387,393 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/primary_630 + @color/grey_account +--- 387,393 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/primary_630 + @color/grey_account +*************** +*** 398,410 **** + @color/chat_input_button_tint_colors_dark + @drawable/drawable_rect_rounded_dark + @color/dark_grey_2_alpha_10 +! #ff3e4145 + @drawable/ic_img_selected_dark_theme + @color/white +! #1afaa61a + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +! @color/primary_700 + @color/white_alpha_10 + @color/primary_600 + @drawable/ic_emoji_placeholder_primary_500 +--- 398,410 ---- + @color/chat_input_button_tint_colors_dark + @drawable/drawable_rect_rounded_dark + @color/dark_grey_2_alpha_10 +! @color/primary_600 + @drawable/ic_img_selected_dark_theme + @color/white +! @color/purple_brand_alpha_10 + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +! @color/primary_500 + @color/white_alpha_10 + @color/primary_600 + @drawable/ic_emoji_placeholder_primary_500 +*************** +*** 739,745 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +