From 87c4df4e156fdf8f4eec6197d9d880fa06d43973 Mon Sep 17 00:00:00 2001 From: Dmitry Donskoy Date: Fri, 8 Nov 2019 08:09:12 +0300 Subject: [PATCH] Added new welcome screens --- android/build.gradle | 1 + android/res/drawable/img_check_sights_out.xml | 525 ++++++++++++++ android/res/drawable/img_discover_guides.xml | 494 +++++++++++++ android/res/drawable/img_download_guide.xml | 658 ++++++++++++++++++ .../res/drawable/img_download_world_map.xml | 639 +++++++++++++++++ android/res/drawable/img_dream_and_plan.xml | 351 ++++++++++ android/res/drawable/img_experience.xml | 249 +++++++ .../drawable/img_permission_explanation.xml | 192 +++++ android/res/drawable/img_share_emptions.xml | 365 ++++++++++ android/res/layout-land/info_page.xml | 10 - android/res/layout-sw600dp-land/info_page.xml | 10 - android/res/layout-sw600dp/info_page.xml | 12 - .../accept_decline_button_container.xml | 36 + android/res/layout/fragment_confirmation.xml | 27 +- android/res/layout/fragment_welcome.xml | 34 +- android/res/layout/info_page.xml | 14 - .../maps/news/WelcomeScreenBindingType.java | 81 +++ .../onboarding/WelcomeDialogFragment.java | 67 +- 18 files changed, 3655 insertions(+), 110 deletions(-) create mode 100644 android/res/drawable/img_check_sights_out.xml create mode 100644 android/res/drawable/img_discover_guides.xml create mode 100644 android/res/drawable/img_download_guide.xml create mode 100644 android/res/drawable/img_download_world_map.xml create mode 100644 android/res/drawable/img_dream_and_plan.xml create mode 100644 android/res/drawable/img_experience.xml create mode 100644 android/res/drawable/img_permission_explanation.xml create mode 100644 android/res/drawable/img_share_emptions.xml create mode 100644 android/res/layout/accept_decline_button_container.xml create mode 100644 android/src/com/mapswithme/maps/news/WelcomeScreenBindingType.java diff --git a/android/build.gradle b/android/build.gradle index 3eeb63b6a0..69f1faf3fe 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -167,6 +167,7 @@ android { compileSdkVersion propCompileSdkVersion.toInteger() defaultConfig { + vectorDrawables.useSupportLibrary = true // Default package name is taken from the manifest and should be com.mapswithme.maps versionCode propVersionCode.toInteger() versionName propVersionName diff --git a/android/res/drawable/img_check_sights_out.xml b/android/res/drawable/img_check_sights_out.xml new file mode 100644 index 0000000000..3513561fbc --- /dev/null +++ b/android/res/drawable/img_check_sights_out.xml @@ -0,0 +1,525 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable/img_discover_guides.xml b/android/res/drawable/img_discover_guides.xml new file mode 100644 index 0000000000..4048d9c9a7 --- /dev/null +++ b/android/res/drawable/img_discover_guides.xml @@ -0,0 +1,494 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable/img_download_guide.xml b/android/res/drawable/img_download_guide.xml new file mode 100644 index 0000000000..ebc3319c40 --- /dev/null +++ b/android/res/drawable/img_download_guide.xml @@ -0,0 +1,658 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable/img_download_world_map.xml b/android/res/drawable/img_download_world_map.xml new file mode 100644 index 0000000000..6474aeb613 --- /dev/null +++ b/android/res/drawable/img_download_world_map.xml @@ -0,0 +1,639 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable/img_dream_and_plan.xml b/android/res/drawable/img_dream_and_plan.xml new file mode 100644 index 0000000000..92d130f19b --- /dev/null +++ b/android/res/drawable/img_dream_and_plan.xml @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable/img_experience.xml b/android/res/drawable/img_experience.xml new file mode 100644 index 0000000000..dbea6e8861 --- /dev/null +++ b/android/res/drawable/img_experience.xml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable/img_permission_explanation.xml b/android/res/drawable/img_permission_explanation.xml new file mode 100644 index 0000000000..5ac9939db7 --- /dev/null +++ b/android/res/drawable/img_permission_explanation.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable/img_share_emptions.xml b/android/res/drawable/img_share_emptions.xml new file mode 100644 index 0000000000..d6f34c0134 --- /dev/null +++ b/android/res/drawable/img_share_emptions.xml @@ -0,0 +1,365 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/layout-land/info_page.xml b/android/res/layout-land/info_page.xml index 01bc9edafd..46bf612f70 100644 --- a/android/res/layout-land/info_page.xml +++ b/android/res/layout-land/info_page.xml @@ -43,15 +43,5 @@ android:layout_marginBottom="@dimen/margin_base" android:textAppearance="@style/MwmTextAppearance.Body1.Secondary" tools:text="@string/onboarding_welcome_first_subtitle"/> - diff --git a/android/res/layout-sw600dp-land/info_page.xml b/android/res/layout-sw600dp-land/info_page.xml index 01bc9edafd..46bf612f70 100644 --- a/android/res/layout-sw600dp-land/info_page.xml +++ b/android/res/layout-sw600dp-land/info_page.xml @@ -43,15 +43,5 @@ android:layout_marginBottom="@dimen/margin_base" android:textAppearance="@style/MwmTextAppearance.Body1.Secondary" tools:text="@string/onboarding_welcome_first_subtitle"/> - diff --git a/android/res/layout-sw600dp/info_page.xml b/android/res/layout-sw600dp/info_page.xml index 60ccda04a6..f1ab4e5148 100644 --- a/android/res/layout-sw600dp/info_page.xml +++ b/android/res/layout-sw600dp/info_page.xml @@ -38,17 +38,5 @@ android:layout_gravity="center_horizontal" android:gravity="center_horizontal" tools:text="@string/onboarding_welcome_first_subtitle"/> - diff --git a/android/res/layout/accept_decline_button_container.xml b/android/res/layout/accept_decline_button_container.xml new file mode 100644 index 0000000000..c23f61d973 --- /dev/null +++ b/android/res/layout/accept_decline_button_container.xml @@ -0,0 +1,36 @@ + + + +