Merge remote-tracking branch 'origin/master'

OsmAnd/res/values-es-rAR/strings.xml

@@ -2004,13 +2004,10 @@
     <string name="faq_item_description">Cómo usar los complementos</string>
     <string name="map_viewing_item">Vista del mapa</string>
     <string name="search_on_the_map_item">Busqueda en el mapa</string>
-    
+	<string name="planning_trip_item">Planificación de viaje</string>
     <string name="contour_lines_and_hillshade_maps_item">Mapas de curvas de nivel y sombreado</string>
-    
     <string name="osmand_ski_maps_item">Mapas de esquí de OsmAnd</string>
-    
     <string name="audio_video_note_item">Notas multimedia</string>
-    
     <string name="instalation_troubleshooting_item">Instalación y solución de problemas</string>
     <string name="techical_articles_item">Artículos técnicos</string>
     <string name="versions_item">Versiones</string>

OsmAnd/res/values/strings.xml

@@ -2042,6 +2042,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="first_usage_item">First usage</string>
     <string name="first_usage_item_description">How to download maps, set basic settings</string>
     <string name="navigation_item_description">Setup navigation</string>
+    <string name="planning_trip_item">Planning a trip</string>
     <string name="faq_item">FAQ</string>
     <string name="faq_item_description">How to use plugins</string>
     <string name="map_viewing_item">Map viewing</string>

OsmAnd/src/net/osmand/plus/OsmandPlugin.java

@@ -92,6 +92,10 @@ public abstract class OsmandPlugin {
 	public void disable(OsmandApplication app) {
 	}
 
+	public String getHelpUrl() {
+		return null;
+	}
+
 	public static void initPlugins(OsmandApplication app) {
 		OsmandSettings settings = app.getSettings();
 		Set<String> enabledPlugins = settings.getEnabledPlugins();

OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java

@@ -451,6 +451,10 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		return app.getString(R.string.audionotes_plugin_name);
 	}
 
+	@Override
+	public String getHelpUrl() {
+		return "feature_articles/audio-video-notes-plugin.html";
+	}
 	@Override
 	public boolean init(final OsmandApplication app, Activity activity) {
 		initializeRemoteControlRegistrationMethods();

OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java

@@ -43,6 +43,11 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin {
 		return app.getString(R.string.debugging_and_development);
 	}
 
+	@Override
+	public String getHelpUrl() {
+		return "feature_articles/development_plugin.html";
+	}
+
 	@Override
 	public void registerLayers(MapActivity activity) {
 		registerWidget(activity);

OsmAnd/src/net/osmand/plus/dialogs/helpscreen/HelpScreenDialogFragment.java

@@ -288,10 +288,19 @@ public class HelpScreenDialogFragment extends DialogFragment implements Expandab
 	private List<MyMenuItem> createPluginsItems() {
 		ArrayList<MyMenuItem> arrayList = new ArrayList<>();
 		MyMenuItem.Builder builder = new MyMenuItem.Builder();
-		for (OsmandPlugin osmandPlugin : OsmandPlugin.getAvailablePlugins()) {
+		for (final OsmandPlugin osmandPlugin : OsmandPlugin.getAvailablePlugins()) {
 			builder.reset();
 			builder.setTitle(osmandPlugin.getName())
 					.setIcon(osmandPlugin.getLogoResourceId());
+			if (osmandPlugin.getHelpUrl() != null) {
+				builder.setListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						HelpArticleDialogFragment.createInstance(osmandPlugin.getHelpUrl())
+								.show(getActivity().getSupportFragmentManager(), null);
+					}
+				});
+			}
 			arrayList.add(builder.create());
 		}
 //		.setListener(new View.OnClickListener() {

OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java

@@ -1,29 +1,5 @@
 package net.osmand.plus.monitoring;
 
-import gnu.trove.list.array.TIntArrayList;
-
-import java.util.List;
-
-import net.osmand.Location;
-import net.osmand.ValueHolder;
-import net.osmand.plus.ApplicationMode;
-import net.osmand.plus.ContextMenuAdapter;
-import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
-import net.osmand.plus.NavigationService;
-import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.R;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.activities.SavingTrackHelper;
-import net.osmand.plus.dashboard.DashboardOnMap;
-import net.osmand.plus.dashboard.tools.DashFragmentData;
-import net.osmand.plus.views.MapInfoLayer;
-import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
-import net.osmand.plus.views.OsmandMapTileView;
-import net.osmand.plus.views.mapwidgets.TextInfoWidget;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -43,6 +19,30 @@ import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 
+import net.osmand.Location;
+import net.osmand.ValueHolder;
+import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.ContextMenuAdapter;
+import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
+import net.osmand.plus.NavigationService;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmAndTaskManager.OsmAndTaskRunnable;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.activities.SavingTrackHelper;
+import net.osmand.plus.dashboard.tools.DashFragmentData;
+import net.osmand.plus.views.MapInfoLayer;
+import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
+import net.osmand.plus.views.OsmandMapTileView;
+import net.osmand.plus.views.mapwidgets.TextInfoWidget;
+
+import java.util.List;
+
+import gnu.trove.list.array.TIntArrayList;
+
 public class OsmandMonitoringPlugin extends OsmandPlugin {
 	private static final String ID = "osmand.monitoring";
 	public final static String OSMAND_SAVE_SERVICE_ACTION = "OSMAND_SAVE_SERVICE_ACTION";
@@ -90,6 +90,12 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
 		return app.getString(R.string.record_plugin_name);
 	}
 
+
+	@Override
+	public String getHelpUrl() {
+		return "feature_articles/trip-recording-plugin.html";
+	}
+
 	@Override
 	public void registerLayers(MapActivity activity) {
 		registerWidget(activity);

OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java

@@ -331,6 +331,12 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		return R.drawable.osm_editing;
 	}
 
+
+	@Override
+	public String getHelpUrl() {
+		return "feature_articles/osm-editing-plugin.html";
+	}
+
 	public static String getEditName(OsmPoint point) {
 		String prefix = getPrefix(point);
 		if (point.getGroup() == OsmPoint.Group.POI) {

OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java

@@ -122,6 +122,11 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 		return R.drawable.ic_osmo_dark;
 	}
 
+
+	@Override
+	public String getHelpUrl() {
+		return "feature_articles/osmo-plugin.html";
+	}
 	
 	@Override
 	public void registerMapContextMenuActions(final MapActivity mapActivity, final double latitude, final double longitude,

OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java

@@ -1,10 +1,11 @@
 package net.osmand.plus.skimapsplugin;
 
+import android.app.Activity;
+
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.render.RendererRegistry;
-import android.app.Activity;
 
 public class SkiMapsPlugin extends OsmandPlugin {
 
@@ -36,7 +37,13 @@ public class SkiMapsPlugin extends OsmandPlugin {
 	public int getAssetResourceName() {
 		return R.drawable.ski_map;
 	}
-	
+
+
+	@Override
+	public String getHelpUrl() {
+		return "feature_articles/ski-plugin.html";
+	}
+
 	@Override
 	public boolean init(final OsmandApplication app, final Activity activity) {
 		if(activity != null) {

OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java

@@ -2,6 +2,7 @@ package net.osmand.plus.srtmplugin;
 
 import android.app.Activity;
 import android.widget.ArrayAdapter;
+
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
@@ -53,6 +54,10 @@ public class SRTMPlugin extends OsmandPlugin {
 		return app.getString(R.string.srtm_plugin_name);
 	}
 
+	@Override
+	public String getHelpUrl() {
+		return "feature_articles/contour-lines-plugin.html";
+	}
 	@Override
 	public boolean init(final OsmandApplication app, Activity activity) {
 		OsmandSettings settings = app.getSettings();