311 lines
17 KiB
Diff
311 lines
17 KiB
Diff
|
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-03-19 16:21:18.953081752 +0000
|
||
|
|
--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-03-19 16:30:19.672819501 +0000
|
||
|
|
***************
|
||
|
|
*** 3,9 ****
|
||
|
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||
|
|
<item android:left="8.0dip" android:right="8.0dip">
|
||
|
|
<shape android:shape="rectangle">
|
||
|
|
! <solid android:color="#ff42464d" />
|
||
|
|
<corners android:radius="4.0dip" />
|
||
|
|
</shape>
|
||
|
|
</item>
|
||
|
|
--- 3,9 ----
|
||
|
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||
|
|
<item android:left="8.0dip" android:right="8.0dip">
|
||
|
|
<shape android:shape="rectangle">
|
||
|
|
! <solid android:color="@color/primary_500" />
|
||
|
|
<corners android:radius="4.0dip" />
|
||
|
|
</shape>
|
||
|
|
</item>
|
||
|
|
diff -crB from/res/values/colors.xml to/res/values/colors.xml
|
||
|
|
*** from/res/values/colors.xml 2020-03-19 16:21:21.042875277 +0000
|
||
|
|
--- to/res/values/colors.xml 2020-03-19 16:32:17.709924802 +0000
|
||
|
|
***************
|
||
|
|
*** 103,112 ****
|
||
|
|
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||
|
|
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||
|
|
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||
|
|
! <color name="dark_grey_2">#ff36393e</color>
|
||
|
|
! <color name="dark_grey_2_alpha_10">#ff303337</color>
|
||
|
|
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||
|
|
! <color name="design_dark_default_color_background">#ff121212</color>
|
||
|
|
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||
|
|
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||
|
|
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||
|
|
--- 103,112 ----
|
||
|
|
<color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
|
||
|
|
<color name="common_google_signin_btn_text_light_focused">#90000000</color>
|
||
|
|
<color name="common_google_signin_btn_text_light_pressed">#de000000</color>
|
||
|
|
! <color name="dark_grey_2">#ff000000</color>
|
||
|
|
! <color name="dark_grey_2_alpha_10">#ff000000</color>
|
||
|
|
<color name="design_bottom_navigation_shadow_color">#14000000</color>
|
||
|
|
! <color name="design_dark_default_color_background">#ff000000</color>
|
||
|
|
<color name="design_dark_default_color_error">#ffcf6679</color>
|
||
|
|
<color name="design_dark_default_color_on_background">#ffffffff</color>
|
||
|
|
<color name="design_dark_default_color_on_error">#ff000000</color>
|
||
|
|
***************
|
||
|
|
*** 118,124 ****
|
||
|
|
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||
|
|
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||
|
|
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||
|
|
! <color name="design_dark_default_color_surface">#ff121212</color>
|
||
|
|
<color name="design_default_color_background">#ffffffff</color>
|
||
|
|
<color name="design_default_color_error">#ffb00020</color>
|
||
|
|
<color name="design_default_color_on_background">#ff000000</color>
|
||
|
|
--- 118,124 ----
|
||
|
|
<color name="design_dark_default_color_primary_variant">#ff3700b3</color>
|
||
|
|
<color name="design_dark_default_color_secondary">#ff03dac6</color>
|
||
|
|
<color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
|
||
|
|
! <color name="design_dark_default_color_surface">#ff000000</color>
|
||
|
|
<color name="design_default_color_background">#ffffffff</color>
|
||
|
|
<color name="design_default_color_error">#ffb00020</color>
|
||
|
|
<color name="design_default_color_on_background">#ff000000</color>
|
||
|
|
***************
|
||
|
|
*** 161,168 ****
|
||
|
|
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||
|
|
<color name="grey_4">#ff949494</color>
|
||
|
|
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||
|
|
! <color name="grey_account">#ff282b30</color>
|
||
|
|
! <color name="grey_unread">#ff8a8e94</color>
|
||
|
|
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||
|
|
<color name="highlighted_text_material_light">#66009688</color>
|
||
|
|
<color name="hypesquad_house_1">#ff9c84ef</color>
|
||
|
|
--- 161,168 ----
|
||
|
|
<color name="grey_3_alpha_30">#4d737f8d</color>
|
||
|
|
<color name="grey_4">#ff949494</color>
|
||
|
|
<color name="grey_6_alpha_05">#0d4f545c</color>
|
||
|
|
! <color name="grey_account">#ff000000</color>
|
||
|
|
! <color name="grey_unread">#ff000000</color>
|
||
|
|
<color name="highlighted_text_material_dark">#6680cbc4</color>
|
||
|
|
<color name="highlighted_text_material_light">#66009688</color>
|
||
|
|
<color name="hypesquad_house_1">#ff9c84ef</color>
|
||
|
|
***************
|
||
|
|
*** 172,178 ****
|
||
|
|
<color name="hypesquad_house_3">#ff45ddc0</color>
|
||
|
|
<color name="hypesquad_house_3_500">#ff45ddc0</color>
|
||
|
|
<color name="league_of_legends">#ff021f25</color>
|
||
|
|
! <color name="link">#ff00b0f4</color>
|
||
|
|
<color name="link_100">#fff2fbfe</color>
|
||
|
|
<color name="link_130">#ffe8f8fe</color>
|
||
|
|
<color name="link_160">#ffdaf4fd</color>
|
||
|
|
--- 172,178 ----
|
||
|
|
<color name="hypesquad_house_3">#ff45ddc0</color>
|
||
|
|
<color name="hypesquad_house_3_500">#ff45ddc0</color>
|
||
|
|
<color name="league_of_legends">#ff021f25</color>
|
||
|
|
! <color name="link">#ff50f148</color>
|
||
|
|
<color name="link_100">#fff2fbfe</color>
|
||
|
|
<color name="link_130">#ffe8f8fe</color>
|
||
|
|
<color name="link_160">#ffdaf4fd</color>
|
||
|
|
***************
|
||
|
|
*** 261,280 ****
|
||
|
|
<color name="primary_400">#ff72767d</color>
|
||
|
|
<color name="primary_400_alpha_30">#4d72767d</color>
|
||
|
|
<color name="primary_400_alpha_60">#9972767d</color>
|
||
|
|
! <color name="primary_500">#ff4f545c</color>
|
||
|
|
! <color name="primary_500_alpha_20">#334f545c</color>
|
||
|
|
! <color name="primary_500_alpha_30">#4d4f545c</color>
|
||
|
|
! <color name="primary_500_alpha_32">#514f545c</color>
|
||
|
|
! <color name="primary_500_alpha_60">#994f545c</color>
|
||
|
|
<color name="primary_560">#ff40444b</color>
|
||
|
|
! <color name="primary_600">#ff36393f</color>
|
||
|
|
! <color name="primary_600_alpha_60">#9936393f</color>
|
||
|
|
! <color name="primary_630">#ff2f3136</color>
|
||
|
|
! <color name="primary_630_alpha_60">#992f3136</color>
|
||
|
|
! <color name="primary_630_alpha_90">#e62f3136</color>
|
||
|
|
<color name="primary_660">#ff292b2f</color>
|
||
|
|
! <color name="primary_700">#ff202225</color>
|
||
|
|
! <color name="primary_700_alpha_60">#99202225</color>
|
||
|
|
<color name="primary_800">#ff18191c</color>
|
||
|
|
<color name="primary_800_alpha_60">#9918191c</color>
|
||
|
|
<color name="primary_800_alpha_90">#e618191c</color>
|
||
|
|
--- 261,280 ----
|
||
|
|
<color name="primary_400">#ff72767d</color>
|
||
|
|
<color name="primary_400_alpha_30">#4d72767d</color>
|
||
|
|
<color name="primary_400_alpha_60">#9972767d</color>
|
||
|
|
! <color name="primary_500">#ff333333</color>
|
||
|
|
! <color name="primary_500_alpha_20">#330f0f0f</color>
|
||
|
|
! <color name="primary_500_alpha_30">#4d0f0f0f</color>
|
||
|
|
! <color name="primary_500_alpha_32">#510f0f0f</color>
|
||
|
|
! <color name="primary_500_alpha_60">#990f0f0f</color>
|
||
|
|
<color name="primary_560">#ff40444b</color>
|
||
|
|
! <color name="primary_600">#ff000000</color>
|
||
|
|
! <color name="primary_600_alpha_60">#99000000</color>
|
||
|
|
! <color name="primary_630">#ff000000</color>
|
||
|
|
! <color name="primary_630_alpha_60">#99000000</color>
|
||
|
|
! <color name="primary_630_alpha_90">#e6000000</color>
|
||
|
|
<color name="primary_660">#ff292b2f</color>
|
||
|
|
! <color name="primary_700">#ff000000</color>
|
||
|
|
! <color name="primary_700_alpha_60">#990f0f0f</color>
|
||
|
|
<color name="primary_800">#ff18191c</color>
|
||
|
|
<color name="primary_800_alpha_60">#9918191c</color>
|
||
|
|
<color name="primary_800_alpha_90">#e618191c</color>
|
||
|
|
***************
|
||
|
|
*** 297,306 ****
|
||
|
|
<color name="primary_dark_500">#ff4f545c</color>
|
||
|
|
<color name="primary_dark_530">#ff484c54</color>
|
||
|
|
<color name="primary_dark_560">#ff40444b</color>
|
||
|
|
! <color name="primary_dark_600">#ff36393f</color>
|
||
|
|
! <color name="primary_dark_630">#ff2f3136</color>
|
||
|
|
<color name="primary_dark_660">#ff292b2f</color>
|
||
|
|
! <color name="primary_dark_700">#ff202225</color>
|
||
|
|
<color name="primary_dark_730">#ff1e1f22</color>
|
||
|
|
<color name="primary_dark_760">#ff1b1d20</color>
|
||
|
|
<color name="primary_dark_800">#ff18191c</color>
|
||
|
|
--- 297,306 ----
|
||
|
|
<color name="primary_dark_500">#ff4f545c</color>
|
||
|
|
<color name="primary_dark_530">#ff484c54</color>
|
||
|
|
<color name="primary_dark_560">#ff40444b</color>
|
||
|
|
! <color name="primary_dark_600">#ff000000</color>
|
||
|
|
! <color name="primary_dark_630">#ff000000</color>
|
||
|
|
<color name="primary_dark_660">#ff292b2f</color>
|
||
|
|
! <color name="primary_dark_700">#ff000000</color>
|
||
|
|
<color name="primary_dark_730">#ff1e1f22</color>
|
||
|
|
<color name="primary_dark_760">#ff1b1d20</color>
|
||
|
|
<color name="primary_dark_800">#ff18191c</color>
|
||
|
|
***************
|
||
|
|
*** 345,353 ****
|
||
|
|
<color name="primary_text_default_material_light">#de000000</color>
|
||
|
|
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||
|
|
<color name="primary_text_disabled_material_light">#39000000</color>
|
||
|
|
! <color name="purple_brand">#ff738bd7</color>
|
||
|
|
! <color name="purple_brand_alpha_10">#1a738bd7</color>
|
||
|
|
! <color name="purple_brand_dark">#ff697ec4</color>
|
||
|
|
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||
|
|
<color name="purple_brand_notification">#ff5161ff</color>
|
||
|
|
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||
|
|
--- 345,353 ----
|
||
|
|
<color name="primary_text_default_material_light">#de000000</color>
|
||
|
|
<color name="primary_text_disabled_material_dark">#4dffffff</color>
|
||
|
|
<color name="primary_text_disabled_material_light">#39000000</color>
|
||
|
|
! <color name="purple_brand">#ff9c4249</color>
|
||
|
|
! <color name="purple_brand_alpha_10">#1a9c4249</color>
|
||
|
|
! <color name="purple_brand_dark">#ff000000</color>
|
||
|
|
<color name="purple_brand_hint">#ffc9d2f0</color>
|
||
|
|
<color name="purple_brand_notification">#ff5161ff</color>
|
||
|
|
<color name="reaction_background_me_dark">#4d5c6a9e</color>
|
||
|
|
***************
|
||
|
|
*** 486,492 ****
|
||
|
|
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||
|
|
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||
|
|
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||
|
|
! <color name="tooltip_background_dark">#e6616161</color>
|
||
|
|
<color name="tooltip_background_light">#e6ffffff</color>
|
||
|
|
<color name="transparent">@android:color/transparent</color>
|
||
|
|
<color name="twitch">#ff593695</color>
|
||
|
|
--- 486,492 ----
|
||
|
|
<color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
|
||
|
|
<color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
|
||
|
|
<color name="switch_thumb_normal_material_light">#fff1f1f1</color>
|
||
|
|
! <color name="tooltip_background_dark">#e6000000</color>
|
||
|
|
<color name="tooltip_background_light">#e6ffffff</color>
|
||
|
|
<color name="transparent">@android:color/transparent</color>
|
||
|
|
<color name="twitch">#ff593695</color>
|
||
|
|
diff -crB from/res/values/styles.xml to/res/values/styles.xml
|
||
|
|
*** from/res/values/styles.xml 2020-03-19 16:21:21.210858721 +0000
|
||
|
|
--- to/res/values/styles.xml 2020-03-19 16:30:19.674819412 +0000
|
||
|
|
***************
|
||
|
|
*** 384,390 ****
|
||
|
|
<item name="tabTextColor">@color/white_alpha_40</item>
|
||
|
|
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||
|
|
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||
|
|
! <item name="theme_chat_blocked_bg">#ff34373c</item>
|
||
|
|
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||
|
|
<item name="theme_chat_code">@color/primary_630</item>
|
||
|
|
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||
|
|
--- 384,390 ----
|
||
|
|
<item name="tabTextColor">@color/white_alpha_40</item>
|
||
|
|
<item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
|
||
|
|
<item name="theme_chat_block_quote_divider">@color/primary_500</item>
|
||
|
|
! <item name="theme_chat_blocked_bg">@color/primary_500</item>
|
||
|
|
<item name="theme_chat_blocked_text">@color/grey_unread</item>
|
||
|
|
<item name="theme_chat_code">@color/primary_630</item>
|
||
|
|
<item name="theme_chat_codeblock_border">@color/grey_account</item>
|
||
|
|
***************
|
||
|
|
*** 396,410 ****
|
||
|
|
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||
|
|
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||
|
|
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||
|
|
! <item name="theme_chat_input_edit">#ff3e4145</item>
|
||
|
|
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||
|
|
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||
|
|
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||
|
|
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||
|
|
! <item name="theme_chat_mentioned_me">#1afaa61a</item>
|
||
|
|
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||
|
|
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||
|
|
! <item name="theme_chat_spoiler_bg">@color/primary_700</item>
|
||
|
|
<item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
|
||
|
|
<item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
|
||
|
|
<item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||
|
|
--- 396,410 ----
|
||
|
|
<item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
|
||
|
|
<item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
|
||
|
|
<item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
|
||
|
|
! <item name="theme_chat_input_edit">@color/primary_600</item>
|
||
|
|
<item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
|
||
|
|
<item name="theme_chat_input_text">@color/white_alpha_70</item>
|
||
|
|
<item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
|
||
|
|
<item name="theme_chat_loading_spinner_color">@color/white</item>
|
||
|
|
! <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
|
||
|
|
<item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
|
||
|
|
<item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
|
||
|
|
! <item name="theme_chat_spoiler_bg">@color/primary_500</item>
|
||
|
|
<item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
|
||
|
|
<item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
|
||
|
|
<item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
|
||
|
|
***************
|
||
|
|
*** 823,829 ****
|
||
|
|
<item name="colorControlActivated">@color/brand_500</item>
|
||
|
|
<item name="colorControlNormal">@color/primary_100</item>
|
||
|
|
<item name="colorPrimary">@color/primary_600</item>
|
||
|
|
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||
|
|
</style>
|
||
|
|
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||
|
|
<item name="colorAccent">@color/brand_600</item>
|
||
|
|
--- 823,829 ----
|
||
|
|
<item name="colorControlActivated">@color/brand_500</item>
|
||
|
|
<item name="colorControlNormal">@color/primary_100</item>
|
||
|
|
<item name="colorPrimary">@color/primary_600</item>
|
||
|
|
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||
|
|
</style>
|
||
|
|
<style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
|
||
|
|
<item name="colorAccent">@color/brand_600</item>
|
||
|
|
***************
|
||
|
|
*** 853,859 ****
|
||
|
|
<item name="colorControlActivated">@color/brand_500</item>
|
||
|
|
<item name="colorControlNormal">@color/primary_100</item>
|
||
|
|
<item name="colorPrimary">@color/primary_600</item>
|
||
|
|
! <item name="colorPrimaryDark">#ff2b2e31</item>
|
||
|
|
</style>
|
||
|
|
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||
|
|
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||
|
|
--- 853,859 ----
|
||
|
|
<item name="colorControlActivated">@color/brand_500</item>
|
||
|
|
<item name="colorControlNormal">@color/primary_100</item>
|
||
|
|
<item name="colorPrimary">@color/primary_600</item>
|
||
|
|
! <item name="colorPrimaryDark">@color/primary_630</item>
|
||
|
|
</style>
|
||
|
|
<style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
|
||
|
|
<item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
|
||
|
|
diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/app/AppActivity$d.smali
|
||
|
|
*** from/smali/com/discord/app/AppActivity$d.smali 2020-03-19 16:21:22.710711015 +0000
|
||
|
|
--- to/smali/com/discord/app/AppActivity$d.smali 2020-03-19 16:32:44.598902924 +0000
|
||
|
|
***************
|
||
|
|
*** 115,121 ****
|
||
|
|
.line 7
|
||
|
|
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||
|
|
|
||
|
|
! const v1, 0x7f060242
|
||
|
|
|
||
|
|
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||
|
|
|
||
|
|
--- 115,121 ----
|
||
|
|
.line 7
|
||
|
|
iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity;
|
||
|
|
|
||
|
|
! const v1, 0x7f060022
|
||
|
|
|
||
|
|
invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
|
||
|
|
|