From 018474dc2bc7f7e13ea9b3b0cd8b64381f910123 Mon Sep 17 00:00:00 2001 From: Ave Date: Wed, 27 May 2020 17:37:12 +0300 Subject: [PATCH] 1150 --- README.md | 2 +- patches/branding/1150.patch | 251 + patches/branding/README.md | 1 + patches/customtheme/1150.patch | 347 + patches/customtheme/README.md | 1 + patches/customversion/1150.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/1150.patch | 20 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/1150.patch | 142 + patches/experiments/README.md | 1 + patches/hqavatars/1150.patch | 20 + patches/hqavatars/README.md | 1 + patches/litecord/1150.patch | 267 + patches/litecord/README.md | 1 + patches/mutant/1150.patch | 52096 +++++++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/1150.patch | 14 + patches/noblocked/1150.patch | 18 + patches/noblocked/README.md | 1 + patches/nocamerabutton/1150.patch | 90 + patches/nocamerabutton/README.md | 1 + patches/noemojibutton/1150.patch | 24 + patches/noemojibutton/README.md | 1 + patches/nonearby/1150.patch | 99 + patches/nonearby/README.md | 1 + patches/noprofilestrip/1150.patch | 49 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/1150.patch | 69 + patches/nospoiler/README.md | 1 + patches/notrack/1150-post.sh | 3 + patches/notrack/1150.patch | 1283 + patches/notrack/README.md | 1 + patches/nozlib/1150.patch | 34 + patches/nozlib/README.md | 1 + patches/profilemention/1150.patch | 65 + patches/profilemention/README.md | 1 + patches/slashcommands/1150.patch | 3382 ++ patches/slashcommands/README.md | 1 + patches/squareavatars/1150.patch | 21 + patches/squareavatars/README.md | 1 + patches/supplemental/1150.patch | 422 + patches/supplemental/README.md | 1 + patches/tokenlogin/1150.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 46 files changed, 58792 insertions(+), 2 deletions(-) create mode 100644 patches/branding/1150.patch create mode 100644 patches/customtheme/1150.patch create mode 100644 patches/customversion/1150.patch create mode 100644 patches/disable-mobileindicator/1150.patch create mode 100644 patches/experiments/1150.patch create mode 100644 patches/hqavatars/1150.patch create mode 100644 patches/litecord/1150.patch create mode 100644 patches/mutant/1150.patch create mode 100644 patches/necessary/1150.patch create mode 100644 patches/noblocked/1150.patch create mode 100644 patches/nocamerabutton/1150.patch create mode 100644 patches/noemojibutton/1150.patch create mode 100644 patches/nonearby/1150.patch create mode 100644 patches/noprofilestrip/1150.patch create mode 100644 patches/nospoiler/1150.patch create mode 100644 patches/notrack/1150-post.sh create mode 100644 patches/notrack/1150.patch create mode 100644 patches/nozlib/1150.patch create mode 100644 patches/profilemention/1150.patch create mode 100644 patches/slashcommands/1150.patch create mode 100644 patches/squareavatars/1150.patch create mode 100644 patches/supplemental/1150.patch create mode 100644 patches/tokenlogin/1150.patch diff --git a/README.md b/README.md index 2b9f62f..acd0bc4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 24-alpha2 (1148), released on 2020-05-24. +**Latest supported Discord Android version:** 24 (1150), released on 2020-05-27. New patch development will be done for the latest supported version. diff --git a/patches/branding/1150.patch b/patches/branding/1150.patch new file mode 100644 index 0000000..b400e30 --- /dev/null +++ b/patches/branding/1150.patch @@ -0,0 +1,251 @@ +diff -crB com.discord-base/AndroidManifest.xml com.discord/AndroidManifest.xml +*** com.discord-base/AndroidManifest.xml 2020-05-27 16:23:37.326798216 +0300 +--- com.discord/AndroidManifest.xml 2020-05-27 16:24:58.663894791 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 20,31 **** + + + +! + + + + +! + + + +--- 20,31 ---- + + + +! + + + + +! + + + +*************** +*** 114,120 **** + + + +! + + + +--- 114,120 ---- + + + +! + + + +*************** +*** 144,150 **** + + + +! + + + +--- 144,150 ---- + + + +! + + + +*************** +*** 161,167 **** + + + +! + + + +--- 161,167 ---- + + + +! + + + +*************** +*** 176,182 **** + + + +! + + + +--- 176,182 ---- + + + +! + + + +*************** +*** 186,192 **** + + + +! + + + +--- 186,192 ---- + + + +! + + + +*************** +*** 226,239 **** + + + +! + + + + + +! +! + + +! +\ No newline at end of file +--- 226,239 ---- + + + +! + + + + + +! +! + + +! +diff -crB com.discord-base/apktool.yml com.discord/apktool.yml +*** com.discord-base/apktool.yml 2020-05-27 16:23:10.503323107 +0300 +--- com.discord/apktool.yml 2020-05-27 16:25:21.574015883 +0300 +*************** +*** 190,194 **** + tag: null + version: 2.4.2-83a459-SNAPSHOT + versionInfo: +! versionCode: '1150' +! versionName: '24' +--- 190,194 ---- + tag: null + version: 2.4.2-83a459-SNAPSHOT + versionInfo: +! versionCode: '1150CTCBUILD' +! versionName: '24-cutthecord-CTCBUILD' +Only in com.discord: apktool.yml.orig +Only in com.discord: apktool.yml.rej +diff -crB com.discord-base/res/values/strings.xml com.discord/res/values/strings.xml +*** com.discord-base/res/values/strings.xml 2020-05-27 16:23:05.976632515 +0300 +--- com.discord/res/values/strings.xml 2020-05-27 16:24:58.663894791 +0300 +*************** +*** 1406,1412 **** + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! Discord + Discord is an all-in-one communication app for your friends, communities, and gaming. + Team voice & text chat + discord.gg/ +--- 1406,1412 ---- + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! CTCNAME + Discord is an all-in-one communication app for your friends, communities, and gaming. + Team voice & text chat + discord.gg/ +*************** +*** 3814,3820 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Setup notifications to know when your friends send a message. +--- 3814,3820 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Setup notifications to know when your friends send a message. +*************** +*** 5147,5153 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 5147,5153 ---- + 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 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 2020-05-27 16:23:07.713308361 +0300 +--- com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-05-27 16:24:58.663894791 +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 --git a/patches/branding/README.md b/patches/branding/README.md index 9a4d32a..a38da8c 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -176,4 +176,5 @@ You can use the following line to patch authorities: - 22.5 - 23.0 - 24-alpha2 +- 24 diff --git a/patches/customtheme/1150.patch b/patches/customtheme/1150.patch new file mode 100644 index 0000000..3b3459d --- /dev/null +++ b/patches/customtheme/1150.patch @@ -0,0 +1,347 @@ +diff -crB com.discord-base/res/drawable/drawable_bg_corners_20dp.xml com.discord/res/drawable/drawable_bg_corners_20dp.xml +*** com.discord-base/res/drawable/drawable_bg_corners_20dp.xml 2020-05-25 02:36:21.146835892 +0300 +--- com.discord/res/drawable/drawable_bg_corners_20dp.xml 2020-05-25 02:49:23.685210370 +0300 +*************** +*** 1,6 **** + + +! + + +\ No newline at end of file +--- 1,6 ---- + + +! + + +\ No newline at end of file +diff -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 2020-05-25 02:36:19.926828033 +0300 +--- com.discord/res/drawable/drawable_circle_black.xml 2020-05-25 02:49:23.685210370 +0300 +*************** +*** 1,5 **** + + +! + +\ No newline at end of file +--- 1,5 ---- + + +! + +\ No newline at end of file +diff -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 2020-05-25 02:36:20.423497899 +0300 +--- com.discord/res/drawable/drawable_overlay_channels_active_dark.xml 2020-05-25 02:49:23.685210370 +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 com.discord-base/res/values/colors.xml com.discord/res/values/colors.xml +*** com.discord-base/res/values/colors.xml 2020-05-25 02:36:22.246842979 +0300 +--- com.discord/res/values/colors.xml 2020-05-25 02:49:23.685210370 +0300 +*************** +*** 103,112 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 +! #ff121212 + #ffcf6679 + #ffffffff + #ff000000 +--- 103,112 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 +! #ff000000 + #ffcf6679 + #ffffffff + #ff000000 +*************** +*** 118,124 **** + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff121212 + #ffffffff + #ffb00020 + #ff000000 +--- 118,124 ---- + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff000000 + #ffffffff + #ffb00020 + #ff000000 +*************** +*** 163,170 **** + #4d737f8d + #ff949494 + #0d4f545c +! #ff282b30 +! #ff8a8e94 + #6680cbc4 + #66009688 + #ff9c84ef +--- 163,170 ---- + #4d737f8d + #ff949494 + #0d4f545c +! #ff000000 +! #ff000000 + #6680cbc4 + #66009688 + #ff9c84ef +*************** +*** 174,180 **** + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +--- 174,180 ---- + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +*************** +*** 262,281 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #334f545c +! #4d4f545c +! #514f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 +! #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #9918191c + #e618191c +--- 262,281 ---- + #ff72767d + #4d72767d + #9972767d +! #ff333333 +! #330f0f0f +! #4d0f0f0f +! #510f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 +! #ff000000 +! #ff000000 +! #990f0f0f + #ff18191c + #9918191c + #e618191c +*************** +*** 299,308 **** + #ff4f545c + #ff484c54 + #ff40444b +! #ff36393f +! #ff2f3136 + #ff292b2f +! #ff202225 + #ff1e1f22 + #ff1b1d20 + #ff18191c +--- 299,308 ---- + #ff4f545c + #ff484c54 + #ff40444b +! #ff000000 +! #ff000000 + #ff292b2f +! #ff000000 + #ff1e1f22 + #ff1b1d20 + #ff18191c +*************** +*** 347,355 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 347,355 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 488,494 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 488,494 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +diff -crB com.discord-base/res/values/styles.xml com.discord/res/values/styles.xml +*** com.discord-base/res/values/styles.xml 2020-05-25 02:36:21.716839564 +0300 +--- com.discord/res/values/styles.xml 2020-05-25 02:49:23.685210370 +0300 +*************** +*** 385,391 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/primary_630 + @color/grey_account +--- 385,391 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/primary_630 + @color/grey_account +*************** +*** 397,409 **** + @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_activity_dark +--- 397,409 ---- + @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_activity_dark +*************** +*** 812,818 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +