Merge remote-tracking branch 'origin/master'

OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java

@@ -27,7 +27,6 @@ public class NauticalMapsPlugin extends OsmandPlugin {
 	
 	@Override
 	public int getLogoResourceId() {
-		// TODO
 		return R.drawable.ic_plugin_nautical_map;
 	}
 	

plugins/Osmand-Nautical/.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

plugins/Osmand-Nautical/.gitignore

@@ -0,0 +1,5 @@
+bin
+gen
+raw
+obj
+*.iml

plugins/Osmand-Nautical/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Osmand-Nautical</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

plugins/Osmand-Nautical/AndroidManifest.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.osmand.nauticalPlugin"
+    android:versionCode="6"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+	<supports-screens  android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" 
+	    android:xlargeScreens="true" android:anyDensity="true" />
+    <application 
+        android:icon="@drawable/icon"
+        android:label="OsmAnd Nautical" >
+        <activity
+            android:name=".NauticalActivity"
+            android:label="@string/app_name" >
+            <!-- 
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+             -->
+        </activity>
+    </application>
+
+</manifest>

plugins/Osmand-Nautical/build.gradle

@@ -0,0 +1,67 @@
+apply plugin: 'com.android.application'
+
+android {
+	compileSdkVersion 21
+	buildToolsVersion "21.1.2"
+
+	signingConfigs {
+		development {
+			storeFile file("../../keystores/debug.keystore")
+			storePassword "android"
+			keyAlias "androiddebugkey"
+			keyPassword "android"
+		}
+
+		publishing {
+			storeFile file("../../osmand_key")
+			storePassword System.getenv("OSMAND_APK_PASSWORD")
+			keyAlias "androiddebugkey"
+			keyPassword System.getenv("OSMAND_APK_PASSWORD")
+		}
+	}
+
+	defaultConfig {
+		minSdkVersion 9
+		targetSdkVersion 21
+	}
+
+	lintOptions {
+		abortOnError false
+	}
+
+	sourceSets {
+		main {
+			manifest.srcFile "AndroidManifest.xml"
+			jni.srcDirs = []
+			jniLibs.srcDirs = []
+			aidl.srcDirs = ["src"]
+			java.srcDirs = ["src"]
+			resources.srcDirs = ["src"]
+			renderscript.srcDirs = ["src"]
+			res.srcDirs = ["res"]
+			assets.srcDirs = ["assets"]
+		}
+	}
+
+	buildTypes {
+		debug {
+			signingConfig signingConfigs.development
+		}
+		release {
+			signingConfig signingConfigs.publishing
+		}
+	}
+}
+
+repositories {
+	ivy {
+		name = "OsmAndBinariesIvy"
+		url = "http://builder.osmand.net"
+		layout "pattern", {
+			artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
+		}
+	}
+}
+
+dependencies {
+}

plugins/Osmand-Nautical/proguard-project.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

plugins/Osmand-Nautical/project.properties

@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19

plugins/Osmand-Nautical/res/layout/main.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"  >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical|center_horizontal"
+        android:text="@string/parking_plugin_installed"  
+        android:textSize="22sp"/>
+
+</FrameLayout>

plugins/Osmand-Nautical/res/values/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="shared_string_no">No</string>
+    <string name="shared_string_yes">Yes</string>
+    <string name="osmand_app_not_found">OsmAnd is not installed</string>
+    <string name="app_name">OsmAnd Nautical</string>
+    <string name="parking_plugin_installed">OsmAnd Nautical Plugin is installed and enabled in OsmAnd settings.</string>
+</resources>

plugins/Osmand-Nautical/src/net/osmand/parkingPlugin/NauticalActivity.java

@@ -0,0 +1,61 @@
+package net.osmand.parkingPlugin;
+
+import net.osmand.nauticalPlugin.R;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+
+public class NauticalActivity extends Activity {
+	private static final String OSMAND_COMPONENT = "net.osmand"; //$NON-NLS-1$
+	private static final String OSMAND_COMPONENT_PLUS = "net.osmand.plus"; //$NON-NLS-1$
+	private static final String OSMAND_ACTIVITY = "net.osmand.plus.activities.MapActivity"; //$NON-NLS-1$
+	
+    /** Called when the activity is first created. */
+    @Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.main);
+
+		Intent intentPlus = new Intent();
+		intentPlus.setComponent(new ComponentName(OSMAND_COMPONENT_PLUS, OSMAND_ACTIVITY));
+		intentPlus.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+		ResolveInfo resolved = getPackageManager().resolveActivity(intentPlus, PackageManager.MATCH_DEFAULT_ONLY);
+		if(resolved != null) {
+			stopService(intentPlus);
+			startActivity(intentPlus);
+		} else {
+			Intent intentNormal = new Intent();
+			intentNormal.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+			intentNormal.setComponent(new ComponentName(OSMAND_COMPONENT, OSMAND_ACTIVITY));
+			resolved = getPackageManager().resolveActivity(intentNormal, PackageManager.MATCH_DEFAULT_ONLY);
+			if (resolved != null) {
+				stopService(intentNormal);
+				startActivity(intentNormal);
+			} else {
+				AlertDialog.Builder builder = new AlertDialog.Builder(this);
+				builder.setMessage(getString(R.string.osmand_app_not_found));
+				builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
+						try {
+							stopService(intent);
+							startActivity(intent);
+						} catch (ActivityNotFoundException e) {
+						}
+					}
+				});
+				builder.setNegativeButton(getString(R.string.shared_string_no), null);
+				builder.show();
+			}
+		}
+	}
+    
+}