Merge branch 'master' into centerPoly

tidev · Sep 23, 2023 · f4a6034 · f4a6034
2 parents fd84f0b + 94ff4b9
commit f4a6034
Show file tree

Hide file tree

Showing 24 changed files with 742 additions and 62 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,8 +4,8 @@ dependencies {
 	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'
+	implementation 'com.google.maps.android:android-maps-utils:3.5.3'
 
 	// https://developer.android.com/jetpack/androidx/releases/fragment
-	implementation 'androidx.fragment:fragment:1.5.2'
+	implementation 'androidx.fragment:fragment:1.5.7'
 }
diff --git a/android/manifest b/android/manifest
@@ -2,6 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
+
 version: 5.6.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64

diff --git a/android/src/ti/map/AnnotationProxy.java b/android/src/ti/map/AnnotationProxy.java
@@ -324,6 +324,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;
 			}
@@ -333,8 +334,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;
 			}
 		}

diff --git a/android/src/ti/map/CircleProxy.java b/android/src/ti/map/CircleProxy.java
@@ -6,6 +6,7 @@
  */
 package ti.map;
 
+import android.app.Activity;
 import android.graphics.Color;
 import android.os.Message;
 import android.view.ViewGroup;
@@ -146,6 +147,7 @@ public boolean handleMessage(Message msg)
 	public void processOptions()
 	{
 		options = new CircleOptions();
+		Activity currentActivity = TiApplication.getAppCurrentActivity();
 
 		if (hasProperty(MapModule.PROPERTY_CENTER)) {
 			options.center(TiMapUtils.parseLocation(getProperty(MapModule.PROPERTY_CENTER)));
@@ -160,11 +162,13 @@ public void processOptions()
 		}
 
 		if (hasProperty(MapModule.PROPERTY_STROKE_COLOR)) {
-			options.strokeColor(alphaColor(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_STROKE_COLOR))));
+			options.strokeColor(
+				alphaColor(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_STROKE_COLOR), currentActivity)));
 		}
 
 		if (hasProperty(MapModule.PROPERTY_FILL_COLOR)) {
-			options.fillColor(alphaColor(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_FILL_COLOR))));
+			options.fillColor(
+				alphaColor(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_FILL_COLOR), currentActivity)));
 		}
 
 		if (hasProperty(MapModule.PROPERTY_ZINDEX)) {
@@ -184,6 +188,7 @@ public void processOptions()
 	public void onPropertyChanged(String name, Object value)
 	{
 		super.onPropertyChanged(name, value);
+		Activity currentActivity = TiApplication.getAppCurrentActivity();
 		if (circle == null) {
 			return;
 		}
@@ -203,12 +208,12 @@ else if (name.equals(MapModule.PROPERTY_STROKE_WIDTH)) {
 
 		else if (name.equals(MapModule.PROPERTY_STROKE_COLOR)) {
 			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_STROKE_COLOR),
-												TiConvert.toColor((String) value));
+												TiConvert.toColor((String) value, currentActivity));
 		}
 
 		else if (name.equals(MapModule.PROPERTY_FILL_COLOR)) {
 			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_FILL_COLOR),
-												TiConvert.toColor((String) value));
+												TiConvert.toColor((String) value, currentActivity));
 		}
 
 		else if (name.equals(MapModule.PROPERTY_ZINDEX)) {

diff --git a/android/src/ti/map/PolygonProxy.java b/android/src/ti/map/PolygonProxy.java
@@ -6,6 +6,7 @@
  */
 package ti.map;
 
+import android.app.Activity;
 import android.os.Message;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
@@ -19,6 +20,7 @@
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.AsyncResult;
 import org.appcelerator.kroll.common.TiMessenger;
+import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 import ti.map.Shape.IShape;
@@ -110,7 +112,7 @@ public void processOptions()
 	{
 
 		options = new PolygonOptions();
-
+		Activity currentActivity = TiApplication.getAppCurrentActivity();
 		if (hasProperty(MapModule.PROPERTY_POINTS)) {
 			processPoints(getProperty(MapModule.PROPERTY_POINTS), false);
 		}
@@ -120,15 +122,16 @@ public void processOptions()
 		}
 
 		if (hasProperty(MapModule.PROPERTY_STROKE_COLOR)) {
-			options.strokeColor(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_STROKE_COLOR)));
+			options.strokeColor(
+				TiConvert.toColor((String) getProperty(MapModule.PROPERTY_STROKE_COLOR), currentActivity));
 		}
 
 		if (hasProperty(MapModule.PROPERTY_STROKE_WIDTH)) {
 			options.strokeWidth(TiConvert.toFloat(getProperty(MapModule.PROPERTY_STROKE_WIDTH)));
 		}
 
 		if (hasProperty(MapModule.PROPERTY_FILL_COLOR)) {
-			options.fillColor(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_FILL_COLOR)));
+			options.fillColor(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_FILL_COLOR), currentActivity));
 		}
 
 		if (hasProperty(MapModule.PROPERTY_ZINDEX)) {
@@ -267,7 +270,7 @@ public void onPropertyChanged(String name, Object value)
 	{
 
 		super.onPropertyChanged(name, value);
-
+		Activity currentActivity = TiApplication.getAppCurrentActivity();
 		if (polygon == null) {
 			return;
 		}
@@ -283,12 +286,12 @@ else if (name.equals(MapModule.PROPERTY_POINTS)) {
 
 		else if (name.equals(MapModule.PROPERTY_STROKE_COLOR)) {
 			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_STROKE_COLOR),
-												TiConvert.toColor((String) value));
+												TiConvert.toColor((String) value, currentActivity));
 		}
 
 		else if (name.equals(MapModule.PROPERTY_FILL_COLOR)) {
 			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_FILL_COLOR),
-												TiConvert.toColor((String) value));
+												TiConvert.toColor((String) value, currentActivity));
 		}
 
 		else if (name.equals(MapModule.PROPERTY_ZINDEX)) {

diff --git a/android/src/ti/map/PolylineProxy.java b/android/src/ti/map/PolylineProxy.java
@@ -6,6 +6,7 @@
  */
 package ti.map;
 
+import android.app.Activity;
 import android.os.Message;
 import com.google.android.gms.maps.model.Dash;
 import com.google.android.gms.maps.model.Dot;
@@ -24,6 +25,7 @@
 import org.appcelerator.kroll.common.AsyncResult;
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.kroll.common.TiMessenger;
+import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 import ti.map.Shape.IShape;
@@ -134,6 +136,7 @@ public void processOptions()
 	{
 
 		options = new PolylineOptions();
+		Activity currentActivity = TiApplication.getAppCurrentActivity();
 		// (int) strokeColor
 		// (float) strokeWidth
 		// (int) fillColor
@@ -144,12 +147,13 @@ public void processOptions()
 		}
 
 		if (hasProperty(MapModule.PROPERTY_STROKE_COLOR)) {
-			options.color(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_STROKE_COLOR)));
+			options.color(TiConvert.toColor((String) getProperty(MapModule.PROPERTY_STROKE_COLOR), currentActivity));
 		}
 
 		// alternate API
 		if (hasProperty(PolylineProxy.PROPERTY_STROKE_COLOR2)) {
-			options.color(TiConvert.toColor((String) getProperty(PolylineProxy.PROPERTY_STROKE_COLOR2)));
+			options.color(
+				TiConvert.toColor((String) getProperty(PolylineProxy.PROPERTY_STROKE_COLOR2), currentActivity));
 		}
 
 		if (hasProperty(MapModule.PROPERTY_STROKE_WIDTH)) {
@@ -243,7 +247,7 @@ public void onPropertyChanged(String name, Object value)
 	{
 
 		super.onPropertyChanged(name, value);
-
+		Activity currentActivity = TiApplication.getAppCurrentActivity();
 		if (polyline == null) {
 			return;
 		}
@@ -264,12 +268,12 @@ else if (name.equals(PolylineProxy.PROPERTY_STROKE_WIDTH2)) {
 
 		else if (name.equals(MapModule.PROPERTY_STROKE_COLOR)) {
 			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_STROKE_COLOR),
-												TiConvert.toColor((String) value));
+												TiConvert.toColor((String) value, currentActivity));
 		}
 		// alternate API
 		else if (name.equals(PolylineProxy.PROPERTY_STROKE_COLOR2)) {
 			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_STROKE_COLOR),
-												TiConvert.toColor((String) value));
+												TiConvert.toColor((String) value, currentActivity));
 		}
 
 		else if (name.equals(PolylineProxy.PROPERTY_ZINDEX)) {

diff --git a/android/src/ti/map/RouteProxy.java b/android/src/ti/map/RouteProxy.java
@@ -18,6 +18,7 @@
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.AsyncResult;
 import org.appcelerator.kroll.common.TiMessenger;
+import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiC;
 import org.appcelerator.titanium.util.TiConvert;
 
@@ -86,7 +87,8 @@ public void processOptions()
 		}
 
 		if (hasProperty(TiC.PROPERTY_COLOR)) {
-			options.color(TiConvert.toColor((String) getProperty(TiC.PROPERTY_COLOR)));
+			options.color(
+				TiConvert.toColor((String) getProperty(TiC.PROPERTY_COLOR), TiApplication.getAppCurrentActivity()));
 		}
 	}
 
@@ -160,8 +162,9 @@ else if (name.equals(MapModule.PROPERTY_POINTS)) {
 		}
 
 		else if (name.equals(TiC.PROPERTY_COLOR)) {
-			TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_SET_COLOR),
-												TiConvert.toColor((String) value));
+			TiMessenger.sendBlockingMainMessage(
+				getMainHandler().obtainMessage(MSG_SET_COLOR),
+				TiConvert.toColor((String) value, TiApplication.getAppCurrentActivity()));
 		}
 
 		else if (name.equals(TiC.PROPERTY_WIDTH)) {

diff --git a/android/src/ti/map/TiMarker.java b/android/src/ti/map/TiMarker.java
@@ -74,4 +74,13 @@ public String getSnippet()
 		}
 		return null;
 	}
+
+	@Override
+	public Float getZIndex()
+	{
+		if (proxy != null) {
+			return proxy.getMarkerOptions().getZIndex();
+		}
+		return null;
+	}
 }
diff --git a/apidoc/Circle.yml b/apidoc/Circle.yml
@@ -22,6 +22,16 @@ properties:
     type: Number
     optional: true
 
+  - name: blendMode
+    summary: The blend mode to apply to the overlay.
+    description: Use one of the `Ti.UI.BLEND_MODE_*` constants!
+    availability: creation
+    type: Number
+    platforms: [iphone, ipad, macos]
+    osver: { ios: { min: "16.0" } }
+    since: "12.0.0"
+    optional: true
+
   - name: fillColor
     summary: |
         Color to use when shading the circle, as a color name or hex triplet.