From c5a4c4b05a6907ef2ee7fc98c00185c7729b1db1 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Fri, 8 Feb 2019 11:29:01 +0300 Subject: [PATCH] Port patches to v8.4.4g --- README.md | 2 +- patches/branding/844.patch | 127 + patches/branding/README.md | 1 + patches/compact/844.patch | 84 + patches/compact/README.md | 1 + patches/customtheme/844.patch | 253 ++ patches/customtheme/README.md | 1 + patches/customversion/844.patch | 21 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/844.patch | 20 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/844.patch | 153 ++ patches/experiments/README.md | 1 + patches/litecord/844.patch | 330 +++ patches/litecord/README.md | 1 + patches/mutant/844.patch | 1907 ++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/844.patch | 13 + patches/necessary/README.md | 1 + patches/noblocked/844.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/844.patch | 87 + patches/nonearby/README.md | 1 + patches/noprofilestrip/844.patch | 29 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/844.patch | 66 + patches/nospoiler/README.md | 1 + patches/notrack/844.patch | 2729 +++++++++++++++++++++ patches/notrack/README.md | 1 + patches/notyping/844.patch | 19 + patches/notyping/README.md | 1 + patches/nozlib/844.patch | 33 + patches/nozlib/README.md | 1 + patches/pureevil/844.patch | 26 + patches/pureevil/README.md | 1 + patches/smalltime/844.patch | 191 ++ patches/smalltime/README.md | 1 + patches/squareavatars/844.patch | 22 + patches/squareavatars/README.md | 1 + 39 files changed, 6148 insertions(+), 1 deletion(-) create mode 100644 patches/branding/844.patch create mode 100644 patches/compact/844.patch create mode 100644 patches/customtheme/844.patch create mode 100644 patches/customversion/844.patch create mode 100644 patches/disable-mobileindicator/844.patch create mode 100644 patches/experiments/844.patch create mode 100644 patches/litecord/844.patch create mode 100644 patches/mutant/844.patch create mode 100644 patches/necessary/844.patch create mode 100644 patches/noblocked/844.patch create mode 100644 patches/nonearby/844.patch create mode 100644 patches/noprofilestrip/844.patch create mode 100644 patches/nospoiler/844.patch create mode 100644 patches/notrack/844.patch create mode 100644 patches/notyping/844.patch create mode 100644 patches/nozlib/844.patch create mode 100644 patches/pureevil/844.patch create mode 100644 patches/smalltime/844.patch create mode 100644 patches/squareavatars/844.patch diff --git a/README.md b/README.md index 202ba52e..c09af2a7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Discord Android app patches. -**Latest supported Discord Android version:** 8.4.2g (842), released on 2019-02-05. +**Latest supported Discord Android version:** 8.4.4g (844), released on 2019-02-08. New patch development will be done for the latest supported version. diff --git a/patches/branding/844.patch b/patches/branding/844.patch new file mode 100644 index 00000000..1cc4e5d6 --- /dev/null +++ b/patches/branding/844.patch @@ -0,0 +1,127 @@ +diff -crB -x dist -x build com.discord-844-base/AndroidManifest.xml com.discord-844/AndroidManifest.xml +*** com.discord-844-base/AndroidManifest.xml 2019-02-06 23:27:45.000000000 +0300 +--- com.discord-844/AndroidManifest.xml 2019-02-07 22:19:29.693898547 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 95,101 **** + + + +! + + + +--- 95,101 ---- + + + +! + + + +*************** +*** 140,148 **** + + + +! + +! + + + +--- 140,148 ---- + + + +! + +! + + + +*************** +*** 181,188 **** + + + +! +! + + + +\ No newline at end of file +--- 181,188 ---- + + + +! +! + + + +\ No newline at end of file +diff -crB -x dist -x build com.discord-844-base/apktool.yml com.discord-844/apktool.yml +*** com.discord-844-base/apktool.yml 2019-02-06 23:27:45.323639501 +0300 +--- com.discord-844/apktool.yml 2019-02-07 22:19:29.697231896 +0300 +*************** +*** 345,349 **** + tag: null + version: 2.4.0-896569-SNAPSHOT + versionInfo: +! versionCode: '844' +! versionName: 8.4.4g +--- 345,349 ---- + tag: null + version: 2.4.0-896569-SNAPSHOT + versionInfo: +! versionCode: '844CTCBUILD' +! versionName: 8.4.4g-cutthecord-CTCBUILD +diff -crB -x dist -x build com.discord-844-base/res/values/strings.xml com.discord-844/res/values/strings.xml +*** com.discord-844-base/res/values/strings.xml 2019-02-06 23:27:49.190325481 +0300 +--- com.discord-844/res/values/strings.xml 2019-02-07 22:19:29.700565245 +0300 +*************** +*** 1157,1163 **** + 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/ +--- 1157,1163 ---- + 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/ +*************** +*** 2721,2727 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Continue +--- 2721,2727 ---- + 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 22125da9..dcf80e62 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -22,4 +22,5 @@ You can use the following line to patch authorities: - 8.4.1g - 8.4.2g - 8.4.3g +- 8.4.4g diff --git a/patches/compact/844.patch b/patches/compact/844.patch new file mode 100644 index 00000000..3ec668b0 --- /dev/null +++ b/patches/compact/844.patch @@ -0,0 +1,84 @@ +diff -crB -x dist -x build com.discord-844-base/res/layout/widget_chat_list_adapter_item_text.xml com.discord-844/res/layout/widget_chat_list_adapter_item_text.xml +*** com.discord-844-base/res/layout/widget_chat_list_adapter_item_text.xml 2019-02-08 11:20:02.524857463 +0300 +--- com.discord-844/res/layout/widget_chat_list_adapter_item_text.xml 2019-02-08 11:27:42.013297382 +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-844-base/res/layout-v17/widget_chat_list_adapter_item_text.xml com.discord-844/res/layout-v17/widget_chat_list_adapter_item_text.xml +*** com.discord-844-base/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-02-08 11:20:02.408190345 +0300 +--- com.discord-844/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-02-08 11:27:42.016630728 +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-844-base/res/values/dimens.xml com.discord-844/res/values/dimens.xml +*** com.discord-844-base/res/values/dimens.xml 2019-02-08 11:20:03.248193591 +0300 +--- com.discord-844/res/values/dimens.xml 2019-02-08 11:27:42.016630728 +0300 +*************** +*** 333,340 **** + 4.0dip + 0.75dip + 96.0dip +! 58.0dip +! 62.0dip + 48.0dip + 72.0dip + 3.0dip +--- 333,340 ---- + 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 b4bbf74f..6f2fa410 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -11,4 +11,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 8.4.1g - 8.4.2g - 8.4.3g +- 8.4.4g diff --git a/patches/customtheme/844.patch b/patches/customtheme/844.patch new file mode 100644 index 00000000..2de07362 --- /dev/null +++ b/patches/customtheme/844.patch @@ -0,0 +1,253 @@ +diff -crB -x dist -x build com.discord-844-base/res/values/colors.xml com.discord-844/res/values/colors.xml +*** com.discord-844-base/res/values/colors.xml 2019-02-08 11:20:03.424860940 +0300 +--- com.discord-844/res/values/colors.xml 2019-02-08 11:26:31.023024801 +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-844-base/res/values/styles.xml com.discord-844/res/values/styles.xml +*** com.discord-844-base/res/values/styles.xml 2019-02-08 11:20:03.574861520 +0300 +--- com.discord-844/res/values/styles.xml 2019-02-08 11:26:31.026358147 +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 +*************** +*** 330,336 **** + @color/white + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 330,336 ---- + @color/white + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 344,355 **** + @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 +--- 344,355 ---- + @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 +*************** +*** 414,420 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +