From e3cd85da670e14a96d4bf5b884bdf93f60837062 Mon Sep 17 00:00:00 2001 From: Chumva Date: Tue, 22 May 2018 15:10:44 +0300 Subject: [PATCH] add string for choose plan dialog --- OsmAnd/res/values/strings.xml | 3 ++- .../chooseplan/ChoosePlanFreeBannerDialogFragment.java | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 79c1f64c10..bb535aef2e 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -10,6 +10,7 @@ - For wording and consistency, please note http://osmand.net/help-online?id=technical-articles#Creating_a_Consistent_User_Experience Thx - Hardy --> + Get OsmAnd Live to unlock all features: Daily map updates with unlimited downloads, all paid and free plugins, Wikipedia, Wikivoyage and much more. Modification of the default style to increase contrast of pedestrian and bicycle roads. Uses legacy Mapnik colors. Bookmark Hide full description @@ -2152,7 +2153,7 @@ Specify a time buffer to keep locations to send without connection Log track using GPX widget or via \'Trip recording\' settings. Show current track - This free OsmAnd version is limited to %1$s map downloads (to add or update maps) and does not support offline Wikipedia articles. + You can download or update %1$s maps. Free version Show POI description. North America diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java index 8c675ca41d..710ba32de3 100644 --- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanFreeBannerDialogFragment.java @@ -5,6 +5,7 @@ import android.view.View; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; +import net.osmand.plus.Version; import net.osmand.plus.activities.OsmandInAppPurchaseActivity; import net.osmand.plus.download.DownloadValidationManager; import net.osmand.plus.inapp.InAppPurchaseHelper; @@ -57,8 +58,12 @@ public class ChoosePlanFreeBannerDialogFragment extends ChoosePlanDialogFragment @Override public String getInfoDescription() { - return getString(R.string.free_version_message, - DownloadValidationManager.MAXIMUM_AVAILABLE_FREE_DOWNLOADS); + if (Version.isFreeVersion(getOsmandApplication())) { + return getString(R.string.free_version_message, + DownloadValidationManager.MAXIMUM_AVAILABLE_FREE_DOWNLOADS) + "\n" + getString(R.string.get_osmand_live); + } else { + return getString(R.string.get_osmand_live); + } } @Override