diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 71a3cbbf23..c2ff23957c 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1005.apk +apkFileName: com.discord-1006.apk compressionType: false doNotCompress: - arsc @@ -184,5 +184,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1005' - versionName: 10.0.5 + versionCode: '1006' + versionName: 10.0.6 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 35e63c2436..f46f330b48 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! # -#Thu Dec 12 22:31:26 UTC 2019 -version_name=10.0.5 +#Fri Dec 13 00:27:46 UTC 2019 +version_name=10.0.6 package_name=com.discord -build_id=c03c2c29-c2ca-41ff-abba-81442fbf4065 -version_code=1005 +build_id=6d97a73a-4b5e-49e5-90cc-50a37d8d8331 +version_code=1006 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 16f3caa349..a3970944b3 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-anydpi-v24/ic_stop_stream_v2.xml b/com.discord/res/drawable-anydpi-v24/ic_stop_stream_v2.xml new file mode 100644 index 0000000000..f04b7414b2 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_stop_stream_v2.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/bg_nitro_classic.png b/com.discord/res/drawable-hdpi/bg_nitro_classic.png index 981666852b..e499795df0 100644 Binary files a/com.discord/res/drawable-hdpi/bg_nitro_classic.png and b/com.discord/res/drawable-hdpi/bg_nitro_classic.png differ diff --git a/com.discord/res/drawable-hdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-hdpi/ic_stop_stream_v2.png new file mode 100644 index 0000000000..5d73e634a4 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_stop_stream_v2.png differ diff --git a/com.discord/res/drawable-ldpi/ic_stop_stream_v2.png b/com.discord/res/drawable-ldpi/ic_stop_stream_v2.png new file mode 100644 index 0000000000..c30d027449 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_stop_stream_v2.png differ diff --git a/com.discord/res/drawable-mdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-mdpi/ic_stop_stream_v2.png new file mode 100644 index 0000000000..70ed9c2f1b Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_stop_stream_v2.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-xhdpi/ic_stop_stream_v2.png new file mode 100644 index 0000000000..deb825eab7 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_stop_stream_v2.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-xxhdpi/ic_stop_stream_v2.png new file mode 100644 index 0000000000..c805f08944 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_stop_stream_v2.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_stop_stream_v2.png b/com.discord/res/drawable-xxxhdpi/ic_stop_stream_v2.png new file mode 100644 index 0000000000..44d8386a25 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_stop_stream_v2.png differ diff --git a/com.discord/res/drawable/bg_stream_feeback_spinner_closed_light.xml b/com.discord/res/drawable/bg_stream_feeback_spinner_closed_light.xml new file mode 100644 index 0000000000..48b2c6b0aa --- /dev/null +++ b/com.discord/res/drawable/bg_stream_feeback_spinner_closed_light.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/bg_stream_feedback_spinner_closed.xml b/com.discord/res/drawable/bg_stream_feedback_spinner_closed.xml new file mode 100644 index 0000000000..3da5c68dd1 --- /dev/null +++ b/com.discord/res/drawable/bg_stream_feedback_spinner_closed.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/bg_stream_feedback_spinner_dropdown.xml b/com.discord/res/drawable/bg_stream_feedback_spinner_dropdown.xml new file mode 100644 index 0000000000..2b512871d7 --- /dev/null +++ b/com.discord/res/drawable/bg_stream_feedback_spinner_dropdown.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/bg_stream_feedback_spinner_dropdown_light.xml b/com.discord/res/drawable/bg_stream_feedback_spinner_dropdown_light.xml new file mode 100644 index 0000000000..ca8340942a --- /dev/null +++ b/com.discord/res/drawable/bg_stream_feedback_spinner_dropdown_light.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/bg_stream_preview.xml b/com.discord/res/drawable/bg_stream_preview.xml new file mode 100644 index 0000000000..517bcaeba0 --- /dev/null +++ b/com.discord/res/drawable/bg_stream_preview.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/bg_stream_preview_overlay_caption.xml b/com.discord/res/drawable/bg_stream_preview_overlay_caption.xml new file mode 100644 index 0000000000..418f0fcd5a --- /dev/null +++ b/com.discord/res/drawable/bg_stream_preview_overlay_caption.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_button_primary_700.xml b/com.discord/res/drawable/drawable_button_primary_700.xml new file mode 100644 index 0000000000..c73fcaeba7 --- /dev/null +++ b/com.discord/res/drawable/drawable_button_primary_700.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_button_primary_700_neutral.xml b/com.discord/res/drawable/drawable_button_primary_700_neutral.xml new file mode 100644 index 0000000000..063b1aa835 --- /dev/null +++ b/com.discord/res/drawable/drawable_button_primary_700_neutral.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_button_primary_700_pressed.xml b/com.discord/res/drawable/drawable_button_primary_700_pressed.xml new file mode 100644 index 0000000000..6071631add --- /dev/null +++ b/com.discord/res/drawable/drawable_button_primary_700_pressed.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_ended_dark.xml b/com.discord/res/drawable/drawable_stream_ended_dark.xml new file mode 100644 index 0000000000..1bde8e6fd1 --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_ended_dark.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_ended_light.xml b/com.discord/res/drawable/drawable_stream_ended_light.xml new file mode 100644 index 0000000000..126a4ab774 --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_ended_light.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_feedback_face_happy_color.xml b/com.discord/res/drawable/drawable_stream_feedback_face_happy_color.xml new file mode 100644 index 0000000000..f1f505718e --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_feedback_face_happy_color.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_feedback_face_happy_grayscale.xml b/com.discord/res/drawable/drawable_stream_feedback_face_happy_grayscale.xml new file mode 100644 index 0000000000..6c9eb00b71 --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_feedback_face_happy_grayscale.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_feedback_face_neutral_color.xml b/com.discord/res/drawable/drawable_stream_feedback_face_neutral_color.xml new file mode 100644 index 0000000000..546b2767c3 --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_feedback_face_neutral_color.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_feedback_face_neutral_grayscale.xml b/com.discord/res/drawable/drawable_stream_feedback_face_neutral_grayscale.xml new file mode 100644 index 0000000000..ed816a9bd4 --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_feedback_face_neutral_grayscale.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_feedback_face_sad_color.xml b/com.discord/res/drawable/drawable_stream_feedback_face_sad_color.xml new file mode 100644 index 0000000000..1c81dcfb6a --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_feedback_face_sad_color.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_feedback_face_sad_grayscale.xml b/com.discord/res/drawable/drawable_stream_feedback_face_sad_grayscale.xml new file mode 100644 index 0000000000..ee055a45cf --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_feedback_face_sad_grayscale.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_full.xml b/com.discord/res/drawable/drawable_stream_full.xml new file mode 100644 index 0000000000..5de16c1299 --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_full.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_preview_not_available_dark.xml b/com.discord/res/drawable/drawable_stream_preview_not_available_dark.xml new file mode 100644 index 0000000000..84cc3be39c --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_preview_not_available_dark.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_stream_preview_not_available_light.xml b/com.discord/res/drawable/drawable_stream_preview_not_available_light.xml new file mode 100644 index 0000000000..ea18fa0de2 --- /dev/null +++ b/com.discord/res/drawable/drawable_stream_preview_not_available_light.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_chevron_down_white_12dp.xml b/com.discord/res/drawable/ic_chevron_down_white_12dp.xml new file mode 100644 index 0000000000..722d803835 --- /dev/null +++ b/com.discord/res/drawable/ic_chevron_down_white_12dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_disable_landscape.xml b/com.discord/res/drawable/ic_disable_landscape.xml new file mode 100644 index 0000000000..b9904e54af --- /dev/null +++ b/com.discord/res/drawable/ic_disable_landscape.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_enable_landscape.xml b/com.discord/res/drawable/ic_enable_landscape.xml new file mode 100644 index 0000000000..d11a1bf99a --- /dev/null +++ b/com.discord/res/drawable/ic_enable_landscape.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_warning_icon_24dp.xml b/com.discord/res/drawable/ic_warning_icon_24dp.xml new file mode 100644 index 0000000000..1fd84d2cba --- /dev/null +++ b/com.discord/res/drawable/ic_warning_icon_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_no_stream_preview.xml b/com.discord/res/drawable/img_no_stream_preview.xml deleted file mode 100644 index a3f92dfe53..0000000000 --- a/com.discord/res/drawable/img_no_stream_preview.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/stream_feedback_spinner_item.xml b/com.discord/res/layout/stream_feedback_spinner_item.xml new file mode 100644 index 0000000000..57e2ed536f --- /dev/null +++ b/com.discord/res/layout/stream_feedback_spinner_item.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/com.discord/res/layout/view_golive_stream.xml b/com.discord/res/layout/view_golive_stream.xml new file mode 100644 index 0000000000..9dfdb07e90 --- /dev/null +++ b/com.discord/res/layout/view_golive_stream.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_loading_button.xml b/com.discord/res/layout/view_loading_button.xml index 4fd7a7ba26..68c73b0b0d 100644 --- a/com.discord/res/layout/view_loading_button.xml +++ b/com.discord/res/layout/view_loading_button.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/view_stream_preview.xml b/com.discord/res/layout/view_stream_preview.xml new file mode 100644 index 0000000000..7f8d7d1822 --- /dev/null +++ b/com.discord/res/layout/view_stream_preview.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_video_call_participant.xml b/com.discord/res/layout/view_video_call_participant.xml index 608bc664bf..ba59490511 100644 --- a/com.discord/res/layout/view_video_call_participant.xml +++ b/com.discord/res/layout/view_video_call_participant.xml @@ -5,6 +5,7 @@ + diff --git a/com.discord/res/layout/voice_user_list_item_user.xml b/com.discord/res/layout/voice_user_list_item_user.xml index 1e25b91458..cb6cf8e6e2 100644 --- a/com.discord/res/layout/voice_user_list_item_user.xml +++ b/com.discord/res/layout/voice_user_list_item_user.xml @@ -1,8 +1,12 @@ - - - - - + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_remote_auth_pending_login.xml b/com.discord/res/layout/widget_remote_auth_pending_login.xml index 74d4e81974..c5385241d3 100644 --- a/com.discord/res/layout/widget_remote_auth_pending_login.xml +++ b/com.discord/res/layout/widget_remote_auth_pending_login.xml @@ -2,7 +2,7 @@ - + diff --git a/com.discord/res/layout/widget_spectate.xml b/com.discord/res/layout/widget_spectate.xml new file mode 100644 index 0000000000..d0f65c95af --- /dev/null +++ b/com.discord/res/layout/widget_spectate.xml @@ -0,0 +1,13 @@ + + + + + + + + + +