From 7bb291ca8f6b425ad53fbcefb4ac24f690f9e965 Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Mon, 15 Aug 2016 22:40:20 +0300 Subject: [PATCH] Merge first usage wizard --- OsmAnd/no_translate.xml | 12 + OsmAnd/res/drawable/btn_round_blue_bottom.xml | 20 + .../layout-xlarge/first_usage_fragment.xml | 100 --- .../first_usage_welcome_fragment.xml} | 111 +-- .../layout/first_usage_welcome_fragment.xml | 102 +++ .../layout/first_usage_wizard_fragment.xml | 809 ++++++++++++++++++ OsmAnd/res/values/dimens.xml | 6 +- OsmAnd/res/values/strings.xml | 5 + .../osmand/plus/activities/MapActivity.java | 31 +- .../plus/download/DownloadIndexesThread.java | 19 +- .../FirstUsageWelcomeFragment.java} | 41 +- .../firstusage/FirstUsageWizardFragment.java | 671 +++++++++++++++ .../controllers/TransportRouteController.java | 4 +- .../plus/resources/ResourceManager.java | 14 +- 14 files changed, 1748 insertions(+), 197 deletions(-) create mode 100644 OsmAnd/res/drawable/btn_round_blue_bottom.xml delete mode 100644 OsmAnd/res/layout-xlarge/first_usage_fragment.xml rename OsmAnd/res/{layout/first_usage_fragment.xml => layout-xlarge/first_usage_welcome_fragment.xml} (51%) create mode 100644 OsmAnd/res/layout/first_usage_welcome_fragment.xml create mode 100644 OsmAnd/res/layout/first_usage_wizard_fragment.xml rename OsmAnd/src/net/osmand/plus/{FirstUsageFragment.java => firstusage/FirstUsageWelcomeFragment.java} (52%) create mode 100644 OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml index 9a71bf6b39..45278995f4 100644 --- a/OsmAnd/no_translate.xml +++ b/OsmAnd/no_translate.xml @@ -11,6 +11,18 @@ --> + Searching map… + We would like to determine your location and suggest to download map of this region. + Location not found + No internet connection + Required to download the map + Searching location… + Free space + OsmAnd holds the data (maps, tracks, etc.) in the %1$s. + Give permission + Allow access to location + Maps & Navigation + Get directions, discover new places, without internet connection OSM Live (Beta) UA-28342846-2 10 diff --git a/OsmAnd/res/drawable/btn_round_blue_bottom.xml b/OsmAnd/res/drawable/btn_round_blue_bottom.xml new file mode 100644 index 0000000000..826bcb19b2 --- /dev/null +++ b/OsmAnd/res/drawable/btn_round_blue_bottom.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout-xlarge/first_usage_fragment.xml b/OsmAnd/res/layout-xlarge/first_usage_fragment.xml deleted file mode 100644 index cd15b235ff..0000000000 --- a/OsmAnd/res/layout-xlarge/first_usage_fragment.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -