diff --git a/README.md b/README.md index 9caca50..387a4db 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 9.3.9 (939), released on 2019-08-16. +**Latest supported Discord Android version:** 9.4.0 (940), released on 2019-08-16. New patch development will be done for the latest supported version. diff --git a/icons/ave/ctcave.xcf b/icons/ave/ctcave.xcf new file mode 100644 index 0000000..a585573 Binary files /dev/null and b/icons/ave/ctcave.xcf differ diff --git a/icons/ave/fgave.png b/icons/ave/fgave.png new file mode 100644 index 0000000..a8fd0b6 Binary files /dev/null and b/icons/ave/fgave.png differ diff --git a/icons/ave/fullave.png b/icons/ave/fullave.png new file mode 100644 index 0000000..bdcd9ce Binary files /dev/null and b/icons/ave/fullave.png differ diff --git a/patches/branding/940.patch b/patches/branding/940.patch new file mode 100644 index 0000000..3e68e24 --- /dev/null +++ b/patches/branding/940.patch @@ -0,0 +1,233 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2019-08-17 00:36:24.134912668 +0300 +--- to/AndroidManifest.xml 2019-08-17 00:36:25.678255364 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 19,29 **** + + + +! + + + +! + + + +--- 19,29 ---- + + + +! + + + +! + + + +*************** +*** 77,83 **** + + + +! + + + +--- 77,83 ---- + + + +! + + + +*************** +*** 107,120 **** + + + +! + + + + + + +! + + + +--- 107,120 ---- + + + +! + + + + + + +! + + + +*************** +*** 177,183 **** + + + +! + + + +--- 177,183 ---- + + + +! + + + +*************** +*** 188,195 **** + + + +! +! + + + +--- 188,195 ---- + + + +! +! + + + +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2019-08-17 00:36:16.848201805 +0300 +--- to/apktool.yml 2019-08-17 00:36:25.681588717 +0300 +*************** +*** 181,185 **** + tag: null + version: 2.4.1-75e4c6-SNAPSHOT + versionInfo: +! versionCode: '940' +! versionName: 9.4.0 +--- 181,185 ---- + tag: null + version: 2.4.1-75e4c6-SNAPSHOT + versionInfo: +! versionCode: '940CTCBUILD' +! versionName: 9.4.0-cutthecord-CTCBUILD +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2019-08-17 00:36:12.681509864 +0300 +--- to/res/values/strings.xml 2019-08-17 00:36:25.681588717 +0300 +*************** +*** 1296,1302 **** + 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/ +--- 1296,1302 ---- + 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/ +*************** +*** 3146,3152 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Join them: %1$s + Join the party! +--- 3146,3152 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Join them: %1$s + Join the party! +*************** +*** 4295,4301 **** + Sub Enabled Servers + Subscriber Information + Suggestions +! Support + Remove all embeds + Suppressed + "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +--- 4295,4301 ---- + Sub Enabled Servers + Subscriber Information + Suggestions +! 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/app/e.smali to/smali/com/discord/app/e.smali +*** from/smali/com/discord/app/e.smali 2019-08-17 00:36:14.538187793 +0300 +--- to/smali/com/discord/app/e.smali 2019-08-17 00:36:25.681588717 +0300 +*************** +*** 56,62 **** + .line 15 + sput-object v0, Lcom/discord/app/e;->un:Ljava/lang/String; + +! const-string v0, "https://support.discordapp.com" + + .line 16 + sput-object v0, Lcom/discord/app/e;->uo:Ljava/lang/String; +--- 56,62 ---- + .line 15 + sput-object v0, Lcom/discord/app/e;->un:Ljava/lang/String; + +! const-string v0, "https://gitdab.com/distok/cutthecord" + + .line 16 + sput-object v0, Lcom/discord/app/e;->uo:Ljava/lang/String; +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-08-17 00:36:15.004857291 +0300 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-08-17 00:36:25.681588717 +0300 +*************** +*** 77,83 **** + + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discordapp.com/app" + + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; + +--- 77,83 ---- + + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + 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 61c681e..88900e9 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -53,4 +53,5 @@ You can use the following line to patch authorities: - 9.1.0 - 9.3.8-SAO-Heathcliff - 9.3.9 +- 9.4.0 diff --git a/patches/compact/940.patch b/patches/compact/940.patch new file mode 100644 index 0000000..f755879 --- /dev/null +++ b/patches/compact/940.patch @@ -0,0 +1,78 @@ +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-08-12 17:12:52.667032201 +0300 +--- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-08-12 17:13:38.650669506 +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-08-12 17:12:51.407023798 +0300 +--- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-08-12 17:13:38.650669506 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,11 ---- + + + + + + ++ + + +\ No newline at end of file +diff -crB from/res/values/dimens.xml to/res/values/dimens.xml +*** from/res/values/dimens.xml 2019-08-12 17:12:52.937034002 +0300 +--- to/res/values/dimens.xml 2019-08-12 17:13:38.650669506 +0300 +*************** +*** 334,340 **** + 4.0dip + 1.0dip + 96.0dip +! 58.0dip + 48.0dip + 72.0dip + 3.0dip +--- 334,340 ---- + 4.0dip + 1.0dip + 96.0dip +! 20.0dip + 48.0dip + 72.0dip + 3.0dip diff --git a/patches/compact/README.md b/patches/compact/README.md index 5b1e61a..b23192e 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -37,4 +37,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 9.1.0 - 9.3.8-SAO-Heathcliff - 9.3.9 +- 9.4.0 diff --git a/patches/customdefaultemoji/940.patch b/patches/customdefaultemoji/940.patch new file mode 100644 index 0000000..974a726 --- /dev/null +++ b/patches/customdefaultemoji/940.patch @@ -0,0 +1,81 @@ +diff -crB com.discord-896-base/smali/com/discord/stores/StoreEmoji.smali com.discord-896/smali/com/discord/stores/StoreEmoji.smali +*** com.discord-896-base/smali/com/discord/stores/StoreEmoji.smali 2019-05-12 12:13:46.831159818 +0300 +--- com.discord-896/smali/com/discord/stores/StoreEmoji.smali 2019-05-12 12:18:56.659462281 +0300 +*************** +*** 101,137 **** + + const/4 v1, 0x0 + +! const-string v2, "thinking" + + aput-object v2, v0, v1 + + const/4 v1, 0x1 + +! const-string v2, "ok_hand" + + aput-object v2, v0, v1 + + const/4 v1, 0x2 + +! const-string v2, "eyes" + + aput-object v2, v0, v1 + + const/4 v1, 0x3 + +! const-string v2, "sweat_drops" + + aput-object v2, v0, v1 + + const/4 v1, 0x4 + +! const-string v2, "joy" + + aput-object v2, v0, v1 + + const/4 v1, 0x5 + +! const-string v2, "pig" + + aput-object v2, v0, v1 + +--- 101,137 ---- + + const/4 v1, 0x0 + +! const-string v2, "star" + + aput-object v2, v0, v1 + + const/4 v1, 0x1 + +! const-string v2, "thinking" + + aput-object v2, v0, v1 + + const/4 v1, 0x2 + +! const-string v2, "ok_hand" + + aput-object v2, v0, v1 + + const/4 v1, 0x3 + +! const-string v2, "eyes" + + aput-object v2, v0, v1 + + const/4 v1, 0x4 + +! const-string v2, "sweat_drops" + + aput-object v2, v0, v1 + + const/4 v1, 0x5 + +! const-string v2, "joy" + + aput-object v2, v0, v1 + + diff --git a/patches/customdefaultemoji/README.md b/patches/customdefaultemoji/README.md index 7d0d36f..c1ae154 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -19,4 +19,5 @@ This patch changes default list of custom emojis. - 9.1.0 - 9.3.8-SAO-Heathcliff - 9.3.9 +- 9.4.0 diff --git a/patches/customtheme/940.patch b/patches/customtheme/940.patch new file mode 100644 index 0000000..ccdc6e1 --- /dev/null +++ b/patches/customtheme/940.patch @@ -0,0 +1,271 @@ +diff -crB com.discord-938-base/res/values/colors.xml com.discord-938/res/values/colors.xml +*** com.discord-938-base/res/values/colors.xml 2019-08-12 17:12:53.117035202 +0300 +--- com.discord-938/res/values/colors.xml 2019-08-12 20:03:45.820250267 +0300 +*************** +*** 50,56 **** + #37000000 + #ff657b83 + #ff333333 +! #ff1d1d1d + @android:color/white + #1f000000 + @android:color/black +--- 50,56 ---- + #37000000 + #ff657b83 + #ff333333 +! #ff000000 + @android:color/white + #1f000000 + @android:color/black +*************** +*** 59,66 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 + #ff3f51b5 + #ff303f9f +--- 59,66 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 + #ff3f51b5 + #ff303f9f +*************** +*** 94,102 **** + #ff4f545c + #0d4f545c + #4d4f545c +! #ff282b30 +! #ff2e3136 +! #ff1e2124 + #ff8a8e94 + #6680cbc4 + #66009688 +--- 94,102 ---- + #ff4f545c + #0d4f545c + #4d4f545c +! #ff000000 +! #ff000000 +! #ff000000 + #ff8a8e94 + #6680cbc4 + #66009688 +*************** +*** 104,118 **** + #fff47b67 + #ff45ddc0 + #ff021f25 +! #fff2fbfe +! #ffcceffd +! #ff99dffb +! #ff33c0f6 +! #ff00b0f4 +! #ff0078a6 +! #ff004662 +! #ff003549 +! #ff00090c + #ff37474f + #ff263238 + #ff21272b +--- 104,118 ---- + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff8cf687 +! #ff7df577 +! #ff6ef368 +! #ff5ff258 +! #ff50f148 +! #ff41f038 +! #ff32ef28 +! #ff23ed19 +! #ff1be411 + #ff37474f + #ff263238 + #ff21272b +*************** +*** 151,165 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #4d4f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 + #ff292b2f + #ff202225 + #99202225 +--- 151,165 ---- + #ff72767d + #4d72767d + #9972767d +! #ff0f0f0f +! #4d0f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 + #ff292b2f + #ff202225 + #99202225 +*************** +*** 192,200 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 192,200 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +Only in com.discord-938/res/values: colors.xml.orig +Only in com.discord-938/res/values: colors.xml.rej +diff -crB com.discord-938-base/res/values/styles.xml com.discord-938/res/values/styles.xml +*** com.discord-938-base/res/values/styles.xml 2019-08-12 17:12:53.017034535 +0300 +--- com.discord-938/res/values/styles.xml 2019-08-12 20:04:00.813688689 +0300 +*************** +*** 114,120 **** + @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 +--- 114,120 ---- + @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 +*************** +*** 327,333 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 327,333 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 341,352 **** + @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 +--- 341,352 ---- + @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 +*************** +*** 412,418 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +