From 4ad1d8b1fbd796af276fb33682f40fa9dc6d2a7c Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Wed, 22 Jan 2020 15:07:58 +0000 Subject: [PATCH] 10.2.5 --- README.md | 2 +- patches/branding/1025.patch | 238 + patches/branding/README.md | 1 + patches/customtheme/1025.patch | 281 + patches/customtheme/README.md | 1 + patches/customversion/1025.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/1025.patch | 23 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/1025.patch | 148 + patches/experiments/README.md | 1 + patches/litecord/1025.patch | 252 + patches/litecord/README.md | 1 + patches/mutant/1025.patch | 52096 +++++++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/1025.patch | 14 + patches/noblocked/1025.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/1025.patch | 86 + patches/nonearby/README.md | 1 + patches/noprofilestrip/1025.patch | 49 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/1025.patch | 74 + patches/nospoiler/README.md | 1 + patches/notrack/1025-post.sh | 3 + patches/notrack/1025.patch | 1277 + patches/notrack/README.md | 1 + patches/nozlib/1025.patch | 37 + patches/nozlib/README.md | 1 + patches/slashcommands/1025.patch | 2857 + patches/slashcommands/README.md | 1 + patches/squareavatars/1025.patch | 21 + patches/squareavatars/README.md | 1 + patches/supplemental/1025.patch | 422 + patches/supplemental/README.md | 1 + patches/tokenlogin/1025.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 38 files changed, 57968 insertions(+), 2 deletions(-) create mode 100644 patches/branding/1025.patch create mode 100644 patches/customtheme/1025.patch create mode 100644 patches/customversion/1025.patch create mode 100644 patches/disable-mobileindicator/1025.patch create mode 100644 patches/experiments/1025.patch create mode 100644 patches/litecord/1025.patch create mode 100644 patches/mutant/1025.patch create mode 100644 patches/necessary/1025.patch create mode 100644 patches/noblocked/1025.patch create mode 100644 patches/nonearby/1025.patch create mode 100644 patches/noprofilestrip/1025.patch create mode 100644 patches/nospoiler/1025.patch create mode 100644 patches/notrack/1025-post.sh create mode 100644 patches/notrack/1025.patch create mode 100644 patches/nozlib/1025.patch create mode 100644 patches/slashcommands/1025.patch create mode 100644 patches/squareavatars/1025.patch create mode 100644 patches/supplemental/1025.patch create mode 100644 patches/tokenlogin/1025.patch diff --git a/README.md b/README.md index 385d43cf..c27bb031 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 10.2.4 (1024), released on 2020-01-18. +**Latest supported Discord Android version:** 10.2.5 (1025), released on 2020-01-22. New patch development will be done for the latest supported version. diff --git a/patches/branding/1025.patch b/patches/branding/1025.patch new file mode 100644 index 00000000..7cff0402 --- /dev/null +++ b/patches/branding/1025.patch @@ -0,0 +1,238 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-01-22 15:07:32.859884935 +0000 +--- to/AndroidManifest.xml 2020-01-22 15:07:34.469944086 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 20,31 **** + + + +! + + + + +! + + + +--- 20,31 ---- + + + +! + + + + +! + + + +*************** +*** 92,98 **** + + + +! + + + +--- 92,98 ---- + + + +! + + + +*************** +*** 122,128 **** + + + +! + + + +--- 122,128 ---- + + + +! + + + +*************** +*** 137,143 **** + + + +! + + + +--- 137,143 ---- + + + +! + + + +*************** +*** 152,158 **** + + + +! + + + +--- 152,158 ---- + + + +! + + + +*************** +*** 162,168 **** + + + +! + + + +--- 162,168 ---- + + + +! + + + +*************** +*** 202,210 **** + + + +! +! +! + + +! +\ No newline at end of file +--- 202,210 ---- + + + +! +! +! + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-01-22 15:07:25.909629598 +0000 +--- to/apktool.yml 2020-01-22 15:07:34.469944086 +0000 +*************** +*** 184,188 **** + tag: null + version: 2.4.2-0143dc-SNAPSHOT + versionInfo: +! versionCode: '1025' +! versionName: 10.2.5 +--- 184,188 ---- + tag: null + version: 2.4.2-0143dc-SNAPSHOT + versionInfo: +! versionCode: '1025CTCBUILD' +! versionName: 10.2.5-cutthecord-CTCBUILD +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-01-22 15:07:20.422761361 +0000 +--- to/res/values/strings.xml 2020-01-22 15:07:34.469944086 +0000 +*************** +*** 1354,1360 **** + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! Discord + Free and secure chat for gamers, works on both your desktop and your phone. + Team voice & text chat + discord.gg/ +--- 1354,1360 ---- + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! CTCNAME + Free and secure chat for gamers, works on both your desktop and your phone. + Team voice & text chat + discord.gg/ +*************** +*** 3392,3398 **** + 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. +--- 3392,3398 ---- + 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. +*************** +*** 4642,4648 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + Muted by you + Suppressed +--- 4642,4648 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + Muted by you + Suppressed +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-01-22 15:07:22.862851001 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-01-22 15:07:34.469944086 +0000 +*************** +*** 76,82 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discordapp.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 a9a102bf..ba585d2e 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -88,4 +88,5 @@ You can use the following line to patch authorities: - 10.2.2 - 10.2.3 - 10.2.4 +- 10.2.5 diff --git a/patches/customtheme/1025.patch b/patches/customtheme/1025.patch new file mode 100644 index 00000000..440e1e49 --- /dev/null +++ b/patches/customtheme/1025.patch @@ -0,0 +1,281 @@ +diff -crB com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml +*** com.discord-1020-base/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 11:58:54.830668343 +0300 +--- com.discord-1020/res/drawable/drawable_overlay_channels_active_dark.xml 2020-01-12 12:30:53.961941373 +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-1020-base/res/values/colors.xml com.discord-1020/res/values/colors.xml +*** com.discord-1020-base/res/values/colors.xml 2020-01-12 11:58:55.320671069 +0300 +--- com.discord-1020/res/values/colors.xml 2020-01-12 12:47:04.817926576 +0300 +*************** +*** 52,58 **** + #37000000 + #ff657b83 + #ff333333 +! #ff1d1d1d + #40000000 + #40ffffff + @android:color/white +--- 52,58 ---- + #37000000 + #ff657b83 + #ff333333 +! #ff000000 + #40000000 + #40ffffff + @android:color/white +*************** +*** 63,70 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 + #ff121212 + #ffcf6679 +--- 63,70 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 + #ff121212 + #ffcf6679 +*************** +*** 120,134 **** + #4d737f8d + #ff949494 + #0d4f545c +! #ff282b30 +! #ff8a8e94 + #6680cbc4 + #66009688 + #ff9c84ef + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #ff0067e0 + #ff37474f + #ff263238 +--- 120,134 ---- + #4d737f8d + #ff949494 + #0d4f545c +! #ff000000 +! #ff000000 + #6680cbc4 + #66009688 + #ff9c84ef + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #ff0067e0 + #ff37474f + #ff263238 +*************** +*** 176,195 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #334f545c +! #4d4f545c +! #514f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 + #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #9918191c + #e618191c +--- 176,195 ---- + #ff72767d + #4d72767d + #9972767d +! #ff333333 +! #330f0f0f +! #4d0f0f0f +! #510f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 + #ff292b2f +! #ff000000 +! #990f0f0f + #ff18191c + #9918191c + #e618191c +*************** +*** 224,232 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 224,232 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 291,297 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 291,297 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +diff -crB com.discord-1020-base/res/values/styles.xml com.discord-1020/res/values/styles.xml +*** com.discord-1020-base/res/values/styles.xml 2020-01-12 11:58:55.240670624 +0300 +--- com.discord-1020/res/values/styles.xml 2020-01-12 12:46:14.510949392 +0300 +*************** +*** 392,398 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/primary_630 + @color/grey_account +--- 392,398 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/primary_630 + @color/grey_account +*************** +*** 404,418 **** + @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_alpha_70 + @color/white_alpha_20 + @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 +--- 404,418 ---- + @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_alpha_70 + @color/white_alpha_20 + @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 +*************** +*** 471,477 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +