kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #6163 from goblinr/MAPSME-4570-permissions-onboarding-dialog

Browse source 
[android] Dynamic permissions dialogs
This commit is contained in:
Arsentiy Milchakov 2017-06-07 13:52:44 +03:00 • committed by GitHub
commit 6b930914b8
109 changed files with 2490 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/AndroidManifest.xml
View file

@ -36,7 +36,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.BATTERY_STATS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<permission

BIN
android/res/drawable-hdpi/ic_navigation_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 557 B

BIN
android/res/drawable-hdpi/ic_storage_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 205 B

BIN
android/res/drawable-hdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
android/res/drawable-hdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 45 KiB

BIN
android/res/drawable-hdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
android/res/drawable-mdpi/ic_navigation_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 381 B

BIN
android/res/drawable-mdpi/ic_storage_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 149 B

BIN
android/res/drawable-mdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
android/res/drawable-mdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
android/res/drawable-mdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
android/res/drawable-sw600dp-hdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 51 KiB

BIN
android/res/drawable-sw600dp-hdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
android/res/drawable-sw600dp-hdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 75 KiB

BIN
android/res/drawable-sw600dp-mdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
android/res/drawable-sw600dp-mdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
android/res/drawable-sw600dp-mdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
android/res/drawable-sw600dp-xhdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 70 KiB

BIN
android/res/drawable-sw600dp-xhdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 89 KiB

BIN
android/res/drawable-sw600dp-xhdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 103 KiB

BIN
android/res/drawable-sw600dp-xxhdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 116 KiB

BIN
android/res/drawable-sw600dp-xxhdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 139 KiB

BIN
android/res/drawable-sw600dp-xxhdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 153 KiB

BIN
android/res/drawable-sw600dp-xxxhdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 178 KiB

BIN
android/res/drawable-sw600dp-xxxhdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 212 KiB

BIN
android/res/drawable-sw600dp-xxxhdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 239 KiB

BIN
android/res/drawable-xhdpi/ic_navigation_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 734 B

BIN
android/res/drawable-xhdpi/ic_storage_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 223 B

BIN
android/res/drawable-xhdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
android/res/drawable-xhdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 62 KiB

BIN
android/res/drawable-xhdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 67 KiB

BIN
android/res/drawable-xxhdpi/ic_navigation_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
android/res/drawable-xxhdpi/ic_storage_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 353 B

BIN
android/res/drawable-xxhdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 85 KiB

BIN
android/res/drawable-xxhdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 101 KiB

BIN
android/res/drawable-xxhdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 108 KiB

BIN
android/res/drawable-xxxhdpi/ic_navigation_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
android/res/drawable-xxxhdpi/ic_storage_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 489 B

BIN
android/res/drawable-xxxhdpi/img_no_storage_permission.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 101 KiB

BIN
android/res/drawable-xxxhdpi/img_permissions.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 117 KiB

BIN
android/res/drawable-xxxhdpi/img_welcome.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 126 KiB

17
android/res/drawable/ic_navigation_permission.xml Normal file
View file

@ -0,0 +1,17 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/black_4"/>
<size
android:height="@dimen/permissions_details_icon_size"
android:width="@dimen/permissions_details_icon_size"/>
</shape>
</item>
<item
android:drawable="@drawable/ic_navigation_light"
android:left="@dimen/margin_half"
android:right="@dimen/margin_half"
android:top="@dimen/margin_half"
android:bottom="@dimen/margin_half"/>
</layer-list>

17
android/res/drawable/ic_storage_permission.xml Normal file
View file

@ -0,0 +1,17 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/black_4"/>
<size
android:height="40dp"
android:width="40dp"/>
</shape>
</item>
<item
android:drawable="@drawable/ic_storage_light"
android:left="@dimen/margin_half"
android:right="@dimen/margin_half"
android:top="@dimen/margin_half"
android:bottom="@dimen/margin_half"/>
</layer-list>

57
android/res/layout-land/info_page.xml Normal file
View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="40dp"
android:layout_weight="1">
<ImageView
android:id="@+id/iv__image"
android:layout_width="@dimen/info_page_image_size"
android:layout_height="@dimen/info_page_image_size"
android:layout_gravity="center|right"
tools:src="@drawable/img_welcome"/>
</FrameLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_weight="1">
<TextView
android:id="@+id/tv__title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginEnd="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Title"
android:fontFamily="@string/robotoMedium"
tools:text="@string/onboarding_welcome_title"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/tv__subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginEnd="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
tools:text="@string/onboarding_welcome_first_subtitle"/>
<TextView
android:id="@+id/tv__subtitle2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginEnd="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:linksClickable="true"
tools:text="@string/onboarding_welcome_second_subtitle"/>
</LinearLayout>
</LinearLayout>

57
android/res/layout-sw600dp-land/info_page.xml Normal file
View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="40dp"
android:layout_weight="1">
<ImageView
android:id="@+id/iv__image"
android:layout_width="@dimen/info_page_image_size"
android:layout_height="@dimen/info_page_image_size"
android:layout_gravity="center|right"
tools:src="@drawable/img_welcome"/>
</FrameLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_weight="1">
<TextView
android:id="@+id/tv__title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginEnd="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Title"
android:fontFamily="@string/robotoMedium"
tools:text="@string/onboarding_welcome_title"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/tv__subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginEnd="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
tools:text="@string/onboarding_welcome_first_subtitle"/>
<TextView
android:id="@+id/tv__subtitle2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginEnd="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:linksClickable="true"
tools:text="@string/onboarding_welcome_second_subtitle"/>
</LinearLayout>
</LinearLayout>

54
android/res/layout-sw600dp/info_page.xml Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mapswithme.maps.widget.HeightLimitedFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="@dimen/info_page_image_size"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center">
<ImageView
android:id="@+id/iv__image"
android:layout_width="@dimen/info_page_image_size"
android:layout_height="@dimen/info_page_image_size"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:tag="@string/tag_height_limited"
tools:src="@drawable/img_welcome"/>
<TextView
android:id="@+id/tv__title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Title"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:fontFamily="@string/robotoMedium"
tools:text="@string/onboarding_welcome_title"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/tv__subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
tools:text="@string/onboarding_welcome_first_subtitle"/>
<TextView
android:id="@+id/tv__subtitle2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:linksClickable="true"
android:visibility="gone"
tools:text="@string/onboarding_welcome_second_subtitle"
tools:visibility="visible"/>
</LinearLayout>
</com.mapswithme.maps.widget.HeightLimitedFrameLayout>

30
android/res/layout/activity_splash.xml
View file

@ -1,14 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
android:layout_height="match_parent">
<View
android:id="@+id/anchor_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"/>
<ImageView
android:id="@+id/iv__logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/img_logo"/>
</LinearLayout>
android:src="@drawable/img_logo"
android:layout_above="@id/anchor_center"
android:layout_centerHorizontal="true"/>
<TextView
android:id="@+id/tv__app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/margin_double_plus"
android:textAppearance="@style/MwmTextAppearance.Title"
android:textAllCaps="true"
android:textColor="?android:textColorSecondary"
android:text="@string/app_name"/>
</RelativeLayout>

54
android/res/layout/fragment_detail_permissions.xml Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv__permissions"
android:layout_width="@dimen/permissions_details_width"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:layout_above="@+id/btn_frame"/>
<RelativeLayout
android:id="@id/btn_frame"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_double_plus"
android:layout_alignParentBottom="true"
android:paddingTop="@dimen/margin_quarter_plus"
android:paddingBottom="@dimen/margin_quarter_plus"
android:paddingRight="@dimen/margin_half"
android:paddingLeft="@dimen/margin_half"
android:background="?accentButtonBackground"
android:gravity="center_vertical">
<TextView
android:id="@+id/btn__back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/back"
android:gravity="center_vertical"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/btn__continue"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/continue_download"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
</RelativeLayout>
</RelativeLayout>

53
android/res/layout/fragment_permissions.xml Normal file
View file

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
layout="@layout/info_page"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/btn_frame"/>
<RelativeLayout
android:id="@id/btn_frame"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_double_plus"
android:layout_alignParentBottom="true"
android:paddingTop="@dimen/margin_quarter_plus"
android:paddingBottom="@dimen/margin_quarter_plus"
android:paddingRight="@dimen/margin_half"
android:paddingLeft="@dimen/margin_half"
android:background="?accentButtonBackground"
android:gravity="center_vertical">
<TextView
android:id="@+id/btn__learn_more"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/learn_more"
android:gravity="center_vertical"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/btn__continue"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/continue_download"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
</RelativeLayout>
</RelativeLayout>

53
android/res/layout/fragment_storage_permissions.xml Normal file
View file

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
layout="@layout/info_page"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/btn_frame"/>
<RelativeLayout
android:id="@id/btn_frame"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_double_plus"
android:layout_alignParentBottom="true"
android:paddingTop="@dimen/margin_quarter_plus"
android:paddingBottom="@dimen/margin_quarter_plus"
android:paddingRight="@dimen/margin_half"
android:paddingLeft="@dimen/margin_half"
android:background="?accentButtonBackground"
android:gravity="center_vertical">
<TextView
android:id="@+id/btn__exit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/exit"
android:gravity="center_vertical"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/btn__settings"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/settings"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
</RelativeLayout>
</RelativeLayout>

40
android/res/layout/fragment_welcome.xml Normal file
View file

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
layout="@layout/info_page"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/btn_frame"/>
<RelativeLayout
android:id="@id/btn_frame"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_double_plus"
android:layout_alignParentBottom="true"
android:paddingTop="@dimen/margin_quarter_plus"
android:paddingBottom="@dimen/margin_quarter_plus"
android:paddingRight="@dimen/margin_half"
android:paddingLeft="@dimen/margin_half"
android:background="?accentButtonBackground"
android:gravity="center_vertical">
<TextView
android:id="@+id/btn__continue"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?accentButtonTextColor"
android:fontFamily="@string/robotoMedium"
android:text="@string/accept_and_continue"
android:gravity="center_vertical"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?clickableBackground"
tools:targetApi="jelly_bean"/>
</RelativeLayout>
</RelativeLayout>

60
android/res/layout/info_page.xml Normal file
View file

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mapswithme.maps.widget.HeightLimitedFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center">
<ImageView
android:id="@+id/iv__image"
android:layout_width="@dimen/info_page_image_size"
android:layout_height="@dimen/info_page_image_size"
android:layout_marginBottom="@dimen/margin_base"
android:layout_gravity="center_horizontal"
android:tag="@string/tag_height_limited"
tools:src="@drawable/img_welcome"/>
<TextView
android:id="@+id/tv__title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_double"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Title"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:fontFamily="@string/robotoMedium"
tools:text="@string/onboarding_welcome_title"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/tv__subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_double"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
tools:text="@string/onboarding_welcome_first_subtitle"/>
<TextView
android:id="@+id/tv__subtitle2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_double"
android:layout_marginRight="@dimen/margin_double"
android:layout_marginBottom="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:linksClickable="true"
android:visibility="gone"
tools:text="@string/onboarding_welcome_second_subtitle"
tools:visibility="visible"/>
</LinearLayout>
</com.mapswithme.maps.widget.HeightLimitedFrameLayout>

37
android/res/layout/item_permission.xml Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/margin_double"
android:paddingRight="@dimen/margin_double"
android:paddingTop="@dimen/permissions_items_margin"
android:paddingBottom="@dimen/permissions_items_margin">
<ImageView
android:id="@+id/iv__permission_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:src="@drawable/ic_storage_permission"/>
<TextView
android:id="@+id/tv__permission_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/iv__permission_icon"
android:layout_toRightOf="@id/iv__permission_icon"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginStart="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="@string/onboarding_detail_permissions_storage_title"/>
<TextView
android:id="@+id/tv__permission_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/iv__permission_icon"
android:layout_toRightOf="@id/iv__permission_icon"
android:layout_below="@id/tv__permission_title"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginStart="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body3"
tools:text="@string/onboarding_detail_permissions_storage_message"/>
</RelativeLayout>

17
android/res/layout/item_permissions_note.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/margin_double"
android:paddingRight="@dimen/margin_double"
android:paddingTop="@dimen/permissions_title_note_margin">
<TextView
android:id="@+id/tv__note"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Body3"
tools:text="@string/onboarding_detail_permissions_storage_path_message"/>
</LinearLayout>

21
android/res/layout/item_permissions_title.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/margin_double"
android:paddingRight="@dimen/margin_double"
android:paddingTop="@dimen/permissions_title_top_margin"
android:paddingBottom="@dimen/permissions_title_bottom_margin">
<TextView
android:id="@+id/tv__title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Toolbar"
android:textColor="?android:textColorPrimary"
android:fontFamily="@string/robotoMedium"
tools:text="@string/onboarding_detail_permissions_title"
tools:targetApi="jelly_bean"/>
</LinearLayout>

2
android/res/values-fr/strings.xml
View file

@ -248,7 +248,7 @@
<!-- Message that will be shown in alert view, when we ask user to leave review on App Store -->
<string name="appStore_message">Nous espérons que vous appréciez l\&#39;utilisation de MAPS.ME ! Si oui, veuillez évaluer l\&#39;appli ou laisser une critique sur l\&#39;App Store. Cela prend moins d\&#39;une minute, mais peut vraiment nous aider. Merci pour votre soutien !</string>
<!-- No, thanks -->
<string name="no_thanks">Non, merci</string>
<string name="no_thanks">Hé, regarde mon épingle sur MAPS.ME ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://maps.me/get</string>
<!-- Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 -->
<string name="bookmark_share_sms">Hé, regarde mon épingle sur MAPS.ME ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://maps.me/get</string>
<!-- Share my position using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link WITHOUT NAME. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 -->

8
android/res/values-land/dimens.xml
View file

@ -18,4 +18,10 @@
<dimen name="altitude_chart_image_width">334dp</dimen>
<dimen name="start_button_width">128dp</dimen>
</resources>
<dimen name="permissions_title_top_margin">52dp</dimen>
<dimen name="permissions_title_bottom_margin">@dimen/margin_half</dimen>
<dimen name="permissions_title_note_margin">@dimen/margin_half</dimen>
<dimen name="permissions_items_margin">@dimen/margin_half</dimen>
<dimen name="info_page_image_size">200dp</dimen>
</resources>

2
android/res/values-pt/strings.xml
View file

@ -133,6 +133,8 @@
<string name="download_country_failed">%s descarga falhou</string>
<!-- Add New Bookmark Set dialog title -->
<string name="add_new_set">Adicionar novo conjunto</string>
<!-- Place Page - Add To Bookmarks button -->
<string name="add_to_bookmarks">Adicionar aos Favoritos</string>
<!-- Bookmark Color dialog title -->
<string name="bookmark_color">Cor de favoritos</string>
<!-- Add Bookmark Set dialog - hint when set name is empty -->

5
android/res/values-ru/strings.xml
View file

@ -911,7 +911,7 @@
<string name="last_update">Последнее обновление: %s</string>
<string name="booking_checkin">заезд: %s</string>
<string name="booking_checkout">выезд: %s</string>
<string name="placepage_add_place_button">Добавить на карту</string>
<string name="placepage_add_place_button">Добавить место на карту</string>
<!-- Displayed when saving some edits to the map to warn against publishing personal data -->
<string name="editor_share_to_all_dialog_title">Отправить всем пользователям?</string>
<!-- iOS Dialog before publishing the modifications to the public map. -->
@ -962,6 +962,7 @@
<string name="something_is_not_working">Что-то не работает</string>
<!-- For the first routing -->
<string name="accept">Принять</string>
<string name="accept_and_continue">Принять и продолжить</string>
<!-- For the first routing -->
<string name="decline">Отклонить</string>
<string name="whats_new_route_profile_title">Умный в гору не пойдет</string>
@ -1110,4 +1111,6 @@
<string name="prefs_languages_information_off_link">Более подробная информация — в этом руководстве.</string>
<string name="whatsnew_transliteration_title">Латинская транслитерация</string>
<string name="whatsnew_transliteration_message">Если у улицы или объекта нет названия на вашем языке, то мы покажем его латиницей.</string>
<string name="learn_more">Узнать больше</string>
<string name="exit">Выход</string>
</resources>

4
android/res/values-sw600dp-land/dimens.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="info_page_image_size">360dp</dimen>
</resources>

3
android/res/values-sw600dp/dimens.xml
View file

@ -7,4 +7,7 @@
<dimen name="margin_direction_side">40dp</dimen>
<dimen name="margin_direction_mid">36dp</dimen>
<dimen name="margin_direction_around_center">80dp</dimen>
<dimen name="permissions_details_width">480dp</dimen>
<dimen name="info_page_image_size">360dp</dimen>
</resources>

11
android/res/values-w1020dp-land/strings.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Android Strings File -->
<!-- Generated by Twine 0.6.0 -->
<!-- Language: w1020dp-land -->
<resources>
<!-- SECTION: Strings -->
<!-- SECTION: Routing dialogs strings -->
<!-- SECTION: Strings for downloading map from search -->
</resources>

1
android/res/values/colors.xml
View file

@ -20,6 +20,7 @@
<color name="black_primary">#DE000000</color> <!-- 87% black -->
<color name="black_secondary">#8A000000</color> <!-- 54% black -->
<color name="black_lightest">#61000000</color> <!-- 38% black -->
<color name="black_4">#0A000000</color> <!-- 4% black -->
<color name="black_8">#14000000</color> <!-- 8% black -->
<color name="black_11">#1E000000</color> <!-- 11% black -->
<color name="black_24">#3D000000</color> <!-- 24% black -->

9
android/res/values/dimens.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="match_parent" type="dimen">-1</item>
<dimen name="track_circle_size">40dp</dimen>
@ -188,4 +189,12 @@
<dimen name="margin_dialog_title">20dp</dimen>
<dimen name="action_bar_extended_height">72dp</dimen>
<dimen name="permissions_title_top_margin">80dp</dimen>
<dimen name="permissions_title_bottom_margin">@dimen/margin_base</dimen>
<dimen name="permissions_title_note_margin">@dimen/margin_base</dimen>
<dimen name="permissions_items_margin">@dimen/margin_base</dimen>
<dimen name="permissions_details_width">@dimen/match_parent</dimen>
<dimen name="permissions_details_icon_size">40dp</dimen>
<dimen name="info_page_image_size">240dp</dimen>
</resources>

16
android/res/values/strings.xml
View file

@ -806,6 +806,19 @@
<string name="onboarding_notifications_title">Enable updates notifications</string>
<string name="onboarding_location_title">Help us find you</string>
<string name="onboarding_location_message">In order for you to use navigation and the other app functions, MAPS.ME needs access to your geoposition.</string>
<string name="onboarding_permissions_title">Allow MAPS.ME access to storage and location</string>
<string name="onboarding_permissions_message">So you can download maps, see places and traffic near you and use navigation.</string>
<string name="onboarding_storage_permissions_title">Grant access</string>
<string name="onboarding_storage_permissions_message">Change permissions settings in your device. Needs a storage access to use MAPS.ME.</string>
<string name="onboarding_detail_permissions_title">MAPS.ME needs access to</string>
<string name="onboarding_detail_permissions_storage_title">Storage</string>
<string name="onboarding_detail_permissions_storage_message">To save and use downloaded maps offline and save bookmarks.</string>
<string name="onboarding_detail_permissions_location_title">Location</string>
<string name="onboarding_detail_permissions_location_message">To see places and traffic near you and use navigation.</string>
<string name="onboarding_detail_permissions_storage_path_message">You can also change a destination to save downloaded maps.</string>
<string name="onboarding_welcome_title">Welcome to MAPS.ME</string>
<string name="onboarding_welcome_first_subtitle">Free, fast, detailed and entirely offline maps with turn-by-turn navigation.</string>
<string name="onboarding_welcome_second_subtitle">By launching the application, you agree to &lt;a href=\&quot;http://legal.my.com/us/maps/tou/\&quot;&gt;Terms&lt;/a&gt; of Use and &lt;a href=\&quot;https://legal.my.com/us/maps/privacy/\&quot;&gt;Privacy Policy&lt;/a&gt;.</string>
<string name="dialog_incorrect_feature_position">Change location</string>
<string name="message_invalid_feature_position">No object can be located here</string>
<string name="login_to_make_edits_visible">Log in so other users can see the changes that you have made</string>
@ -966,6 +979,7 @@
<string name="something_is_not_working">Something is not working</string>
<!-- For the first routing -->
<string name="accept">Accept</string>
<string name="accept_and_continue">Accept and continue</string>
<!-- For the first routing -->
<string name="decline">Decline</string>
<string name="whats_new_route_profile_title">Better go about than fall into the ditch</string>
@ -1122,4 +1136,6 @@
<string name="prefs_languages_information_off_link">For more information please check this guide.</string>
<string name="whatsnew_transliteration_title">Transliteration into Latin</string>
<string name="whatsnew_transliteration_message">If a street or an object doesn\&#39;t have a name in your language, it will be spelt using the Latin alphabet.</string>
<string name="learn_more">Learn more</string>
<string name="exit">Exit</string>
</resources>

18
android/src/com/mapswithme/maps/MapFragment.java
View file

@ -16,8 +16,9 @@ import android.view.View;
import android.view.ViewGroup;
import com.mapswithme.maps.base.BaseMwmFragment;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.statistics.PushwooshHelper;
import com.mapswithme.util.concurrency.UiThread;
public class MapFragment extends BaseMwmFragment
implements View.OnTouchListener,
@ -166,12 +167,25 @@ public class MapFragment extends BaseMwmFragment
getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
final float exactDensityDpi = metrics.densityDpi;
if (!nativeCreateEngine(surface, (int) exactDensityDpi, SplashActivity.isFirstStart()))
final boolean firstStart = SplashActivity.isFirstStart();
if (!nativeCreateEngine(surface, (int) exactDensityDpi, firstStart))
{
reportUnsupported();
return;
}
if (firstStart)
{
UiThread.runLater(new Runnable()
{
@Override
public void run()
{
LocationHelper.INSTANCE.onExitFromFirstRun();
}
});
}
mContextCreated = true;
onRenderingInitialized();
}

40
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -27,6 +27,7 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.ImageButton;
import android.widget.Toast;
import com.mapswithme.maps.Framework.MapObjectListener;
import com.mapswithme.maps.activity.CustomNavigateUpListener;
@ -88,11 +89,13 @@ import com.mapswithme.util.Animations;
import com.mapswithme.util.BottomSheetHelper;
import com.mapswithme.util.Counters;
import com.mapswithme.util.InputUtils;
import com.mapswithme.util.PermissionsUtils;
import com.mapswithme.util.ThemeSwitcher;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.permissions.PermissionsResult;
import com.mapswithme.util.sharing.ShareOption;
import com.mapswithme.util.sharing.SharingHelper;
import com.mapswithme.util.statistics.AlohaHelper;
@ -131,6 +134,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
private static final String STATE_MAP_OBJECT = "MapObject";
private static final String EXTRA_LOCATION_DIALOG_IS_ANNOYING = "LOCATION_DIALOG_IS_ANNOYING";
private static final int LOCATION_REQUEST = 1;
// Map tasks that we run AFTER rendering initialized
private final Stack<MapTask> mTasks = new Stack<>();
private final StoragePathManager mPathManager = new StoragePathManager();
@ -186,11 +191,20 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onClick(View v)
{
mLocationErrorDialogAnnoying = false;
LocationHelper.INSTANCE.switchToNextMode();
LocationHelper.INSTANCE.restart();
Statistics.INSTANCE.trackEvent(Statistics.EventName.TOOLBAR_MY_POSITION);
AlohaHelper.logClick(AlohaHelper.TOOLBAR_MY_POSITION);
if (!PermissionsUtils.isLocationGranted())
{
if (PermissionsUtils.isLocationExplanationNeeded(MwmActivity.this))
PermissionsUtils.requestLocationPermission(MwmActivity.this, LOCATION_REQUEST);
else
Toast.makeText(MwmActivity.this, R.string.enable_location_services, Toast.LENGTH_SHORT)
.show();
return;
}
myPositionClick();
}
};
@ -309,6 +323,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
runTasks();
}
private void myPositionClick()
{
mLocationErrorDialogAnnoying = false;
LocationHelper.INSTANCE.switchToNextMode();
LocationHelper.INSTANCE.restart();
}
private void runTasks()
{
while (!mTasks.isEmpty())
@ -961,6 +982,19 @@ public class MwmActivity extends BaseMwmFragmentActivity
mFilterController.onRestoreState(savedInstanceState);
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
@NonNull int[] grantResults)
{
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode != LOCATION_REQUEST || grantResults.length == 0)
return;
PermissionsResult result = PermissionsUtils.computePermissionsResult(permissions, grantResults);
if (result.isLocationGranted())
myPositionClick();
}
@Override
protected void onNewIntent(Intent intent)
{

82
android/src/com/mapswithme/maps/SplashActivity.java
View file

@ -7,13 +7,16 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import com.mapswithme.maps.editor.ViralFragment;
import com.mapswithme.maps.news.BaseNewsFragment;
import com.mapswithme.maps.news.FirstStartFragment;
import com.mapswithme.maps.news.NewsFragment;
import com.mapswithme.maps.news.WelcomeDialogFragment;
import com.mapswithme.maps.permissions.PermissionsDialogFragment;
import com.mapswithme.maps.permissions.StoragePermissionsDialogFragment;
import com.mapswithme.util.Config;
import com.mapswithme.util.Counters;
import com.mapswithme.util.PermissionsUtils;
@ -27,18 +30,31 @@ public class SplashActivity extends AppCompatActivity
public static final String EXTRA_INTENT = "extra_intent";
private static final String EXTRA_ACTIVITY_TO_START = "extra_activity_to_start";
private static final int REQUEST_PERMISSIONS = 1;
private static final long FIRST_START_DELAY = 1000;
private static final long DELAY = 100;
// The first launch of application ever - onboarding screen will be shown.
private static boolean sFirstStart;
private View mIvLogo;
private View mAppName;
private boolean mPermissionsGranted;
private boolean mNeedStoragePermission;
private boolean mCanceled;
@NonNull
private final Runnable mDelayedTask = new Runnable()
private final Runnable mPermissionsDelayedTask = new Runnable()
{
@Override
public void run()
{
PermissionsDialogFragment.show(SplashActivity.this, REQUEST_PERMISSIONS);
}
};
@NonNull
private final Runnable mInitCoreDelayedTask = new Runnable()
{
@Override
public void run()
@ -47,11 +63,11 @@ public class SplashActivity extends AppCompatActivity
// Run delayed task because resumeDialogs() must see the actual value of mCanceled flag,
// since onPause() callback can be blocked because of UI thread is busy with framework
// initialization.
UiThread.runLater(mFinalTask);
UiThread.runLater(mFinalDelayedTask);
}
};
@NonNull
private final Runnable mFinalTask = new Runnable()
private final Runnable mFinalDelayedTask = new Runnable()
{
@Override
public void run()
@ -79,8 +95,9 @@ public class SplashActivity extends AppCompatActivity
protected void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
UiThread.cancelDelayedTasks(mDelayedTask);
UiThread.cancelDelayedTasks(mFinalTask);
UiThread.cancelDelayedTasks(mPermissionsDelayedTask);
UiThread.cancelDelayedTasks(mInitCoreDelayedTask);
UiThread.cancelDelayedTasks(mFinalDelayedTask);
Counters.initCounters(this);
initView();
}
@ -91,43 +108,60 @@ public class SplashActivity extends AppCompatActivity
super.onResume();
mCanceled = false;
mPermissionsGranted = PermissionsUtils.isExternalStorageGranted();
DialogFragment storagePermissionsDialog = StoragePermissionsDialogFragment.find(this);
DialogFragment permissionsDialog = PermissionsDialogFragment.find(this);
if (!mPermissionsGranted)
{
// TODO requestPermissions after Permissions dialog
PermissionsUtils.requestPermissions(this, REQUEST_PERMISSIONS);
if (mNeedStoragePermission || storagePermissionsDialog != null)
{
if (permissionsDialog != null)
permissionsDialog.dismiss();
if (storagePermissionsDialog == null)
StoragePermissionsDialogFragment.show(this);
return;
}
permissionsDialog = PermissionsDialogFragment.find(this);
if (permissionsDialog == null)
UiThread.runLater(mPermissionsDelayedTask, FIRST_START_DELAY);
return;
}
UiThread.runLater(mDelayedTask, DELAY);
if (permissionsDialog != null)
permissionsDialog.dismiss();
if (storagePermissionsDialog != null)
storagePermissionsDialog.dismiss();
UiThread.runLater(mInitCoreDelayedTask, DELAY);
}
@Override
protected void onPause()
{
mCanceled = true;
UiThread.cancelDelayedTasks(mDelayedTask);
UiThread.cancelDelayedTasks(mFinalTask);
UiThread.cancelDelayedTasks(mPermissionsDelayedTask);
UiThread.cancelDelayedTasks(mInitCoreDelayedTask);
UiThread.cancelDelayedTasks(mFinalDelayedTask);
super.onPause();
}
private void resumeDialogs()
{
// TODO show permissions dialog if Permissions is not granted
if (!mPermissionsGranted || mCanceled)
if (mCanceled)
return;
if (Counters.isMigrationNeeded())
{
Config.migrateCountersToSharedPrefs();
Counters.setMigrationExecuted();
Counters.initCounters(this);
}
sFirstStart = FirstStartFragment.showOn(this, this);
sFirstStart = WelcomeDialogFragment.showOn(this);
if (sFirstStart)
{
PushwooshHelper.nativeProcessFirstLaunch();
UiUtils.hide(mIvLogo);
UiUtils.hide(mIvLogo, mAppName);
return;
}
@ -136,7 +170,7 @@ public class SplashActivity extends AppCompatActivity
{
if (ViralFragment.shouldDisplay())
{
UiUtils.hide(mIvLogo);
UiUtils.hide(mIvLogo, mAppName);
ViralFragment dialog = new ViralFragment();
dialog.onDismiss(new DialogInterface()
{
@ -161,7 +195,7 @@ public class SplashActivity extends AppCompatActivity
}
else
{
UiUtils.hide(mIvLogo);
UiUtils.hide(mIvLogo, mAppName);
}
}
@ -175,16 +209,7 @@ public class SplashActivity extends AppCompatActivity
mPermissionsGranted = PermissionsUtils.computePermissionsResult(permissions, grantResults)
.isExternalStorageGranted();
if (mPermissionsGranted)
{
init();
resumeDialogs();
}
else
{
finish();
}
mNeedStoragePermission = !mPermissionsGranted;
}
@Override
@ -198,6 +223,7 @@ public class SplashActivity extends AppCompatActivity
UiUtils.setupStatusBar(this);
setContentView(R.layout.activity_splash);
mIvLogo = findViewById(R.id.iv__logo);
mAppName = findViewById(R.id.tv__app_name);
}
private void init()

1
android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java
View file

@ -5,6 +5,7 @@ import android.support.annotation.Nullable;
import android.support.annotation.StyleRes;
import android.support.v4.app.DialogFragment;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.util.ThemeUtils;

96
android/src/com/mapswithme/maps/news/FirstStartFragment.java
View file

@ -1,96 +0,0 @@
package com.mapswithme.maps.news;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.R;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.Counters;
public class FirstStartFragment extends BaseNewsFragment
{
private class Adapter extends BaseNewsFragment.Adapter
{
@Override
int getTitles()
{
return R.array.first_start_titles;
}
@Override
int getSubtitles1()
{
return R.array.first_start_subtitles;
}
@Override
int getSubtitles2()
{
return 0;
}
@Override
int getSwitchTitles()
{
return R.array.first_start_switch_titles;
}
@Override
int getSwitchSubtitles()
{
return R.array.first_start_switch_subtitles;
}
@Override
int getImages()
{
return R.array.first_start_images;
}
}
@Override
BaseNewsFragment.Adapter createAdapter()
{
return new Adapter();
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
LocationHelper.INSTANCE.onEnteredIntoFirstRun();
return super.onCreateDialog(savedInstanceState);
}
@Override
protected void onDoneClick()
{
super.onDoneClick();
LocationHelper.INSTANCE.onExitFromFirstRun();
}
public static boolean showOn(@NonNull FragmentActivity activity,
@Nullable NewsDialogListener listener)
{
if (Counters.getFirstInstallVersion() < BuildConfig.VERSION_CODE)
return false;
FragmentManager fm = activity.getSupportFragmentManager();
if (fm.isDestroyed())
return false;
if (Counters.isFirstStartDialogSeen() &&
!recreate(activity, FirstStartFragment.class))
return false;
create(activity, FirstStartFragment.class, listener);
Counters.setFirstStartDialogSeen();
return true;
}
}

135
android/src/com/mapswithme/maps/news/WelcomeDialogFragment.java Normal file
View file

@ -0,0 +1,135 @@
package com.mapswithme.maps.news;
import android.app.Activity;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
import android.widget.TextView;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.Counters;
import com.mapswithme.util.UiUtils;
public class WelcomeDialogFragment extends BaseMwmDialogFragment implements View.OnClickListener
{
@Nullable
private BaseNewsFragment.NewsDialogListener mListener;
public static boolean showOn(@NonNull FragmentActivity activity)
{
if (Counters.getFirstInstallVersion() < BuildConfig.VERSION_CODE)
return false;
FragmentManager fm = activity.getSupportFragmentManager();
if (fm.isDestroyed())
return false;
if (Counters.isFirstStartDialogSeen() &&
!recreate(activity))
return false;
create(activity);
Counters.setFirstStartDialogSeen();
return true;
}
private static void create(@NonNull FragmentActivity activity)
{
final WelcomeDialogFragment fragment = new WelcomeDialogFragment();
activity.getSupportFragmentManager()
.beginTransaction()
.add(fragment, WelcomeDialogFragment.class.getName())
.commitAllowingStateLoss();
}
private static boolean recreate(@NonNull FragmentActivity activity)
{
FragmentManager fm = activity.getSupportFragmentManager();
Fragment f = fm.findFragmentByTag(WelcomeDialogFragment.class.getName());
if (f == null)
return false;
// If we're here, it means that the user has rotated the screen.
// We use different dialog themes for landscape and portrait modes on tablets,
// so the fragment should be recreated to be displayed correctly.
fm.beginTransaction()
.remove(f)
.commitAllowingStateLoss();
fm.executePendingTransactions();
return true;
}
@Override
public void onAttach(Activity activity)
{
super.onAttach(activity);
if (activity instanceof BaseNewsFragment.NewsDialogListener)
mListener = (BaseNewsFragment.NewsDialogListener) activity;
}
@Override
public void onDetach()
{
mListener = null;
super.onDetach();
}
@Override
protected int getCustomTheme()
{
return getFullscreenTheme();
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
LocationHelper.INSTANCE.onEnteredIntoFirstRun();
if (!LocationHelper.INSTANCE.isActive())
LocationHelper.INSTANCE.start();
Dialog res = super.onCreateDialog(savedInstanceState);
res.requestWindowFeature(Window.FEATURE_NO_TITLE);
res.setCancelable(false);
View content = View.inflate(getActivity(), R.layout.fragment_welcome, null);
res.setContentView(content);
content.findViewById(R.id.btn__continue).setOnClickListener(this);
ImageView image = (ImageView) content.findViewById(R.id.iv__image);
image.setImageResource(R.drawable.img_welcome);
TextView title = (TextView) content.findViewById(R.id.tv__title);
title.setText(R.string.onboarding_welcome_title);
TextView subtitle = (TextView) content.findViewById(R.id.tv__subtitle1);
subtitle.setText(R.string.onboarding_welcome_first_subtitle);
TextView terms = (TextView) content.findViewById(R.id.tv__subtitle2);
UiUtils.show(terms);
terms.setText(Html.fromHtml(getString(R.string.onboarding_welcome_second_subtitle)));
terms.setMovementMethod(LinkMovementMethod.getInstance());
return res;
}
@Override
public void onClick(View v)
{
if (v.getId() != R.id.btn__continue)
return;
if (mListener != null)
mListener.onDialogDone();
dismiss();
}
}

160
android/src/com/mapswithme/maps/permissions/BasePermissionsDialogFragment.java Normal file
View file

@ -0,0 +1,160 @@
package com.mapswithme.maps.permissions;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.IdRes;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.util.PermissionsUtils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
abstract class BasePermissionsDialogFragment extends BaseMwmDialogFragment
implements View.OnClickListener
{
private static final String TAG = BasePermissionsDialogFragment.class.getName();
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
private static final String ARG_REQUEST_CODE = "arg_request_code";
private int mRequestCode;
@SuppressWarnings("TryWithIdenticalCatches")
@Nullable
public static DialogFragment show(@NonNull FragmentActivity activity, int requestCode,
@NonNull Class<? extends BaseMwmDialogFragment> dialogClass)
{
final FragmentManager fm = activity.getSupportFragmentManager();
if (fm.isDestroyed())
return null;
Fragment f = fm.findFragmentByTag(dialogClass.getName());
if (f != null)
return (DialogFragment) f;
BaseMwmDialogFragment dialog = null;
try
{
dialog = dialogClass.newInstance();
final Bundle args = new Bundle();
args.putInt(ARG_REQUEST_CODE, requestCode);
dialog.setArguments(args);
dialog.show(fm, dialogClass.getName());
}
catch (java.lang.InstantiationException e)
{
LOGGER.e(TAG, "Can't instantiate " + dialogClass.getName() + " fragment", e);
}
catch (IllegalAccessException e)
{
LOGGER.e(TAG, "Can't instantiate " + dialogClass.getName() + " fragment", e);
}
return dialog;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
Bundle args = getArguments();
if (args != null)
mRequestCode = args.getInt(ARG_REQUEST_CODE);
}
@Override
protected int getCustomTheme()
{
// We can't read actual theme, because permissions are not granted yet.
return R.style.MwmTheme_DialogFragment_Fullscreen;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
Dialog res = super.onCreateDialog(savedInstanceState);
res.requestWindowFeature(Window.FEATURE_NO_TITLE);
View content = View.inflate(getActivity(), getLayoutRes(), null);
res.setContentView(content);
View button = content.findViewById(getFirstActionButton());
if (button != null)
button.setOnClickListener(this);
button = content.findViewById(getContinueActionButton());
if (button != null)
button.setOnClickListener(this);
ImageView image = (ImageView) content.findViewById(R.id.iv__image);
if (image != null)
image.setImageResource(getImageRes());
TextView title = (TextView) content.findViewById(R.id.tv__title);
if (title != null)
title.setText(getTitleRes());
TextView subtitle = (TextView) content.findViewById(R.id.tv__subtitle1);
if (subtitle != null)
subtitle.setText(getSubtitleRes());
return res;
}
@DrawableRes
protected int getImageRes()
{
return 0;
}
@StringRes
protected int getTitleRes()
{
return 0;
}
@StringRes
protected int getSubtitleRes()
{
return 0;
}
@LayoutRes
abstract protected int getLayoutRes();
@IdRes
protected abstract int getFirstActionButton();
protected abstract void onFirstActionClick();
@IdRes
protected abstract int getContinueActionButton();
@Override
public void onClick(@NonNull View v)
{
if (v.getId() == getFirstActionButton())
{
onFirstActionClick();
return;
}
if (v.getId() == getContinueActionButton())
PermissionsUtils.requestPermissions(getActivity(), mRequestCode);
}
protected int getRequestCode()
{
return mRequestCode;
}
}

176
android/src/com/mapswithme/maps/permissions/PermissionsAdapter.java Normal file
View file

@ -0,0 +1,176 @@
package com.mapswithme.maps.permissions;
import android.support.annotation.DrawableRes;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.mapswithme.maps.R;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
class PermissionsAdapter extends RecyclerView.Adapter<PermissionsAdapter.ViewHolder>
{
static final int TYPE_TITLE = 0;
static final int TYPE_PERMISSION = 1;
static final int TYPE_NOTE = 2;
@Retention(RetentionPolicy.SOURCE)
@IntDef({ TYPE_TITLE, TYPE_PERMISSION, TYPE_NOTE})
@interface ViewHolderType {}
private static final List<PermissionItem> ITEMS;
static {
ArrayList<PermissionItem> items = new ArrayList<>();
items.add(new PermissionItem(TYPE_TITLE, R.string.onboarding_detail_permissions_title, 0, 0));
items.add(new PermissionItem(TYPE_PERMISSION,
R.string.onboarding_detail_permissions_storage_title,
R.string.onboarding_detail_permissions_storage_message,
R.drawable.ic_storage_permission));
items.add(new PermissionItem(TYPE_PERMISSION,
R.string.onboarding_detail_permissions_location_title,
R.string.onboarding_detail_permissions_location_message,
R.drawable.ic_navigation_permission));
items.add(new PermissionItem(TYPE_NOTE, 0,
R.string.onboarding_detail_permissions_storage_path_message, 0));
ITEMS = Collections.unmodifiableList(items);
}
@ViewHolderType
@Override
public int getItemViewType(int position)
{
return ITEMS.get(position).mType;
}
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, @ViewHolderType int viewType)
{
switch (viewType)
{
case TYPE_NOTE:
return new NoteViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.item_permissions_note, parent, false));
case TYPE_PERMISSION:
return new PermissionViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.item_permission, parent,
false));
case TYPE_TITLE:
return new TitleViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.item_permissions_title, parent,
false));
default:
return null;
}
}
@Override
public void onBindViewHolder(ViewHolder holder, int position)
{
holder.bind(ITEMS.get(position));
}
@Override
public int getItemCount()
{
return ITEMS.size();
}
private static final class PermissionItem
{
@ViewHolderType
private final int mType;
@StringRes
private final int mTitle;
@StringRes
private final int mMessage;
@DrawableRes
private final int mIcon;
PermissionItem(@ViewHolderType int type, @StringRes int title, @StringRes int message, int icon)
{
mType = type;
mTitle = title;
mMessage = message;
mIcon = icon;
}
}
static abstract class ViewHolder extends RecyclerView.ViewHolder
{
public ViewHolder(@NonNull View itemView)
{
super(itemView);
}
abstract void bind(@NonNull PermissionItem item);
}
private static class TitleViewHolder extends ViewHolder
{
private final TextView mTitle;
TitleViewHolder(@NonNull View itemView)
{
super(itemView);
mTitle = (TextView) itemView.findViewById(R.id.tv__title);
}
@Override
void bind(@NonNull PermissionItem item)
{
mTitle.setText(item.mTitle);
}
}
private static class PermissionViewHolder extends ViewHolder
{
private final ImageView mIcon;
private final TextView mTitle;
private final TextView mMessage;
PermissionViewHolder(@NonNull View itemView)
{
super(itemView);
mIcon = (ImageView) itemView.findViewById(R.id.iv__permission_icon);
mTitle = (TextView) itemView.findViewById(R.id.tv__permission_title);
mMessage = (TextView) itemView.findViewById(R.id.tv__permission_message);
}
@Override
void bind(@NonNull PermissionItem item)
{
mIcon.setImageResource(item.mIcon);
mTitle.setText(item.mTitle);
mMessage.setText(item.mMessage);
}
}
private static class NoteViewHolder extends ViewHolder
{
private final TextView mMessage;
NoteViewHolder(@NonNull View itemView)
{
super(itemView);
mMessage = (TextView) itemView.findViewById(R.id.tv__note);
}
@Override
void bind(@NonNull PermissionItem item)
{
mMessage.setText(item.mMessage);
}
}
}

80
android/src/com/mapswithme/maps/permissions/PermissionsDetailDialogFragment.java Normal file
View file

@ -0,0 +1,80 @@
package com.mapswithme.maps.permissions;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import com.mapswithme.maps.R;
public class PermissionsDetailDialogFragment extends BasePermissionsDialogFragment
{
@Nullable
public static DialogFragment show(@NonNull FragmentActivity activity, int requestCode)
{
DialogFragment dialog = BasePermissionsDialogFragment.show(activity, requestCode,
PermissionsDetailDialogFragment.class);
if (dialog != null)
dialog.setCancelable(true);
return dialog;
}
@Nullable
public static DialogFragment find(@NonNull FragmentActivity activity)
{
final FragmentManager fm = activity.getSupportFragmentManager();
if (fm.isDestroyed())
return null;
Fragment f = fm.findFragmentByTag(PermissionsDetailDialogFragment.class.getName());
return (DialogFragment) f;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
Dialog res = super.onCreateDialog(savedInstanceState);
RecyclerView permissions = (RecyclerView) res.findViewById(R.id.rv__permissions);
permissions.setLayoutManager(new LinearLayoutManager(getContext(),
LinearLayoutManager.VERTICAL, false));
permissions.setAdapter(new PermissionsAdapter());
return res;
}
@LayoutRes
@Override
protected int getLayoutRes()
{
return R.layout.fragment_detail_permissions;
}
@IdRes
@Override
protected int getFirstActionButton()
{
return R.id.btn__back;
}
@Override
protected void onFirstActionClick()
{
dismiss();
}
@IdRes
@Override
protected int getContinueActionButton()
{
return R.id.btn__continue;
}
}

98
android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java Normal file
View file

@ -0,0 +1,98 @@
package com.mapswithme.maps.permissions;
import android.content.DialogInterface;
import android.support.annotation.DrawableRes;
import android.support.annotation.IdRes;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import com.mapswithme.maps.R;
public class PermissionsDialogFragment extends BasePermissionsDialogFragment
{
@Nullable
public static DialogFragment show(@NonNull FragmentActivity activity, int requestCode)
{
return BasePermissionsDialogFragment.show(activity, requestCode, PermissionsDialogFragment.class);
}
public static DialogFragment find(@NonNull FragmentActivity activity)
{
final FragmentManager fm = activity.getSupportFragmentManager();
if (fm.isDestroyed())
return null;
Fragment f = fm.findFragmentByTag(PermissionsDialogFragment.class.getName());
return (DialogFragment) f;
}
@DrawableRes
@Override
protected int getImageRes()
{
return R.drawable.img_permissions;
}
@StringRes
@Override
protected int getTitleRes()
{
return R.string.onboarding_permissions_title;
}
@StringRes
@Override
protected int getSubtitleRes()
{
return R.string.onboarding_permissions_message;
}
@LayoutRes
@Override
protected int getLayoutRes()
{
return R.layout.fragment_permissions;
}
@IdRes
@Override
protected int getFirstActionButton()
{
return R.id.btn__learn_more;
}
@Override
protected void onFirstActionClick()
{
PermissionsDetailDialogFragment.show(getActivity(), getRequestCode());
}
@IdRes
@Override
protected int getContinueActionButton()
{
return R.id.btn__continue;
}
@Override
public void dismiss()
{
DialogFragment dialog = PermissionsDetailDialogFragment.find(getActivity());
if (dialog != null)
dialog.dismiss();
super.dismiss();
}
@Override
public void onCancel(DialogInterface dialog)
{
super.onCancel(dialog);
getActivity().finish();
}
}

106
android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java Normal file
View file

@ -0,0 +1,106 @@
package com.mapswithme.maps.permissions;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.SplashActivity;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
public class StoragePermissionsDialogFragment extends BaseMwmDialogFragment implements View.OnClickListener
{
@Nullable
public static DialogFragment show(@NonNull FragmentActivity activity)
{
final FragmentManager fm = activity.getSupportFragmentManager();
if (fm.isDestroyed())
return null;
Fragment f = fm.findFragmentByTag(StoragePermissionsDialogFragment.class.getName());
if (f != null)
return (DialogFragment) f;
StoragePermissionsDialogFragment dialog = new StoragePermissionsDialogFragment();
dialog.show(fm, StoragePermissionsDialogFragment.class.getName());
return dialog;
}
public static DialogFragment find(SplashActivity activity)
{
final FragmentManager fm = activity.getSupportFragmentManager();
if (fm.isDestroyed())
return null;
Fragment f = fm.findFragmentByTag(StoragePermissionsDialogFragment.class.getName());
return (DialogFragment) f;
}
@Override
protected int getCustomTheme()
{
// We can't read actual theme, because permissions are not granted yet.
return R.style.MwmTheme_DialogFragment_Fullscreen;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
Dialog res = super.onCreateDialog(savedInstanceState);
res.requestWindowFeature(Window.FEATURE_NO_TITLE);
View content = View.inflate(getActivity(), R.layout.fragment_storage_permissions, null);
res.setContentView(content);
content.findViewById(R.id.btn__exit).setOnClickListener(this);
content.findViewById(R.id.btn__settings).setOnClickListener(this);
ImageView image = (ImageView) content.findViewById(R.id.iv__image);
image.setImageResource(R.drawable.img_no_storage_permission);
TextView title = (TextView) content.findViewById(R.id.tv__title);
title.setText(R.string.onboarding_storage_permissions_title);
TextView subtitle = (TextView) content.findViewById(R.id.tv__subtitle1);
subtitle.setText(R.string.onboarding_storage_permissions_message);
return res;
}
@Override
public void onClick(@NonNull View v)
{
switch (v.getId())
{
case R.id.btn__exit:
getActivity().finish();
break;
case R.id.btn__settings:
Intent intent = new Intent();
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
Uri uri = Uri.fromParts("package", getContext().getPackageName(), null);
intent.setData(uri);
startActivity(intent);
break;
}
}
@Override
public void onCancel(DialogInterface dialog)
{
super.onCancel(dialog);
getActivity().finish();
}
}

7
android/src/com/mapswithme/util/Config.java
View file

@ -2,6 +2,7 @@ package com.mapswithme.util;
import android.support.annotation.NonNull;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmApplication;
import static com.mapswithme.util.Counters.KEY_APP_FIRST_INSTALL_FLAVOR;
@ -104,14 +105,16 @@ public final class Config
public static void migrateCountersToSharedPrefs()
{
int version = getInt(KEY_APP_FIRST_INSTALL_VERSION, BuildConfig.VERSION_CODE);
MwmApplication.prefs()
.edit()
.putInt(KEY_APP_LAUNCH_NUMBER, getInt(KEY_APP_LAUNCH_NUMBER))
.putInt(KEY_APP_FIRST_INSTALL_VERSION, getInt(KEY_APP_FIRST_INSTALL_VERSION))
.putInt(KEY_APP_FIRST_INSTALL_VERSION, version)
.putString(KEY_APP_FIRST_INSTALL_FLAVOR, getString(KEY_APP_FIRST_INSTALL_FLAVOR))
.putLong(KEY_APP_LAST_SESSION_TIMESTAMP, getLong(KEY_APP_LAST_SESSION_TIMESTAMP))
.putInt(KEY_APP_SESSION_NUMBER, getInt(KEY_APP_SESSION_NUMBER))
.putBoolean(KEY_MISC_FIRST_START_DIALOG_SEEN, getBool(KEY_MISC_FIRST_START_DIALOG_SEEN))
.putBoolean(KEY_MISC_FIRST_START_DIALOG_SEEN,
getBool(KEY_MISC_FIRST_START_DIALOG_SEEN))
.putInt(KEY_MISC_NEWS_LAST_VERSION, getInt(KEY_MISC_NEWS_LAST_VERSION))
.putInt(KEY_LIKES_LAST_RATED_SESSION, getInt(KEY_LIKES_LAST_RATED_SESSION))
.apply();

31
android/src/com/mapswithme/util/PermissionsUtils.java
View file

@ -15,8 +15,8 @@ import java.util.Map;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static android.Manifest.permission.GET_ACCOUNTS;
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
import static android.support.v4.app.ActivityCompat.shouldShowRequestPermissionRationale;
public final class PermissionsUtils
{
@ -24,8 +24,13 @@ public final class PermissionsUtils
{
WRITE_EXTERNAL_STORAGE,
ACCESS_COARSE_LOCATION,
ACCESS_FINE_LOCATION,
GET_ACCOUNTS
ACCESS_FINE_LOCATION
};
private static final String[] LOCATION_PERMISSIONS = new String[]
{
ACCESS_COARSE_LOCATION,
ACCESS_FINE_LOCATION
};
private PermissionsUtils() {}
@ -48,16 +53,17 @@ public final class PermissionsUtils
return checkPermissions().isLocationGranted();
}
public static boolean isLocationExplanationNeeded(@NonNull Activity activity)
{
return shouldShowRequestPermissionRationale(activity, ACCESS_COARSE_LOCATION)
|| shouldShowRequestPermissionRationale(activity, ACCESS_FINE_LOCATION);
}
public static boolean isExternalStorageGranted()
{
return checkPermissions().isExternalStorageGranted();
}
public static boolean isGetAccountsGranted()
{
return checkPermissions().isGetAccountsGranted();
}
@NonNull
private static PermissionsResult checkPermissions()
{
@ -82,13 +88,16 @@ public final class PermissionsUtils
? result.get(ACCESS_COARSE_LOCATION) : false)
|| (result.containsKey(ACCESS_FINE_LOCATION)
? result.get(ACCESS_FINE_LOCATION) : false);
boolean getAccountsGranted = result.containsKey(GET_ACCOUNTS)
? result.get(GET_ACCOUNTS) : false;
return new PermissionsResult(externalStorageGranted, locationGranted, getAccountsGranted);
return new PermissionsResult(externalStorageGranted, locationGranted);
}
public static void requestPermissions(@NonNull Activity activity, int code)
{
ActivityCompat.requestPermissions(activity, PERMISSIONS, code);
}
public static void requestLocationPermission(@NonNull Activity activity, int code)
{
ActivityCompat.requestPermissions(activity, LOCATION_PERMISSIONS, code);
}
}

10
android/src/com/mapswithme/util/permissions/PermissionsResult.java
View file

@ -4,14 +4,11 @@ public final class PermissionsResult
{
private final boolean mExternalStorageGranted;
private final boolean mLocationGranted;
private final boolean mGetAccountsGranted;
public PermissionsResult(boolean externalStorageGranted, boolean locationGranted,
boolean getAccountsGranted)
public PermissionsResult(boolean externalStorageGranted, boolean locationGranted)
{
mExternalStorageGranted = externalStorageGranted;
mLocationGranted = locationGranted;
mGetAccountsGranted = getAccountsGranted;
}
public boolean isExternalStorageGranted()
@ -23,9 +20,4 @@ public final class PermissionsResult
{
return mLocationGranted;
}
public boolean isGetAccountsGranted()
{
return mGetAccountsGranted;
}
}

32
iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "لاستخدام الملاحة والميزات الأخرى، فنحن بحاجة إلى تحديد موقعك الجغرافي.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "تغيير الموقع";
"message_invalid_feature_position" = "لا يمكن تحديد موقع الكائن هنا";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "قبول";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "رفض";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "كتابة بالحروف اللاتينية";
"whatsnew_transliteration_message" = "إذا كان الشارع أو الهدف ليس له اسم بلغتك. فسيتم هجاؤه بالحروف اللاتينية.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Chcete-li používat navigaci a další funkce, pak potřebujeme přístup k vaší zeměpisné poloze.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Změnit umístění";
"message_invalid_feature_position" = "Objekt zde nemůže být umístěn";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Přijmout";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Odmítnout";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliterace do latinky";
"whatsnew_transliteration_message" = "Pokud ulice nebo objekt nemá název ve vašem jazyce, bude zobrazeno latinkou.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "For at bruge navigering og andre funktioner skal vi have adgang til din geolokation.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Skift lokation";
"message_invalid_feature_position" = "Et objekt kan ikke placeres her";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Accepter";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Afvis";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Translitteration til latinsk";
"whatsnew_transliteration_message" = "Hvis en gade eller et objekt ikke har et navn på dit sprog, vil det blive stavet ved hjælp af det latinske alfabet.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Um Navigation und andere Funktionen zu verwenden, brauchen wir Zugriff auf Ihren Geo-Standort.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Standort wechseln";
"message_invalid_feature_position" = "Ein Objekt kann hier nicht positioniert werden";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Annehmen";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Ablehnen";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliteration ins Lateinische";
"whatsnew_transliteration_message" = "Wenn eine Straße oder ein Objekt in Ihrer Sprache keinen Namen hat, wird er mit lateinischen Buchstaben geschrieben.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Προκειμένου να χρησιμοποιήσετε την πλοήγηση και τις άλλες λειτουργίες του MAPS.ME χρειάζεται πρόσβαση στη γεωγραφική σας θέση.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Αλλαγή τοποθεσίας";
"message_invalid_feature_position" = "Δε μπορεί να εντοπιστεί αντικείμενο εδώ";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Συμφωνώ";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Διαφωνώ";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Μεταγραφή στα Λατινικά";
"whatsnew_transliteration_message" = "Εάν ένας δρόμος ή ένα αντικείμενο δεν έχει όνομα στη γλώσσα σας, θα διατυπωθεί χρησιμοποιώντας το λατινικό αλφάβητο.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "In order for you to use navigation and the other app functions, MAPS.ME needs access to your geoposition.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Change location";
"message_invalid_feature_position" = "No object can be located here";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Accept";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Decline";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliteration into Latin";
"whatsnew_transliteration_message" = "If a street or an object doesn't have a name in your language, it will be spelt using the Latin alphabet.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "In order for you to use navigation and the other app functions, MAPS.ME needs access to your geoposition.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Change location";
"message_invalid_feature_position" = "No object can be located here";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Accept";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Decline";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliteration into Latin";
"whatsnew_transliteration_message" = "If a street or an object doesn't have a name in your language, it will be spelt using the Latin alphabet.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Para utilizar la navegación y otras funciones, necesitamos acceso a tu geolocalización.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Cambiar ubicación";
"message_invalid_feature_position" = "No se puede ubicar ningún objeto aquí";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Aceptar";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Declinar";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliteración al alfabeto latino";
"whatsnew_transliteration_message" = "Si una calle o un objeto no tiene nombre en su idioma, se escribirá con el alfabeto latino.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Tarvitsemme sijaintisi käyttääksemme navigointia ja muita ominaisuuksia.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Vaihda sijaintia";
"message_invalid_feature_position" = "Kohdetta ei voida asettaa tänne";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Hyväksy";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Hylkää";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Translitterointi latinaksi";
"whatsnew_transliteration_message" = "Jos kadulla tai kohteella ei ole nimeä kielelläsi, se kirjoitetetaan latinalaisilla kirjaimilla.";
"learn_more" = "Learn more";
"exit" = "Exit";

34
iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
View file

@ -389,7 +389,7 @@
"appStore_message" = "Nous espérons que vous appréciez l'utilisation de MAPS.ME ! Si oui, veuillez évaluer l'appli ou laisser une critique sur l'App Store. Cela prend moins d'une minute, mais peut vraiment nous aider. Merci pour votre soutien !";
/* No, thanks */
"no_thanks" = "Non, merci";
"no_thanks" = "Hé, regarde mon épingle sur MAPS.ME ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://maps.me/get";
/* Share one specific bookmark using SMS, %1$@ contains ge0:// and %2$@ http://ge0.me link. @NOTE non-ascii symbols in the link will make 70 bytes sms instead of 140 */
"bookmark_share_sms" = "Hé, regarde mon épingle sur MAPS.ME ! %1$@ ou %2$@. Les cartes hors ligne ne sont pas installées ? Les télécharger ici : http://maps.me/get";
@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Pour utiliser la navigation et d'autres fonctionnalités, nous devons pouvoir accéder à votre position géographique.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Modifier l'emplacement";
"message_invalid_feature_position" = "Aucun objet ne peut être localisé ici";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Accepter";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Refuser";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Translittération en latin";
"whatsnew_transliteration_message" = "Si une rue ou un objet n’a pas de nom dans votre langue, l’alphabet latin sera utilisé pour l'écrire.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "A navigáció és egyéb funkciók használatához hozzá kell férnünk a geolokációdhoz.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Helyszín megváltoztatása";
"message_invalid_feature_position" = "Célpont áthelyezése ide nem lehetséges";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Elfogadja";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Elutasítja";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Átírás latin nyelvre";
"whatsnew_transliteration_message" = "Ha egy utcának vagy egy objektumnak nincs neve az Ön nyelvén, latin ábécével kerül átírásra.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Untuk menggunakan navigasi dan fitur-fitur lainnya, kami perlu mengakses geolokasi Anda.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Ubah lokasi";
"message_invalid_feature_position" = "Objek tidak dapat diletakkan di sini";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Terima";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Tolak";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliterasi ke dalam bahasa Latin";
"whatsnew_transliteration_message" = "Jika jalan atau objek tidak memiliki nama dalam bahasa Anda, namanya akan dieja menggunakan alfabet Latin.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Per usare la navigazione e altri strumenti, dobbiamo accedere alla tua geolocalizzazione.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Cambia posizione";
"message_invalid_feature_position" = "Un oggetto non può essere posizionato qui";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Accetta";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Rifiuta";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Traslitterazione in latino";
"whatsnew_transliteration_message" = "Se una strada o un oggetto non ha un nome nella tua lingua, tale nome sarà scritto utilizzando l'alfabeto latino.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "ナビゲーションやその他の機能の使用のために、アプリがGeolocationにアクセスする必要があります";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "位置を変更してください";
"message_invalid_feature_position" = "ここにはオブジェクトを配置できません";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "了解";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "拒否";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "ラテン文字への字訳";
"whatsnew_transliteration_message" = "通り名や物件名をあなたの言語で表示できない場合、ラテン文字のアルファベットで綴られます。";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "탐색 및 기타 기능을 사용하려면, 위치 정보에 액세스해야 합니다.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "위치 변경";
"message_invalid_feature_position" = "목적지를 이곳에서 찾을 수 없습니다";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "동의";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "거부";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "라틴어로 음역";
"whatsnew_transliteration_message" = "거리 또는 개체에 사용자 언어로 된 이름이 없는 경우, 라틴 알파벳을 사용하여 나옵니다.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "For å bruke navigering og andre funksjoner må vi ha tilgang til posisjonen din.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Endre plassering";
"message_invalid_feature_position" = "Et objekt kan ikke plasseres her";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Godta";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Avvis";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Omskrivning til latin";
"whatsnew_transliteration_message" = "Hvis en gate eller et element ikke har et navn på ditt språk, vil det bli skrevet med det latinske alfabetet.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Om de navigatie en andere functies te kunnen gebruiken, hebben we toegang tot je geolocatie nodig.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Locatie wijzigen";
"message_invalid_feature_position" = "Hier kan geen object worden geplaatst";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Aanvaarden";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Weigeren";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliteratie in het Latijn";
"whatsnew_transliteration_message" = "Indien een straat of object geen naam heeft in uw taal, wordt deze gespeld door gebruik van het Latijns alfabet.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Abyś mógł korzystać z nawigacji i innych funkcji, musimy uzyskać dostęp do twojej geolokalizacji.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Zmień lokalizację";
"message_invalid_feature_position" = "Obiekt nie może znajdować się tutaj";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Zaakceptuj";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Odrzuć";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transkrypcja na alfabet łaciński";
"whatsnew_transliteration_message" = "Jeśli dana ulica lub obiekt nie posiada nazwy w twoim języku, ich nazwa zapisana zostanie w alfabecie łacińskim.";
"learn_more" = "Learn more";
"exit" = "Exit";

34
iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
View file

@ -224,7 +224,7 @@
"add_new_set" = "Adicionar novo conjunto";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add to Bookmarks";
"add_to_bookmarks" = "Adicionar aos Favoritos";
/* Bookmark Color dialog title */
"bookmark_color" = "Cor de favoritos";
@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Para utilizar a navegação e outros recursos, precisamos de aceder à sua localização geográfica.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Mudar o local";
"message_invalid_feature_position" = "Um objeto não pode ser localizado aqui";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Aceitar";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Declinar";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transliteração para o latim";
"whatsnew_transliteration_message" = "Se uma rua ou um objeto não tiver nome na sua língua, será utilizado o alfabeto latino.";
"learn_more" = "Learn more";
"exit" = "Exit";

32
iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Ca să puteți naviga și folosi alte funcții, trebuie să accesăm poziționarea dvs. geografică.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Schimbare locație";
"message_invalid_feature_position" = "În acest loc nu poate fi localizat un obiect";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Acceptați";
"accept_and_continue" = "Accept and continue";
/* For the first routing */
"decline" = "Refuzați";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Transcriere în alfabet latin";
"whatsnew_transliteration_message" = "Dacă o stradă sau un obiect nu are un nume în limba dvs., va fi exprimat utilizând alfabetul latin.";
"learn_more" = "Learn more";
"exit" = "Exit";

34
iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
View file

@ -1326,6 +1326,32 @@
"onboarding_location_message" = "Чтобы пользоваться навигацией и другими функциями приложения, нам необходим доступ к вашей геопозиции.";
"onboarding_permissions_title" = "Allow MAPS.ME access to storage and location";
"onboarding_permissions_message" = "So you can download maps, see places and traffic near you and use navigation.";
"onboarding_storage_permissions_title" = "Grant access";
"onboarding_storage_permissions_message" = "Change permissions settings in your device. Needs a storage access to use MAPS.ME.";
"onboarding_detail_permissions_title" = "MAPS.ME needs access to";
"onboarding_detail_permissions_storage_title" = "Storage";
"onboarding_detail_permissions_storage_message" = "To save and use downloaded maps offline and save bookmarks.";
"onboarding_detail_permissions_location_title" = "Location";
"onboarding_detail_permissions_location_message" = "To see places and traffic near you and use navigation.";
"onboarding_detail_permissions_storage_path_message" = "You can also change a destination to save downloaded maps.";
"onboarding_welcome_title" = "Welcome to MAPS.ME";
"onboarding_welcome_first_subtitle" = "Free, fast, detailed and entirely offline maps with turn-by-turn navigation.";
"onboarding_welcome_second_subtitle" = "By launching the application, you agree to <a href=\"http://legal.my.com/us/maps/tou/\">Terms</a> of Use and <a href=\"https://legal.my.com/us/maps/privacy/\">Privacy Policy</a>.";
"dialog_incorrect_feature_position" = "Измените местоположение";
"message_invalid_feature_position" = "Объект не может находиться в этом месте";
@ -1535,7 +1561,7 @@
"booking_checkout" = "выезд: %s";
"placepage_add_place_button" = "Добавить на карту";
"placepage_add_place_button" = "Добавить место на карту";
/* Displayed when saving some edits to the map to warn against publishing personal data */
"editor_share_to_all_dialog_title" = "Отправить всем пользователям?";
@ -1622,6 +1648,8 @@
/* For the first routing */
"accept" = "Принять";
"accept_and_continue" = "Принять и продолжить";
/* For the first routing */
"decline" = "Отклонить";
@ -1900,3 +1928,7 @@
"whatsnew_transliteration_title" = "Латинская транслитерация";
"whatsnew_transliteration_message" = "Если у улицы или объекта нет названия на вашем языке, то мы покажем его латиницей.";
"learn_more" = "Узнать больше";
"exit" = "Выход";

Some files were not shown because too many files have changed in this diff Show more