From 9beeb28d8159e56e36caed74d162a36eafcb375e Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Mon, 4 Feb 2019 23:49:46 +0300 Subject: [PATCH] Ported patches to v8.4.1 + release patchport --- README.md | 9 +- patches/branding/841.patch | 68 + patches/branding/README.md | 1 + patches/compact/841.patch | 84 + patches/compact/README.md | 1 + patches/customtheme/841.patch | 253 ++ patches/customtheme/README.md | 1 + patches/customversion/841.patch | 21 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/841.patch | 20 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/841.patch | 153 ++ patches/experiments/README.md | 1 + patches/litecord/841.patch | 334 +++ patches/litecord/README.md | 1 + patches/mutant/841.patch | 1907 ++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/841.patch | 13 + patches/necessary/README.md | 1 + patches/noblocked/841.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/841.patch | 87 + patches/nonearby/README.md | 1 + patches/nospoiler/841.patch | 66 + patches/nospoiler/README.md | 1 + patches/notrack/841.patch | 2740 +++++++++++++++++++++ patches/notrack/README.md | 1 + patches/notyping/841.patch | 18 + patches/notyping/README.md | 1 + patches/nozlib/841.patch | 20 + patches/nozlib/README.md | 1 + patches/pureevil/841.patch | 26 + patches/pureevil/README.md | 1 + patches/smalltime/841.patch | 191 ++ patches/smalltime/README.md | 1 + patches/squareavatars/841.patch | 22 + patches/squareavatars/README.md | 1 + patchport.py | 121 + 38 files changed, 6188 insertions(+), 1 deletion(-) create mode 100644 patches/branding/841.patch create mode 100644 patches/compact/841.patch create mode 100644 patches/customtheme/841.patch create mode 100644 patches/customversion/841.patch create mode 100644 patches/disable-mobileindicator/841.patch create mode 100644 patches/experiments/841.patch create mode 100644 patches/litecord/841.patch create mode 100644 patches/mutant/841.patch create mode 100644 patches/necessary/841.patch create mode 100644 patches/noblocked/841.patch create mode 100644 patches/nonearby/841.patch create mode 100644 patches/nospoiler/841.patch create mode 100644 patches/notrack/841.patch create mode 100644 patches/notyping/841.patch create mode 100644 patches/nozlib/841.patch create mode 100644 patches/pureevil/841.patch create mode 100644 patches/smalltime/841.patch create mode 100644 patches/squareavatars/841.patch create mode 100644 patchport.py diff --git a/README.md b/README.md index a766055f..2b8e0feb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Discord Android app patches. -**Latest supported Discord Android version:** 8.3.9g (839), released on 2019-02-01. +**Latest supported Discord Android version:** 8.4.1g (841), released on 2019-02-04. New patch development will be done for the latest supported version. @@ -44,3 +44,10 @@ After extracting the APK, copy it to a folder that you won't modify (`cp -r com. To get the diff, run `diff -crB -x "dist" -x "res/raw" -x "build" CleanFolder PatchedFolder > patchname.patch` +#### Porting patches + +You can use `patchport` to easily attempt to port patches. + +It's not really intelligent and doesn't do much more than just checking if an existing patch can be applied to a given version (it also replaces relevant variables required for porting various patches), but it saves a lot of time if used carefully. + +Example command: `python3 patchport.py 839 8.3.9g /home/ave/Downloads/dic/com.discord-841 /home/ave/Projects/cutthecord/` diff --git a/patches/branding/841.patch b/patches/branding/841.patch new file mode 100644 index 00000000..ec0dc37f --- /dev/null +++ b/patches/branding/841.patch @@ -0,0 +1,68 @@ +diff -crB -x dist -x build com.discord-841-testing/AndroidManifest.xml com.discord-841/AndroidManifest.xml +*** com.discord-841-testing/AndroidManifest.xml 2019-02-03 09:37:05.523261124 +0300 +--- com.discord-841/AndroidManifest.xml 2019-02-03 09:42:43.867140699 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +diff -crB -x dist -x build com.discord-841-testing/apktool.yml com.discord-841/apktool.yml +*** com.discord-841-testing/apktool.yml 2019-02-03 09:37:05.523261124 +0300 +--- com.discord-841/apktool.yml 2019-02-03 09:42:43.867140699 +0300 +*************** +*** 345,349 **** + tag: null + version: 2.4.0-896569-SNAPSHOT + versionInfo: +! versionCode: '841' +! versionName: 8.4.1g +--- 345,349 ---- + tag: null + version: 2.4.0-896569-SNAPSHOT + versionInfo: +! versionCode: '841CTCBUILD' +! versionName: 8.4.1g-cutthecord-CTCBUILD +diff -crB -x dist -x build com.discord-841-testing/res/values/strings.xml com.discord-841/res/values/strings.xml +*** com.discord-841-testing/res/values/strings.xml 2019-02-03 09:37:05.666595490 +0300 +--- com.discord-841/res/values/strings.xml 2019-02-03 09:42:43.873807402 +0300 +*************** +*** 1137,1143 **** + 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/ +--- 1137,1143 ---- + 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/ +*************** +*** 2691,2697 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Continue +--- 2691,2697 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Continue + diff --git a/patches/branding/README.md b/patches/branding/README.md index 981f61c4..72d764b4 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -14,4 +14,5 @@ Running customicon.sh (while on root of the extracted folder) will also change t - 8.3.5g - 8.3.6g - 8.3.9g +- 8.4.1g diff --git a/patches/compact/841.patch b/patches/compact/841.patch new file mode 100644 index 00000000..cebe0edd --- /dev/null +++ b/patches/compact/841.patch @@ -0,0 +1,84 @@ +diff -crB -x dist -x build com.discord-836-testing/res/layout/widget_chat_list_adapter_item_text.xml com.discord-836/res/layout/widget_chat_list_adapter_item_text.xml +*** com.discord-836-testing/res/layout/widget_chat_list_adapter_item_text.xml 2019-01-31 10:40:04.405948262 +0300 +--- com.discord-836/res/layout/widget_chat_list_adapter_item_text.xml 2019-01-31 10:41:29.889614538 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,11 ---- + + + + + + ++ + + +\ No newline at end of file +diff -crB -x dist -x build com.discord-836-testing/res/layout-v17/widget_chat_list_adapter_item_text.xml com.discord-836/res/layout-v17/widget_chat_list_adapter_item_text.xml +*** com.discord-836-testing/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-01-31 10:40:04.452615110 +0300 +--- com.discord-836/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-01-31 10:41:29.889614538 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,14 ---- + + + + ++ + ++ + ++ ++ + + +\ No newline at end of file +diff -crB -x dist -x build com.discord-836-testing/res/values/dimens.xml com.discord-836/res/values/dimens.xml +*** com.discord-836-testing/res/values/dimens.xml 2019-01-31 10:40:04.482615227 +0300 +--- com.discord-836/res/values/dimens.xml 2019-01-31 10:41:29.889614538 +0300 +*************** +*** 330,337 **** + 4.0dip + 0.75dip + 96.0dip +! 58.0dip +! 62.0dip + 48.0dip + 72.0dip + 3.0dip +--- 330,337 ---- + 4.0dip + 0.75dip + 96.0dip +! 20.0dip +! 24.0dip + 48.0dip + 72.0dip + 3.0dip + diff --git a/patches/compact/README.md b/patches/compact/README.md index 9252d6a3..c01e2eff 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -8,4 +8,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 8.3.5g - 8.3.6g - 8.3.9g +- 8.4.1g diff --git a/patches/customtheme/841.patch b/patches/customtheme/841.patch new file mode 100644 index 00000000..72058046 --- /dev/null +++ b/patches/customtheme/841.patch @@ -0,0 +1,253 @@ +diff -crB -x dist -x build com.discord-839-testing/res/values/colors.xml com.discord-839/res/values/colors.xml +*** com.discord-839-testing/res/values/colors.xml 2019-02-03 09:37:05.666595490 +0300 +--- com.discord-839/res/values/colors.xml 2019-02-03 09:45:12.648033297 +0300 +*************** +*** 61,68 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 + #ff3f51b5 + #ff303f9f +--- 61,68 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 + #ff3f51b5 + #ff303f9f +*************** +*** 98,106 **** + #0d4f545c + #4d4f545c + #994f545c +! #ff282b30 +! #ff2e3136 +! #ff1e2124 + #ff8a8e94 + #6680cbc4 + #66009688 +--- 98,106 ---- + #0d4f545c + #4d4f545c + #994f545c +! #ff000000 +! #ff000000 +! #ff000000 + #ff8a8e94 + #6680cbc4 + #66009688 +*************** +*** 109,123 **** + #ff45ddc0 + #ff93a5af + #ff021f25 +! #fff2fbfe +! #ffcceffd +! #ff99dffb +! #ff33c0f6 +! #ff00b0f4 +! #ff0078a6 +! #ff004662 +! #ff003549 +! #ff00090c + #ff37474f + #ff263238 + #ff21272b +--- 109,123 ---- + #ff45ddc0 + #ff93a5af + #ff021f25 +! #ff8cf687 +! #ff7df577 +! #ff6ef368 +! #ff5ff258 +! #ff50f148 +! #ff41f038 +! #ff32ef28 +! #ff23ed19 +! #ff1be411 + #ff37474f + #ff263238 + #ff21272b +*************** +*** 159,176 **** + #4d7d8187 + #997d8187 + #e67d8187 +! #ff4f545c +! #4d4f545c +! #994f545c +! #e64f545c +! #ff36393f +! #4d36393f +! #9936393f +! #e636393f +! #ff2f3136 +! #4d2f3136 +! #992f3136 +! #e62f3136 + #ff202225 + #4d202225 + #99202225 +--- 159,176 ---- + #4d7d8187 + #997d8187 + #e67d8187 +! #ff0f0f0f +! #4d0f0f0f +! #990f0f0f +! #e60f0f0f +! #ff000000 +! #4d000000 +! #99000000 +! #e6000000 +! #ff000000 +! #4d000000 +! #99000000 +! #e6000000 + #ff202225 + #4d202225 + #99202225 +*************** +*** 191,198 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 + #ff697ec4 + #ffc9d2f0 + #ff5161ff +--- 191,198 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 + #ff697ec4 + #ffc9d2f0 + #ff5161ff +diff -crB -x dist -x build com.discord-839-testing/res/values/styles.xml com.discord-839/res/values/styles.xml +*** com.discord-839-testing/res/values/styles.xml 2019-02-03 09:37:05.669928847 +0300 +--- com.discord-839/res/values/styles.xml 2019-02-03 09:45:12.651366651 +0300 +*************** +*** 116,122 **** + @color/primary_600 + @drawable/drawable_uikit_primary_600_bg_dark + @drawable/drawable_uikit_primary_600_circle +! #ff2b2e31 + @color/primary_500_alpha_60 + @color/black_alpha_05 + @style/AppTheme.Dark.Notice +--- 116,122 ---- + @color/primary_600 + @drawable/drawable_uikit_primary_600_bg_dark + @drawable/drawable_uikit_primary_600_circle +! @color/primary_630 + @color/primary_500_alpha_60 + @color/black_alpha_05 + @style/AppTheme.Dark.Notice +*************** +*** 323,329 **** + @color/white + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 323,329 ---- + @color/white + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 337,348 **** + @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 + @color/white + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +--- 337,348 ---- + @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 + @color/white + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +*************** +*** 407,413 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +