diff --git a/README.md b/README.md index e1b29e6..d9e73b8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 53.0 (1356), released on 2020-12-13. +**Latest supported Discord Android version:** 52.3 (1355), released on 2020-12-10. New patch development will be done for the latest supported version. diff --git a/patches/betterdmheader/1356.patch b/patches/betterdmheader/1356.patch deleted file mode 100644 index 20e2a16..0000000 --- a/patches/betterdmheader/1356.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml -*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 ---- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 -*************** -*** 1,11 **** - - -! - - - -! -! - -! -\ No newline at end of file ---- 1,11 ---- - - -! - - - -! -! - -! -diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali -*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 ---- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 -*************** -*** 119,125 **** - - invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 5 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; ---- 119,125 ---- - - invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 5 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; -*************** -*** 140,146 **** - - invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 7 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; ---- 140,146 ---- - - invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 7 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/README.md b/patches/betterdmheader/README.md index 7810c7f..9bc9746 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -40,5 +40,4 @@ This patch replaces the call button on DM headers with search button. The call b - 49.12 - 49.13 - 52.3 -- 53.0 diff --git a/patches/betterrotation/1356.patch b/patches/betterrotation/1356.patch deleted file mode 100644 index 94bb3fb..0000000 --- a/patches/betterrotation/1356.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 ---- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 -*************** -*** 30,37 **** - - - -! -! - - - ---- 30,37 ---- - - - -! -! - - - diff --git a/patches/betterrotation/README.md b/patches/betterrotation/README.md index b0fac2e..ecf73d5 100644 --- a/patches/betterrotation/README.md +++ b/patches/betterrotation/README.md @@ -7,5 +7,4 @@ Contributed by [clienthax](https://gitdab.com/clienthax). #### Available and tested on: - 49.13 - 52.3 -- 53.0 diff --git a/patches/branding/1356.patch b/patches/branding/1356.patch deleted file mode 100644 index 3e0c8bb..0000000 --- a/patches/branding/1356.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 ---- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 21,34 **** - - - -! - - - - - - -! - - - ---- 21,34 ---- - - - -! - - - - - - -! - - - -*************** -*** 132,138 **** - - - -! - - - ---- 132,138 ---- - - - -! - - - -*************** -*** 156,162 **** - - - -! - - - ---- 156,162 ---- - - - -! - - - -*************** -*** 165,171 **** - - - -! - - - ---- 165,171 ---- - - - -! - - - -*************** -*** 204,212 **** - - - -! - -! - - - ---- 204,212 ---- - - - -! - -! - - - -*************** -*** 261,264 **** - - - -! -\ No newline at end of file ---- 261,264 ---- - - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 ---- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 -*************** -*** 82,86 **** - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1356' -! versionName: '53.0' ---- 82,86 ---- - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1356CTCBUILD' -! versionName: '53.0-cutthecord-CTCBUILD' -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 ---- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 -*************** -*** 1650,1656 **** - 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/ ---- 1650,1656 ---- - 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/ -*************** -*** 4619,4625 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Notifications - Notifications, muted ---- 4619,4625 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Notifications - Notifications, muted -*************** -*** 6224,6230 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds ---- 6224,6230 ---- - 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-12-13 04:52:12.150319258 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 -*************** -*** 78,84 **** - .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; ---- 78,84 ---- - .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 -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali -*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 ---- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 -*************** -*** 63,69 **** - - invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://support.discord.com" - - const/4 v3, 0x0 - ---- 63,69 ---- - - invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://gitdab.com/distok/cutthecord" - - const/4 v3, 0x0 - diff --git a/patches/branding/README.md b/patches/branding/README.md index e924283..7c032b4 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -221,5 +221,4 @@ You can use the following line to patch authorities: - 49.12 - 49.13 - 52.3 -- 53.0 diff --git a/patches/customtheme/1356.patch b/patches/customtheme/1356.patch deleted file mode 100644 index 09fbad0..0000000 --- a/patches/customtheme/1356.patch +++ /dev/null @@ -1,391 +0,0 @@ -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-12-13 04:52:09.201073466 +0000 ---- to/res/drawable/drawable_bg_corners_20dp.xml 2020-12-13 04:52:26.076186978 +0000 -*************** -*** 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-12-13 04:52:08.961140288 +0000 ---- to/res/drawable/drawable_circle_black.xml 2020-12-13 04:52:26.076186978 +0000 -*************** -*** 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-12-13 04:52:09.594965022 +0000 ---- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-12-13 04:52:26.076186978 +0000 -*************** -*** 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/layout/widget_chat_input.xml to/res/layout/widget_chat_input.xml -*** from/res/layout/widget_chat_input.xml 2020-12-13 04:52:09.660946856 +0000 ---- to/res/layout/widget_chat_input.xml 2020-12-13 04:52:26.076186978 +0000 -*************** -*** 7,13 **** - - - -! - - - ---- 7,13 ---- - - - -! - - - -*************** -*** 17,20 **** - - - -! -\ No newline at end of file ---- 17,20 ---- - - - -! -diff -crB from/res/values/colors.xml to/res/values/colors.xml -*** from/res/values/colors.xml 2020-12-13 04:52:10.452736607 +0000 ---- to/res/values/colors.xml 2020-12-13 04:52:26.076186978 +0000 -*************** -*** 107,116 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 -! #ff121212 - #ffcf6679 - #ffffffff - #ff000000 ---- 107,116 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 -! #ff000000 - #ffcf6679 - #ffffffff - #ff000000 -*************** -*** 122,128 **** - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff121212 - #ffffffff - #ffb00020 - #ff000000 ---- 122,128 ---- - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff000000 - #ffffffff - #ffb00020 - #ff000000 -*************** -*** 171,178 **** - #4d737f8d - #ff949494 - #0d4f545c -! #ff282b30 -! #ff8a8e94 - #6680cbc4 - #66009688 - #ff9c84ef ---- 171,178 ---- - #4d737f8d - #ff949494 - #0d4f545c -! #ff000000 -! #ff000000 - #6680cbc4 - #66009688 - #ff9c84ef -*************** -*** 182,188 **** - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff00b0f4 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd ---- 182,188 ---- - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff50f148 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd -*************** -*** 294,315 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #334f545c -! #4d4f545c -! #514f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 -! #ff292b2f -! #e6292b2f -! #ff202225 -! #80202225 -! #99202225 - #ff18191c - #8018191c - #9918191c ---- 294,315 ---- - #ff72767d - #4d72767d - #9972767d -! #ff333333 -! #330f0f0f -! #4d0f0f0f -! #510f0f0f -! #990f0f0f - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 -! #ff000000 -! #e6000000 -! #ff000000 -! #80000000 -! #990f0f0f - #ff18191c - #8018191c - #9918191c -*************** -*** 334,343 **** - #ff4f545c - #ff484c54 - #ff40444b -! #ff36393f -! #ff2f3136 - #ff292b2f -! #ff202225 - #ff1e1f22 - #ff1b1d20 - #ff18191c ---- 334,343 ---- - #ff4f545c - #ff484c54 - #ff40444b -! #ff000000 -! #ff000000 - #ff292b2f -! #ff000000 - #ff1e1f22 - #ff1b1d20 - #ff18191c -*************** -*** 381,389 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 381,389 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -*************** -*** 518,524 **** - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6616161 - #e6ffffff - @android:color/transparent - #ff593695 ---- 518,524 ---- - #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-12-13 04:52:10.414746413 +0000 ---- to/res/values/styles.xml 2020-12-13 04:52:26.076186978 +0000 -*************** -*** 423,429 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/primary_630 - @color/grey_account ---- 423,429 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/primary_630 - @color/grey_account -*************** -*** 439,445 **** - #1afaa61a - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark -! @color/primary_700 - @color/white_alpha_10 - @color/primary_600 - @drawable/img_empty_server_settings_emoji_dark ---- 439,445 ---- - #1afaa61a - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark -! @color/primary_500 - @color/white_alpha_10 - @color/primary_600 - @drawable/img_empty_server_settings_emoji_dark -*************** -*** 677,686 **** - #ffe5e5e5 - @drawable/ic_img_selected_light_theme - @color/purple_brand -! #33faa61a - @drawable/drawable_bg_reaction_light - @drawable/drawable_reaction_text_color_light -! @color/primary_300 - @color/black_alpha_10 - @color/primary_300 - @drawable/img_empty_server_settings_emoji_light ---- 677,686 ---- - #ffe5e5e5 - @drawable/ic_img_selected_light_theme - @color/purple_brand -! @color/purple_brand_alpha_10 - @drawable/drawable_bg_reaction_light - @drawable/drawable_reaction_text_color_light -! @color/primary_500 - @color/black_alpha_10 - @color/primary_300 - @drawable/img_empty_server_settings_emoji_light -*************** -*** 784,790 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -