feat(ios, android): add new API's, fix existing API's

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Appcelerator, Inc.
+Copyright 2013-present Appcelerator, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

android/build.gradle

@@ -1,6 +1,11 @@
 
 dependencies {
-	implementation 'com.google.android.gms:play-services-maps:17.0.0'
-	implementation 'com.google.maps.android:android-maps-utils:0.6.2'
-	implementation 'androidx.fragment:fragment:1.1.0'
+	// https://developers.google.com/android/guides/releases
+	implementation 'com.google.android.gms:play-services-maps:18.1.0'
+
+	// https://github.com/googlemaps/android-maps-utils/releases
+	implementation 'com.google.maps.android:android-maps-utils:2.4.0'
+
+	// https://developer.android.com/jetpack/androidx/releases/fragment
+	implementation 'androidx.fragment:fragment:1.5.2'
 }

android/example/app.js

@@ -1,7 +1,4 @@
-var IOS = (Ti.Platform.osname === 'iphone' || Ti.Platform.osname === 'ipad');
-var ANDROID = (Ti.Platform.osname === 'android');
-var UI = require('ui');
-var Map = require('ti.map');
+const Map = require('ti.map');
 
 //=====================================================================
 // Rows
@@ -14,19 +11,4 @@ var rows = [
     require('tests/drawing')
 ];
 
-if (IOS) {
-    rows.push(require('tests/camera'));
-    rows.push(require('tests/properties'));
-}
-
-if (ANDROID && Map.isGooglePlayServicesAvailable() != Map.SUCCESS) {
-        alert ("Google Play Services is not installed/updated/available");
-} else {
-    startUI();
-}
-
-function startUI() {
-    UI.init(rows, function(e) {
-        rows[e.index].run && rows[e.index].run(UI, Map);
-    });
-}
+win.open();

android/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.0.2
+version: 5.1.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: External version of Map module using native Google Maps library

android/platform/android/res/drawable/pin_waypoint.xml

@@ -0,0 +1,4 @@
+<vector android:height="28dp" android:viewportHeight="84"
+    android:viewportWidth="60" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#006d44" android:pathData="M28.31,0L31.56,0Q56.66,3.26 60,28.31L60,30.56Q59.5,38.86 56.19,43.94Q43.23,63.81 29.97,83.55A0.37,0.37 -43.9,0 1,29.35 83.54Q19.82,68.78 10.52,54.42Q4.05,44.45 3.59,43.53Q0.64,37.69 0,30.94L0,28.19Q3.4,3.33 28.31,0Z"/>
+</vector>

android/platform/android/res/layout/ti_map.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.fragment.app.FragmentContainerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />

android/platform/android/res/layout/ti_map_raw.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.gms.maps.MapView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:map="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/lite_raw_map"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    map:liteMode="true" />

android/platform/android/res/values/dimensions.xml

@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="pin_width">20dp</dimen>
+</resources>

android/src/ti/map/AnnotationProxy.java

@@ -8,15 +8,30 @@
 
 import android.animation.ObjectAnimator;
 import android.animation.TypeEvaluator;
+import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Message;
 import android.util.Property;
+import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.maps.android.ui.IconGenerator;
+
 import java.util.HashMap;
+import java.util.Locale;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -30,6 +45,7 @@
 import org.appcelerator.titanium.TiPoint;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.util.TiConvert;
+import org.appcelerator.titanium.util.TiUIHelper;
 import org.appcelerator.titanium.view.TiDrawableReference;
 
 @Kroll.proxy(creatableInModule = MapModule.class,
@@ -268,6 +284,8 @@ public void processOptions()
 			handleCustomView(getProperty(MapModule.PROPERTY_CUSTOM_VIEW));
 		} else if (hasProperty(TiC.PROPERTY_IMAGE)) {
 			handleImage(getProperty(TiC.PROPERTY_IMAGE));
+		} else if (hasProperty(MapModule.PROPERTY_CUSTOM_ICON)) {
+			handleCustomIcon((HashMap) getProperty(MapModule.PROPERTY_CUSTOM_ICON));
 		} else if (hasProperty(TiC.PROPERTY_PINCOLOR)) {
 			markerOptions.icon(
 				BitmapDescriptorFactory.defaultMarker(TiConvert.toFloat(getProperty(TiC.PROPERTY_PINCOLOR))));
@@ -301,6 +319,40 @@ private void handleCustomView(Object obj)
 		setIconImageDimensions(-1, -1);
 	}
 
+	private void handleCustomIcon(HashMap params) {
+		KrollDict customIcon = new KrollDict(params);
+		Context context = TiApplication.getInstance().getApplicationContext();
+
+		String title = customIcon.getString("title");
+		int tintColor = TiConvert.toColor(customIcon.get("tintColor"), context);
+		int textColor = TiConvert.toColor(customIcon.get("textColor"), context);
+
+		Drawable iconDrawable = ContextCompat.getDrawable(context, R.drawable.pin_waypoint);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			iconDrawable.setTint(tintColor);
+		}
+		IconGenerator mIconGenerator = new IconGenerator(context);
+		mIconGenerator.setBackground(iconDrawable);
+
+		if (title != null) {
+			int pinContentSize = (int) context.getResources().getDimension(R.dimen.pin_width);
+			TextView label = new TextView(context);
+			TiUIHelper.styleText(label, customIcon.getKrollDict(TiC.PROPERTY_FONT));
+
+			label.setTextColor(textColor);
+			label.setGravity(Gravity.CENTER);
+			label.setText(title);
+			label.setLayoutParams(new ViewGroup.LayoutParams(pinContentSize, pinContentSize));
+
+			mIconGenerator.setContentView(label);
+		}
+
+		Bitmap icon = mIconGenerator.makeIcon();
+
+		markerOptions.icon(BitmapDescriptorFactory.fromBitmap(icon));
+		setIconImageDimensions(icon.getWidth(), icon.getHeight());
+	}
+
 	private void handleImage(Object image)
 	{
 		// Image path
@@ -312,6 +364,7 @@ private void handleImage(Object image)
 					markerOptions.icon(BitmapDescriptorFactory.fromBitmap(bitmap));
 					setIconImageDimensions(bitmap.getWidth(), bitmap.getHeight());
 				} catch (Exception e) {
+					Log.e(TAG, e.getMessage());
 				}
 				return;
 			}
@@ -321,8 +374,12 @@ private void handleImage(Object image)
 		if (image instanceof TiBlob) {
 			Bitmap bitmap = ((TiBlob) image).getImage();
 			if (bitmap != null) {
-				markerOptions.icon(BitmapDescriptorFactory.fromBitmap(bitmap));
-				setIconImageDimensions(bitmap.getWidth(), bitmap.getHeight());
+				try {
+					markerOptions.icon(BitmapDescriptorFactory.fromBitmap(bitmap));
+					setIconImageDimensions(bitmap.getWidth(), bitmap.getHeight());
+				} catch (Exception e) {
+					Log.e(TAG, e.getMessage());
+				}
 				return;
 			}
 		}

android/src/ti/map/MapModule.java

@@ -9,22 +9,39 @@
 package ti.map;
 
 import org.appcelerator.kroll.KrollModule;
+import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiApplication;
+import org.appcelerator.titanium.util.TiConvert;
+import org.appcelerator.titanium.TiC;
+import org.appcelerator.kroll.common.Log;
+
+import android.location.Location;
+import androidx.annotation.NonNull;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.MapsInitializer;
+import com.google.android.gms.maps.OnMapsSdkInitializedCallback;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.maps.android.PolyUtil;
 
 @Kroll.module(name = "Map", id = "ti.map")
-public class MapModule extends KrollModule
+public class MapModule extends KrollModule implements OnMapsSdkInitializedCallback
 {
 	public static final String EVENT_MAP_CLICK = "mapclick";
+	public static final String EVENT_POI_CLICK = "poiclick";
 	public static final String EVENT_PIN_CHANGE_DRAG_STATE = "pinchangedragstate";
+	public static final String EVENT_READY = "ready";
 	public static final String EVENT_ON_SNAPSHOT_READY = "onsnapshotready";
 	public static final String EVENT_REGION_WILL_CHANGE = "regionwillchange";
 	public static final String EVENT_USER_LOCATION = "userLocation";
+	public static final String EVENT_IDLE = "idle";
 
 	public static final String PROPERTY_DRAGGABLE = "draggable";
 	public static final String PROPERTY_POINTS = "points";
@@ -47,6 +64,8 @@ public class MapModule extends KrollModule
 	public static final String PROPERTY_PADDING = "padding";
 	public static final String PROPERTY_TILT = "tilt";
 	public static final String PROPERTY_BEARING = "bearing";
+
+	public static final String PROPERTY_CUSTOM_ICON = "customIcon";
 	public static final String PROPERTY_ZOOM = "zoom";
 	public static final String PROPERTY_ZORDER_ON_TOP = "zOrderOnTop";
 	public static final String PROPERTY_CENTER_OFFSET = "centerOffset";
@@ -68,7 +87,9 @@ public class MapModule extends KrollModule
 	public static final String PROPERTY_CENTER = "center";
 	public static final String PROPERTY_RADIUS = "radius";
 	public static final String PROPERTY_INDOOR_ENABLED = "indoorEnabled";
+	public static final String PROPERTY_PLACE_ID = "placeID";
 	public static final String PROPERTY_DESELECTED = "deselected";
+	public static final String PROPERTY_LITE_MODE = "liteMode";
 
 	@Kroll.constant
 	public static final int NORMAL_TYPE = GoogleMap.MAP_TYPE_NORMAL;
@@ -135,7 +156,7 @@ public class MapModule extends KrollModule
 	public MapModule()
 	{
 		super();
-		MapsInitializer.initialize(TiApplication.getInstance().getApplicationContext());
+		MapsInitializer.initialize(TiApplication.getInstance().getApplicationContext(), MapsInitializer.Renderer.LATEST, this);
 	}
 
 	@Kroll.method
@@ -144,9 +165,51 @@ public int isGooglePlayServicesAvailable()
 		return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(TiApplication.getInstance());
 	}
 
+	@Kroll.method
+	public boolean geometryContainsLocation(KrollDict dict)
+	{
+		HashMap<String, String> point = (HashMap<String, String>) dict.get("location");
+		LatLng location = new LatLng(TiConvert.toDouble(point.get(TiC.PROPERTY_LATITUDE)),TiConvert.toDouble(point.get(TiC.PROPERTY_LONGITUDE)));
+		List<LatLng> polygon = new ArrayList<>();
+		Object[] dictPoints =(Object[]) dict.get("points");
+		for (Object _point : dictPoints) {
+			HashMap<String, String> _location = (HashMap<String, String>)_point;
+			polygon.add(new LatLng(TiConvert.toDouble(_location.get(TiC.PROPERTY_LATITUDE)), TiConvert.toDouble(_location.get(TiC.PROPERTY_LONGITUDE))));
+		}
+		return PolyUtil.containsLocation(location, polygon, true);
+	}
+
+	@Kroll.method
+	public double geometryDistanceBetweenPoints(Object jsLocation1, Object jsLocation2)
+	{
+		HashMap<String, String> location1Dict = (HashMap<String, String>) jsLocation1;
+		HashMap<String, String> location2Dict = (HashMap<String, String>) jsLocation2;
+
+		LatLng location1 = new LatLng(TiConvert.toDouble(location1Dict.get(TiC.PROPERTY_LATITUDE)), TiConvert.toDouble(location1Dict.get(TiC.PROPERTY_LONGITUDE)));
+		LatLng location2 = new LatLng(TiConvert.toDouble(location2Dict.get(TiC.PROPERTY_LATITUDE)), TiConvert.toDouble(location2Dict.get(TiC.PROPERTY_LONGITUDE)));
+
+		float[] results = new float[1];
+		Location.distanceBetween(location1.latitude, location1.longitude, location2.latitude, location2.longitude, results);
+
+		return results[0];
+	}
+
 	@Override
 	public String getApiName()
 	{
 		return "Ti.Map";
 	}
+
+	@Override
+	public void onMapsSdkInitialized(@NonNull MapsInitializer.Renderer renderer)
+	{
+		switch (renderer) {
+			case LATEST:
+				Log.d("MapsDemo", "The latest version of the renderer is used.");
+				break;
+			case LEGACY:
+				Log.d("MapsDemo", "The legacy version of the renderer is used.");
+				break;
+		}
+	}
 }

android/src/ti/map/PolygonProxy.java

@@ -23,6 +23,7 @@
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.PolygonOptions;
+import com.google.maps.android.PolyUtil;
 
 @Kroll.proxy(name = "Polygon", creatableInModule = MapModule.class,
 			 propertyAccessors =
@@ -154,21 +155,29 @@ public void addLocation(Object loc, ArrayList<LatLng> locationArray, boolean lis
 		}
 	}
 
-	public ArrayList<LatLng> processPoints(Object points, boolean list)
+	public List<LatLng> processPoints(Object points, boolean list)
 	{
-
 		ArrayList<LatLng> locationArray = new ArrayList<LatLng>();
-		// multiple points
+
+		// Handle an array of points
 		if (points instanceof Object[]) {
 			Object[] pointsArray = (Object[]) points;
 			for (int i = 0; i < pointsArray.length; i++) {
 				Object obj = pointsArray[i];
 				addLocation(obj, locationArray, list);
 			}
+
+			return locationArray;
+		// Handle encoded polyline
+		} else if (points instanceof  String) {
+			for (LatLng point : PolyUtil.decode((String) points)) {
+				addLocation(point, locationArray, list);
+			}
+
 			return locationArray;
 		}
 
-		// single point
+		// Single point
 		addLocation(points, locationArray, list);
 		return locationArray;
 	}