diff --git a/README.md b/README.md index 7e9f9e2..9c6cd51 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 11.5 (1046), released on 2020-03-01. +**Latest supported Discord Android version:** '11.4' (1045), released on 2020-02-29. New patch development will be done for the latest supported version. diff --git a/patches/branding/1041.patch b/patches/branding/1041.patch index 111506c..2665b85 100644 --- a/patches/branding/1041.patch +++ b/patches/branding/1041.patch @@ -3,12 +3,12 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml --- to/AndroidManifest.xml 2020-02-24 20:13:55.033903663 +0000 *************** *** 1,4 **** -! +! --- 1,4 ---- -! +! diff --git a/patches/branding/1045.patch b/patches/branding/1045.patch index ddc6f2e..0b2c3f1 100644 --- a/patches/branding/1045.patch +++ b/patches/branding/1045.patch @@ -3,12 +3,12 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml --- to/AndroidManifest.xml 2020-02-24 20:13:55.033903663 +0000 *************** *** 1,4 **** -! +! --- 1,4 ---- -! +! diff --git a/patches/branding/1046.patch b/patches/branding/1046.patch deleted file mode 100644 index d82bd13..0000000 --- a/patches/branding/1046.patch +++ /dev/null @@ -1,248 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-02-24 20:13:53.627915594 +0000 ---- to/AndroidManifest.xml 2020-02-24 20:13:55.033903663 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 20,31 **** - - - -! - - - - -! - - - ---- 20,31 ---- - - - -! - - - - -! - - - -*************** -*** 97,103 **** - - - -! - - - ---- 97,103 ---- - - - -! - - - -*************** -*** 127,133 **** - - - -! - - - ---- 127,133 ---- - - - -! - - - -*************** -*** 144,150 **** - - - -! - - - ---- 144,150 ---- - - - -! - - - -*************** -*** 159,165 **** - - - -! - - - ---- 159,165 ---- - - - -! - - - -*************** -*** 169,175 **** - - - -! - - - ---- 169,175 ---- - - - -! - - - -*************** -*** 209,222 **** - - - -! - - - - - -! -! - - -! -\ No newline at end of file ---- 209,222 ---- - - - -! - - - - - -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-02-24 20:13:38.240046153 +0000 ---- to/apktool.yml 2020-02-24 20:13:55.033903663 +0000 -*************** -*** 190,194 **** - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1046' -! versionName: '11.5' ---- 190,194 ---- - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1046CTCBUILD' -! versionName: '11.5-cutthecord-CTCBUILD' -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-02-24 20:13:33.410087135 +0000 ---- to/res/values/strings.xml 2020-02-24 20:13:55.033903663 +0000 -*************** -*** 1338,1344 **** - 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/ ---- 1338,1344 ---- - 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/ -*************** -*** 3463,3469 **** - 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. ---- 3463,3469 ---- - 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. -*************** -*** 4740,4746 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds ---- 4740,4746 ---- - 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-02-24 20:13:35.760067196 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-02-24 20:13:55.033903663 +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 f720885..8ee631e 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -93,11 +93,4 @@ You can use the following line to patch authorities: - 10.2.9 - 10.3.1 - 10.3.2 -- 10.3.3 -- 10.4.0 -- 10.4.1 -- 10.5.1 -- 11.0 -- 11.4 -- 11.5 diff --git a/patches/customtheme/1046.patch b/patches/customtheme/1046.patch deleted file mode 100644 index e3b30eb..0000000 --- a/patches/customtheme/1046.patch +++ /dev/null @@ -1,306 +0,0 @@ -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-02-21 02:43:49.921046379 +0000 ---- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-02-21 02:44:05.538425633 +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/values/colors.xml to/res/values/colors.xml -*** from/res/values/colors.xml 2020-02-21 02:43:50.525099146 +0000 ---- to/res/values/colors.xml 2020-02-21 02:44:05.538425633 +0000 -*************** -*** 94,100 **** - #37000000 - #ff657b83 - #ff333333 -! #ff1d1d1d - #40000000 - #40ffffff - @android:color/white ---- 94,100 ---- - #37000000 - #ff657b83 - #ff333333 -! #ff000000 - #40000000 - #40ffffff - @android:color/white -*************** -*** 105,112 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 - #ff121212 - #ffcf6679 ---- 105,112 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 - #ff121212 - #ffcf6679 -*************** -*** 163,170 **** - #4d737f8d - #ff949494 - #0d4f545c -! #ff282b30 -! #ff8a8e94 - #6680cbc4 - #66009688 - #ff9c84ef ---- 163,170 ---- - #4d737f8d - #ff949494 - #0d4f545c -! #ff000000 -! #ff000000 - #6680cbc4 - #66009688 - #ff9c84ef -*************** -*** 174,180 **** - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff00b0f4 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd ---- 174,180 ---- - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff50f148 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd -*************** -*** 263,282 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #334f545c -! #4d4f545c -! #514f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 - #ff292b2f -! #ff202225 -! #99202225 - #ff18191c - #9918191c - #e618191c ---- 263,282 ---- - #ff72767d - #4d72767d - #9972767d -! #ff333333 -! #330f0f0f -! #4d0f0f0f -! #510f0f0f -! #990f0f0f - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 - #ff292b2f -! #ff000000 -! #990f0f0f - #ff18191c - #9918191c - #e618191c -*************** -*** 299,308 **** - #ff4f545c - #ff484c54 - #ff40444b -! #ff36393f -! #ff2f3136 - #ff292b2f -! #ff202225 - #ff1e1f22 - #ff1b1d20 - #ff18191c ---- 299,308 ---- - #ff4f545c - #ff484c54 - #ff40444b -! #ff000000 -! #ff000000 - #ff292b2f -! #ff000000 - #ff1e1f22 - #ff1b1d20 - #ff18191c -*************** -*** 347,355 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 347,355 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -*************** -*** 488,494 **** - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6616161 - #e6ffffff - @android:color/transparent - #ff593695 ---- 488,494 ---- - #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-02-21 02:43:50.613106836 +0000 ---- to/res/values/styles.xml 2020-02-21 02:44:05.538425633 +0000 -*************** -*** 388,394 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/primary_630 - @color/grey_account ---- 388,394 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/primary_630 - @color/grey_account -*************** -*** 400,414 **** - @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 ---- 400,414 ---- - @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 -*************** -*** 818,824 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -