From daf4e2870e80498230791e8ef724c250525fa33f Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Fri, 10 Jul 2020 17:34:11 +0300 Subject: [PATCH] 31-alpha2 (1196) --- README.md | 2 +- patches/branding/1196.patch | 230 + patches/branding/README.md | 1 + patches/customtheme/1196.patch | 346 + patches/customtheme/README.md | 1 + patches/customversion/1196.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/1196.patch | 20 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/1196.patch | 142 + patches/experiments/README.md | 1 + patches/hqavatars/1196.patch | 20 + patches/hqavatars/README.md | 1 + patches/litecord/1196.patch | 328 + patches/litecord/README.md | 1 + patches/mutant/1196.patch | 52093 +++++++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/1196.patch | 14 + patches/noblocked/1196.patch | 18 + patches/noblocked/README.md | 1 + patches/nocamerabutton/1196.patch | 20 + patches/nocamerabutton/README.md | 1 + patches/noemojibutton/1196.patch | 20 + patches/noemojibutton/README.md | 1 + patches/nonearby/1196.patch | 179 + patches/nonearby/README.md | 1 + patches/noprofilestrip/1196.patch | 49 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/1196.patch | 69 + patches/nospoiler/README.md | 1 + patches/notrack/1196-post.sh | 2 + patches/notrack/1196.patch | 1291 + patches/notrack/README.md | 1 + patches/nozlib/1196.patch | 34 + patches/nozlib/README.md | 1 + patches/profilemention/1196.patch | 65 + patches/profilemention/README.md | 1 + patches/pseudonitro-viewer/1196.patch | 21 + patches/pseudonitro-viewer/README.md | 1 + patches/slashcommands/1196.patch | 3386 ++ patches/slashcommands/README.md | 1 + patches/squareavatars/1196.patch | 21 + patches/squareavatars/README.md | 1 + patches/supplemental/1196.patch | 424 + patches/supplemental/README.md | 1 + patches/tokenlogin/1196.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 48 files changed, 58869 insertions(+), 2 deletions(-) create mode 100644 patches/branding/1196.patch create mode 100644 patches/customtheme/1196.patch create mode 100644 patches/customversion/1196.patch create mode 100644 patches/disable-mobileindicator/1196.patch create mode 100644 patches/experiments/1196.patch create mode 100644 patches/hqavatars/1196.patch create mode 100644 patches/litecord/1196.patch create mode 100644 patches/mutant/1196.patch create mode 100644 patches/necessary/1196.patch create mode 100644 patches/noblocked/1196.patch create mode 100644 patches/nocamerabutton/1196.patch create mode 100644 patches/noemojibutton/1196.patch create mode 100644 patches/nonearby/1196.patch create mode 100644 patches/noprofilestrip/1196.patch create mode 100644 patches/nospoiler/1196.patch create mode 100644 patches/notrack/1196-post.sh create mode 100644 patches/notrack/1196.patch create mode 100644 patches/nozlib/1196.patch create mode 100644 patches/profilemention/1196.patch create mode 100644 patches/pseudonitro-viewer/1196.patch create mode 100644 patches/slashcommands/1196.patch create mode 100644 patches/squareavatars/1196.patch create mode 100644 patches/supplemental/1196.patch create mode 100644 patches/tokenlogin/1196.patch diff --git a/README.md b/README.md index 4294dbe403..179341e0a4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 31-alpha1 (1192), released on 2020-07-09. +**Latest supported Discord Android version:** 31-alpha2 (1196), released on 2020-07-10. New patch development will be done for the latest supported version. diff --git a/patches/branding/1196.patch b/patches/branding/1196.patch new file mode 100644 index 0000000000..fe8be507fc --- /dev/null +++ b/patches/branding/1196.patch @@ -0,0 +1,230 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-07-10 17:09:15.980000000 +0300 +--- to/AndroidManifest.xml 2020-07-10 17:20:21.240000000 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 20,31 **** + + + +! + + + + +! + + + +--- 20,31 ---- + + + +! + + + + +! + + + +*************** +*** 120,126 **** + + + +! + + + +--- 120,126 ---- + + + +! + + + +*************** +*** 150,156 **** + + + +! + + + +--- 150,156 ---- + + + +! + + + +*************** +*** 174,180 **** + + + +! + + + +--- 174,180 ---- + + + +! + + + +*************** +*** 183,189 **** + + + +! + + + +--- 183,189 ---- + + + +! + + + +*************** +*** 194,200 **** + + + +! + + + +--- 194,200 ---- + + + +! + + + +*************** +*** 242,245 **** + + + +! +\ No newline at end of file +--- 242,245 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-07-10 17:08:51.230000000 +0300 +--- to/apktool.yml 2020-07-10 17:19:43.630000000 +0300 +*************** +*** 3224,3228 **** + tag: null + version: 2.4.2-de5d0e-SNAPSHOT + versionInfo: +! versionCode: '1196' +! versionName: 31-alpha2 +--- 3224,3228 ---- + tag: null + version: 2.4.2-de5d0e-SNAPSHOT + versionInfo: +! versionCode: '1196CTCBUILD' +! versionName: 31-alpha2-cutthecord-CTCBUILD +Only in to: build +Only in to: dist +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-07-10 17:08:45.650000000 +0300 +--- to/res/values/strings.xml 2020-07-10 17:19:43.630000000 +0300 +*************** +*** 1479,1485 **** + 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/ +--- 1479,1485 ---- + 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/ +*************** +*** 4046,4052 **** + 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. +--- 4046,4052 ---- + 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. +*************** +*** 5390,5396 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 5390,5396 ---- + 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-07-10 17:08:48.140000000 +0300 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-07-10 17:19:43.630000000 +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 e6f2b93eb7..c1ff1dff13 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -183,4 +183,5 @@ You can use the following line to patch authorities: - 30.0 - 30.1 - 31-alpha1 +- 31-alpha2 diff --git a/patches/customtheme/1196.patch b/patches/customtheme/1196.patch new file mode 100644 index 0000000000..e355b58fc6 --- /dev/null +++ b/patches/customtheme/1196.patch @@ -0,0 +1,346 @@ +Only in to: build +Only in to: dist +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-07-10 17:08:44.260000000 +0300 +--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-07-10 17:24:34.340000000 +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-07-10 17:08:44.360000000 +0300 +--- to/res/drawable/drawable_circle_black.xml 2020-07-10 17:24:34.340000000 +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-07-10 17:08:44.960000000 +0300 +--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-07-10 17:24:34.340000000 +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-07-10 17:08:46.160000000 +0300 +--- to/res/values/colors.xml 2020-07-10 17:24:34.340000000 +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 +*************** +*** 266,285 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #334f545c +! #4d4f545c +! #514f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 +! #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #8018191c + #9918191c +--- 266,285 ---- + #ff72767d + #4d72767d + #9972767d +! #ff333333 +! #330f0f0f +! #4d0f0f0f +! #510f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 +! #ff000000 +! #ff000000 +! #990f0f0f + #ff18191c + #8018191c + #9918191c +*************** +*** 304,313 **** + #ff4f545c + #ff484c54 + #ff40444b +! #ff36393f +! #ff2f3136 + #ff292b2f +! #ff202225 + #ff1e1f22 + #ff1b1d20 + #ff18191c +--- 304,313 ---- + #ff4f545c + #ff484c54 + #ff40444b +! #ff000000 +! #ff000000 + #ff292b2f +! #ff000000 + #ff1e1f22 + #ff1b1d20 + #ff18191c +*************** +*** 353,361 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 353,361 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 494,500 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 494,500 ---- + #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-07-10 17:08:45.890000000 +0300 +--- to/res/values/styles.xml 2020-07-10 17:24:34.340000000 +0300 +*************** +*** 398,404 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/primary_630 + @color/grey_account +--- 398,404 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/primary_630 + @color/grey_account +*************** +*** 410,422 **** + @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 +--- 410,422 ---- + @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 +*************** +*** 825,831 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +