diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 2209c3be55..50b790ed41 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1028.apk +apkFileName: com.discord-1029.apk compressionType: false doNotCompress: - arsc @@ -184,5 +184,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1028' - versionName: 10.2.8 + versionCode: '1029' + versionName: 10.2.9 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 55ae68fd89..249c065e15 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 Jan 24 18:52:32 UTC 2020 -version_name=10.2.8 +#Mon Jan 27 22:41:51 UTC 2020 +version_name=10.2.9 package_name=com.discord -build_id=895c9e22-24dc-433f-bad8-56e199796876 -version_code=1028 +build_id=017957a1-958e-4b55-843f-7ab18a5cefa1 +version_code=1029 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index d2f032c1cd..aa2eaf22ae 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/color/uikit_btn_bg_color_selector_white.xml b/com.discord/res/color/uikit_btn_bg_color_selector_white.xml new file mode 100644 index 0000000000..9ec7b36a5a --- /dev/null +++ b/com.discord/res/color/uikit_btn_bg_color_selector_white.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_nitro_caution__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_nitro_caution__0.xml deleted file mode 100644 index 740a88ec6f..0000000000 --- a/com.discord/res/drawable-anydpi-v24/$bg_nitro_caution__0.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_nitro_classic__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_nitro_classic__0.xml deleted file mode 100644 index 0adfbcaa8b..0000000000 --- a/com.discord/res/drawable-anydpi-v24/$bg_nitro_classic__0.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_nitro_error__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_nitro_error__0.xml deleted file mode 100644 index ec3d256946..0000000000 --- a/com.discord/res/drawable-anydpi-v24/$bg_nitro_error__0.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_premium_classic_subscription_header__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_premium_classic_subscription_header__0.xml new file mode 100644 index 0000000000..b5b6c21acc --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/$bg_premium_classic_subscription_header__0.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header__0.xml new file mode 100644 index 0000000000..f5fe5819bf --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header__0.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header_error__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header_error__0.xml new file mode 100644 index 0000000000..c624ed2056 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header_error__0.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header_resub__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header_resub__0.xml new file mode 100644 index 0000000000..2e272f825b --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/$bg_premium_guild_subscription_header_resub__0.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_nitro__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header__0.xml similarity index 64% rename from com.discord/res/drawable-anydpi-v24/$bg_nitro__0.xml rename to com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header__0.xml index ffdd513cc7..81789903f7 100644 --- a/com.discord/res/drawable-anydpi-v24/$bg_nitro__0.xml +++ b/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header__0.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header_error__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header_error__0.xml new file mode 100644 index 0000000000..c624ed2056 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header_error__0.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header_resub__0.xml b/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header_resub__0.xml new file mode 100644 index 0000000000..2e272f825b --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/$bg_premium_subscription_header_resub__0.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_announcements_follow_sheet_dark.xml b/com.discord/res/drawable-anydpi-v24/bg_announcements_follow_sheet_dark.xml new file mode 100644 index 0000000000..6f6a937741 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_announcements_follow_sheet_dark.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_announcements_follow_sheet_light.xml b/com.discord/res/drawable-anydpi-v24/bg_announcements_follow_sheet_light.xml new file mode 100644 index 0000000000..67a31bfc7f --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_announcements_follow_sheet_light.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_nitro.xml b/com.discord/res/drawable-anydpi-v24/bg_nitro.xml deleted file mode 100644 index b71246feed..0000000000 --- a/com.discord/res/drawable-anydpi-v24/bg_nitro.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_nitro_caution.xml b/com.discord/res/drawable-anydpi-v24/bg_nitro_caution.xml deleted file mode 100644 index c61be57db6..0000000000 --- a/com.discord/res/drawable-anydpi-v24/bg_nitro_caution.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_nitro_classic.xml b/com.discord/res/drawable-anydpi-v24/bg_nitro_classic.xml deleted file mode 100644 index c77211fd24..0000000000 --- a/com.discord/res/drawable-anydpi-v24/bg_nitro_classic.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_nitro_error.xml b/com.discord/res/drawable-anydpi-v24/bg_nitro_error.xml deleted file mode 100644 index 77035270d3..0000000000 --- a/com.discord/res/drawable-anydpi-v24/bg_nitro_error.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_premium_classic_subscription_header.xml b/com.discord/res/drawable-anydpi-v24/bg_premium_classic_subscription_header.xml new file mode 100644 index 0000000000..ac1dbe63b6 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_premium_classic_subscription_header.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header.xml b/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header.xml new file mode 100644 index 0000000000..228b1c3546 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header_error.xml b/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header_error.xml new file mode 100644 index 0000000000..664a5d4d46 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header_error.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header_resub.xml b/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header_resub.xml new file mode 100644 index 0000000000..5a0c2c5a95 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_premium_guild_subscription_header_resub.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header.xml b/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header.xml new file mode 100644 index 0000000000..cd1db1e02a --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header_error.xml b/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header_error.xml new file mode 100644 index 0000000000..74b7357c32 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header_error.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header_resub.xml b/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header_resub.xml new file mode 100644 index 0000000000..dcc9a4159e --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/bg_premium_subscription_header_resub.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_channel_announcements_locked.xml b/com.discord/res/drawable-anydpi-v24/ic_channel_announcements_locked.xml new file mode 100644 index 0000000000..b3f211bc6a --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_channel_announcements_locked.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_channel_announcements_nsfw.xml b/com.discord/res/drawable-anydpi-v24/ic_channel_announcements_nsfw.xml new file mode 100644 index 0000000000..4e7bd580d6 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_channel_announcements_nsfw.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_nitro_broken_wheel.xml b/com.discord/res/drawable-anydpi-v24/img_nitro_broken_wheel.xml deleted file mode 100644 index e25e838a34..0000000000 --- a/com.discord/res/drawable-anydpi-v24/img_nitro_broken_wheel.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header.xml b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header.xml new file mode 100644 index 0000000000..64f5903ea2 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_error.xml b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_error.xml new file mode 100644 index 0000000000..7c7bfa7de9 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_error.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_logo.xml b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_logo.xml new file mode 100644 index 0000000000..7b7d196fc1 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_logo.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_resub.xml b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_resub.xml new file mode 100644 index 0000000000..1e65e0bcc5 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_classic_subscription_header_resub.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header.xml b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header.xml new file mode 100644 index 0000000000..86d810ec31 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_error.xml b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_error.xml new file mode 100644 index 0000000000..90bae7a353 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_error.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_logo.xml b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_logo.xml new file mode 100644 index 0000000000..0072c30b71 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_logo.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_resub.xml b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_resub.xml new file mode 100644 index 0000000000..69ed0f4645 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/img_premium_subscription_header_resub.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/bg_announcements_follow_sheet_dark.png b/com.discord/res/drawable-hdpi/bg_announcements_follow_sheet_dark.png new file mode 100644 index 0000000000..4c7581bd38 Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_announcements_follow_sheet_dark.png differ diff --git a/com.discord/res/drawable-hdpi/bg_announcements_follow_sheet_light.png b/com.discord/res/drawable-hdpi/bg_announcements_follow_sheet_light.png new file mode 100644 index 0000000000..934400cf79 Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_announcements_follow_sheet_light.png differ diff --git a/com.discord/res/drawable-hdpi/bg_nitro.png b/com.discord/res/drawable-hdpi/bg_nitro.png deleted file mode 100644 index 8869336c5b..0000000000 Binary files a/com.discord/res/drawable-hdpi/bg_nitro.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/bg_nitro_caution.png b/com.discord/res/drawable-hdpi/bg_nitro_caution.png deleted file mode 100644 index 442f4d1a13..0000000000 Binary files a/com.discord/res/drawable-hdpi/bg_nitro_caution.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/bg_nitro_classic.png b/com.discord/res/drawable-hdpi/bg_nitro_classic.png deleted file mode 100644 index 981666852b..0000000000 Binary files a/com.discord/res/drawable-hdpi/bg_nitro_classic.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/bg_nitro_error.png b/com.discord/res/drawable-hdpi/bg_nitro_error.png deleted file mode 100644 index 88eed36587..0000000000 Binary files a/com.discord/res/drawable-hdpi/bg_nitro_error.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/bg_premium_classic_subscription_header.png b/com.discord/res/drawable-hdpi/bg_premium_classic_subscription_header.png new file mode 100644 index 0000000000..0e500444b5 Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header.png b/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header.png new file mode 100644 index 0000000000..2da34458a5 Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header.png differ diff --git a/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header_error.png b/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header_error.png new file mode 100644 index 0000000000..ff42664a09 Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header_error.png differ diff --git a/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header_resub.png b/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header_resub.png new file mode 100644 index 0000000000..c5303e56d0 Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_premium_guild_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-hdpi/bg_premium_subscription_header.png b/com.discord/res/drawable-hdpi/bg_premium_subscription_header.png new file mode 100644 index 0000000000..719e42b401 Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-hdpi/bg_premium_subscription_header_error.png b/com.discord/res/drawable-hdpi/bg_premium_subscription_header_error.png new file mode 100644 index 0000000000..d657c1eeea Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-hdpi/bg_premium_subscription_header_resub.png b/com.discord/res/drawable-hdpi/bg_premium_subscription_header_resub.png new file mode 100644 index 0000000000..e17b265eeb Binary files /dev/null and b/com.discord/res/drawable-hdpi/bg_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-hdpi/ic_channel_announcements_locked.png b/com.discord/res/drawable-hdpi/ic_channel_announcements_locked.png new file mode 100644 index 0000000000..a7f0c48d83 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_channel_announcements_locked.png differ diff --git a/com.discord/res/drawable-hdpi/ic_channel_announcements_nsfw.png b/com.discord/res/drawable-hdpi/ic_channel_announcements_nsfw.png new file mode 100644 index 0000000000..a49f81d8f5 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_channel_announcements_nsfw.png differ diff --git a/com.discord/res/drawable-hdpi/img_nitro_broken_wheel.png b/com.discord/res/drawable-hdpi/img_nitro_broken_wheel.png deleted file mode 100644 index 75ef7e8347..0000000000 Binary files a/com.discord/res/drawable-hdpi/img_nitro_broken_wheel.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header.png b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header.png new file mode 100644 index 0000000000..e11e5f938c Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_error.png b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_error.png new file mode 100644 index 0000000000..57c2b4b952 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_error.png differ diff --git a/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_logo.png b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_logo.png new file mode 100644 index 0000000000..7f7145460d Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_resub.png b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_resub.png new file mode 100644 index 0000000000..7b93c82047 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_classic_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-hdpi/img_premium_subscription_header.png b/com.discord/res/drawable-hdpi/img_premium_subscription_header.png new file mode 100644 index 0000000000..efbb5ef854 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-hdpi/img_premium_subscription_header_error.png b/com.discord/res/drawable-hdpi/img_premium_subscription_header_error.png new file mode 100644 index 0000000000..2b2739eb6e Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-hdpi/img_premium_subscription_header_logo.png b/com.discord/res/drawable-hdpi/img_premium_subscription_header_logo.png new file mode 100644 index 0000000000..6cd9aabbe6 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-hdpi/img_premium_subscription_header_resub.png b/com.discord/res/drawable-hdpi/img_premium_subscription_header_resub.png new file mode 100644 index 0000000000..4bc3387be8 Binary files /dev/null and b/com.discord/res/drawable-hdpi/img_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-ldpi/bg_announcements_follow_sheet_dark.png b/com.discord/res/drawable-ldpi/bg_announcements_follow_sheet_dark.png new file mode 100644 index 0000000000..f83dc89494 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_announcements_follow_sheet_dark.png differ diff --git a/com.discord/res/drawable-ldpi/bg_announcements_follow_sheet_light.png b/com.discord/res/drawable-ldpi/bg_announcements_follow_sheet_light.png new file mode 100644 index 0000000000..ab820bd5f5 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_announcements_follow_sheet_light.png differ diff --git a/com.discord/res/drawable-ldpi/bg_nitro.png b/com.discord/res/drawable-ldpi/bg_nitro.png deleted file mode 100644 index ab7b92fbf0..0000000000 Binary files a/com.discord/res/drawable-ldpi/bg_nitro.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/bg_nitro_caution.png b/com.discord/res/drawable-ldpi/bg_nitro_caution.png deleted file mode 100644 index 9d0bf5cffa..0000000000 Binary files a/com.discord/res/drawable-ldpi/bg_nitro_caution.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/bg_nitro_classic.png b/com.discord/res/drawable-ldpi/bg_nitro_classic.png deleted file mode 100644 index 6ddd4d9310..0000000000 Binary files a/com.discord/res/drawable-ldpi/bg_nitro_classic.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/bg_nitro_error.png b/com.discord/res/drawable-ldpi/bg_nitro_error.png deleted file mode 100644 index c415a2273c..0000000000 Binary files a/com.discord/res/drawable-ldpi/bg_nitro_error.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/bg_premium_classic_subscription_header.png b/com.discord/res/drawable-ldpi/bg_premium_classic_subscription_header.png new file mode 100644 index 0000000000..75ac850fc2 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header.png b/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header.png new file mode 100644 index 0000000000..6ad304b562 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header.png differ diff --git a/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header_error.png b/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header_error.png new file mode 100644 index 0000000000..c7386e1e27 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header_error.png differ diff --git a/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header_resub.png b/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header_resub.png new file mode 100644 index 0000000000..c557967039 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_premium_guild_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-ldpi/bg_premium_subscription_header.png b/com.discord/res/drawable-ldpi/bg_premium_subscription_header.png new file mode 100644 index 0000000000..481d96fd18 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-ldpi/bg_premium_subscription_header_error.png b/com.discord/res/drawable-ldpi/bg_premium_subscription_header_error.png new file mode 100644 index 0000000000..3938098b35 Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-ldpi/bg_premium_subscription_header_resub.png b/com.discord/res/drawable-ldpi/bg_premium_subscription_header_resub.png new file mode 100644 index 0000000000..485fa50e5d Binary files /dev/null and b/com.discord/res/drawable-ldpi/bg_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-ldpi/ic_channel_announcements_locked.png b/com.discord/res/drawable-ldpi/ic_channel_announcements_locked.png new file mode 100644 index 0000000000..3cfa76ef04 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_channel_announcements_locked.png differ diff --git a/com.discord/res/drawable-ldpi/ic_channel_announcements_nsfw.png b/com.discord/res/drawable-ldpi/ic_channel_announcements_nsfw.png new file mode 100644 index 0000000000..d989a56dcb Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_channel_announcements_nsfw.png differ diff --git a/com.discord/res/drawable-ldpi/img_nitro_broken_wheel.png b/com.discord/res/drawable-ldpi/img_nitro_broken_wheel.png deleted file mode 100644 index 5496131c76..0000000000 Binary files a/com.discord/res/drawable-ldpi/img_nitro_broken_wheel.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header.png b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header.png new file mode 100644 index 0000000000..3ba124deec Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_error.png b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_error.png new file mode 100644 index 0000000000..84ad050e87 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_error.png differ diff --git a/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_logo.png b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_logo.png new file mode 100644 index 0000000000..5acd0bcd2e Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_resub.png b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_resub.png new file mode 100644 index 0000000000..41bf4506f5 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_classic_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-ldpi/img_premium_subscription_header.png b/com.discord/res/drawable-ldpi/img_premium_subscription_header.png new file mode 100644 index 0000000000..3b568ec23a Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-ldpi/img_premium_subscription_header_error.png b/com.discord/res/drawable-ldpi/img_premium_subscription_header_error.png new file mode 100644 index 0000000000..624acbec60 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-ldpi/img_premium_subscription_header_logo.png b/com.discord/res/drawable-ldpi/img_premium_subscription_header_logo.png new file mode 100644 index 0000000000..659c6f2fb7 Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-ldpi/img_premium_subscription_header_resub.png b/com.discord/res/drawable-ldpi/img_premium_subscription_header_resub.png new file mode 100644 index 0000000000..7d3b20d47f Binary files /dev/null and b/com.discord/res/drawable-ldpi/img_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-mdpi/bg_announcements_follow_sheet_dark.png b/com.discord/res/drawable-mdpi/bg_announcements_follow_sheet_dark.png new file mode 100644 index 0000000000..9dbd7c1efc Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_announcements_follow_sheet_dark.png differ diff --git a/com.discord/res/drawable-mdpi/bg_announcements_follow_sheet_light.png b/com.discord/res/drawable-mdpi/bg_announcements_follow_sheet_light.png new file mode 100644 index 0000000000..dced6b15a2 Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_announcements_follow_sheet_light.png differ diff --git a/com.discord/res/drawable-mdpi/bg_nitro.png b/com.discord/res/drawable-mdpi/bg_nitro.png deleted file mode 100644 index 27ecce3ece..0000000000 Binary files a/com.discord/res/drawable-mdpi/bg_nitro.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/bg_nitro_caution.png b/com.discord/res/drawable-mdpi/bg_nitro_caution.png deleted file mode 100644 index fed769b8ff..0000000000 Binary files a/com.discord/res/drawable-mdpi/bg_nitro_caution.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/bg_nitro_classic.png b/com.discord/res/drawable-mdpi/bg_nitro_classic.png deleted file mode 100644 index 11a5c6dcec..0000000000 Binary files a/com.discord/res/drawable-mdpi/bg_nitro_classic.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/bg_nitro_error.png b/com.discord/res/drawable-mdpi/bg_nitro_error.png deleted file mode 100644 index 35649a1a27..0000000000 Binary files a/com.discord/res/drawable-mdpi/bg_nitro_error.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/bg_premium_classic_subscription_header.png b/com.discord/res/drawable-mdpi/bg_premium_classic_subscription_header.png new file mode 100644 index 0000000000..86b14481ef Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header.png b/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header.png new file mode 100644 index 0000000000..b040451a35 Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header.png differ diff --git a/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header_error.png b/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header_error.png new file mode 100644 index 0000000000..c08391213d Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header_error.png differ diff --git a/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header_resub.png b/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header_resub.png new file mode 100644 index 0000000000..ff64839333 Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_premium_guild_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-mdpi/bg_premium_subscription_header.png b/com.discord/res/drawable-mdpi/bg_premium_subscription_header.png new file mode 100644 index 0000000000..6c681eabe2 Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-mdpi/bg_premium_subscription_header_error.png b/com.discord/res/drawable-mdpi/bg_premium_subscription_header_error.png new file mode 100644 index 0000000000..e961dda692 Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-mdpi/bg_premium_subscription_header_resub.png b/com.discord/res/drawable-mdpi/bg_premium_subscription_header_resub.png new file mode 100644 index 0000000000..01bd459fd0 Binary files /dev/null and b/com.discord/res/drawable-mdpi/bg_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-mdpi/ic_channel_announcements_locked.png b/com.discord/res/drawable-mdpi/ic_channel_announcements_locked.png new file mode 100644 index 0000000000..8f50b3b6c6 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_channel_announcements_locked.png differ diff --git a/com.discord/res/drawable-mdpi/ic_channel_announcements_nsfw.png b/com.discord/res/drawable-mdpi/ic_channel_announcements_nsfw.png new file mode 100644 index 0000000000..7d29bc3a82 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_channel_announcements_nsfw.png differ diff --git a/com.discord/res/drawable-mdpi/img_nitro_broken_wheel.png b/com.discord/res/drawable-mdpi/img_nitro_broken_wheel.png deleted file mode 100644 index ea0006d30c..0000000000 Binary files a/com.discord/res/drawable-mdpi/img_nitro_broken_wheel.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header.png b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header.png new file mode 100644 index 0000000000..cfa43625a3 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_error.png b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_error.png new file mode 100644 index 0000000000..980db49fa1 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_error.png differ diff --git a/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_logo.png b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_logo.png new file mode 100644 index 0000000000..3c3d98b240 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_resub.png b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_resub.png new file mode 100644 index 0000000000..1deef07ab7 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_classic_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-mdpi/img_premium_subscription_header.png b/com.discord/res/drawable-mdpi/img_premium_subscription_header.png new file mode 100644 index 0000000000..b6b5ad9901 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-mdpi/img_premium_subscription_header_error.png b/com.discord/res/drawable-mdpi/img_premium_subscription_header_error.png new file mode 100644 index 0000000000..4b68680634 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-mdpi/img_premium_subscription_header_logo.png b/com.discord/res/drawable-mdpi/img_premium_subscription_header_logo.png new file mode 100644 index 0000000000..d9a2820d53 Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-mdpi/img_premium_subscription_header_resub.png b/com.discord/res/drawable-mdpi/img_premium_subscription_header_resub.png new file mode 100644 index 0000000000..8cd8bea4eb Binary files /dev/null and b/com.discord/res/drawable-mdpi/img_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_announcements_follow_sheet_dark.png b/com.discord/res/drawable-xhdpi/bg_announcements_follow_sheet_dark.png new file mode 100644 index 0000000000..9811f690b7 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_announcements_follow_sheet_dark.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_announcements_follow_sheet_light.png b/com.discord/res/drawable-xhdpi/bg_announcements_follow_sheet_light.png new file mode 100644 index 0000000000..995874d752 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_announcements_follow_sheet_light.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_nitro.png b/com.discord/res/drawable-xhdpi/bg_nitro.png deleted file mode 100644 index 9198697c0a..0000000000 Binary files a/com.discord/res/drawable-xhdpi/bg_nitro.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/bg_nitro_caution.png b/com.discord/res/drawable-xhdpi/bg_nitro_caution.png deleted file mode 100644 index 6e0d8007a1..0000000000 Binary files a/com.discord/res/drawable-xhdpi/bg_nitro_caution.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/bg_nitro_classic.png b/com.discord/res/drawable-xhdpi/bg_nitro_classic.png deleted file mode 100644 index 4ae051f196..0000000000 Binary files a/com.discord/res/drawable-xhdpi/bg_nitro_classic.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/bg_nitro_error.png b/com.discord/res/drawable-xhdpi/bg_nitro_error.png deleted file mode 100644 index 7821112b6e..0000000000 Binary files a/com.discord/res/drawable-xhdpi/bg_nitro_error.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/bg_premium_classic_subscription_header.png b/com.discord/res/drawable-xhdpi/bg_premium_classic_subscription_header.png new file mode 100644 index 0000000000..f827dc2b08 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header.png b/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header.png new file mode 100644 index 0000000000..450aa9392c Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header_error.png b/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header_error.png new file mode 100644 index 0000000000..397eb42138 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header_resub.png b/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header_resub.png new file mode 100644 index 0000000000..8cb2a8cfe1 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_premium_guild_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_premium_subscription_header.png b/com.discord/res/drawable-xhdpi/bg_premium_subscription_header.png new file mode 100644 index 0000000000..c35d927119 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_premium_subscription_header_error.png b/com.discord/res/drawable-xhdpi/bg_premium_subscription_header_error.png new file mode 100644 index 0000000000..f7c8a23353 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xhdpi/bg_premium_subscription_header_resub.png b/com.discord/res/drawable-xhdpi/bg_premium_subscription_header_resub.png new file mode 100644 index 0000000000..d48df21ff4 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/bg_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_channel_announcements_locked.png b/com.discord/res/drawable-xhdpi/ic_channel_announcements_locked.png new file mode 100644 index 0000000000..a48f2b4955 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_channel_announcements_locked.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_channel_announcements_nsfw.png b/com.discord/res/drawable-xhdpi/ic_channel_announcements_nsfw.png new file mode 100644 index 0000000000..8f7e8ed8de Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_channel_announcements_nsfw.png differ diff --git a/com.discord/res/drawable-xhdpi/img_nitro_broken_wheel.png b/com.discord/res/drawable-xhdpi/img_nitro_broken_wheel.png deleted file mode 100644 index 72e4742c4d..0000000000 Binary files a/com.discord/res/drawable-xhdpi/img_nitro_broken_wheel.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header.png b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header.png new file mode 100644 index 0000000000..f1a21866bd Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_error.png b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_error.png new file mode 100644 index 0000000000..baa78f188d Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_logo.png b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_logo.png new file mode 100644 index 0000000000..e031c6285c Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_resub.png b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_resub.png new file mode 100644 index 0000000000..b229454630 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_classic_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_subscription_header.png b/com.discord/res/drawable-xhdpi/img_premium_subscription_header.png new file mode 100644 index 0000000000..378b1c9948 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_subscription_header_error.png b/com.discord/res/drawable-xhdpi/img_premium_subscription_header_error.png new file mode 100644 index 0000000000..217e32bb77 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_subscription_header_logo.png b/com.discord/res/drawable-xhdpi/img_premium_subscription_header_logo.png new file mode 100644 index 0000000000..b5884a9bfc Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-xhdpi/img_premium_subscription_header_resub.png b/com.discord/res/drawable-xhdpi/img_premium_subscription_header_resub.png new file mode 100644 index 0000000000..e1bc433b99 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/img_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_announcements_follow_sheet_dark.png b/com.discord/res/drawable-xxhdpi/bg_announcements_follow_sheet_dark.png new file mode 100644 index 0000000000..419debda99 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_announcements_follow_sheet_dark.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_announcements_follow_sheet_light.png b/com.discord/res/drawable-xxhdpi/bg_announcements_follow_sheet_light.png new file mode 100644 index 0000000000..1731f3860c Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_announcements_follow_sheet_light.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_nitro.png b/com.discord/res/drawable-xxhdpi/bg_nitro.png deleted file mode 100644 index eaea43aae9..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/bg_nitro.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/bg_nitro_caution.png b/com.discord/res/drawable-xxhdpi/bg_nitro_caution.png deleted file mode 100644 index a4494c80a0..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/bg_nitro_caution.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/bg_nitro_classic.png b/com.discord/res/drawable-xxhdpi/bg_nitro_classic.png deleted file mode 100644 index e7214b35db..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/bg_nitro_classic.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/bg_nitro_error.png b/com.discord/res/drawable-xxhdpi/bg_nitro_error.png deleted file mode 100644 index 4153ac507a..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/bg_nitro_error.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/bg_premium_classic_subscription_header.png b/com.discord/res/drawable-xxhdpi/bg_premium_classic_subscription_header.png new file mode 100644 index 0000000000..a35e0e6046 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header.png b/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header.png new file mode 100644 index 0000000000..711a2f71fd Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header_error.png b/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header_error.png new file mode 100644 index 0000000000..35f318e395 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header_resub.png b/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header_resub.png new file mode 100644 index 0000000000..c491e7340a Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_premium_guild_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header.png b/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header.png new file mode 100644 index 0000000000..a7bf8dee3b Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header_error.png b/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header_error.png new file mode 100644 index 0000000000..8fe6aee0ad Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header_resub.png b/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header_resub.png new file mode 100644 index 0000000000..0bc5ce1429 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/bg_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_channel_announcements_locked.png b/com.discord/res/drawable-xxhdpi/ic_channel_announcements_locked.png new file mode 100644 index 0000000000..3f77cc55f4 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_channel_announcements_locked.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_channel_announcements_nsfw.png b/com.discord/res/drawable-xxhdpi/ic_channel_announcements_nsfw.png new file mode 100644 index 0000000000..efeec204f2 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_channel_announcements_nsfw.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_nitro_broken_wheel.png b/com.discord/res/drawable-xxhdpi/img_nitro_broken_wheel.png deleted file mode 100644 index 6ef9d34f6c..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/img_nitro_broken_wheel.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header.png b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header.png new file mode 100644 index 0000000000..40e8d30769 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_error.png b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_error.png new file mode 100644 index 0000000000..6a5de0d937 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_logo.png b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_logo.png new file mode 100644 index 0000000000..fa87319d85 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_resub.png b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_resub.png new file mode 100644 index 0000000000..5df3d0974c Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_classic_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_subscription_header.png b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header.png new file mode 100644 index 0000000000..da56733a93 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_error.png b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_error.png new file mode 100644 index 0000000000..67635a4eac Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_logo.png b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_logo.png new file mode 100644 index 0000000000..3f82c649b3 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_resub.png b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_resub.png new file mode 100644 index 0000000000..a02f82a240 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_announcements_follow_sheet_dark.png b/com.discord/res/drawable-xxxhdpi/bg_announcements_follow_sheet_dark.png new file mode 100644 index 0000000000..6389e192ff Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_announcements_follow_sheet_dark.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_announcements_follow_sheet_light.png b/com.discord/res/drawable-xxxhdpi/bg_announcements_follow_sheet_light.png new file mode 100644 index 0000000000..366eb2848a Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_announcements_follow_sheet_light.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_nitro.png b/com.discord/res/drawable-xxxhdpi/bg_nitro.png deleted file mode 100644 index 8f44253d23..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/bg_nitro.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_nitro_caution.png b/com.discord/res/drawable-xxxhdpi/bg_nitro_caution.png deleted file mode 100644 index 9f07f14506..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/bg_nitro_caution.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_nitro_classic.png b/com.discord/res/drawable-xxxhdpi/bg_nitro_classic.png deleted file mode 100644 index 3795dd169d..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/bg_nitro_classic.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_nitro_error.png b/com.discord/res/drawable-xxxhdpi/bg_nitro_error.png deleted file mode 100644 index 7cfe919f2c..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/bg_nitro_error.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_premium_classic_subscription_header.png b/com.discord/res/drawable-xxxhdpi/bg_premium_classic_subscription_header.png new file mode 100644 index 0000000000..794c9b1765 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header.png b/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header.png new file mode 100644 index 0000000000..e3957ec4d9 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header_error.png b/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header_error.png new file mode 100644 index 0000000000..fde8ab973f Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header_resub.png b/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header_resub.png new file mode 100644 index 0000000000..f0afc30da9 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_premium_guild_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header.png b/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header.png new file mode 100644 index 0000000000..0261fbf083 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header_error.png b/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header_error.png new file mode 100644 index 0000000000..676d7d4f74 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header_resub.png b/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header_resub.png new file mode 100644 index 0000000000..c3674dbab0 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/bg_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_channel_announcements_locked.png b/com.discord/res/drawable-xxxhdpi/ic_channel_announcements_locked.png new file mode 100644 index 0000000000..9cfaf3a598 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_channel_announcements_locked.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_channel_announcements_nsfw.png b/com.discord/res/drawable-xxxhdpi/ic_channel_announcements_nsfw.png new file mode 100644 index 0000000000..6f671af4d5 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_channel_announcements_nsfw.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_nitro_broken_wheel.png b/com.discord/res/drawable-xxxhdpi/img_nitro_broken_wheel.png deleted file mode 100644 index a1a71ebd09..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/img_nitro_broken_wheel.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header.png b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header.png new file mode 100644 index 0000000000..034b018ae1 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_error.png b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_error.png new file mode 100644 index 0000000000..ffe6f9c9b7 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_logo.png b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_logo.png new file mode 100644 index 0000000000..af6ab78995 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_resub.png b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_resub.png new file mode 100644 index 0000000000..5eb61db4d6 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_classic_subscription_header_resub.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header.png b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header.png new file mode 100644 index 0000000000..eae0c5d9a7 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_error.png b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_error.png new file mode 100644 index 0000000000..8df3dd47f3 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_error.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_logo.png b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_logo.png new file mode 100644 index 0000000000..a633136b6f Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_logo.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_resub.png b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_resub.png new file mode 100644 index 0000000000..035dc73752 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_premium_subscription_header_resub.png differ diff --git a/com.discord/res/drawable/bg_nitro_grandfathered.xml b/com.discord/res/drawable/bg_nitro_grandfathered.xml deleted file mode 100644 index 4e6685b5f7..0000000000 --- a/com.discord/res/drawable/bg_nitro_grandfathered.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/bg_payment_method_spinner_closed.xml b/com.discord/res/drawable/bg_payment_method_spinner_closed.xml index 3da5c68dd1..ca7daccba3 100644 --- a/com.discord/res/drawable/bg_payment_method_spinner_closed.xml +++ b/com.discord/res/drawable/bg_payment_method_spinner_closed.xml @@ -3,9 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - - - + + diff --git a/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml b/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml index 48b2c6b0aa..4d76127d24 100644 --- a/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml +++ b/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml @@ -3,9 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - - - + + diff --git a/com.discord/res/drawable/guild_use_cases_join_friend_32dp.xml b/com.discord/res/drawable/guild_use_cases_join_friend_32dp.xml index ae2a610464..2a2086ad05 100644 --- a/com.discord/res/drawable/guild_use_cases_join_friend_32dp.xml +++ b/com.discord/res/drawable/guild_use_cases_join_friend_32dp.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/com.discord/res/drawable/ic_channel_announcements.xml b/com.discord/res/drawable/ic_channel_announcements.xml new file mode 100644 index 0000000000..0a1084a1a4 --- /dev/null +++ b/com.discord/res/drawable/ic_channel_announcements.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml b/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml index 59c11e3083..f1ff9c9cc5 100644 --- a/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml +++ b/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml b/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml index addcf7bb69..02550cfe9b 100644 --- a/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml +++ b/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml b/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml index d3aaf580ee..2307c9e162 100644 --- a/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml +++ b/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/img_channel_following_success_1_dark.xml b/com.discord/res/drawable/img_channel_following_success_1_dark.xml new file mode 100644 index 0000000000..b1b077c683 --- /dev/null +++ b/com.discord/res/drawable/img_channel_following_success_1_dark.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_channel_following_success_1_light.xml b/com.discord/res/drawable/img_channel_following_success_1_light.xml new file mode 100644 index 0000000000..4b7edc52f9 --- /dev/null +++ b/com.discord/res/drawable/img_channel_following_success_1_light.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_channel_following_success_2_dark.xml b/com.discord/res/drawable/img_channel_following_success_2_dark.xml new file mode 100644 index 0000000000..05cbd13b23 --- /dev/null +++ b/com.discord/res/drawable/img_channel_following_success_2_dark.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_channel_following_success_2_light.xml b/com.discord/res/drawable/img_channel_following_success_2_light.xml new file mode 100644 index 0000000000..5f79c307a2 --- /dev/null +++ b/com.discord/res/drawable/img_channel_following_success_2_light.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_channel_following_success_3_dark.xml b/com.discord/res/drawable/img_channel_following_success_3_dark.xml new file mode 100644 index 0000000000..2032b3cdd4 --- /dev/null +++ b/com.discord/res/drawable/img_channel_following_success_3_dark.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_channel_following_success_3_light.xml b/com.discord/res/drawable/img_channel_following_success_3_light.xml new file mode 100644 index 0000000000..dbc418afaa --- /dev/null +++ b/com.discord/res/drawable/img_channel_following_success_3_light.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_premium_guild_subscription_header.xml b/com.discord/res/drawable/img_premium_guild_subscription_header.xml new file mode 100644 index 0000000000..c8316b58d7 --- /dev/null +++ b/com.discord/res/drawable/img_premium_guild_subscription_header.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_premium_guild_subscription_header_error.xml b/com.discord/res/drawable/img_premium_guild_subscription_header_error.xml new file mode 100644 index 0000000000..9ecd41d3af --- /dev/null +++ b/com.discord/res/drawable/img_premium_guild_subscription_header_error.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_premium_guild_subscription_header_logo.xml b/com.discord/res/drawable/img_premium_guild_subscription_header_logo.xml new file mode 100644 index 0000000000..6a4c662ade --- /dev/null +++ b/com.discord/res/drawable/img_premium_guild_subscription_header_logo.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_premium_guild_subscription_header_resub.xml b/com.discord/res/drawable/img_premium_guild_subscription_header_resub.xml new file mode 100644 index 0000000000..fdf2dedb12 --- /dev/null +++ b/com.discord/res/drawable/img_premium_guild_subscription_header_resub.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_channels_list.xml b/com.discord/res/layout-v22/widget_channels_list.xml index 64808e1f24..c8093171d0 100644 --- a/com.discord/res/layout-v22/widget_channels_list.xml +++ b/com.discord/res/layout-v22/widget_channels_list.xml @@ -8,7 +8,7 @@ - + diff --git a/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml b/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml index 7bd165dd0f..e27cdcd24e 100644 --- a/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml +++ b/com.discord/res/layout/active_subscription_payment_method_spinner_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/layout_account_credits_list.xml b/com.discord/res/layout/layout_account_credits_list.xml index 5442a60619..4d79fe4250 100644 --- a/com.discord/res/layout/layout_account_credits_list.xml +++ b/com.discord/res/layout/layout_account_credits_list.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/layout/layout_premium_guild_status_features_user.xml b/com.discord/res/layout/layout_premium_guild_status_features_user.xml index 068be9a41f..39eeeac304 100644 --- a/com.discord/res/layout/layout_premium_guild_status_features_user.xml +++ b/com.discord/res/layout/layout_premium_guild_status_features_user.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/layout_premium_settings_payment.xml b/com.discord/res/layout/layout_premium_settings_payment.xml new file mode 100644 index 0000000000..b7af86a2be --- /dev/null +++ b/com.discord/res/layout/layout_premium_settings_payment.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml b/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml index 7d38a46317..205ad6b7a0 100644 --- a/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml +++ b/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml @@ -19,7 +19,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml b/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml index c9313f97b7..b0af668ee1 100644 --- a/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml +++ b/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/view_account_credit.xml b/com.discord/res/layout/view_account_credit.xml index 018d720f6d..4655b0a70f 100644 --- a/com.discord/res/layout/view_account_credit.xml +++ b/com.discord/res/layout/view_account_credit.xml @@ -1,10 +1,10 @@ - + - - + + - + \ No newline at end of file diff --git a/com.discord/res/layout/view_active_subscription.xml b/com.discord/res/layout/view_active_subscription.xml index 371cfd2354..7ab09055e4 100644 --- a/com.discord/res/layout/view_active_subscription.xml +++ b/com.discord/res/layout/view_active_subscription.xml @@ -1,18 +1,17 @@ - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_application_stream.xml b/com.discord/res/layout/view_application_stream.xml index cfe6cd77d1..74cb761468 100644 --- a/com.discord/res/layout/view_application_stream.xml +++ b/com.discord/res/layout/view_application_stream.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout/view_guild.xml b/com.discord/res/layout/view_guild.xml index aced72b0e0..39ea991403 100644 --- a/com.discord/res/layout/view_guild.xml +++ b/com.discord/res/layout/view_guild.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/view_premium_guild_confirmation.xml b/com.discord/res/layout/view_premium_guild_confirmation.xml index d301ae6082..45d4f28b68 100644 --- a/com.discord/res/layout/view_premium_guild_confirmation.xml +++ b/com.discord/res/layout/view_premium_guild_confirmation.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + diff --git a/com.discord/res/layout/view_premium_guild_feature.xml b/com.discord/res/layout/view_premium_guild_feature.xml index 5ba42b7842..5f00f09147 100644 --- a/com.discord/res/layout/view_premium_guild_feature.xml +++ b/com.discord/res/layout/view_premium_guild_feature.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + \ No newline at end of file diff --git a/com.discord/res/layout/view_premium_guild_features_guild_old.xml b/com.discord/res/layout/view_premium_guild_features_guild_old.xml index 4133757547..612d1007a7 100644 --- a/com.discord/res/layout/view_premium_guild_features_guild_old.xml +++ b/com.discord/res/layout/view_premium_guild_features_guild_old.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/view_premium_guild_features_user_old.xml b/com.discord/res/layout/view_premium_guild_features_user_old.xml index 8e72b559ca..9df2384e44 100644 --- a/com.discord/res/layout/view_premium_guild_features_user_old.xml +++ b/com.discord/res/layout/view_premium_guild_features_user_old.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/view_premium_guild_progress.xml b/com.discord/res/layout/view_premium_guild_progress.xml index 2111ca7de2..04ef85608f 100644 --- a/com.discord/res/layout/view_premium_guild_progress.xml +++ b/com.discord/res/layout/view_premium_guild_progress.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + \ No newline at end of file diff --git a/com.discord/res/layout/view_premium_upsell_info.xml b/com.discord/res/layout/view_premium_upsell_info.xml index 5bae4519c4..cbb3533362 100644 --- a/com.discord/res/layout/view_premium_upsell_info.xml +++ b/com.discord/res/layout/view_premium_upsell_info.xml @@ -1,8 +1,8 @@ - - - - + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml b/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml index ff6afe4469..85d4a750da 100644 --- a/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml +++ b/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml @@ -2,7 +2,7 @@ - - - + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml b/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml index 171272b276..a2f0ee435b 100644 --- a/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml +++ b/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/voice_user_list_item_invite.xml b/com.discord/res/layout/voice_user_list_item_invite.xml index c1a0ca7fca..a149fc9dcb 100644 --- a/com.discord/res/layout/voice_user_list_item_invite.xml +++ b/com.discord/res/layout/voice_user_list_item_invite.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file 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 18b278a798..3d7c86bd16 100644 --- a/com.discord/res/layout/voice_user_list_item_user.xml +++ b/com.discord/res/layout/voice_user_list_item_user.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + diff --git a/com.discord/res/layout/widget_channel_follow_sheet.xml b/com.discord/res/layout/widget_channel_follow_sheet.xml new file mode 100644 index 0000000000..1cf00cbc11 --- /dev/null +++ b/com.discord/res/layout/widget_channel_follow_sheet.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_follow_success_dialog.xml b/com.discord/res/layout/widget_channel_follow_success_dialog.xml new file mode 100644 index 0000000000..2c9740b597 --- /dev/null +++ b/com.discord/res/layout/widget_channel_follow_success_dialog.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_selector.xml b/com.discord/res/layout/widget_channel_selector.xml index 1afdcc0f58..14cc3e0d70 100644 --- a/com.discord/res/layout/widget_channel_selector.xml +++ b/com.discord/res/layout/widget_channel_selector.xml @@ -2,10 +2,7 @@ - - - - + diff --git a/com.discord/res/layout/widget_channel_topic.xml b/com.discord/res/layout/widget_channel_topic.xml index a8fdb0e8bd..28df1fa559 100644 --- a/com.discord/res/layout/widget_channel_topic.xml +++ b/com.discord/res/layout/widget_channel_topic.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list.xml b/com.discord/res/layout/widget_channels_list.xml index af2572a5da..c38894ba20 100644 --- a/com.discord/res/layout/widget_channels_list.xml +++ b/com.discord/res/layout/widget_channels_list.xml @@ -8,7 +8,7 @@ - + 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 15f1465cdc..95957c8bbd 100644 --- a/com.discord/res/layout/widget_channels_list_item_channel.xml +++ b/com.discord/res/layout/widget_channels_list_item_channel.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/widget_channels_list_item_mfa.xml b/com.discord/res/layout/widget_channels_list_item_mfa.xml index 153d2bab6d..8a8dc2f827 100644 --- a/com.discord/res/layout/widget_channels_list_item_mfa.xml +++ b/com.discord/res/layout/widget_channels_list_item_mfa.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_input_guard.xml b/com.discord/res/layout/widget_chat_input_guard.xml index e9650981d6..7d5b39d76a 100644 --- a/com.discord/res/layout/widget_chat_input_guard.xml +++ b/com.discord/res/layout/widget_chat_input_guard.xml @@ -3,5 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml index 54e3f19308..e46bf1515f 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml @@ -7,7 +7,7 @@ - + diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml b/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml index 96a9c76969..3a30f67799 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_message_header.xml b/com.discord/res/layout/widget_chat_list_adapter_item_message_header.xml index a0a69b11de..1f3fbf4cb5 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_message_header.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_message_header.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml b/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml index 24876c645b..f582aba3d9 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_private_channel_start.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml index 511a26b280..09b8d46f31 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout/widget_guild_actions_add.xml b/com.discord/res/layout/widget_guild_actions_add.xml index c652eba37e..e822ea3664 100644 --- a/com.discord/res/layout/widget_guild_actions_add.xml +++ b/com.discord/res/layout/widget_guild_actions_add.xml @@ -1,11 +1,11 @@ - - + @@ -14,7 +14,7 @@ - + diff --git a/com.discord/res/layout/widget_guild_actions_add_colored.xml b/com.discord/res/layout/widget_guild_actions_add_colored.xml new file mode 100644 index 0000000000..3f528c196e --- /dev/null +++ b/com.discord/res/layout/widget_guild_actions_add_colored.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_actions_add_edu.xml b/com.discord/res/layout/widget_guild_actions_add_edu.xml new file mode 100644 index 0000000000..936a2bff96 --- /dev/null +++ b/com.discord/res/layout/widget_guild_actions_add_edu.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_selector.xml b/com.discord/res/layout/widget_guild_selector.xml new file mode 100644 index 0000000000..6362229b14 --- /dev/null +++ b/com.discord/res/layout/widget_guild_selector.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_selector_item.xml b/com.discord/res/layout/widget_guild_selector_item.xml new file mode 100644 index 0000000000..3eb0b4112f --- /dev/null +++ b/com.discord/res/layout/widget_guild_selector_item.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guilds_list_item_guild.xml b/com.discord/res/layout/widget_guilds_list_item_guild.xml index 6b0a6a203d..7da3db12ab 100644 --- a/com.discord/res/layout/widget_guilds_list_item_guild.xml +++ b/com.discord/res/layout/widget_guilds_list_item_guild.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + diff --git a/com.discord/res/layout/widget_premium_guild_transfer.xml b/com.discord/res/layout/widget_premium_guild_transfer.xml index 2ccb591930..8a4bc6d423 100644 --- a/com.discord/res/layout/widget_premium_guild_transfer.xml +++ b/com.discord/res/layout/widget_premium_guild_transfer.xml @@ -9,9 +9,9 @@ - + - + diff --git a/com.discord/res/layout/widget_remote_auth_not_found.xml b/com.discord/res/layout/widget_remote_auth_not_found.xml index 9a344271c5..c6c8a10c2f 100644 --- a/com.discord/res/layout/widget_remote_auth_not_found.xml +++ b/com.discord/res/layout/widget_remote_auth_not_found.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ 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 e2e9830d04..edcda05e98 100644 --- a/com.discord/res/layout/widget_remote_auth_pending_login.xml +++ b/com.discord/res/layout/widget_remote_auth_pending_login.xml @@ -5,8 +5,8 @@ - + - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_remote_auth_success.xml b/com.discord/res/layout/widget_remote_auth_success.xml index 4479ca03a0..32dd440218 100644 --- a/com.discord/res/layout/widget_remote_auth_success.xml +++ b/com.discord/res/layout/widget_remote_auth_success.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_server_boost_status.xml b/com.discord/res/layout/widget_server_boost_status.xml index 8b6e0a3f17..8b1cd44f5b 100644 --- a/com.discord/res/layout/widget_server_boost_status.xml +++ b/com.discord/res/layout/widget_server_boost_status.xml @@ -12,7 +12,7 @@ - + diff --git a/com.discord/res/layout/widget_server_settings_members.xml b/com.discord/res/layout/widget_server_settings_members.xml index 7297174a8a..3a0ce821da 100644 --- a/com.discord/res/layout/widget_server_settings_members.xml +++ b/com.discord/res/layout/widget_server_settings_members.xml @@ -6,7 +6,7 @@ - + diff --git a/com.discord/res/layout/widget_settings_billing.xml b/com.discord/res/layout/widget_settings_billing.xml index da995a9ec8..cd782bad0e 100644 --- a/com.discord/res/layout/widget_settings_billing.xml +++ b/com.discord/res/layout/widget_settings_billing.xml @@ -6,7 +6,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_settings_premium.xml b/com.discord/res/layout/widget_settings_premium.xml index b9ac0f7d28..8399c97d81 100644 --- a/com.discord/res/layout/widget_settings_premium.xml +++ b/com.discord/res/layout/widget_settings_premium.xml @@ -10,16 +10,26 @@ - - - - - + + + + + + + + + + + + + + + diff --git a/com.discord/res/layout/widget_spectate_report_problem.xml b/com.discord/res/layout/widget_spectate_report_problem.xml index f6e2d57334..f7f0de0f70 100644 --- a/com.discord/res/layout/widget_spectate_report_problem.xml +++ b/com.discord/res/layout/widget_spectate_report_problem.xml @@ -17,7 +17,7 @@ -