diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index f95343727d..8310faf235 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-874.apk +apkFileName: com.discord-875.apk compressionType: false doNotCompress: - arsc @@ -469,5 +469,5 @@ usesFramework: tag: null version: 2.4.1-cc194d-SNAPSHOT versionInfo: - versionCode: '874' - versionName: 8.7.4 + versionCode: '875' + versionName: 8.7.5 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 8370d0af02..682a72bcb3 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Fri Apr 12 22:03:36 UTC 2019 -version_name=8.7.4 +#Tue Apr 16 19:00:35 UTC 2019 +version_name=8.7.5 package_name=com.discord -build_id=ed1abe1c-bb83-4657-8b84-57966c1d3b66 -version_code=874 +build_id=05c788a4-681a-4106-acc8-81fcfadc4afb +version_code=875 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 95b4ae0347..fe775bfbf5 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable/drawable_circle_purple_brand.xml b/com.discord/res/drawable/drawable_circle_purple_brand.xml index 996690d8e6..579e4c126e 100644 --- a/com.discord/res/drawable/drawable_circle_purple_brand.xml +++ b/com.discord/res/drawable/drawable_circle_purple_brand.xml @@ -1,8 +1,5 @@ - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_circle_purple_brand_guild.xml b/com.discord/res/drawable/drawable_circle_purple_brand_guild.xml new file mode 100644 index 0000000000..996690d8e6 --- /dev/null +++ b/com.discord/res/drawable/drawable_circle_purple_brand_guild.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_guild_mentions.xml b/com.discord/res/drawable/drawable_overlay_guild_mentions.xml index 2afb02ba5e..de1706b788 100644 --- a/com.discord/res/drawable/drawable_overlay_guild_mentions.xml +++ b/com.discord/res/drawable/drawable_overlay_guild_mentions.xml @@ -1,7 +1,10 @@ - - - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_guild_mentions_horiz.xml b/com.discord/res/drawable/drawable_overlay_guild_mentions_horiz.xml deleted file mode 100644 index ac71cead95..0000000000 --- a/com.discord/res/drawable/drawable_overlay_guild_mentions_horiz.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_guild_mentions_horiz_light.xml b/com.discord/res/drawable/drawable_overlay_guild_mentions_horiz_light.xml deleted file mode 100644 index 28e05f6bc1..0000000000 --- a/com.discord/res/drawable/drawable_overlay_guild_mentions_horiz_light.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_mentions_primary_100.xml b/com.discord/res/drawable/drawable_overlay_mentions_primary_100.xml new file mode 100644 index 0000000000..48ae3c7938 --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_mentions_primary_100.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_mentions_primary_600.xml b/com.discord/res/drawable/drawable_overlay_mentions_primary_600.xml new file mode 100644 index 0000000000..98b9a14b2d --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_mentions_primary_600.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_mentions_primary_630.xml b/com.discord/res/drawable/drawable_overlay_mentions_primary_630.xml new file mode 100644 index 0000000000..9e76e37afa --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_mentions_primary_630.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v17/view_chat_list_actions_emoji_item.xml b/com.discord/res/layout-v17/view_chat_list_actions_emoji_item.xml index cd16fb55a4..ca02361029 100644 --- a/com.discord/res/layout-v17/view_chat_list_actions_emoji_item.xml +++ b/com.discord/res/layout-v17/view_chat_list_actions_emoji_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/com.discord/res/layout-v17/widget_channel_search_item.xml b/com.discord/res/layout-v17/widget_channel_search_item.xml index 5fe7bb3451..cf8133d5bd 100644 --- a/com.discord/res/layout-v17/widget_channel_search_item.xml +++ b/com.discord/res/layout-v17/widget_channel_search_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout-v17/widget_channels_list_item_channel.xml b/com.discord/res/layout-v17/widget_channels_list_item_channel.xml index 6eec785f64..b0a59d52dc 100644 --- a/com.discord/res/layout-v17/widget_channels_list_item_channel.xml +++ b/com.discord/res/layout-v17/widget_channels_list_item_channel.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml b/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml index ec00ff80cb..4b8ef6c9ff 100644 --- a/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml +++ b/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout-v17/widget_channels_list_item_friends.xml b/com.discord/res/layout-v17/widget_channels_list_item_friends.xml index 09352aa57d..27c1060a99 100644 --- a/com.discord/res/layout-v17/widget_channels_list_item_friends.xml +++ b/com.discord/res/layout-v17/widget_channels_list_item_friends.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/com.discord/res/layout-v17/widget_incoming_share.xml b/com.discord/res/layout-v17/widget_incoming_share.xml index 0bb332851f..5cec147da8 100644 --- a/com.discord/res/layout-v17/widget_incoming_share.xml +++ b/com.discord/res/layout-v17/widget_incoming_share.xml @@ -13,7 +13,7 @@ - + diff --git a/com.discord/res/layout-v17/widget_main_panel_center_content_unread.xml b/com.discord/res/layout-v17/widget_main_panel_center_content_unread.xml index d724db44a9..0c93011672 100644 --- a/com.discord/res/layout-v17/widget_main_panel_center_content_unread.xml +++ b/com.discord/res/layout-v17/widget_main_panel_center_content_unread.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout-v17/widget_voice_call_inline.xml b/com.discord/res/layout-v17/widget_voice_call_inline.xml index 1a3d692832..3884dc31d7 100644 --- a/com.discord/res/layout-v17/widget_voice_call_inline.xml +++ b/com.discord/res/layout-v17/widget_voice_call_inline.xml @@ -1,6 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -10,7 +10,7 @@ - + diff --git a/com.discord/res/layout-v21/widget_incoming_share.xml b/com.discord/res/layout-v21/widget_incoming_share.xml index dd1a694636..fe345e6ebb 100644 --- a/com.discord/res/layout-v21/widget_incoming_share.xml +++ b/com.discord/res/layout-v21/widget_incoming_share.xml @@ -13,7 +13,7 @@ - + diff --git a/com.discord/res/layout-v21/widget_main_panel_center_content_unread.xml b/com.discord/res/layout-v21/widget_main_panel_center_content_unread.xml index ac454e7a03..1f6c5a34ff 100644 --- a/com.discord/res/layout-v21/widget_main_panel_center_content_unread.xml +++ b/com.discord/res/layout-v21/widget_main_panel_center_content_unread.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout-v21/widget_voice_call_inline.xml b/com.discord/res/layout-v21/widget_voice_call_inline.xml index 06fa713531..8c8e22b3d7 100644 --- a/com.discord/res/layout-v21/widget_voice_call_inline.xml +++ b/com.discord/res/layout-v21/widget_voice_call_inline.xml @@ -1,6 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -10,7 +10,7 @@ - + diff --git a/com.discord/res/layout/view_chat_list_actions_emoji_item.xml b/com.discord/res/layout/view_chat_list_actions_emoji_item.xml index bb5e5fac96..8159de03d2 100644 --- a/com.discord/res/layout/view_chat_list_actions_emoji_item.xml +++ b/com.discord/res/layout/view_chat_list_actions_emoji_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_search_item.xml b/com.discord/res/layout/widget_channel_search_item.xml index 83e8345b10..5ad0984cc4 100644 --- a/com.discord/res/layout/widget_channel_search_item.xml +++ b/com.discord/res/layout/widget_channel_search_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_channel.xml b/com.discord/res/layout/widget_channels_list_item_channel.xml index 06790bc24a..39cfabea8a 100644 --- a/com.discord/res/layout/widget_channels_list_item_channel.xml +++ b/com.discord/res/layout/widget_channels_list_item_channel.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_channel_private.xml b/com.discord/res/layout/widget_channels_list_item_channel_private.xml index bb80ee4ebd..3cb2f79cd4 100644 --- a/com.discord/res/layout/widget_channels_list_item_channel_private.xml +++ b/com.discord/res/layout/widget_channels_list_item_channel_private.xml @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_friends.xml b/com.discord/res/layout/widget_channels_list_item_friends.xml index 558f1c1545..20d25a3db1 100644 --- a/com.discord/res/layout/widget_channels_list_item_friends.xml +++ b/com.discord/res/layout/widget_channels_list_item_friends.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_incoming_share.xml b/com.discord/res/layout/widget_incoming_share.xml index 1a00ea39ba..b3ea1ae9d3 100644 --- a/com.discord/res/layout/widget_incoming_share.xml +++ b/com.discord/res/layout/widget_incoming_share.xml @@ -13,7 +13,7 @@ - + diff --git a/com.discord/res/layout/widget_main_panel_center.xml b/com.discord/res/layout/widget_main_panel_center.xml index 27a9f8d77e..3dc26eee79 100644 --- a/com.discord/res/layout/widget_main_panel_center.xml +++ b/com.discord/res/layout/widget_main_panel_center.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_main_panel_center_content.xml b/com.discord/res/layout/widget_main_panel_center_content.xml index 7629d71de2..79bf61454d 100644 --- a/com.discord/res/layout/widget_main_panel_center_content.xml +++ b/com.discord/res/layout/widget_main_panel_center_content.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/layout/widget_main_panel_center_content_unread.xml b/com.discord/res/layout/widget_main_panel_center_content_unread.xml index 6c1e61ca14..4bc033e584 100644 --- a/com.discord/res/layout/widget_main_panel_center_content_unread.xml +++ b/com.discord/res/layout/widget_main_panel_center_content_unread.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_settings_billing.xml b/com.discord/res/layout/widget_settings_billing.xml index 6feffeab4c..ce2aa6f95a 100644 --- a/com.discord/res/layout/widget_settings_billing.xml +++ b/com.discord/res/layout/widget_settings_billing.xml @@ -5,7 +5,8 @@ - - + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_voice_call_inline.xml b/com.discord/res/layout/widget_voice_call_inline.xml index f1e125696e..93dedee6ac 100644 --- a/com.discord/res/layout/widget_voice_call_inline.xml +++ b/com.discord/res/layout/widget_voice_call_inline.xml @@ -1,6 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -10,7 +10,7 @@ - + diff --git a/com.discord/res/layout/widget_web_view.xml b/com.discord/res/layout/widget_web_view.xml new file mode 100644 index 0000000000..3819685467 --- /dev/null +++ b/com.discord/res/layout/widget_web_view.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/com.discord/res/values-v17/styles.xml b/com.discord/res/values-v17/styles.xml index 79f87da25c..40380cb153 100644 --- a/com.discord/res/values-v17/styles.xml +++ b/com.discord/res/values-v17/styles.xml @@ -153,15 +153,6 @@ ?primary_100 @font/whitney_medium -