From 74d87d178fcdc3bbd78298f5034312518c7771bd Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Sun, 1 Mar 2020 03:34:41 +0000 Subject: [PATCH 1/4] [housekeeping] Remove quotes from version name Due to a change in apktool (?), the versionName was being parsed incorrectly. --- README.md | 2 +- patches/branding/1041.patch | 4 ++-- patches/branding/1045.patch | 4 ++-- patches/necessary/1041.patch | 2 +- patches/necessary/1045.patch | 2 +- patches/noemojibutton/README.md | 4 ++-- patches/slashcommands/README.md | 4 ++-- patchport-state.json | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 9c6cd51..34c3ae5 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.4' (1045), released on 2020-02-29. +**Latest supported Discord Android version:** 11.4 (1045), released on 2020-03-01. New patch development will be done for the latest supported version. diff --git a/patches/branding/1041.patch b/patches/branding/1041.patch index 2665b85..111506c 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 0b2c3f1..ddc6f2e 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/necessary/1041.patch b/patches/necessary/1041.patch index ec33117..fca1bf3 100644 --- a/patches/necessary/1041.patch +++ b/patches/necessary/1041.patch @@ -8,7 +8,7 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml --- 1,4 ---- -! +! diff --git a/patches/necessary/1045.patch b/patches/necessary/1045.patch index 743e07d..b957084 100644 --- a/patches/necessary/1045.patch +++ b/patches/necessary/1045.patch @@ -8,7 +8,7 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml --- 1,4 ---- -! +! diff --git a/patches/noemojibutton/README.md b/patches/noemojibutton/README.md index 29a2b58..566b0e9 100644 --- a/patches/noemojibutton/README.md +++ b/patches/noemojibutton/README.md @@ -11,6 +11,6 @@ Self explanatory. #### Available and tested on: - 10.4.1 - 10.5.1 -- '11.0' -- '11.4' +- 11.0 +- 11.4 diff --git a/patches/slashcommands/README.md b/patches/slashcommands/README.md index 483464b..b4737b4 100644 --- a/patches/slashcommands/README.md +++ b/patches/slashcommands/README.md @@ -87,6 +87,6 @@ Commands like fw can be generated by `textreplacegen.py` or `textreplacegen-arra - 10.3.2 - 10.4.1 - 10.5.1 -- '11.0' -- '11.4' +- 11.0 +- 11.4 diff --git a/patchport-state.json b/patchport-state.json index 29b3704..6c92b02 100644 --- a/patchport-state.json +++ b/patchport-state.json @@ -1 +1 @@ -{"versionname": "'11.4'", "versioncode": "1045"} \ No newline at end of file +{"versionname": "11.4", "versioncode": "1045"} From 88f716ade90e3cfd765b83571d5a8f12f71ccba1 Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Sun, 1 Mar 2020 03:45:34 +0000 Subject: [PATCH 2/4] [housekeeping] Document missing supported versions I think this one is a consequence of a botched porting on my part in the past, sorry! Version 10.3.3, to be precise, as I forgot to commit the READMEs initially and then only commited the README on the top directory. --- patches/branding/README.md | 6 ++++++ patches/customtheme/README.md | 6 ++++++ patches/customversion/README.md | 6 ++++++ patches/disable-mobileindicator/README.md | 6 ++++++ patches/experiments/README.md | 6 ++++++ patches/litecord/README.md | 6 ++++++ patches/mutant/README.md | 6 ++++++ patches/noblocked/README.md | 6 ++++++ patches/nonearby/README.md | 6 ++++++ patches/noprofilestrip/README.md | 6 ++++++ patches/nospoiler/README.md | 6 ++++++ patches/notrack/README.md | 6 ++++++ patches/nozlib/README.md | 6 ++++++ patches/slashcommands/README.md | 1 + patches/squareavatars/README.md | 6 ++++++ patches/supplemental/README.md | 6 ++++++ patches/tokenlogin/README.md | 6 ++++++ 17 files changed, 97 insertions(+) diff --git a/patches/branding/README.md b/patches/branding/README.md index 8ee631e..476d0fb 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -93,4 +93,10 @@ 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 diff --git a/patches/customtheme/README.md b/patches/customtheme/README.md index f4dbb21..804d741 100644 --- a/patches/customtheme/README.md +++ b/patches/customtheme/README.md @@ -86,6 +86,12 @@ Self note: Top bar color is set by `setStatusBarColorResourceId` - 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 #### Value reference diff --git a/patches/customversion/README.md b/patches/customversion/README.md index f19fa29..5a0e1cf 100644 --- a/patches/customversion/README.md +++ b/patches/customversion/README.md @@ -80,4 +80,10 @@ This patch replaces version string and adds mention of cutthecord in the user se - 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 diff --git a/patches/disable-mobileindicator/README.md b/patches/disable-mobileindicator/README.md index 52f882c..bc9029d 100644 --- a/patches/disable-mobileindicator/README.md +++ b/patches/disable-mobileindicator/README.md @@ -82,4 +82,10 @@ However, this causes some issues. See the `Bugs / Side effects` list below. - 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 diff --git a/patches/experiments/README.md b/patches/experiments/README.md index 88241cb..b064b2d 100644 --- a/patches/experiments/README.md +++ b/patches/experiments/README.md @@ -84,4 +84,10 @@ This patch enables developer options (empty), mobile experiments (of which there - 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 diff --git a/patches/litecord/README.md b/patches/litecord/README.md index 41ac667..078b2f7 100644 --- a/patches/litecord/README.md +++ b/patches/litecord/README.md @@ -84,4 +84,10 @@ Please keep in mind that litecord is free (gratis and libre) software, provided - 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 diff --git a/patches/mutant/README.md b/patches/mutant/README.md index 0ae3242..39ca478 100644 --- a/patches/mutant/README.md +++ b/patches/mutant/README.md @@ -92,6 +92,12 @@ Various scripts are provided to help building of custom patches easier. - 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 #### Disclaimer diff --git a/patches/noblocked/README.md b/patches/noblocked/README.md index d5ca87b..734d138 100644 --- a/patches/noblocked/README.md +++ b/patches/noblocked/README.md @@ -75,4 +75,10 @@ This patch completely hides the "# Blocked Message(s)" thing. - 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 diff --git a/patches/nonearby/README.md b/patches/nonearby/README.md index 6901805..7b682a7 100644 --- a/patches/nonearby/README.md +++ b/patches/nonearby/README.md @@ -78,4 +78,10 @@ This patch nulls a bunch of nearby friends features for privacy. - 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 diff --git a/patches/noprofilestrip/README.md b/patches/noprofilestrip/README.md index 8b0e390..376f35d 100644 --- a/patches/noprofilestrip/README.md +++ b/patches/noprofilestrip/README.md @@ -72,4 +72,10 @@ This patch removes the "profile strip" from the left side menu, helping remove P - 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 diff --git a/patches/nospoiler/README.md b/patches/nospoiler/README.md index c528483..96e4aed 100644 --- a/patches/nospoiler/README.md +++ b/patches/nospoiler/README.md @@ -75,4 +75,10 @@ I personally won't be using it as I like to use them as CWs, but I do acknowledg - 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 diff --git a/patches/notrack/README.md b/patches/notrack/README.md index d4ab1ee..4fd714d 100644 --- a/patches/notrack/README.md +++ b/patches/notrack/README.md @@ -82,3 +82,9 @@ Fuck telemetry. - 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 diff --git a/patches/nozlib/README.md b/patches/nozlib/README.md index 14b6286..1f29e3c 100644 --- a/patches/nozlib/README.md +++ b/patches/nozlib/README.md @@ -75,4 +75,10 @@ This patch disables zlib-stream field on wss, making it easier to parse it. - 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 diff --git a/patches/slashcommands/README.md b/patches/slashcommands/README.md index b4737b4..bb0a5de 100644 --- a/patches/slashcommands/README.md +++ b/patches/slashcommands/README.md @@ -85,6 +85,7 @@ Commands like fw can be generated by `textreplacegen.py` or `textreplacegen-arra - 10.2.9 - 10.3.1 - 10.3.2 +- 10.3.3 - 10.4.1 - 10.5.1 - 11.0 diff --git a/patches/squareavatars/README.md b/patches/squareavatars/README.md index 76880ef..1d97393 100644 --- a/patches/squareavatars/README.md +++ b/patches/squareavatars/README.md @@ -77,4 +77,10 @@ A very small amount of rounding is applied to make it look a little better. - 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 diff --git a/patches/supplemental/README.md b/patches/supplemental/README.md index 064afc8..a6e88e6 100644 --- a/patches/supplemental/README.md +++ b/patches/supplemental/README.md @@ -28,4 +28,10 @@ This patch adds various helper functions that were previously part of slashcomma - 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 diff --git a/patches/tokenlogin/README.md b/patches/tokenlogin/README.md index a998941..ad2c9fe 100644 --- a/patches/tokenlogin/README.md +++ b/patches/tokenlogin/README.md @@ -54,3 +54,9 @@ This patch relies on supplemental, so please use that patch too. - 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 From a7a16f68a61d52e242822cf8ec7028f5a2feec09 Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Sun, 1 Mar 2020 03:48:59 +0000 Subject: [PATCH 3/4] Fix versionName regex in patchport --- patchport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patchport.py b/patchport.py index e4d8845..8b6d23c 100644 --- a/patchport.py +++ b/patchport.py @@ -92,7 +92,7 @@ re_versioncode_xml = re.compile(r'(platformBuildVersionCode="[0-9]+")') re_versionname_xml = re.compile(r'(platformBuildVersionName="[0-9a-z.]+")') re_versioncode_yml = re.compile(r'versionCode: \'([0-9]+)\'') -re_versionname_yml = re.compile(r'versionName: (.+)$') +re_versionname_yml = re.compile(r'versionName: \'(.+)\'$') re_releasedate = re.compile(r'released on ([0-9]{4}-[0-9]{2}-[0-9]{2})') re_crashlytics = re.compile(r'com\.crashlytics\.android\.build_id">([a-z0-9]' From 3e617ce37909d44cb8b6552f7eb8a9787fa60e20 Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Sun, 1 Mar 2020 03:49:22 +0000 Subject: [PATCH 4/4] 11.5 (1046) --- README.md | 2 +- patches/branding/1046.patch | 248 + patches/branding/README.md | 1 + patches/customtheme/1046.patch | 306 + patches/customtheme/README.md | 1 + patches/customversion/1046.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/1046.patch | 23 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/1046.patch | 140 + patches/experiments/README.md | 1 + patches/litecord/1046.patch | 256 + patches/litecord/README.md | 1 + patches/mutant/1046.patch | 52096 +++++++++++++++++++ patches/mutant/README.md | 1 + patches/necessary/1046.patch | 14 + patches/noblocked/1046.patch | 18 + patches/noblocked/README.md | 1 + patches/noemojibutton/1046.patch | 70 + patches/noemojibutton/README.md | 1 + patches/nonearby/1046.patch | 86 + patches/nonearby/README.md | 1 + patches/noprofilestrip/1046.patch | 49 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/1046.patch | 74 + patches/nospoiler/README.md | 1 + patches/notrack/1046-post.sh | 3 + patches/notrack/1046.patch | 1278 + patches/notrack/README.md | 1 + patches/nozlib/1046.patch | 34 + patches/nozlib/README.md | 1 + patches/slashcommands/1046.patch | 2857 + patches/slashcommands/README.md | 1 + patches/squareavatars/1046.patch | 21 + patches/squareavatars/README.md | 1 + patches/supplemental/1046.patch | 422 + patches/supplemental/README.md | 1 + patches/tokenlogin/1046.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 40 files changed, 58068 insertions(+), 2 deletions(-) create mode 100644 patches/branding/1046.patch create mode 100644 patches/customtheme/1046.patch create mode 100644 patches/customversion/1046.patch create mode 100644 patches/disable-mobileindicator/1046.patch create mode 100644 patches/experiments/1046.patch create mode 100644 patches/litecord/1046.patch create mode 100644 patches/mutant/1046.patch create mode 100644 patches/necessary/1046.patch create mode 100644 patches/noblocked/1046.patch create mode 100644 patches/noemojibutton/1046.patch create mode 100644 patches/nonearby/1046.patch create mode 100644 patches/noprofilestrip/1046.patch create mode 100644 patches/nospoiler/1046.patch create mode 100644 patches/notrack/1046-post.sh create mode 100644 patches/notrack/1046.patch create mode 100644 patches/nozlib/1046.patch create mode 100644 patches/slashcommands/1046.patch create mode 100644 patches/squareavatars/1046.patch create mode 100644 patches/supplemental/1046.patch create mode 100644 patches/tokenlogin/1046.patch diff --git a/README.md b/README.md index 34c3ae5..7e9f9e2 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.4 (1045), released on 2020-03-01. +**Latest supported Discord Android version:** 11.5 (1046), released on 2020-03-01. New patch development will be done for the latest supported version. diff --git a/patches/branding/1046.patch b/patches/branding/1046.patch new file mode 100644 index 0000000..d82bd13 --- /dev/null +++ b/patches/branding/1046.patch @@ -0,0 +1,248 @@ +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 476d0fb..f720885 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -99,4 +99,5 @@ You can use the following line to patch authorities: - 10.5.1 - 11.0 - 11.4 +- 11.5 diff --git a/patches/customtheme/1046.patch b/patches/customtheme/1046.patch new file mode 100644 index 0000000..e3b30eb --- /dev/null +++ b/patches/customtheme/1046.patch @@ -0,0 +1,306 @@ +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 + + + + + + +