diff --git a/README.md b/README.md index 4a4d9ae..178919c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 46.0 (1301), released on 2020-10-27. +**Latest supported Discord Android version:** 44.6 (1298), released on 2020-10-17. New patch development will be done for the latest supported version. diff --git a/patches/betterdmheader/1300.patch b/patches/betterdmheader/1300.patch deleted file mode 100644 index 0fb0079..0000000 --- a/patches/betterdmheader/1300.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml -*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300 ---- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300 -*************** -*** 1,11 **** - - -! - - - -! -! - -! -\ No newline at end of file ---- 1,11 ---- - - -! - - - -! -! - -! -diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali -*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300 ---- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300 -*************** -*** 119,125 **** - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 5 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; ---- 119,125 ---- - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 5 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; -*************** -*** 140,146 **** - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 7 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; ---- 140,146 ---- - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 7 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1301.patch b/patches/betterdmheader/1301.patch deleted file mode 100644 index 0fb0079..0000000 --- a/patches/betterdmheader/1301.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml -*** from/res/menu/menu_chat_toolbar.xml 2020-08-20 11:50:15.090000000 +0300 ---- to/res/menu/menu_chat_toolbar.xml 2020-08-20 11:55:29.120000000 +0300 -*************** -*** 1,11 **** - - -! - - - -! -! - -! -\ No newline at end of file ---- 1,11 ---- - - -! - - - -! -! - -! -diff -crB from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali -*** from/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:50:18.180000000 +0300 ---- to/smali/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-08-20 11:53:49.170000000 +0300 -*************** -*** 119,125 **** - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 5 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; ---- 119,125 ---- - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 5 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; -*************** -*** 140,146 **** - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 7 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; ---- 140,146 ---- - - invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - -! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; - - .line 7 - invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/README.md b/patches/betterdmheader/README.md index 3e60fbb..9fa5433 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -27,6 +27,4 @@ This patch replaces the call button on DM headers with search button. The call b - 44-alpha4 - 44.5 - 44.6 -- 45.2 -- 46.0 diff --git a/patches/branding/1300.patch b/patches/branding/1300.patch deleted file mode 100644 index 4a59d72..0000000 --- a/patches/branding/1300.patch +++ /dev/null @@ -1,247 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-10-20 01:01:18.368159926 +0100 ---- to/AndroidManifest.xml 2020-10-20 01:02:50.434535407 +0100 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 21,33 **** - - - -! - - - - - -! - - - ---- 21,33 ---- - - - -! - - - - - -! - - - -*************** -*** 131,137 **** - - - -! - - - ---- 131,137 ---- - - - -! - - - -*************** -*** 155,161 **** - - - -! - - - ---- 155,161 ---- - - - -! - - - -*************** -*** 179,185 **** - - - -! - - - ---- 179,185 ---- - - - -! - - - -*************** -*** 197,210 **** - - - -! - - - - - - -! - - - ---- 197,210 ---- - - - -! - - - - - - -! - - - -*************** -*** 259,262 **** - - - -! -\ No newline at end of file ---- 259,262 ---- - - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-10-20 01:01:01.264093209 +0100 ---- to/apktool.yml 2020-10-20 01:02:50.434535407 +0100 -*************** -*** 81,85 **** - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1300' -! versionName: '45.2' ---- 81,85 ---- - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1300CTCBUILD' -! versionName: '45.2-cutthecord-CTCBUILD' -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-10-20 01:00:57.254077726 +0100 ---- to/res/values/strings.xml 2020-10-20 01:02:50.434535407 +0100 -*************** -*** 1573,1579 **** - Disconnect %1$s - Disconnect from Voice - User has been disconnected from voice. -! Discord - Join over 100 million people who use Discord to talk and hang out with communities and friends. - Your place to talk - discord.gg/ ---- 1573,1579 ---- - Disconnect %1$s - Disconnect from Voice - User has been disconnected from voice. -! CTCNAME - Join over 100 million people who use Discord to talk and hang out with communities and friends. - Your place to talk - discord.gg/ -*************** -*** 4431,4437 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Notifications - Notifications, muted ---- 4431,4437 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Notifications - Notifications, muted -*************** -*** 5939,5945 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds ---- 5939,5945 ---- - 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-10-20 01:00:59.116084909 +0100 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-10-20 01:02:50.434535407 +0100 -*************** -*** 78,84 **** - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discord.com/app" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 78,84 ---- - .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 -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali -*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-10-20 01:00:59.826087650 +0100 ---- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-10-20 01:03:58.128825524 +0100 -*************** -*** 63,69 **** - - invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://support.discord.com" - - const/4 v3, 0x0 - ---- 63,69 ---- - - invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://gitdab.com/distok/cutthecord" - - const/4 v3, 0x0 - diff --git a/patches/branding/1301.patch b/patches/branding/1301.patch deleted file mode 100644 index e802faa..0000000 --- a/patches/branding/1301.patch +++ /dev/null @@ -1,237 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2020-10-27 21:12:01.278962004 +0000 ---- to/AndroidManifest.xml 2020-10-27 21:39:21.623301921 +0000 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 21,33 **** - - - -! - - - - - -! - - - ---- 21,33 ---- - - - -! - - - - - -! - - - -*************** -*** 131,137 **** - - - -! - - - ---- 131,137 ---- - - - -! - - - -*************** -*** 155,161 **** - - - -! - - - ---- 155,161 ---- - - - -! - - - -*************** -*** 168,174 **** - - - -! - - - ---- 168,174 ---- - - - -! - - - -*************** -*** 202,210 **** - - - -! - -! - - - ---- 202,210 ---- - - - -! - -! - - - -*************** -*** 259,262 **** - - - -! -\ No newline at end of file ---- 259,262 ---- - - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2020-10-27 21:11:48.054873584 +0000 ---- to/apktool.yml 2020-10-27 21:37:34.082638680 +0000 -*************** -*** 81,85 **** - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1301' -! versionName: '46.0' ---- 81,85 ---- - tag: null - version: 2.4.2-f3136b-SNAPSHOT - versionInfo: -! versionCode: '1301CTCBUILD' -! versionName: '46.0-cutthecord-CTCBUILD' -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2020-10-27 21:11:42.468836177 +0000 ---- to/res/values/strings.xml 2020-10-27 21:37:34.084638693 +0000 -*************** -*** 1575,1581 **** - Disconnect %1$s - Disconnect from Voice - User has been disconnected from voice. -! Discord - Join over 100 million people who use Discord to talk and hang out with communities and friends. - Your place to talk - discord.gg/ ---- 1575,1581 ---- - Disconnect %1$s - Disconnect from Voice - User has been disconnected from voice. -! CTCNAME - Join over 100 million people who use Discord to talk and hang out with communities and friends. - Your place to talk - discord.gg/ -*************** -*** 4438,4444 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Notifications - Notifications, muted ---- 4438,4444 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Notifications - Notifications, muted -*************** -*** 5950,5956 **** - Subscriptions - Suggestions - %1$s, %2$s -! Support - Remove all embeds - This will remove all embeds on this message for everyone. - Remove All Embeds ---- 5950,5956 ---- - 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-10-27 21:11:44.894852427 +0000 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-10-27 21:37:34.084638693 +0000 -*************** -*** 78,84 **** - .line 3 - new-instance v0, Landroid/content/Intent; - -! const-string v1, "https://discord.com/app" - - .line 4 - invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; ---- 78,84 ---- - .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 -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali -*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-10-27 21:11:45.890859096 +0000 ---- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$19.smali 2020-10-27 21:37:34.084638693 +0000 -*************** -*** 63,69 **** - - invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://support.discord.com" - - const/4 v3, 0x0 - ---- 63,69 ---- - - invoke-static {v1, p1}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - -! const-string v2, "https://gitdab.com/distok/cutthecord" - - const/4 v3, 0x0 - diff --git a/patches/branding/README.md b/patches/branding/README.md index d86388a..6711b5e 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -208,6 +208,4 @@ You can use the following line to patch authorities: - 44-alpha4 - 44.5 - 44.6 -- 45.2 -- 46.0 diff --git a/patches/customtheme/1300.patch b/patches/customtheme/1300.patch deleted file mode 100644 index c218d5a..0000000 --- a/patches/customtheme/1300.patch +++ /dev/null @@ -1,344 +0,0 @@ -diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml -*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-10-20 01:00:55.714071797 +0100 ---- to/res/drawable/drawable_bg_corners_20dp.xml 2020-10-20 01:01:30.274206990 +0100 -*************** -*** 1,6 **** - - -! - - -\ No newline at end of file ---- 1,6 ---- - - -! - - -\ No newline at end of file -diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml -*** from/res/drawable/drawable_circle_black.xml 2020-10-20 01:00:56.034073029 +0100 ---- to/res/drawable/drawable_circle_black.xml 2020-10-20 01:01:30.274206990 +0100 -*************** -*** 1,5 **** - - -! - -\ No newline at end of file ---- 1,5 ---- - - -! - -\ No newline at end of file -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-10-20 01:00:56.002072904 +0100 ---- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-10-20 01:01:30.274206990 +0100 -*************** -*** 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-10-20 01:00:57.050076940 +0100 ---- to/res/values/colors.xml 2020-10-20 01:01:30.274206990 +0100 -*************** -*** 108,117 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 -! #ff121212 - #ffcf6679 - #ffffffff - #ff000000 ---- 108,117 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 -! #ff000000 - #ffcf6679 - #ffffffff - #ff000000 -*************** -*** 123,129 **** - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff121212 - #ffffffff - #ffb00020 - #ff000000 ---- 123,129 ---- - #ff3700b3 - #ff03dac6 - #ff03dac6 -! #ff000000 - #ffffffff - #ffb00020 - #ff000000 -*************** -*** 172,179 **** - #4d737f8d - #ff949494 - #0d4f545c -! #ff282b30 -! #ff8a8e94 - #6680cbc4 - #66009688 - #ff9c84ef ---- 172,179 ---- - #4d737f8d - #ff949494 - #0d4f545c -! #ff000000 -! #ff000000 - #6680cbc4 - #66009688 - #ff9c84ef -*************** -*** 183,189 **** - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff00b0f4 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd ---- 183,189 ---- - #ff45ddc0 - #ff45ddc0 - #ff021f25 -! #ff50f148 - #fff2fbfe - #ffe8f8fe - #ffdaf4fd -*************** -*** 294,313 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #334f545c -! #4d4f545c -! #514f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 -! #ff292b2f -! #ff202225 -! #99202225 - #ff18191c - #8018191c - #9918191c ---- 294,313 ---- - #ff72767d - #4d72767d - #9972767d -! #ff333333 -! #330f0f0f -! #4d0f0f0f -! #510f0f0f -! #990f0f0f - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 -! #ff000000 -! #ff000000 -! #990f0f0f - #ff18191c - #8018191c - #9918191c -*************** -*** 332,341 **** - #ff4f545c - #ff484c54 - #ff40444b -! #ff36393f -! #ff2f3136 - #ff292b2f -! #ff202225 - #ff1e1f22 - #ff1b1d20 - #ff18191c ---- 332,341 ---- - #ff4f545c - #ff484c54 - #ff40444b -! #ff000000 -! #ff000000 - #ff292b2f -! #ff000000 - #ff1e1f22 - #ff1b1d20 - #ff18191c -*************** -*** 379,387 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 379,387 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -*************** -*** 515,521 **** - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 -! #e6616161 - #e6ffffff - @android:color/transparent - #ff593695 ---- 515,521 ---- - #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-10-20 01:00:57.084077071 +0100 ---- to/res/values/styles.xml 2020-10-20 01:01:30.274206990 +0100 -*************** -*** 420,426 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/primary_630 - @color/grey_account ---- 420,426 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/primary_630 - @color/grey_account -*************** -*** 431,443 **** - @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 -! #1afaa61a - @drawable/drawable_bg_reaction_dark - @drawable/drawable_reaction_text_color_dark -! @color/primary_700 - @color/white_alpha_10 - @color/primary_600 - @drawable/img_empty_server_settings_emoji_dark ---- 431,443 ---- - @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 -! @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/img_empty_server_settings_emoji_dark -*************** -*** 783,789 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - - - - - - - -