diff --git a/README.md b/README.md index 2f8a9f4..2442c46 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 10.1.2 (1012), released on 2019-12-20. +**Latest supported Discord Android version:** 10.1.1 (1011), released on 2019-12-18. New patch development will be done for the latest supported version. diff --git a/patches/branding/1012.patch b/patches/branding/1012.patch deleted file mode 100644 index 3b07e00..0000000 --- a/patches/branding/1012.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-12-20 16:43:27.540506983 +0200 ---- to/AndroidManifest.xml 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,31 **** - - - -! - - - - - -! - - - ---- 19,31 ---- - - - -! - - - - - -! - - - -*************** -*** 88,94 **** - - - -! - - - ---- 88,94 ---- - - - -! - - - -*************** -*** 118,124 **** - - - -! - - - ---- 118,124 ---- - - - -! - - - -*************** -*** 133,139 **** - - - -! - - - ---- 133,139 ---- - - - -! - - - -*************** -*** 148,154 **** - - - -! - - - ---- 148,154 ---- - - - -! - - - -*************** -*** 158,164 **** - - - -! - - - ---- 158,164 ---- - - - -! - - - -*************** -*** 198,206 **** - - - -! -! -! - - -! -\ No newline at end of file ---- 198,206 ---- - - - -! -! -! - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-12-20 16:42:32.254312584 +0200 ---- to/apktool.yml 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 184,188 **** - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1012' -! versionName: 10.1.2 ---- 184,188 ---- - tag: null - version: 2.4.2-0143dc-SNAPSHOT - versionInfo: -! versionCode: '1012CTCBUILD' -! versionName: 10.1.2-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-12-20 16:42:25.147709762 +0200 ---- to/res/values/strings.xml 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 1319,1325 **** - 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/ ---- 1319,1325 ---- - 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/ -*************** -*** 3252,3258 **** - 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. ---- 3252,3258 ---- - 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. -*************** -*** 4473,4479 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." ---- 4473,4479 ---- - Subscriptions - Suggestions - %1$s, %2$s -! CutTheCord Repo - Remove all embeds - Suppressed - "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." -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 2019-12-20 16:42:28.281014855 +0200 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-20 16:43:30.127152569 +0200 -*************** -*** 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 9651e45..eb9a3de 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -78,5 +78,4 @@ You can use the following line to patch authorities: - 10.0.6 - 10.0.7 - 10.1.1 -- 10.1.2 diff --git a/patches/customdefaultemoji/1012.patch b/patches/customdefaultemoji/1012.patch deleted file mode 100644 index 242a1ad..0000000 --- a/patches/customdefaultemoji/1012.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300 ---- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300 -*************** -*** 97,113 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "thinking" - -! const-string v3, "ok_hand" - -! const-string v4, "eyes" - -! const-string v5, "sweat_drops" - -! const-string v6, "joy" - -! const-string v7, "pig" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; ---- 97,113 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "thinking" - -! const-string v4, "ok_hand" - -! const-string v5, "eyes" - -! const-string v6, "sweat_drops" - -! const-string v7, "joy" - - .line 350 - filled-new-array/range {v2 .. v7}, [Ljava/lang/String; -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig -Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej - diff --git a/patches/customdefaultemoji/README.md b/patches/customdefaultemoji/README.md index 7a49395..734da73 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -44,5 +44,4 @@ This patch changes default list of custom emojis. - 10.0.6 - 10.0.7 - 10.1.1 -- 10.1.2 diff --git a/patches/customtheme/1012.patch b/patches/customtheme/1012.patch deleted file mode 100644 index d81c684..0000000 --- a/patches/customtheme/1012.patch +++ /dev/null @@ -1,277 +0,0 @@ -diff -crB from/res/drawable/drawable_overlay_channels_active.xml to/res/drawable/drawable_overlay_channels_active.xml -*** from/res/drawable/drawable_overlay_channels_active.xml 2019-12-20 17:01:27.112582207 +0200 ---- to/res/drawable/drawable_overlay_channels_active.xml 2019-12-20 17:18:57.576103360 +0200 -*************** -*** 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 2019-12-20 17:01:28.522579003 +0200 ---- to/res/values/colors.xml 2019-12-20 17:18:57.576103360 +0200 -*************** -*** 51,57 **** - #37000000 - #ff657b83 - #ff333333 -! #ff1d1d1d - #40000000 - #40ffffff - @android:color/white ---- 51,57 ---- - #37000000 - #ff657b83 - #ff333333 -! #ff000000 - #40000000 - #40ffffff - @android:color/white -*************** -*** 62,69 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 - #ff3f51b5 - #ff303f9f ---- 62,69 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 - #ff3f51b5 - #ff303f9f -*************** -*** 97,105 **** - #ff4f545c - #0d4f545c - #4d4f545c -! #ff282b30 -! #ff2e3136 -! #ff1e2124 - #ff8a8e94 - #6680cbc4 - #66009688 ---- 97,105 ---- - #ff4f545c - #0d4f545c - #4d4f545c -! #ff000000 -! #ff000000 -! #ff000000 - #ff8a8e94 - #6680cbc4 - #66009688 -*************** -*** 107,113 **** - #fff47b67 - #ff45ddc0 - #ff021f25 -! #ff00b0f4 - #ff0067e0 - #ff37474f - #ff263238 ---- 107,113 ---- - #fff47b67 - #ff45ddc0 - #ff021f25 -! #ff50f148 - #ff0067e0 - #ff37474f - #ff263238 -*************** -*** 151,168 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #4d4f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 - #ff292b2f -! #ff202225 -! #99202225 - #ff18191c - #9918191c - #e618191c ---- 151,168 ---- - #ff72767d - #4d72767d - #9972767d -! #ff0f0f0f -! #4d0f0f0f -! #99404040 - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 - #ff292b2f -! #ff0f0f0f -! #990f0f0f - #ff18191c - #9918191c - #e618191c -*************** -*** 193,201 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 193,201 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -*************** -*** 258,264 **** - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6616161 - #e6ffffff - @android:color/transparent - #ff593695 ---- 258,264 ---- - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6000000 - #e6ffffff - @android:color/transparent - #ff593695 -Only in to/res/values: colors.xml.orig -diff -crB from/res/values/styles.xml to/res/values/styles.xml -*** from/res/values/styles.xml 2019-12-20 17:01:28.605912147 +0200 ---- to/res/values/styles.xml 2019-12-20 17:18:57.579436668 +0200 -*************** -*** 377,383 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/grey_channels - @color/grey_account ---- 377,383 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/grey_channels - @color/grey_account -*************** -*** 389,400 **** - @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 ---- 389,400 ---- - @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_700 -*************** -*** 457,463 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -