From 042fe52427518577c3e71d9b4d876ee83c6c3f46 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Thu, 25 Apr 2019 13:12:30 +0300 Subject: [PATCH] Add v8.7.6 support and improve patchport --- README.md | 2 +- patches/branding/876.patch | 124 + patches/branding/README.md | 1 + patches/compact/876.patch | 83 + patches/compact/README.md | 1 + patches/customtheme/876.patch | 235 ++ patches/customtheme/README.md | 1 + patches/customversion/876.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/876.patch | 21 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/876.patch | 160 ++ patches/experiments/README.md | 1 + patches/litecord/876.patch | 329 +++ patches/litecord/README.md | 1 + patches/mutant/876.patch | 1907 +++++++++++++ patches/mutant/README.md | 1 + patches/necessary/876.patch | 14 + patches/noblocked/876.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/876.patch | 102 + patches/nonearby/README.md | 1 + patches/noprofilestrip/876.patch | 53 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/876.patch | 64 + patches/nospoiler/README.md | 1 + patches/notrack/876.patch | 3063 +++++++++++++++++++++ patches/notyping/876.patch | 19 + patches/notyping/README.md | 1 + patches/nozlib/876.patch | 34 + patches/nozlib/README.md | 1 + patches/pureevil/README.md | 1 + patches/smalltime/876.patch | 191 ++ patches/smalltime/README.md | 1 + patches/squareavatars/876.patch | 21 + patches/squareavatars/README.md | 1 + patchport.py | 64 +- 37 files changed, 6530 insertions(+), 11 deletions(-) create mode 100644 patches/branding/876.patch create mode 100644 patches/compact/876.patch create mode 100644 patches/customtheme/876.patch create mode 100644 patches/customversion/876.patch create mode 100644 patches/disable-mobileindicator/876.patch create mode 100644 patches/experiments/876.patch create mode 100644 patches/litecord/876.patch create mode 100644 patches/mutant/876.patch create mode 100644 patches/necessary/876.patch create mode 100644 patches/noblocked/876.patch create mode 100644 patches/nonearby/876.patch create mode 100644 patches/noprofilestrip/876.patch create mode 100644 patches/nospoiler/876.patch create mode 100644 patches/notrack/876.patch create mode 100644 patches/notyping/876.patch create mode 100644 patches/nozlib/876.patch create mode 100644 patches/smalltime/876.patch create mode 100644 patches/squareavatars/876.patch diff --git a/README.md b/README.md index 8d0cf78..75ccc2a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Discord Android app patches. -**Latest supported Discord Android version:** 8.5.6 (856), released on 2019-03-08. +**Latest supported Discord Android version:** 8.7.6 (876), released on 2019-04-18. New patch development will be done for the latest supported version. diff --git a/patches/branding/876.patch b/patches/branding/876.patch new file mode 100644 index 0000000..932bb7b --- /dev/null +++ b/patches/branding/876.patch @@ -0,0 +1,124 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2019-04-25 11:23:36.734134485 +0300 +--- to/AndroidManifest.xml 2019-04-25 11:23:39.967485513 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 96,102 **** + + + +! + + + +--- 96,102 ---- + + + +! + + + +*************** +*** 141,149 **** + + + +! + +! + + + +--- 141,149 ---- + + + +! + +! + + + +*************** +*** 182,189 **** + + + +! +! + + + +--- 182,189 ---- + + + +! +! + + + +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2019-04-25 10:45:14.687646292 +0300 +--- to/apktool.yml 2019-04-25 11:23:39.967485513 +0300 +*************** +*** 469,473 **** + tag: null + version: 2.4.1-73ac0d-SNAPSHOT + versionInfo: +! versionCode: '876' +! versionName: 8.7.6 +--- 469,473 ---- + tag: null + version: 2.4.1-73ac0d-SNAPSHOT + versionInfo: +! versionCode: '876CTCBUILD' +! versionName: 8.7.6-cutthecord-CTCBUILD +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2019-04-25 10:45:10.627626294 +0300 +--- to/res/values/strings.xml 2019-04-25 11:23:39.970818864 +0300 +*************** +*** 1258,1264 **** + 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/ +--- 1258,1264 ---- + 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/ +*************** +*** 2886,2892 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Continue +--- 2886,2892 ---- + 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 ffe45e0..f32a681 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -31,4 +31,5 @@ You can use the following line to patch authorities: - 8.5.4 - 8.5.5 - 8.5.6 +- 8.7.6 diff --git a/patches/compact/876.patch b/patches/compact/876.patch new file mode 100644 index 0000000..b39aa19 --- /dev/null +++ b/patches/compact/876.patch @@ -0,0 +1,83 @@ +diff -crB from/res/layout/widget_chat_list_adapter_item_text.xml to/res/layout/widget_chat_list_adapter_item_text.xml +*** from/res/layout/widget_chat_list_adapter_item_text.xml 2019-04-25 10:45:10.180957427 +0300 +--- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-04-25 11:23:45.657516652 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,11 ---- + + + + + + ++ + + +\ No newline at end of file +diff -crB from/res/layout-v17/widget_chat_list_adapter_item_text.xml to/res/layout-v17/widget_chat_list_adapter_item_text.xml +*** from/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-04-25 10:45:09.770955407 +0300 +--- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-04-25 11:23:45.657516652 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,14 ---- + + + + ++ + ++ + ++ ++ + + +\ No newline at end of file +diff -crB from/res/values/dimens.xml to/res/values/dimens.xml +*** from/res/values/dimens.xml 2019-04-25 10:45:10.547625899 +0300 +--- to/res/values/dimens.xml 2019-04-25 11:23:45.660850003 +0300 +*************** +*** 334,341 **** + 4.0dip + 1.0dip + 96.0dip +! 58.0dip +! 62.0dip + 48.0dip + 72.0dip + 3.0dip +--- 334,341 ---- + 4.0dip + 1.0dip + 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 eb30c5e..17f9be3 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -20,4 +20,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 8.5.4 - 8.5.5 - 8.5.6 +- 8.7.6 diff --git a/patches/customtheme/876.patch b/patches/customtheme/876.patch new file mode 100644 index 0000000..fd35b6f --- /dev/null +++ b/patches/customtheme/876.patch @@ -0,0 +1,235 @@ +diff -crB -x dist -x build com.discord-876-base/res/values/colors.xml com.discord-876/res/values/colors.xml +*** com.discord-876-base/res/values/colors.xml 2019-04-25 11:32:32.232915774 +0300 +--- com.discord-876/res/values/colors.xml 2019-04-25 11:41:17.261090022 +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 + #ff292b2f + #4d292b2f + #99292b2f +--- 159,176 ---- + #4d7d8187 + #997d8187 + #e67d8187 +! #ff0f0f0f +! #4d0f0f0f +! #990f0f0f +! #e60f0f0f +! #ff000000 +! #4d000000 +! #99000000 +! #e6000000 +! #ff000000 +! #4d000000 +! #99000000 +! #e6000000 + #ff292b2f + #4d292b2f + #99292b2f +*************** +*** 195,203 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 195,203 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #ff9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +diff -crB -x dist -x build com.discord-876-base/res/values/styles.xml com.discord-876/res/values/styles.xml +*** com.discord-876-base/res/values/styles.xml 2019-04-25 11:32:32.109582104 +0300 +--- com.discord-876/res/values/styles.xml 2019-04-25 11:44:13.935296023 +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 +*************** +*** 333,339 **** + @color/white + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 333,339 ---- + @color/white + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 347,358 **** + @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 +--- 347,358 ---- + @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 +*************** +*** 418,424 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +