diff --color -crB com.discord-base/res/drawable/drawable_circle_black.xml com.discord/res/drawable/drawable_circle_black.xml *** com.discord-base/res/drawable/drawable_circle_black.xml 2021-01-10 03:45:19.417712451 +0300 --- com.discord/res/drawable/drawable_circle_black.xml 2021-01-10 05:30:02.320253465 +0300 *************** *** 1,5 **** ! \ No newline at end of file --- 1,5 ---- ! \ No newline at end of file diff --color -crB com.discord-base/res/drawable/drawable_flex_input_bg.xml com.discord/res/drawable/drawable_flex_input_bg.xml *** com.discord-base/res/drawable/drawable_flex_input_bg.xml 2021-01-10 03:45:19.417712451 +0300 --- com.discord/res/drawable/drawable_flex_input_bg.xml 2021-01-10 05:30:02.320253465 +0300 *************** *** 1,6 **** ! \ No newline at end of file --- 1,6 ---- ! \ No newline at end of file diff --color -crB com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml com.discord/res/drawable/drawable_overlay_channels_active_dark.xml *** com.discord-base/res/drawable/drawable_overlay_channels_active_dark.xml 2021-01-10 03:45:20.024383551 +0300 --- com.discord/res/drawable/drawable_overlay_channels_active_dark.xml 2021-01-10 05:30:02.320253465 +0300 *************** *** 3,9 **** xmlns:android="http://schemas.android.com/apk/res/android"> ! --- 3,9 ---- xmlns:android="http://schemas.android.com/apk/res/android"> ! diff --color -crB com.discord-base/res/layout/widget_chat_input.xml com.discord/res/layout/widget_chat_input.xml *** com.discord-base/res/layout/widget_chat_input.xml 2021-01-10 03:45:20.031050267 +0300 --- com.discord/res/layout/widget_chat_input.xml 2021-01-10 05:30:02.323586818 +0300 *************** *** 7,13 **** ! --- 7,13 ---- ! *************** *** 17,20 **** ! \ No newline at end of file --- 17,20 ---- ! diff --color -crB com.discord-base/res/values/colors.xml com.discord/res/values/colors.xml *** com.discord-base/res/values/colors.xml 2021-01-10 03:45:21.897730576 +0300 --- com.discord/res/values/colors.xml 2021-01-10 05:30:22.537043794 +0300 *************** *** 107,116 **** #1f000000 #90000000 #de000000 ! #ff36393e ! #ff303337 #14000000 ! #ff121212 #ffcf6679 #ffffffff #ff000000 --- 107,116 ---- #1f000000 #90000000 #de000000 ! #ff000000 ! #ff000000 #14000000 ! #ff000000 #ffcf6679 #ffffffff #ff000000 *************** *** 122,128 **** #ff3700b3 #ff03dac6 #ff03dac6 ! #ff121212 #ffffffff #ffb00020 #ff000000 --- 122,128 ---- #ff3700b3 #ff03dac6 #ff03dac6 ! #ff000000 #ffffffff #ffb00020 #ff000000 *************** *** 171,177 **** #4d737f8d #ff949494 #0d4f545c ! #ff8a8e94 #6680cbc4 #66009688 #ff9c84ef --- 171,177 ---- #4d737f8d #ff949494 #0d4f545c ! #ff000000 #6680cbc4 #66009688 #ff9c84ef *************** *** 181,187 **** #ff45ddc0 #ff45ddc0 #ff021f25 ! #ff00b0f4 #fff2fbfe #ffe8f8fe #ffdaf4fd --- 181,187 ---- #ff45ddc0 #ff45ddc0 #ff021f25 ! #ff50f148 #fff2fbfe #ffe8f8fe #ffdaf4fd *************** *** 293,314 **** #ff72767d #4d72767d #9972767d ! #ff4f545c ! #334f545c ! #4d4f545c ! #514f545c ! #994f545c #ff40444b ! #ff36393f ! #9936393f ! #ff2f3136 ! #992f3136 ! #e62f3136 ! #ff292b2f ! #e6292b2f ! #ff202225 ! #80202225 ! #99202225 #ff18191c #8018191c #9918191c --- 293,314 ---- #ff72767d #4d72767d #9972767d ! #ff333333 ! #330f0f0f ! #4d0f0f0f ! #510f0f0f ! #990f0f0f #ff40444b ! #ff000000 ! #99000000 ! #ff000000 ! #99000000 ! #e6000000 ! #ff000000 ! #e6000000 ! #ff000000 ! #80000000 ! #990f0f0f #ff18191c #8018191c #9918191c *************** *** 333,342 **** #ff4f545c #ff484c54 #ff40444b ! #ff36393f ! #ff2f3136 #ff292b2f ! #ff202225 #ff1e1f22 #ff1b1d20 #ff18191c --- 333,342 ---- #ff4f545c #ff484c54 #ff40444b ! #ff000000 ! #ff000000 #ff292b2f ! #ff000000 #ff1e1f22 #ff1b1d20 #ff18191c *************** *** 380,388 **** #de000000 #4dffffff #39000000 ! #ff738bd7 ! #1a738bd7 ! #ff697ec4 #ffc9d2f0 #ff5161ff #4d5c6a9e --- 380,388 ---- #de000000 #4dffffff #39000000 ! #ff9c4249 ! #1a9c4249 ! #ff000000 #ffc9d2f0 #ff5161ff #4d5c6a9e *************** *** 517,523 **** #ffbdbdbd #ffbdbdbd #fff1f1f1 ! #e6616161 #e6ffffff @android:color/transparent #ff593695 --- 517,523 ---- #ffbdbdbd #ffbdbdbd #fff1f1f1 ! #e6000000 #e6ffffff @android:color/transparent #ff593695 Only in com.discord/res/values: colors.xml.orig Only in com.discord/res/values: colors.xml.rej diff --color -crB com.discord-base/res/values/styles.xml com.discord/res/values/styles.xml *** com.discord-base/res/values/styles.xml 2021-01-10 03:45:22.717736570 +0300 --- com.discord/res/values/styles.xml 2021-01-10 05:30:02.330253526 +0300 *************** *** 423,429 **** @color/white_alpha_40 @drawable/ic_backspace_white_24dp @color/primary_500 ! #ff34373c @color/grey_unread @color/primary_630 @color/primary_660 --- 423,429 ---- @color/white_alpha_40 @drawable/ic_backspace_white_24dp @color/primary_500 ! @color/primary_500 @color/grey_unread @color/primary_630 @color/primary_660 *************** *** 439,445 **** #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 --- 439,445 ---- #1afaa61a @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 *************** *** 677,686 **** #ffe5e5e5 @drawable/ic_img_selected_light_theme @color/purple_brand ! #33faa61a @drawable/drawable_bg_reaction_light @drawable/drawable_reaction_text_color_light ! @color/primary_300 @color/black_alpha_10 @color/primary_300 @drawable/img_empty_server_settings_emoji_light --- 677,686 ---- #ffe5e5e5 @drawable/ic_img_selected_light_theme @color/purple_brand ! @color/purple_brand_alpha_10 @drawable/drawable_bg_reaction_light @drawable/drawable_reaction_text_color_light ! @color/primary_500 @color/black_alpha_10 @color/primary_300 @drawable/img_empty_server_settings_emoji_light *************** *** 784,790 **** @color/brand_500 @color/primary_100 @color/primary_600 ! #ff2b2e31