Skip to content

Commit

Permalink
feat(android): implement liteMode
Browse files Browse the repository at this point in the history
  • Loading branch information
m1ga authored and Gary Mathews committed Oct 10, 2019
1 parent dee2259 commit 3ba7c7f
Show file tree
Hide file tree
Showing 15 changed files with 124 additions and 118 deletions.
2 changes: 1 addition & 1 deletion android/manifest
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 4.5.0
version: 4.5.1
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86
description: External version of Map module to support new Google Map v2 sdk
Expand Down
17 changes: 7 additions & 10 deletions android/src/ti/map/AnnotationProxy.java
Expand Up @@ -6,8 +6,14 @@
*/
package ti.map;

import android.graphics.Bitmap;
import android.os.Message;
import android.view.View;
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 java.util.HashMap;

import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
Expand All @@ -23,15 +29,6 @@
import org.appcelerator.titanium.util.TiConvert;
import org.appcelerator.titanium.view.TiDrawableReference;

import android.graphics.Bitmap;
import android.os.Message;
import android.view.View;

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;

@Kroll.proxy(creatableInModule = MapModule.class,
propertyAccessors = { TiC.PROPERTY_SUBTITLE, TiC.PROPERTY_SUBTITLEID, TiC.PROPERTY_TITLE,
TiC.PROPERTY_TITLEID, TiC.PROPERTY_LATITUDE, TiC.PROPERTY_LONGITUDE,
Expand Down
15 changes: 6 additions & 9 deletions android/src/ti/map/CircleProxy.java
Expand Up @@ -6,8 +6,13 @@
*/
package ti.map;

import android.graphics.Color;
import android.os.Message;
import android.view.ViewGroup;
import com.google.android.gms.maps.model.Circle;
import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng;
import java.util.HashMap;

import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.kroll.common.AsyncResult;
Expand All @@ -16,15 +21,7 @@
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.TiDimension;
import org.appcelerator.titanium.util.TiConvert;

import ti.map.Shape.IShape;
import android.graphics.Color;
import android.os.Message;
import android.view.ViewGroup;

import com.google.android.gms.maps.model.Circle;
import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng;

@Kroll.
proxy(name = "Circle", creatableInModule = MapModule.class,
Expand Down
1 change: 0 additions & 1 deletion android/src/ti/map/ImageOverlayProxy.java
Expand Up @@ -13,7 +13,6 @@
import com.google.android.gms.maps.model.GroundOverlayOptions;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.LatLngBounds;

import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
Expand Down
8 changes: 4 additions & 4 deletions android/src/ti/map/MapModule.java
Expand Up @@ -8,14 +8,13 @@
*/
package ti.map;

import org.appcelerator.kroll.KrollModule;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.titanium.TiApplication;

import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapsInitializer;
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import org.appcelerator.kroll.KrollModule;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.titanium.TiApplication;

@Kroll.module(name = "Map", id = "ti.map")
public class MapModule extends KrollModule
Expand Down Expand Up @@ -69,6 +68,7 @@ public class MapModule extends KrollModule
public static final String PROPERTY_RADIUS = "radius";
public static final String PROPERTY_INDOOR_ENABLED = "indoorEnabled";
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;
Expand Down
11 changes: 4 additions & 7 deletions android/src/ti/map/PolygonProxy.java
Expand Up @@ -6,23 +6,20 @@
*/
package ti.map;

import android.os.Message;
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 java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.kroll.common.AsyncResult;
import org.appcelerator.kroll.common.TiMessenger;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.util.TiConvert;

import ti.map.Shape.IShape;
import android.os.Message;

import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Polygon;
import com.google.android.gms.maps.model.PolygonOptions;

@Kroll.proxy(name = "Polygon", creatableInModule = MapModule.class,
propertyAccessors =
Expand Down
23 changes: 10 additions & 13 deletions android/src/ti/map/PolylineProxy.java
Expand Up @@ -6,29 +6,26 @@
*/
package ti.map;

import java.util.Arrays;
import android.os.Message;
import com.google.android.gms.maps.model.Dash;
import com.google.android.gms.maps.model.Dot;
import com.google.android.gms.maps.model.Gap;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.PatternItem;
import com.google.android.gms.maps.model.Polyline;
import com.google.android.gms.maps.model.PolylineOptions;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.kroll.common.AsyncResult;
import org.appcelerator.kroll.common.TiMessenger;
import org.appcelerator.kroll.common.Log;
import org.appcelerator.kroll.common.TiMessenger;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.util.TiConvert;

import ti.map.Shape.IShape;
import android.os.Message;

import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Polyline;
import com.google.android.gms.maps.model.PolylineOptions;
import com.google.android.gms.maps.model.Dash;
import com.google.android.gms.maps.model.Dot;
import com.google.android.gms.maps.model.Gap;
import com.google.android.gms.maps.model.PatternItem;

@Kroll.proxy(name = "Polyline", creatableInModule = MapModule.class,
propertyAccessors = { MapModule.PROPERTY_STROKE_COLOR, MapModule.PROPERTY_STROKE_WIDTH,
Expand Down
11 changes: 4 additions & 7 deletions android/src/ti/map/RouteProxy.java
Expand Up @@ -6,22 +6,19 @@
*/
package ti.map;

import android.os.Message;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Polyline;
import com.google.android.gms.maps.model.PolylineOptions;
import java.util.ArrayList;
import java.util.HashMap;

import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.kroll.common.AsyncResult;
import org.appcelerator.kroll.common.TiMessenger;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.util.TiConvert;

import android.os.Message;

import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Polyline;
import com.google.android.gms.maps.model.PolylineOptions;

@Kroll.proxy(creatableInModule = MapModule.class,
propertyAccessors = { MapModule.PROPERTY_POINTS, TiC.PROPERTY_COLOR, TiC.PROPERTY_WIDTH })
public class RouteProxy extends KrollProxy
Expand Down
3 changes: 1 addition & 2 deletions android/src/ti/map/StreetViewPanoramaProxy.java
Expand Up @@ -6,12 +6,11 @@
*/
package ti.map;

import android.app.Activity;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.view.TiUIView;

import android.app.Activity;

@Kroll.proxy(creatableInModule = MapModule.class,
propertyAccessors = { TiC.PROPERTY_POSITION, MapModule.PROPERTY_PANNING, MapModule.PROPERTY_ZOOM,
MapModule.PROPERTY_STREET_NAMES, MapModule.PROPERTY_USER_NAVIGATION })
Expand Down
22 changes: 11 additions & 11 deletions android/src/ti/map/TiClusterRenderer.java
@@ -1,22 +1,22 @@
package ti.map;

import com.google.maps.android.clustering.view.DefaultClusterRenderer;
import com.google.android.gms.maps.GoogleMap;
import android.content.Context;
import com.google.maps.android.clustering.ClusterManager;
import com.google.android.gms.maps.model.Marker;
import org.appcelerator.titanium.view.TiDrawableReference;
import android.graphics.Bitmap;
import com.google.android.gms.maps.model.MarkerOptions;
import org.appcelerator.titanium.TiApplication;
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import android.view.View;
import org.appcelerator.titanium.TiDimension;
import org.appcelerator.titanium.TiPoint;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions;
import com.google.maps.android.clustering.ClusterManager;
import com.google.maps.android.clustering.view.DefaultClusterRenderer;
import java.util.HashMap;
import org.appcelerator.titanium.TiC;
import org.appcelerator.kroll.common.Log;
import org.appcelerator.titanium.TiApplication;
import org.appcelerator.titanium.TiBlob;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.TiDimension;
import org.appcelerator.titanium.TiPoint;
import org.appcelerator.titanium.view.TiDrawableReference;

public class TiClusterRenderer extends DefaultClusterRenderer<TiMarker>
{
Expand Down
15 changes: 7 additions & 8 deletions android/src/ti/map/TiMapInfoWindow.java
Expand Up @@ -7,14 +7,6 @@

package ti.map;

import org.appcelerator.kroll.common.Log;
import org.appcelerator.titanium.TiApplication;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.proxy.TiViewProxy;
import org.appcelerator.titanium.view.TiCompositeLayout;
import org.appcelerator.titanium.view.TiDrawableReference;
import org.appcelerator.titanium.view.TiUIView;

import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Color;
Expand All @@ -29,6 +21,13 @@
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import org.appcelerator.kroll.common.Log;
import org.appcelerator.titanium.TiApplication;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.proxy.TiViewProxy;
import org.appcelerator.titanium.view.TiCompositeLayout;
import org.appcelerator.titanium.view.TiDrawableReference;
import org.appcelerator.titanium.view.TiUIView;

public class TiMapInfoWindow extends RelativeLayout
{
Expand Down
15 changes: 6 additions & 9 deletions android/src/ti/map/TiStreetViewPanorama.java
Expand Up @@ -6,23 +6,20 @@
*/
package ti.map;

import android.app.Activity;
import android.support.v4.app.Fragment;
import com.google.android.gms.maps.OnStreetViewPanoramaReadyCallback;
import com.google.android.gms.maps.StreetViewPanorama;
import com.google.android.gms.maps.SupportStreetViewPanoramaFragment;
import com.google.android.gms.maps.model.LatLng;
import java.util.HashMap;

import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollProxy;
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.proxy.TiViewProxy;
import org.appcelerator.titanium.util.TiConvert;
import org.appcelerator.titanium.view.TiUIFragment;

import com.google.android.gms.maps.OnStreetViewPanoramaReadyCallback;
import com.google.android.gms.maps.StreetViewPanorama;
import com.google.android.gms.maps.SupportStreetViewPanoramaFragment;
import com.google.android.gms.maps.model.LatLng;

import android.app.Activity;
import android.support.v4.app.Fragment;

public class TiStreetViewPanorama extends TiUIFragment implements OnStreetViewPanoramaReadyCallback
{
private StreetViewPanorama panorama;
Expand Down

0 comments on commit 3ba7c7f

Please sign in to comment.