diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 147e3d449a..8a7a85f3cb 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1071.apk +apkFileName: com.discord-1072.apk compressionType: false doNotCompress: - arsc @@ -190,5 +190,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1071' - versionName: 15-alpha5 + versionCode: '1072' + versionName: 15-alpha6 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 2b3f494ae7..a84884d798 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 Mar 20 03:14:24 UTC 2020 -version_name=15-alpha5 +#Fri Mar 20 18:11:36 UTC 2020 +version_name=15-alpha6 package_name=com.discord -build_id=f1e272f5-61d0-4317-b584-0cfc67ad4a92 -version_code=1071 +build_id=691b2eb9-9b0c-4d03-b93d-34edaad09760 +version_code=1072 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index f29955c0bf..df40a64717 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-xxhdpi/img_auth_bg_dark.png b/com.discord/res/drawable-xxhdpi/img_auth_bg_dark.png index f14cb36cb9..c0b8a1b717 100644 Binary files a/com.discord/res/drawable-xxhdpi/img_auth_bg_dark.png and b/com.discord/res/drawable-xxhdpi/img_auth_bg_dark.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_auth_bg_light.png b/com.discord/res/drawable-xxhdpi/img_auth_bg_light.png index e1f0fb44a2..ed264839d0 100644 Binary files a/com.discord/res/drawable-xxhdpi/img_auth_bg_light.png and b/com.discord/res/drawable-xxhdpi/img_auth_bg_light.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_landing_bg_dark.png b/com.discord/res/drawable-xxhdpi/img_landing_bg_dark.png new file mode 100644 index 0000000000..31c7ed35b4 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_landing_bg_dark.png differ diff --git a/com.discord/res/drawable-xxhdpi/img_landing_bg_light.png b/com.discord/res/drawable-xxhdpi/img_landing_bg_light.png new file mode 100644 index 0000000000..1a0c613cf4 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/img_landing_bg_light.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_auth_bg_bl.png b/com.discord/res/drawable-xxxhdpi/img_auth_bg_bl.png deleted file mode 100644 index 51f1387c07..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/img_auth_bg_bl.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/img_auth_bg_br.png b/com.discord/res/drawable-xxxhdpi/img_auth_bg_br.png deleted file mode 100644 index f48973fd64..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/img_auth_bg_br.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/img_auth_bg_tr.png b/com.discord/res/drawable-xxxhdpi/img_auth_bg_tr.png deleted file mode 100644 index 1731e71f4a..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/img_auth_bg_tr.png and /dev/null differ diff --git a/com.discord/res/drawable/drawable_circle_dashed.xml b/com.discord/res/drawable/drawable_circle_dashed.xml new file mode 100644 index 0000000000..f2d9d08b15 --- /dev/null +++ b/com.discord/res/drawable/drawable_circle_dashed.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_clickable_rounded_4dp_brighten.xml b/com.discord/res/drawable/drawable_clickable_rounded_4dp_brighten.xml new file mode 100644 index 0000000000..65c7706f71 --- /dev/null +++ b/com.discord/res/drawable/drawable_clickable_rounded_4dp_brighten.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_clickable_rounded_4dp_darken.xml b/com.discord/res/drawable/drawable_clickable_rounded_4dp_darken.xml new file mode 100644 index 0000000000..2928a6776a --- /dev/null +++ b/com.discord/res/drawable/drawable_clickable_rounded_4dp_darken.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_invite_share_art_envelope.xml b/com.discord/res/drawable/drawable_invite_share_art_envelope.xml new file mode 100644 index 0000000000..06b08ec21c --- /dev/null +++ b/com.discord/res/drawable/drawable_invite_share_art_envelope.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_logo_auth_dark.xml b/com.discord/res/drawable/drawable_logo_auth_dark.xml new file mode 100644 index 0000000000..4cf478851b --- /dev/null +++ b/com.discord/res/drawable/drawable_logo_auth_dark.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_logo_auth_light.xml b/com.discord/res/drawable/drawable_logo_auth_light.xml new file mode 100644 index 0000000000..dd974c2760 --- /dev/null +++ b/com.discord/res/drawable/drawable_logo_auth_light.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_ptrn_auth_bg_dark.xml b/com.discord/res/drawable/drawable_ptrn_auth_bg_dark.xml index 30a34f19de..06daed9f2c 100644 --- a/com.discord/res/drawable/drawable_ptrn_auth_bg_dark.xml +++ b/com.discord/res/drawable/drawable_ptrn_auth_bg_dark.xml @@ -1,3 +1,8 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_ptrn_auth_bg_light.xml b/com.discord/res/drawable/drawable_ptrn_auth_bg_light.xml index 963aa4856e..67707087f1 100644 --- a/com.discord/res/drawable/drawable_ptrn_auth_bg_light.xml +++ b/com.discord/res/drawable/drawable_ptrn_auth_bg_light.xml @@ -1,3 +1,8 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_ptrn_landing_bg_dark.xml b/com.discord/res/drawable/drawable_ptrn_landing_bg_dark.xml new file mode 100644 index 0000000000..de5cb10efb --- /dev/null +++ b/com.discord/res/drawable/drawable_ptrn_landing_bg_dark.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_ptrn_landing_bg_light.xml b/com.discord/res/drawable/drawable_ptrn_landing_bg_light.xml new file mode 100644 index 0000000000..f3009414fd --- /dev/null +++ b/com.discord/res/drawable/drawable_ptrn_landing_bg_light.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_rect_rounded_white.xml b/com.discord/res/drawable/drawable_rect_rounded_white_corner_radius_8dp.xml similarity index 100% rename from com.discord/res/drawable/drawable_rect_rounded_white.xml rename to com.discord/res/drawable/drawable_rect_rounded_white_corner_radius_8dp.xml diff --git a/com.discord/res/drawable/drawable_uikit_primary_500_button_outline.xml b/com.discord/res/drawable/drawable_uikit_background_tertiary_button.xml similarity index 81% rename from com.discord/res/drawable/drawable_uikit_primary_500_button_outline.xml rename to com.discord/res/drawable/drawable_uikit_background_tertiary_button.xml index 96ec4f2990..dd5059dfa6 100644 --- a/com.discord/res/drawable/drawable_uikit_primary_500_button_outline.xml +++ b/com.discord/res/drawable/drawable_uikit_background_tertiary_button.xml @@ -3,8 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_uikit_brand_500_button_outline.xml b/com.discord/res/drawable/drawable_uikit_background_tertiary_button_outline.xml similarity index 92% rename from com.discord/res/drawable/drawable_uikit_brand_500_button_outline.xml rename to com.discord/res/drawable/drawable_uikit_background_tertiary_button_outline.xml index aae03a6a99..199e36fe17 100644 --- a/com.discord/res/drawable/drawable_uikit_brand_500_button_outline.xml +++ b/com.discord/res/drawable/drawable_uikit_background_tertiary_button_outline.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/com.discord/res/drawable/ic_camera_24dp.xml b/com.discord/res/drawable/ic_camera_24dp.xml new file mode 100644 index 0000000000..802e47c034 --- /dev/null +++ b/com.discord/res/drawable/ic_camera_24dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_upload_plus_32dp.xml b/com.discord/res/drawable/ic_upload_plus_32dp.xml new file mode 100644 index 0000000000..36f3b0e2b9 --- /dev/null +++ b/com.discord/res/drawable/ic_upload_plus_32dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/img_plus_illo.xml b/com.discord/res/drawable/img_plus_illo.xml deleted file mode 100644 index 12d983e5cb..0000000000 --- a/com.discord/res/drawable/img_plus_illo.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_auth_login.xml b/com.discord/res/layout-v22/widget_auth_login.xml index 066d58b161..355a3caa12 100644 --- a/com.discord/res/layout-v22/widget_auth_login.xml +++ b/com.discord/res/layout-v22/widget_auth_login.xml @@ -1,30 +1,20 @@ + 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-v22/widget_auth_register.xml b/com.discord/res/layout-v22/widget_auth_register.xml index aed0e843e6..365d8a5aa2 100644 --- a/com.discord/res/layout-v22/widget_auth_register.xml +++ b/com.discord/res/layout-v22/widget_auth_register.xml @@ -2,35 +2,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_guild_clone.xml b/com.discord/res/layout-v22/widget_guild_clone.xml index 5089640de4..1df7e085fb 100644 --- a/com.discord/res/layout-v22/widget_guild_clone.xml +++ b/com.discord/res/layout-v22/widget_guild_clone.xml @@ -19,12 +19,12 @@ - - + + - + @@ -33,14 +33,14 @@ - + - + diff --git a/com.discord/res/layout-v22/widget_guild_create.xml b/com.discord/res/layout-v22/widget_guild_create.xml deleted file mode 100644 index e938fdd4cf..0000000000 --- a/com.discord/res/layout-v22/widget_guild_create.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/layout_icon_uploader.xml b/com.discord/res/layout/layout_icon_uploader.xml new file mode 100644 index 0000000000..4b0c97ae11 --- /dev/null +++ b/com.discord/res/layout/layout_icon_uploader.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_auth_invite_info.xml b/com.discord/res/layout/view_auth_invite_info.xml new file mode 100644 index 0000000000..1671a3089a --- /dev/null +++ b/com.discord/res/layout/view_auth_invite_info.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_screen_title.xml b/com.discord/res/layout/view_screen_title.xml new file mode 100644 index 0000000000..67c816ed5c --- /dev/null +++ b/com.discord/res/layout/view_screen_title.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_captcha.xml b/com.discord/res/layout/widget_auth_captcha.xml index 524d4bcab2..16d231e650 100644 --- a/com.discord/res/layout/widget_auth_captcha.xml +++ b/com.discord/res/layout/widget_auth_captcha.xml @@ -1,21 +1,15 @@ - + - - - - - - - - - - - + + + + + + + - - - - + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_header.xml b/com.discord/res/layout/widget_auth_header.xml index 1644ac7bca..e9c89c1053 100644 --- a/com.discord/res/layout/widget_auth_header.xml +++ b/com.discord/res/layout/widget_auth_header.xml @@ -1,8 +1,4 @@ - - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_invite_info.xml b/com.discord/res/layout/widget_auth_invite_info.xml deleted file mode 100644 index 60bf476326..0000000000 --- a/com.discord/res/layout/widget_auth_invite_info.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_landing.xml b/com.discord/res/layout/widget_auth_landing.xml index cb279cca72..411c663b9d 100644 --- a/com.discord/res/layout/widget_auth_landing.xml +++ b/com.discord/res/layout/widget_auth_landing.xml @@ -1,17 +1,21 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_login.xml b/com.discord/res/layout/widget_auth_login.xml index b0e6d3f7c3..5ac12d5e18 100644 --- a/com.discord/res/layout/widget_auth_login.xml +++ b/com.discord/res/layout/widget_auth_login.xml @@ -1,30 +1,20 @@ + 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/widget_auth_mfa.xml b/com.discord/res/layout/widget_auth_mfa.xml index e4301b5771..edddfe9e75 100644 --- a/com.discord/res/layout/widget_auth_mfa.xml +++ b/com.discord/res/layout/widget_auth_mfa.xml @@ -1,22 +1,14 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_register.xml b/com.discord/res/layout/widget_auth_register.xml index 9b229c563c..0f3e3d783d 100644 --- a/com.discord/res/layout/widget_auth_register.xml +++ b/com.discord/res/layout/widget_auth_register.xml @@ -2,35 +2,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_undelete_account.xml b/com.discord/res/layout/widget_auth_undelete_account.xml index 0655aab03a..5211f83683 100644 --- a/com.discord/res/layout/widget_auth_undelete_account.xml +++ b/com.discord/res/layout/widget_auth_undelete_account.xml @@ -1,23 +1,15 @@ - - - - - - - - - - - - - - - + + + + + - - - + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_clone.xml b/com.discord/res/layout/widget_guild_clone.xml index d80a14db2b..15037fd754 100644 --- a/com.discord/res/layout/widget_guild_clone.xml +++ b/com.discord/res/layout/widget_guild_clone.xml @@ -19,12 +19,12 @@ - - + + - + @@ -33,14 +33,14 @@ - + - + diff --git a/com.discord/res/layout/widget_guild_create.xml b/com.discord/res/layout/widget_guild_create.xml index 33efd7d50e..1467539df1 100644 --- a/com.discord/res/layout/widget_guild_create.xml +++ b/com.discord/res/layout/widget_guild_create.xml @@ -2,22 +2,17 @@ - + - + - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml index b2670f626f..0ba1d6da93 100644 --- a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml +++ b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml @@ -2,23 +2,20 @@ - + - - - - - - - - - - - - - + + + + + + + + + + - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_join.xml b/com.discord/res/layout/widget_guild_join.xml index 568cbc20b4..7accfd94d7 100644 --- a/com.discord/res/layout/widget_guild_join.xml +++ b/com.discord/res/layout/widget_guild_join.xml @@ -1,21 +1,21 @@ + 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/widget_guild_join_invite_examples.xml b/com.discord/res/layout/widget_guild_join_invite_examples.xml index 112dbbea60..696c6798b2 100644 --- a/com.discord/res/layout/widget_guild_join_invite_examples.xml +++ b/com.discord/res/layout/widget_guild_join_invite_examples.xml @@ -1,9 +1,8 @@ - - - - - + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_nux_guild_use_cases.xml b/com.discord/res/layout/widget_nux_guild_use_cases.xml index 599a17d121..9cb2c5a281 100644 --- a/com.discord/res/layout/widget_nux_guild_use_cases.xml +++ b/com.discord/res/layout/widget_nux_guild_use_cases.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_nux_post_registration.xml b/com.discord/res/layout/widget_nux_post_registration.xml index 3ea3ce5e5d..5dc16545c1 100644 --- a/com.discord/res/layout/widget_nux_post_registration.xml +++ b/com.discord/res/layout/widget_nux_post_registration.xml @@ -1,26 +1,18 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + - - - - - + + + \ No newline at end of file diff --git a/com.discord/res/menu/menu_auth_mfa.xml b/com.discord/res/menu/menu_auth_mfa.xml index f238224b19..82be0f0200 100644 --- a/com.discord/res/menu/menu_auth_mfa.xml +++ b/com.discord/res/menu/menu_auth_mfa.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/menu/menu_guild_join.xml b/com.discord/res/menu/menu_guild_join.xml deleted file mode 100644 index 2000520912..0000000000 --- a/com.discord/res/menu/menu_guild_join.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/values-v23/styles.xml b/com.discord/res/values-v23/styles.xml index 7717063305..7c8a35cf4f 100644 --- a/com.discord/res/values-v23/styles.xml +++ b/com.discord/res/values-v23/styles.xml @@ -50,7 +50,6 @@ @color/primary_light_500 @color/primary_500_alpha_60 @drawable/drawable_uikit_primary_500_bg_dark - @drawable/drawable_uikit_primary_500_button_outline @drawable/drawable_uikit_primary_500_circle @color/primary_light_230 @color/white diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index a42fe1ccc3..cd813b379c 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -101,6 +101,8 @@ + + @@ -173,6 +175,7 @@ + @@ -1333,7 +1336,6 @@ - @@ -1524,6 +1526,8 @@ + + diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index 4fe5717acc..94f723e348 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -144,7 +144,7 @@ - + @@ -152,11 +152,12 @@ - + + @@ -166,7 +167,7 @@ - + @@ -174,7 +175,6 @@ - @@ -828,8 +828,7 @@ - - + @@ -838,14 +837,11 @@ - - - @@ -963,6 +959,12 @@ + + + + + + @@ -1181,7 +1183,6 @@ - @@ -1618,6 +1619,8 @@ + + diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 83b6d0ac57..019754fc99 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -159,1247 +159,1251 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2688,713 +2692,722 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3410,195 +3423,195 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3652,18 +3665,18 @@ - - - - - - - - + + + + + + + + - - + + @@ -3674,70 +3687,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3746,57 +3759,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3809,21 +3824,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -4014,7 +4026,7 @@ - + @@ -4022,29 +4034,29 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -4751,1614 +4763,1617 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6473,548 +6488,550 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7031,22 +7048,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -13330,2534 +13346,2535 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15900,1034 +15917,1032 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 4ad38786b4..0e0c38a1af 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1038,7 +1038,7 @@ Fixes and Updates {fixed} OR Collapse Collapse Category - f1e272f5-61d0-4317-b584-0cfc67ad4a92 + 691b2eb9-9b0c-4d03-b93d-34edaad09760 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -2529,8 +2529,8 @@ Boosts are **%3$s** $[(%4$s)](originalPriceHook)." Chat about the latest Wumpus sightings "What's this server about? What do people do here?" Don’t forget to enable when you’re finished! - Your Welcome Screen is up and running! - New members will now see this! + Your Welcome Screen is up and running. + New members will be greeted by this screen when they join! Chat about the latest Wumpus sightings Find others to hunt Wumpus together Get the latest news about Wumpus @@ -2546,7 +2546,7 @@ Servers that have set up a Welcome Screen see improvements in more people sticki You can only select channels that are viewable by everyone. Pick a channel that you think new members should check out. Preview - Your progress will save automatically. + Your changes are saved automatically. Add a Recommended Channel Edit Recommended Channel Select up to 5 recommended channels. We suggest channels where people can interact, like channels for discussions, asking questions, reading news, or selecting roles. @@ -3052,6 +3052,7 @@ Want to know more about Discord?" Enter an invite below to join an existing server. The invite will look something like these: Enter an invite above to join an existing server. Enter an invite below to join an existing server. + Invites should look like Invites should look like %1$s, %2$s, or %3$s Join a Server Join a server diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index add4a72543..41a926705c 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -175,10 +175,13 @@ @color/brand_500 @drawable/drawable_uikit_primary_600_bg_dark @drawable/drawable_ptrn_auth_gradient_dark + @drawable/drawable_ptrn_landing_bg_dark + @drawable/drawable_logo_auth_dark @drawable/drawable_ptrn_auth_bg_dark @drawable/bg_announcements_follow_sheet_dark @drawable/drawable_boost_progress_bar_dark @drawable/drawable_bg_chat_embed_gift_image_dark + @drawable/drawable_clickable_rounded_4dp_darken @drawable/bg_cloud_pattern_dark @drawable/drawable_squircle_primary_600 @drawable/drawable_squircle_white_alpha_20 @@ -463,10 +466,13 @@ @color/primary_500 @drawable/drawable_uikit_primary_100_bg_dark @drawable/drawable_ptrn_auth_gradient_light + @drawable/drawable_ptrn_landing_bg_light + @drawable/drawable_logo_auth_light @drawable/drawable_ptrn_auth_bg_light @drawable/bg_announcements_follow_sheet_light @drawable/drawable_boost_progress_bar_light @drawable/drawable_bg_chat_embed_gift_image_light + @drawable/drawable_clickable_rounded_4dp_brighten @drawable/bg_cloud_pattern_light @drawable/drawable_squircle_white @drawable/drawable_squircle_primary_light_700_alpha_20 @@ -682,7 +688,7 @@ @drawable/ic_members_grey_24dp @color/white @color/chat_input_button_tint_colors_light - @drawable/drawable_rect_rounded_white + @drawable/drawable_rect_rounded_white_corner_radius_8dp #ffe5e5e5 #fff8f8f8 @drawable/ic_img_selected_light_theme @@ -792,7 +798,6 @@ @color/primary_500 @color/primary_500_alpha_60 @drawable/drawable_uikit_primary_500_bg_dark - @drawable/drawable_uikit_primary_500_button_outline @drawable/drawable_uikit_primary_500_circle @color/primary_560 @color/primary_600 @@ -922,7 +927,6 @@ @color/primary_light_500 @color/primary_500_alpha_60 @drawable/drawable_uikit_primary_500_bg_dark - @drawable/drawable_uikit_primary_500_button_outline @drawable/drawable_uikit_primary_500_circle @color/primary_light_230 @color/white @@ -993,6 +997,9 @@ @color/purple_brand @color/purple_brand + - - - - - - - - - + + + + @@ -5024,20 +5022,18 @@