From 2b89b9b6a0c6e9bddf4d6fe2017035cae62711e4 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Sat, 21 Dec 2019 21:30:11 +0300 Subject: [PATCH] Re-port 10.1.3 Revert "10.1.3" This reverts commit 12c11a1451964eeff171a7be233a6236e24e957a. Re-port 10.1.3 --- old-patches/README.md | 1 + .../customdefaultemoji/1006.patch | 0 .../customdefaultemoji/1007.patch | 0 .../customdefaultemoji/1011.patch | 0 .../customdefaultemoji/1012.patch | 0 .../customdefaultemoji/1013.patch-failed | 0 .../customdefaultemoji/884.patch | 0 .../customdefaultemoji/888.patch | 0 .../customdefaultemoji/896.patch | 0 .../customdefaultemoji/897.patch | 0 .../customdefaultemoji/898.patch | 0 .../customdefaultemoji/899.patch | 0 .../customdefaultemoji/900.patch | 0 .../customdefaultemoji/901.patch | 0 .../customdefaultemoji/902.patch | 0 .../customdefaultemoji/903.patch | 0 .../customdefaultemoji/904.patch | 0 .../customdefaultemoji/906.patch | 0 .../customdefaultemoji/909.patch | 0 .../customdefaultemoji/910.patch | 0 .../customdefaultemoji/938.patch | 0 .../customdefaultemoji/939.patch | 0 .../customdefaultemoji/940.patch | 0 .../customdefaultemoji/942.patch | 0 .../customdefaultemoji/943.patch | 0 .../customdefaultemoji/945.patch | 0 .../customdefaultemoji/946.patch | 0 .../customdefaultemoji/947.patch | 0 .../customdefaultemoji/948.patch | 0 .../customdefaultemoji/963.patch | 0 .../customdefaultemoji/964.patch | 0 .../customdefaultemoji/965.patch | 0 .../customdefaultemoji/966.patch | 0 .../customdefaultemoji/967.patch | 0 .../customdefaultemoji/968.patch | 0 .../customdefaultemoji/970.patch | 0 .../customdefaultemoji/980.patch | 0 .../customdefaultemoji/984.patch | 0 .../customdefaultemoji/986.patch | 0 .../customdefaultemoji/991.patch | 0 .../customdefaultemoji/991.patch-failed | 80 +++ .../customdefaultemoji/992.patch | 0 .../customdefaultemoji/993.patch | 0 .../customdefaultemoji/994.patch | 0 old-patches/customdefaultemoji/996.patch | 43 ++ .../customdefaultemoji/README.md | 0 patches/branding/1013.patch | 19 +- patches/customdefaultemoji/1013.patch | 48 -- patches/customtheme/1013.patch | 29 +- patches/experiments/1013.patch | 48 +- patches/litecord/1013.patch | 41 +- patches/necessary/1013.patch | 4 +- patches/notrack/1013.patch | 511 ++++++++++++++++-- patches/slashcommands/1013.patch | 105 +--- patches/squareavatars/1013.patch | 4 +- patches/supplemental/1013.patch | 24 +- 56 files changed, 710 insertions(+), 247 deletions(-) rename {patches => old-patches}/customdefaultemoji/1006.patch (100%) rename {patches => old-patches}/customdefaultemoji/1007.patch (100%) rename {patches => old-patches}/customdefaultemoji/1011.patch (100%) rename {patches => old-patches}/customdefaultemoji/1012.patch (100%) rename patches/customdefaultemoji/991.patch => old-patches/customdefaultemoji/1013.patch-failed (100%) rename {patches => old-patches}/customdefaultemoji/884.patch (100%) rename {patches => old-patches}/customdefaultemoji/888.patch (100%) rename {patches => old-patches}/customdefaultemoji/896.patch (100%) rename {patches => old-patches}/customdefaultemoji/897.patch (100%) rename {patches => old-patches}/customdefaultemoji/898.patch (100%) rename {patches => old-patches}/customdefaultemoji/899.patch (100%) rename {patches => old-patches}/customdefaultemoji/900.patch (100%) rename {patches => old-patches}/customdefaultemoji/901.patch (100%) rename {patches => old-patches}/customdefaultemoji/902.patch (100%) rename {patches => old-patches}/customdefaultemoji/903.patch (100%) rename {patches => old-patches}/customdefaultemoji/904.patch (100%) rename {patches => old-patches}/customdefaultemoji/906.patch (100%) rename {patches => old-patches}/customdefaultemoji/909.patch (100%) rename {patches => old-patches}/customdefaultemoji/910.patch (100%) rename {patches => old-patches}/customdefaultemoji/938.patch (100%) rename {patches => old-patches}/customdefaultemoji/939.patch (100%) rename {patches => old-patches}/customdefaultemoji/940.patch (100%) rename {patches => old-patches}/customdefaultemoji/942.patch (100%) rename {patches => old-patches}/customdefaultemoji/943.patch (100%) rename {patches => old-patches}/customdefaultemoji/945.patch (100%) rename {patches => old-patches}/customdefaultemoji/946.patch (100%) rename {patches => old-patches}/customdefaultemoji/947.patch (100%) rename {patches => old-patches}/customdefaultemoji/948.patch (100%) rename {patches => old-patches}/customdefaultemoji/963.patch (100%) rename {patches => old-patches}/customdefaultemoji/964.patch (100%) rename {patches => old-patches}/customdefaultemoji/965.patch (100%) rename {patches => old-patches}/customdefaultemoji/966.patch (100%) rename {patches => old-patches}/customdefaultemoji/967.patch (100%) rename {patches => old-patches}/customdefaultemoji/968.patch (100%) rename {patches => old-patches}/customdefaultemoji/970.patch (100%) rename {patches => old-patches}/customdefaultemoji/980.patch (100%) rename {patches => old-patches}/customdefaultemoji/984.patch (100%) rename {patches => old-patches}/customdefaultemoji/986.patch (100%) rename patches/customdefaultemoji/992.patch => old-patches/customdefaultemoji/991.patch (100%) create mode 100644 old-patches/customdefaultemoji/991.patch-failed rename patches/customdefaultemoji/993.patch => old-patches/customdefaultemoji/992.patch (100%) rename patches/customdefaultemoji/994.patch => old-patches/customdefaultemoji/993.patch (100%) rename patches/customdefaultemoji/996.patch => old-patches/customdefaultemoji/994.patch (100%) create mode 100644 old-patches/customdefaultemoji/996.patch rename {patches => old-patches}/customdefaultemoji/README.md (100%) delete mode 100644 patches/customdefaultemoji/1013.patch diff --git a/old-patches/README.md b/old-patches/README.md index 9ac89c5..bd29779 100644 --- a/old-patches/README.md +++ b/old-patches/README.md @@ -8,3 +8,4 @@ Here's why these patches are no longer maintained in this form: - pureevil: It's now upstream (yay.) - compact: It's just a pain to maintain. - smalltime: It's just a pain to maintain. +- customdefaultemoji: There doesn't seem to be default emojis anymore? diff --git a/patches/customdefaultemoji/1006.patch b/old-patches/customdefaultemoji/1006.patch similarity index 100% rename from patches/customdefaultemoji/1006.patch rename to old-patches/customdefaultemoji/1006.patch diff --git a/patches/customdefaultemoji/1007.patch b/old-patches/customdefaultemoji/1007.patch similarity index 100% rename from patches/customdefaultemoji/1007.patch rename to old-patches/customdefaultemoji/1007.patch diff --git a/patches/customdefaultemoji/1011.patch b/old-patches/customdefaultemoji/1011.patch similarity index 100% rename from patches/customdefaultemoji/1011.patch rename to old-patches/customdefaultemoji/1011.patch diff --git a/patches/customdefaultemoji/1012.patch b/old-patches/customdefaultemoji/1012.patch similarity index 100% rename from patches/customdefaultemoji/1012.patch rename to old-patches/customdefaultemoji/1012.patch diff --git a/patches/customdefaultemoji/991.patch b/old-patches/customdefaultemoji/1013.patch-failed similarity index 100% rename from patches/customdefaultemoji/991.patch rename to old-patches/customdefaultemoji/1013.patch-failed diff --git a/patches/customdefaultemoji/884.patch b/old-patches/customdefaultemoji/884.patch similarity index 100% rename from patches/customdefaultemoji/884.patch rename to old-patches/customdefaultemoji/884.patch diff --git a/patches/customdefaultemoji/888.patch b/old-patches/customdefaultemoji/888.patch similarity index 100% rename from patches/customdefaultemoji/888.patch rename to old-patches/customdefaultemoji/888.patch diff --git a/patches/customdefaultemoji/896.patch b/old-patches/customdefaultemoji/896.patch similarity index 100% rename from patches/customdefaultemoji/896.patch rename to old-patches/customdefaultemoji/896.patch diff --git a/patches/customdefaultemoji/897.patch b/old-patches/customdefaultemoji/897.patch similarity index 100% rename from patches/customdefaultemoji/897.patch rename to old-patches/customdefaultemoji/897.patch diff --git a/patches/customdefaultemoji/898.patch b/old-patches/customdefaultemoji/898.patch similarity index 100% rename from patches/customdefaultemoji/898.patch rename to old-patches/customdefaultemoji/898.patch diff --git a/patches/customdefaultemoji/899.patch b/old-patches/customdefaultemoji/899.patch similarity index 100% rename from patches/customdefaultemoji/899.patch rename to old-patches/customdefaultemoji/899.patch diff --git a/patches/customdefaultemoji/900.patch b/old-patches/customdefaultemoji/900.patch similarity index 100% rename from patches/customdefaultemoji/900.patch rename to old-patches/customdefaultemoji/900.patch diff --git a/patches/customdefaultemoji/901.patch b/old-patches/customdefaultemoji/901.patch similarity index 100% rename from patches/customdefaultemoji/901.patch rename to old-patches/customdefaultemoji/901.patch diff --git a/patches/customdefaultemoji/902.patch b/old-patches/customdefaultemoji/902.patch similarity index 100% rename from patches/customdefaultemoji/902.patch rename to old-patches/customdefaultemoji/902.patch diff --git a/patches/customdefaultemoji/903.patch b/old-patches/customdefaultemoji/903.patch similarity index 100% rename from patches/customdefaultemoji/903.patch rename to old-patches/customdefaultemoji/903.patch diff --git a/patches/customdefaultemoji/904.patch b/old-patches/customdefaultemoji/904.patch similarity index 100% rename from patches/customdefaultemoji/904.patch rename to old-patches/customdefaultemoji/904.patch diff --git a/patches/customdefaultemoji/906.patch b/old-patches/customdefaultemoji/906.patch similarity index 100% rename from patches/customdefaultemoji/906.patch rename to old-patches/customdefaultemoji/906.patch diff --git a/patches/customdefaultemoji/909.patch b/old-patches/customdefaultemoji/909.patch similarity index 100% rename from patches/customdefaultemoji/909.patch rename to old-patches/customdefaultemoji/909.patch diff --git a/patches/customdefaultemoji/910.patch b/old-patches/customdefaultemoji/910.patch similarity index 100% rename from patches/customdefaultemoji/910.patch rename to old-patches/customdefaultemoji/910.patch diff --git a/patches/customdefaultemoji/938.patch b/old-patches/customdefaultemoji/938.patch similarity index 100% rename from patches/customdefaultemoji/938.patch rename to old-patches/customdefaultemoji/938.patch diff --git a/patches/customdefaultemoji/939.patch b/old-patches/customdefaultemoji/939.patch similarity index 100% rename from patches/customdefaultemoji/939.patch rename to old-patches/customdefaultemoji/939.patch diff --git a/patches/customdefaultemoji/940.patch b/old-patches/customdefaultemoji/940.patch similarity index 100% rename from patches/customdefaultemoji/940.patch rename to old-patches/customdefaultemoji/940.patch diff --git a/patches/customdefaultemoji/942.patch b/old-patches/customdefaultemoji/942.patch similarity index 100% rename from patches/customdefaultemoji/942.patch rename to old-patches/customdefaultemoji/942.patch diff --git a/patches/customdefaultemoji/943.patch b/old-patches/customdefaultemoji/943.patch similarity index 100% rename from patches/customdefaultemoji/943.patch rename to old-patches/customdefaultemoji/943.patch diff --git a/patches/customdefaultemoji/945.patch b/old-patches/customdefaultemoji/945.patch similarity index 100% rename from patches/customdefaultemoji/945.patch rename to old-patches/customdefaultemoji/945.patch diff --git a/patches/customdefaultemoji/946.patch b/old-patches/customdefaultemoji/946.patch similarity index 100% rename from patches/customdefaultemoji/946.patch rename to old-patches/customdefaultemoji/946.patch diff --git a/patches/customdefaultemoji/947.patch b/old-patches/customdefaultemoji/947.patch similarity index 100% rename from patches/customdefaultemoji/947.patch rename to old-patches/customdefaultemoji/947.patch diff --git a/patches/customdefaultemoji/948.patch b/old-patches/customdefaultemoji/948.patch similarity index 100% rename from patches/customdefaultemoji/948.patch rename to old-patches/customdefaultemoji/948.patch diff --git a/patches/customdefaultemoji/963.patch b/old-patches/customdefaultemoji/963.patch similarity index 100% rename from patches/customdefaultemoji/963.patch rename to old-patches/customdefaultemoji/963.patch diff --git a/patches/customdefaultemoji/964.patch b/old-patches/customdefaultemoji/964.patch similarity index 100% rename from patches/customdefaultemoji/964.patch rename to old-patches/customdefaultemoji/964.patch diff --git a/patches/customdefaultemoji/965.patch b/old-patches/customdefaultemoji/965.patch similarity index 100% rename from patches/customdefaultemoji/965.patch rename to old-patches/customdefaultemoji/965.patch diff --git a/patches/customdefaultemoji/966.patch b/old-patches/customdefaultemoji/966.patch similarity index 100% rename from patches/customdefaultemoji/966.patch rename to old-patches/customdefaultemoji/966.patch diff --git a/patches/customdefaultemoji/967.patch b/old-patches/customdefaultemoji/967.patch similarity index 100% rename from patches/customdefaultemoji/967.patch rename to old-patches/customdefaultemoji/967.patch diff --git a/patches/customdefaultemoji/968.patch b/old-patches/customdefaultemoji/968.patch similarity index 100% rename from patches/customdefaultemoji/968.patch rename to old-patches/customdefaultemoji/968.patch diff --git a/patches/customdefaultemoji/970.patch b/old-patches/customdefaultemoji/970.patch similarity index 100% rename from patches/customdefaultemoji/970.patch rename to old-patches/customdefaultemoji/970.patch diff --git a/patches/customdefaultemoji/980.patch b/old-patches/customdefaultemoji/980.patch similarity index 100% rename from patches/customdefaultemoji/980.patch rename to old-patches/customdefaultemoji/980.patch diff --git a/patches/customdefaultemoji/984.patch b/old-patches/customdefaultemoji/984.patch similarity index 100% rename from patches/customdefaultemoji/984.patch rename to old-patches/customdefaultemoji/984.patch diff --git a/patches/customdefaultemoji/986.patch b/old-patches/customdefaultemoji/986.patch similarity index 100% rename from patches/customdefaultemoji/986.patch rename to old-patches/customdefaultemoji/986.patch diff --git a/patches/customdefaultemoji/992.patch b/old-patches/customdefaultemoji/991.patch similarity index 100% rename from patches/customdefaultemoji/992.patch rename to old-patches/customdefaultemoji/991.patch diff --git a/old-patches/customdefaultemoji/991.patch-failed b/old-patches/customdefaultemoji/991.patch-failed new file mode 100644 index 0000000..eed3df5 --- /dev/null +++ b/old-patches/customdefaultemoji/991.patch-failed @@ -0,0 +1,80 @@ +diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali +*** from/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:32:21.079850865 +0300 +--- to/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:33:18.846833515 +0300 +*************** +*** 103,139 **** + + 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 + +--- 103,139 ---- + + 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/993.patch b/old-patches/customdefaultemoji/992.patch similarity index 100% rename from patches/customdefaultemoji/993.patch rename to old-patches/customdefaultemoji/992.patch diff --git a/patches/customdefaultemoji/994.patch b/old-patches/customdefaultemoji/993.patch similarity index 100% rename from patches/customdefaultemoji/994.patch rename to old-patches/customdefaultemoji/993.patch diff --git a/patches/customdefaultemoji/996.patch b/old-patches/customdefaultemoji/994.patch similarity index 100% rename from patches/customdefaultemoji/996.patch rename to old-patches/customdefaultemoji/994.patch diff --git a/old-patches/customdefaultemoji/996.patch b/old-patches/customdefaultemoji/996.patch new file mode 100644 index 0000000..242a1ad --- /dev/null +++ b/old-patches/customdefaultemoji/996.patch @@ -0,0 +1,43 @@ +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/old-patches/customdefaultemoji/README.md similarity index 100% rename from patches/customdefaultemoji/README.md rename to old-patches/customdefaultemoji/README.md diff --git a/patches/branding/1013.patch b/patches/branding/1013.patch index 7b75454..6b10cd6 100644 --- a/patches/branding/1013.patch +++ b/patches/branding/1013.patch @@ -1,6 +1,6 @@ diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidManifest.xml -*** com.discord-1013-base/AndroidManifest.xml 2019-12-21 20:51:33.103146237 +0300 ---- com.discord-1013/AndroidManifest.xml 2019-12-21 20:52:20.913415017 +0300 +*** com.discord-1013-base/AndroidManifest.xml 2019-12-21 21:31:39.126821471 +0300 +--- com.discord-1013/AndroidManifest.xml 2019-12-21 21:38:27.075863549 +0300 *************** *** 1,4 **** ! @@ -146,9 +146,11 @@ diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidMani ! +Only in com.discord-1013: AndroidManifest.xml.orig +Only in com.discord-1013: AndroidManifest.xml.rej diff -crB com.discord-1013-base/apktool.yml com.discord-1013/apktool.yml -*** com.discord-1013-base/apktool.yml 2019-12-21 20:50:00.862627680 +0300 ---- com.discord-1013/apktool.yml 2019-12-21 20:52:09.236682706 +0300 +*** com.discord-1013-base/apktool.yml 2019-12-21 21:31:19.773375445 +0300 +--- com.discord-1013/apktool.yml 2019-12-21 21:37:33.032215527 +0300 *************** *** 184,188 **** tag: null @@ -164,8 +166,8 @@ diff -crB com.discord-1013-base/apktool.yml com.discord-1013/apktool.yml ! versionName: 10.1.3-cutthecord-CTCBUILD Only in com.discord-1013: apktool.yml.orig diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/values/strings.xml -*** com.discord-1013-base/res/values/strings.xml 2019-12-21 20:49:56.712604349 +0300 ---- com.discord-1013/res/values/strings.xml 2019-12-21 20:52:09.240016058 +0300 +*** com.discord-1013-base/res/values/strings.xml 2019-12-21 21:31:15.933353085 +0300 +--- com.discord-1013/res/values/strings.xml 2019-12-21 21:37:33.035548879 +0300 *************** *** 1347,1353 **** Disconnecting your account might remove you from servers you joined via this account. @@ -217,9 +219,10 @@ diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/valu Remove all embeds Suppressed "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +Only in com.discord-1013/res/values: strings.xml.orig diff -crB com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 20:49:58.519281172 +0300 ---- com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 20:52:09.240016058 +0300 +*** com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 21:31:17.590029398 +0300 +--- com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-12-21 21:37:33.035548879 +0300 *************** *** 76,82 **** .line 3 diff --git a/patches/customdefaultemoji/1013.patch b/patches/customdefaultemoji/1013.patch deleted file mode 100644 index 0c5bca6..0000000 --- a/patches/customdefaultemoji/1013.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali -*** from/smali/com/discord/stores/StoreEmoji.smali 2019-12-21 11:43:12.363840487 +0200 ---- to/smali/com/discord/stores/StoreEmoji.smali 2019-12-21 11:59:40.866248132 +0200 -*************** -*** 97,117 **** - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "bread" - -! const-string v3, "fork_and_knife" - -! const-string v4, "yum" - -! const-string v5, "weary" - -! const-string v6, "tired_face" - -! const-string v7, "poop" - -! const-string v8, "thumbsup" - -! const-string v9, "100" - - .line 1 - filled-new-array/range {v2 .. v9}, [Ljava/lang/String; ---- 97,117 ---- - - sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion; - -! const-string v2, "star" - -! const-string v3, "bread" - -! const-string v4, "fork_and_knife" - -! const-string v5, "yum" - -! const-string v6, "weary" - -! const-string v7, "tired_face" - -! const-string v8, "poop" - -! const-string v9, "thumbsup" - - .line 1 - filled-new-array/range {v2 .. v9}, [Ljava/lang/String; diff --git a/patches/customtheme/1013.patch b/patches/customtheme/1013.patch index 0375e2c..434e3ec 100644 --- a/patches/customtheme/1013.patch +++ b/patches/customtheme/1013.patch @@ -1,6 +1,6 @@ -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-21 11:43:09.593796226 +0200 ---- to/res/drawable/drawable_overlay_channels_active.xml 2019-12-21 11:49:28.100592813 +0200 +diff -crB com.discord-1013-base/res/drawable/drawable_overlay_channels_active.xml com.discord-1013/res/drawable/drawable_overlay_channels_active.xml +*** com.discord-1013-base/res/drawable/drawable_overlay_channels_active.xml 2019-12-21 21:31:15.310016122 +0300 +--- com.discord-1013/res/drawable/drawable_overlay_channels_active.xml 2019-12-21 21:42:02.377117220 +0300 *************** *** 3,9 **** xmlns:android="http://schemas.android.com/apk/res/android"> @@ -18,9 +18,9 @@ diff -crB from/res/drawable/drawable_overlay_channels_active.xml to/res/drawable -diff -crB from/res/values/colors.xml to/res/values/colors.xml -*** from/res/values/colors.xml 2019-12-21 11:43:10.273807283 +0200 ---- to/res/values/colors.xml 2019-12-21 11:49:28.100592813 +0200 +diff -crB com.discord-1013-base/res/values/colors.xml com.discord-1013/res/values/colors.xml +*** com.discord-1013-base/res/values/colors.xml 2019-12-21 21:31:15.996686787 +0300 +--- com.discord-1013/res/values/colors.xml 2019-12-21 21:42:02.380450573 +0300 *************** *** 52,58 **** #37000000 @@ -172,9 +172,10 @@ diff -crB from/res/values/colors.xml to/res/values/colors.xml #e6ffffff @android:color/transparent #ff593695 -diff -crB from/res/values/styles.xml to/res/values/styles.xml -*** from/res/values/styles.xml 2019-12-21 11:43:10.427143086 +0200 ---- to/res/values/styles.xml 2019-12-21 11:49:28.100592813 +0200 +Only in com.discord-1013/res/values: colors.xml.orig +diff -crB com.discord-1013-base/res/values/styles.xml com.discord-1013/res/values/styles.xml +*** com.discord-1013-base/res/values/styles.xml 2019-12-21 21:31:15.670018218 +0300 +--- com.discord-1013/res/values/styles.xml 2019-12-21 21:42:02.380450573 +0300 *************** *** 380,386 **** @color/white_alpha_40 @@ -253,9 +254,10 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml