diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml index 069b7da4b7..961ff0095a 100644 --- a/com.discord/AndroidManifest.xml +++ b/com.discord/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 0796b937bd..62e55b7f45 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-857.apk +apkFileName: com.discord-858.apk compressionType: false doNotCompress: - arsc @@ -469,5 +469,5 @@ usesFramework: tag: null version: 2.4.1-cc194d-SNAPSHOT versionInfo: - versionCode: '857' - versionName: 8.5.7 + versionCode: '858' + versionName: 8.5.8 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 99d7723e0a..244afc82fe 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 Mar 14 17:48:53 UTC 2019 -version_name=8.5.7 +#Fri Mar 15 23:48:29 UTC 2019 +version_name=8.5.8 package_name=com.discord -build_id=e98df891-cd0c-434b-b6db-b992fc74fafd -version_code=857 +build_id=31546bf8-5bcb-4cbc-be0c-1beeea698141 +version_code=858 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index d9fc463e61..0b78315819 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-v21/img_item_shop_dark.xml b/com.discord/res/drawable-anydpi-v21/img_item_shop_dark.xml new file mode 100644 index 0000000000..5a1e6e9dbd --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/img_item_shop_dark.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_animated_emoji_upsell.xml b/com.discord/res/drawable-anydpi-v24/img_animated_emoji_upsell.xml new file mode 100644 index 0000000000..d3adba9ac3 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_animated_emoji_upsell.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_avatar_upsell.xml b/com.discord/res/drawable-anydpi-v24/img_avatar_upsell.xml new file mode 100644 index 0000000000..fc23c51867 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_avatar_upsell.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_badge_upsell.xml b/com.discord/res/drawable-anydpi-v24/img_badge_upsell.xml new file mode 100644 index 0000000000..3d62c8a08d --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_badge_upsell.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_global_emoji_upsell.xml b/com.discord/res/drawable-anydpi-v24/img_global_emoji_upsell.xml new file mode 100644 index 0000000000..90a8c91f26 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_global_emoji_upsell.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_logo_nitro_classic_header.xml b/com.discord/res/drawable-anydpi-v24/img_logo_nitro_classic_header.xml new file mode 100644 index 0000000000..79c78a038b --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_logo_nitro_classic_header.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_tag_upsell.xml b/com.discord/res/drawable-anydpi-v24/img_tag_upsell.xml new file mode 100644 index 0000000000..86ce468987 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_tag_upsell.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_upload_upsell.xml b/com.discord/res/drawable-anydpi-v24/img_upload_upsell.xml new file mode 100644 index 0000000000..0462937055 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_upload_upsell.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/img_animated_emoji_upsell.png b/com.discord/res/drawable-hdpi/img_animated_emoji_upsell.png new file mode 100644 index 0000000000..6b030813da Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_animated_emoji_upsell.png differ diff --git a/com.discord/res/drawable-hdpi/img_avatar_upsell.png b/com.discord/res/drawable-hdpi/img_avatar_upsell.png new file mode 100644 index 0000000000..0bc3e9c8fa Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_avatar_upsell.png differ diff --git a/com.discord/res/drawable-hdpi/img_badge_upsell.png b/com.discord/res/drawable-hdpi/img_badge_upsell.png new file mode 100644 index 0000000000..31c9daf1d7 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_badge_upsell.png differ diff --git a/com.discord/res/drawable-hdpi/img_global_emoji_upsell.png b/com.discord/res/drawable-hdpi/img_global_emoji_upsell.png new file mode 100644 index 0000000000..cc4ddd1513 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_global_emoji_upsell.png differ diff --git a/com.discord/res/drawable-hdpi/img_item_shop_dark.png b/com.discord/res/drawable-hdpi/img_item_shop_dark.png new file mode 100644 index 0000000000..7b7399babf Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_item_shop_dark.png differ diff --git a/com.discord/res/drawable-hdpi/img_logo_nitro_classic_header.png b/com.discord/res/drawable-hdpi/img_logo_nitro_classic_header.png new file mode 100644 index 0000000000..7688b3e4c8 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_logo_nitro_classic_header.png differ diff --git a/com.discord/res/drawable-hdpi/img_tag_upsell.png b/com.discord/res/drawable-hdpi/img_tag_upsell.png new file mode 100644 index 0000000000..00f39238e9 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_tag_upsell.png differ diff --git a/com.discord/res/drawable-hdpi/img_upload_upsell.png b/com.discord/res/drawable-hdpi/img_upload_upsell.png new file mode 100644 index 0000000000..98a6a8336d Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_upload_upsell.png differ diff --git a/com.discord/res/drawable-ldpi/img_animated_emoji_upsell.png b/com.discord/res/drawable-ldpi/img_animated_emoji_upsell.png new file mode 100644 index 0000000000..6c8a3f49a6 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_animated_emoji_upsell.png differ diff --git a/com.discord/res/drawable-ldpi/img_avatar_upsell.png b/com.discord/res/drawable-ldpi/img_avatar_upsell.png new file mode 100644 index 0000000000..2d588d8188 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_avatar_upsell.png differ diff --git a/com.discord/res/drawable-ldpi/img_badge_upsell.png b/com.discord/res/drawable-ldpi/img_badge_upsell.png new file mode 100644 index 0000000000..bcf2d24a25 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_badge_upsell.png differ diff --git a/com.discord/res/drawable-ldpi/img_global_emoji_upsell.png b/com.discord/res/drawable-ldpi/img_global_emoji_upsell.png new file mode 100644 index 0000000000..ff8545deba Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_global_emoji_upsell.png differ diff --git a/com.discord/res/drawable-ldpi/img_item_shop_dark.png b/com.discord/res/drawable-ldpi/img_item_shop_dark.png new file mode 100644 index 0000000000..00248cbd5d Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_item_shop_dark.png differ diff --git a/com.discord/res/drawable-ldpi/img_logo_nitro_classic_header.png b/com.discord/res/drawable-ldpi/img_logo_nitro_classic_header.png new file mode 100644 index 0000000000..943b4bcd82 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_logo_nitro_classic_header.png differ diff --git a/com.discord/res/drawable-ldpi/img_tag_upsell.png b/com.discord/res/drawable-ldpi/img_tag_upsell.png new file mode 100644 index 0000000000..2fc60308f0 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_tag_upsell.png differ diff --git a/com.discord/res/drawable-ldpi/img_upload_upsell.png b/com.discord/res/drawable-ldpi/img_upload_upsell.png new file mode 100644 index 0000000000..15b7693ab4 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_upload_upsell.png differ diff --git a/com.discord/res/drawable-mdpi/img_animated_emoji_upsell.png b/com.discord/res/drawable-mdpi/img_animated_emoji_upsell.png new file mode 100644 index 0000000000..62427ce4e5 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_animated_emoji_upsell.png differ diff --git a/com.discord/res/drawable-mdpi/img_avatar_upsell.png b/com.discord/res/drawable-mdpi/img_avatar_upsell.png new file mode 100644 index 0000000000..0e7e7178ca Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_avatar_upsell.png differ diff --git a/com.discord/res/drawable-mdpi/img_badge_upsell.png b/com.discord/res/drawable-mdpi/img_badge_upsell.png new file mode 100644 index 0000000000..9b5a25b34f Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_badge_upsell.png differ diff --git a/com.discord/res/drawable-mdpi/img_global_emoji_upsell.png b/com.discord/res/drawable-mdpi/img_global_emoji_upsell.png new file mode 100644 index 0000000000..2d74b25a19 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_global_emoji_upsell.png differ diff --git a/com.discord/res/drawable-mdpi/img_item_shop_dark.png b/com.discord/res/drawable-mdpi/img_item_shop_dark.png new file mode 100644 index 0000000000..e79d765aac Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_item_shop_dark.png differ diff --git a/com.discord/res/drawable-mdpi/img_logo_nitro_classic_header.png b/com.discord/res/drawable-mdpi/img_logo_nitro_classic_header.png new file mode 100644 index 0000000000..d45293d846 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_logo_nitro_classic_header.png differ diff --git a/com.discord/res/drawable-mdpi/img_tag_upsell.png b/com.discord/res/drawable-mdpi/img_tag_upsell.png new file mode 100644 index 0000000000..3d6e65491b Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_tag_upsell.png differ diff --git a/com.discord/res/drawable-mdpi/img_upload_upsell.png b/com.discord/res/drawable-mdpi/img_upload_upsell.png new file mode 100644 index 0000000000..61fdcaae5c Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_upload_upsell.png differ diff --git a/com.discord/res/drawable-xhdpi/img_animated_emoji_upsell.png b/com.discord/res/drawable-xhdpi/img_animated_emoji_upsell.png new file mode 100644 index 0000000000..db15908e17 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_animated_emoji_upsell.png differ diff --git a/com.discord/res/drawable-xhdpi/img_avatar_upsell.png b/com.discord/res/drawable-xhdpi/img_avatar_upsell.png new file mode 100644 index 0000000000..1d73d1563d Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_avatar_upsell.png differ diff --git a/com.discord/res/drawable-xhdpi/img_badge_upsell.png b/com.discord/res/drawable-xhdpi/img_badge_upsell.png new file mode 100644 index 0000000000..29b356ef6b Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_badge_upsell.png differ diff --git a/com.discord/res/drawable-xhdpi/img_global_emoji_upsell.png b/com.discord/res/drawable-xhdpi/img_global_emoji_upsell.png new file mode 100644 index 0000000000..c79a098124 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_global_emoji_upsell.png differ diff --git a/com.discord/res/drawable-xhdpi/img_item_shop_dark.png b/com.discord/res/drawable-xhdpi/img_item_shop_dark.png new file mode 100644 index 0000000000..0063796ad4 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_item_shop_dark.png differ diff --git a/com.discord/res/drawable-xhdpi/img_logo_nitro_classic_header.png b/com.discord/res/drawable-xhdpi/img_logo_nitro_classic_header.png new file mode 100644 index 0000000000..3c2f74fa33 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_logo_nitro_classic_header.png differ diff --git a/com.discord/res/drawable-xhdpi/img_tag_upsell.png b/com.discord/res/drawable-xhdpi/img_tag_upsell.png new file mode 100644 index 0000000000..069348aeba Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_tag_upsell.png differ diff --git a/com.discord/res/drawable-xhdpi/img_upload_upsell.png b/com.discord/res/drawable-xhdpi/img_upload_upsell.png new file mode 100644 index 0000000000..8573d8ebc0 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_upload_upsell.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_animated_emoji_upsell.png b/com.discord/res/drawable-xxhdpi/img_animated_emoji_upsell.png new file mode 100644 index 0000000000..9ac200e9ec Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_animated_emoji_upsell.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_avatar_upsell.png b/com.discord/res/drawable-xxhdpi/img_avatar_upsell.png new file mode 100644 index 0000000000..6720ddae55 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_avatar_upsell.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_badge_upsell.png b/com.discord/res/drawable-xxhdpi/img_badge_upsell.png new file mode 100644 index 0000000000..5cd5b1120d Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_badge_upsell.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_global_emoji_upsell.png b/com.discord/res/drawable-xxhdpi/img_global_emoji_upsell.png new file mode 100644 index 0000000000..06529148a9 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_global_emoji_upsell.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_item_shop_dark.png b/com.discord/res/drawable-xxhdpi/img_item_shop_dark.png new file mode 100644 index 0000000000..6a4fde26f6 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_item_shop_dark.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_logo_nitro_classic_header.png b/com.discord/res/drawable-xxhdpi/img_logo_nitro_classic_header.png new file mode 100644 index 0000000000..2a3adafcbc Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_logo_nitro_classic_header.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_tag_upsell.png b/com.discord/res/drawable-xxhdpi/img_tag_upsell.png new file mode 100644 index 0000000000..9e86b72ad1 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_tag_upsell.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_upload_upsell.png b/com.discord/res/drawable-xxhdpi/img_upload_upsell.png new file mode 100644 index 0000000000..c711aa349f Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_upload_upsell.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_animated_emoji_upsell.png b/com.discord/res/drawable-xxxhdpi/img_animated_emoji_upsell.png new file mode 100644 index 0000000000..59953b391a Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_animated_emoji_upsell.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_avatar_upsell.png b/com.discord/res/drawable-xxxhdpi/img_avatar_upsell.png new file mode 100644 index 0000000000..097c81222b Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_avatar_upsell.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_badge_upsell.png b/com.discord/res/drawable-xxxhdpi/img_badge_upsell.png new file mode 100644 index 0000000000..d5ffd6cd1d Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_badge_upsell.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_global_emoji_upsell.png b/com.discord/res/drawable-xxxhdpi/img_global_emoji_upsell.png new file mode 100644 index 0000000000..e6d0c65d8f Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_global_emoji_upsell.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_item_shop_dark.png b/com.discord/res/drawable-xxxhdpi/img_item_shop_dark.png new file mode 100644 index 0000000000..a7df4489da Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_item_shop_dark.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_logo_nitro_classic_header.png b/com.discord/res/drawable-xxxhdpi/img_logo_nitro_classic_header.png new file mode 100644 index 0000000000..1d956d907b Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_logo_nitro_classic_header.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_tag_upsell.png b/com.discord/res/drawable-xxxhdpi/img_tag_upsell.png new file mode 100644 index 0000000000..9fca46aba2 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_tag_upsell.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_upload_upsell.png b/com.discord/res/drawable-xxxhdpi/img_upload_upsell.png new file mode 100644 index 0000000000..eca98e16d7 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_upload_upsell.png differ diff --git a/com.discord/res/drawable/tab_dot_selector.xml b/com.discord/res/drawable/tab_dot_selector.xml new file mode 100644 index 0000000000..4460ada9f6 --- /dev/null +++ b/com.discord/res/drawable/tab_dot_selector.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/tab_indicator_default.xml b/com.discord/res/drawable/tab_indicator_default.xml new file mode 100644 index 0000000000..9f8efa05a9 --- /dev/null +++ b/com.discord/res/drawable/tab_indicator_default.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/tab_indicator_selected.xml b/com.discord/res/drawable/tab_indicator_selected.xml new file mode 100644 index 0000000000..4ec6c3e000 --- /dev/null +++ b/com.discord/res/drawable/tab_indicator_selected.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v17/premium_upsell_dialog.xml b/com.discord/res/layout-v17/premium_upsell_dialog.xml new file mode 100644 index 0000000000..777bf6cd7c --- /dev/null +++ b/com.discord/res/layout-v17/premium_upsell_dialog.xml @@ -0,0 +1,11 @@ + + + + + + +