diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers')
15 files changed, 298 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java index 0a0c3f1e43..ddb4d04fff 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class BackgroundLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public BackgroundLayer(long nativePtr) { super(nativePtr); } @@ -40,6 +42,7 @@ public class BackgroundLayer extends Layer { initialize(layerId); } + @Keep protected native void initialize(String layerId); /** @@ -165,25 +168,35 @@ public class BackgroundLayer extends Layer { nativeSetBackgroundOpacityTransition(options.getDuration(), options.getDelay()); } + @Keep private native Object nativeGetBackgroundColor(); + @Keep private native TransitionOptions nativeGetBackgroundColorTransition(); + @Keep private native void nativeSetBackgroundColorTransition(long duration, long delay); + @Keep private native Object nativeGetBackgroundPattern(); + @Keep private native TransitionOptions nativeGetBackgroundPatternTransition(); + @Keep private native void nativeSetBackgroundPatternTransition(long duration, long delay); + @Keep private native Object nativeGetBackgroundOpacity(); + @Keep private native TransitionOptions nativeGetBackgroundOpacityTransition(); + @Keep private native void nativeSetBackgroundOpacityTransition(long duration, long delay); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java index 212493032d..783f9e9024 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CannotAddLayerException.java @@ -1,8 +1,11 @@ package com.mapbox.mapboxsdk.style.layers; +import android.support.annotation.Keep; + /** * Thrown when adding a layer to a map twice */ +@Keep public class CannotAddLayerException extends RuntimeException { public CannotAddLayerException(String message) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java index c85cfba0a5..8abd78ace2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class CircleLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public CircleLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class CircleLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -439,61 +442,89 @@ public class CircleLayer extends Layer { nativeSetCircleStrokeOpacityTransition(options.getDuration(), options.getDelay()); } + @Keep private native Object nativeGetCircleRadius(); + @Keep private native TransitionOptions nativeGetCircleRadiusTransition(); + @Keep private native void nativeSetCircleRadiusTransition(long duration, long delay); + @Keep private native Object nativeGetCircleColor(); + @Keep private native TransitionOptions nativeGetCircleColorTransition(); + @Keep private native void nativeSetCircleColorTransition(long duration, long delay); + @Keep private native Object nativeGetCircleBlur(); + @Keep private native TransitionOptions nativeGetCircleBlurTransition(); + @Keep private native void nativeSetCircleBlurTransition(long duration, long delay); + @Keep private native Object nativeGetCircleOpacity(); + @Keep private native TransitionOptions nativeGetCircleOpacityTransition(); + @Keep private native void nativeSetCircleOpacityTransition(long duration, long delay); + @Keep private native Object nativeGetCircleTranslate(); + @Keep private native TransitionOptions nativeGetCircleTranslateTransition(); + @Keep private native void nativeSetCircleTranslateTransition(long duration, long delay); + @Keep private native Object nativeGetCircleTranslateAnchor(); + @Keep private native Object nativeGetCirclePitchScale(); + @Keep private native Object nativeGetCirclePitchAlignment(); + @Keep private native Object nativeGetCircleStrokeWidth(); + @Keep private native TransitionOptions nativeGetCircleStrokeWidthTransition(); + @Keep private native void nativeSetCircleStrokeWidthTransition(long duration, long delay); + @Keep private native Object nativeGetCircleStrokeColor(); + @Keep private native TransitionOptions nativeGetCircleStrokeColorTransition(); + @Keep private native void nativeSetCircleStrokeColorTransition(long duration, long delay); + @Keep private native Object nativeGetCircleStrokeOpacity(); + @Keep private native TransitionOptions nativeGetCircleStrokeOpacityTransition(); + @Keep private native void nativeSetCircleStrokeOpacityTransition(long duration, long delay); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java index a0ba1e2159..79b68bbfc0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java @@ -1,5 +1,7 @@ package com.mapbox.mapboxsdk.style.layers; +import android.support.annotation.Keep; + /** * Custom layer. * <p> @@ -13,6 +15,7 @@ public class CustomLayer extends Layer { initialize(id, host); } + @Keep public CustomLayer(long nativePtr) { super(nativePtr); } @@ -21,11 +24,14 @@ public class CustomLayer extends Layer { nativeUpdate(); } + @Keep protected native void initialize(String id, long host); + @Keep protected native void nativeUpdate(); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java index fdfc8c51a9..6efe04e39d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class FillExtrusionLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public FillExtrusionLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class FillExtrusionLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -338,45 +341,65 @@ public class FillExtrusionLayer extends Layer { nativeSetFillExtrusionBaseTransition(options.getDuration(), options.getDelay()); } + @Keep private native Object nativeGetFillExtrusionOpacity(); + @Keep private native TransitionOptions nativeGetFillExtrusionOpacityTransition(); + @Keep private native void nativeSetFillExtrusionOpacityTransition(long duration, long delay); + @Keep private native Object nativeGetFillExtrusionColor(); + @Keep private native TransitionOptions nativeGetFillExtrusionColorTransition(); + @Keep private native void nativeSetFillExtrusionColorTransition(long duration, long delay); + @Keep private native Object nativeGetFillExtrusionTranslate(); + @Keep private native TransitionOptions nativeGetFillExtrusionTranslateTransition(); + @Keep private native void nativeSetFillExtrusionTranslateTransition(long duration, long delay); + @Keep private native Object nativeGetFillExtrusionTranslateAnchor(); + @Keep private native Object nativeGetFillExtrusionPattern(); + @Keep private native TransitionOptions nativeGetFillExtrusionPatternTransition(); + @Keep private native void nativeSetFillExtrusionPatternTransition(long duration, long delay); + @Keep private native Object nativeGetFillExtrusionHeight(); + @Keep private native TransitionOptions nativeGetFillExtrusionHeightTransition(); + @Keep private native void nativeSetFillExtrusionHeightTransition(long duration, long delay); + @Keep private native Object nativeGetFillExtrusionBase(); + @Keep private native TransitionOptions nativeGetFillExtrusionBaseTransition(); + @Keep private native void nativeSetFillExtrusionBaseTransition(long duration, long delay); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java index b51c49e517..aaa20d6f3a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class FillLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public FillLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class FillLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -335,41 +338,59 @@ public class FillLayer extends Layer { nativeSetFillPatternTransition(options.getDuration(), options.getDelay()); } + @Keep private native Object nativeGetFillAntialias(); + @Keep private native Object nativeGetFillOpacity(); + @Keep private native TransitionOptions nativeGetFillOpacityTransition(); + @Keep private native void nativeSetFillOpacityTransition(long duration, long delay); + @Keep private native Object nativeGetFillColor(); + @Keep private native TransitionOptions nativeGetFillColorTransition(); + @Keep private native void nativeSetFillColorTransition(long duration, long delay); + @Keep private native Object nativeGetFillOutlineColor(); + @Keep private native TransitionOptions nativeGetFillOutlineColorTransition(); + @Keep private native void nativeSetFillOutlineColorTransition(long duration, long delay); + @Keep private native Object nativeGetFillTranslate(); + @Keep private native TransitionOptions nativeGetFillTranslateTransition(); + @Keep private native void nativeSetFillTranslateTransition(long duration, long delay); + @Keep private native Object nativeGetFillTranslateAnchor(); + @Keep private native Object nativeGetFillPattern(); + @Keep private native TransitionOptions nativeGetFillPatternTransition(); + @Keep private native void nativeSetFillPatternTransition(long duration, long delay); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java index d28e4bd838..6d7cece124 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class HeatmapLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public HeatmapLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class HeatmapLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -256,29 +259,41 @@ public class HeatmapLayer extends Layer { nativeSetHeatmapOpacityTransition(options.getDuration(), options.getDelay()); } + @Keep private native Object nativeGetHeatmapRadius(); + @Keep private native TransitionOptions nativeGetHeatmapRadiusTransition(); + @Keep private native void nativeSetHeatmapRadiusTransition(long duration, long delay); + @Keep private native Object nativeGetHeatmapWeight(); + @Keep private native Object nativeGetHeatmapIntensity(); + @Keep private native TransitionOptions nativeGetHeatmapIntensityTransition(); + @Keep private native void nativeSetHeatmapIntensityTransition(long duration, long delay); + @Keep private native Object nativeGetHeatmapColor(); + @Keep private native Object nativeGetHeatmapOpacity(); + @Keep private native TransitionOptions nativeGetHeatmapOpacityTransition(); + @Keep private native void nativeSetHeatmapOpacityTransition(long duration, long delay); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java index 75a2607b05..f906104e91 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class HillshadeLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public HillshadeLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class HillshadeLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -274,35 +277,50 @@ public class HillshadeLayer extends Layer { nativeSetHillshadeAccentColorTransition(options.getDuration(), options.getDelay()); } + @Keep private native Object nativeGetHillshadeIlluminationDirection(); + @Keep private native Object nativeGetHillshadeIlluminationAnchor(); + @Keep private native Object nativeGetHillshadeExaggeration(); + @Keep private native TransitionOptions nativeGetHillshadeExaggerationTransition(); + @Keep private native void nativeSetHillshadeExaggerationTransition(long duration, long delay); + @Keep private native Object nativeGetHillshadeShadowColor(); + @Keep private native TransitionOptions nativeGetHillshadeShadowColorTransition(); + @Keep private native void nativeSetHillshadeShadowColorTransition(long duration, long delay); + @Keep private native Object nativeGetHillshadeHighlightColor(); + @Keep private native TransitionOptions nativeGetHillshadeHighlightColorTransition(); + @Keep private native void nativeSetHillshadeHighlightColorTransition(long duration, long delay); + @Keep private native Object nativeGetHillshadeAccentColor(); + @Keep private native TransitionOptions nativeGetHillshadeAccentColorTransition(); + @Keep private native void nativeSetHillshadeAccentColorTransition(long duration, long delay); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java index 3edc202c8e..92aa54e55f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.style.layers; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import com.google.gson.JsonElement; @@ -11,9 +12,12 @@ import com.mapbox.mapboxsdk.utils.ThreadUtils; */ public abstract class Layer { + @Keep private long nativePtr; + @Keep private boolean invalidated; + @Keep public Layer(long nativePtr) { checkThread(); this.nativePtr = nativePtr; @@ -77,30 +81,43 @@ public abstract class Layer { } @Override + @Keep protected native void finalize() throws Throwable; + @Keep protected native String nativeGetId(); + @Keep protected native Object nativeGetVisibility(); + @Keep protected native void nativeSetLayoutProperty(String name, Object value); + @Keep protected native void nativeSetPaintProperty(String name, Object value); + @Keep protected native void nativeSetFilter(Object[] filter); + @Keep protected native JsonElement nativeGetFilter(); + @Keep protected native void nativeSetSourceLayer(String sourceLayer); + @Keep protected native String nativeGetSourceLayer(); + @Keep protected native float nativeGetMinZoom(); + @Keep protected native float nativeGetMaxZoom(); + @Keep protected native void nativeSetMinZoom(float zoom); + @Keep protected native void nativeSetMaxZoom(float zoom); public long getNativePtr() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java index b094162c4b..4a742cd7a6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class LineLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public LineLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class LineLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -475,71 +478,104 @@ public class LineLayer extends Layer { nativeSetLinePatternTransition(options.getDuration(), options.getDelay()); } + @Keep private native Object nativeGetLineCap(); + @Keep private native Object nativeGetLineJoin(); + @Keep private native Object nativeGetLineMiterLimit(); + @Keep private native Object nativeGetLineRoundLimit(); + @Keep private native Object nativeGetLineOpacity(); + @Keep private native TransitionOptions nativeGetLineOpacityTransition(); + @Keep private native void nativeSetLineOpacityTransition(long duration, long delay); + @Keep private native Object nativeGetLineColor(); + @Keep private native TransitionOptions nativeGetLineColorTransition(); + @Keep private native void nativeSetLineColorTransition(long duration, long delay); + @Keep private native Object nativeGetLineTranslate(); + @Keep private native TransitionOptions nativeGetLineTranslateTransition(); + @Keep private native void nativeSetLineTranslateTransition(long duration, long delay); + @Keep private native Object nativeGetLineTranslateAnchor(); + @Keep private native Object nativeGetLineWidth(); + @Keep private native TransitionOptions nativeGetLineWidthTransition(); + @Keep private native void nativeSetLineWidthTransition(long duration, long delay); + @Keep private native Object nativeGetLineGapWidth(); + @Keep private native TransitionOptions nativeGetLineGapWidthTransition(); + @Keep private native void nativeSetLineGapWidthTransition(long duration, long delay); + @Keep private native Object nativeGetLineOffset(); + @Keep private native TransitionOptions nativeGetLineOffsetTransition(); + @Keep private native void nativeSetLineOffsetTransition(long duration, long delay); + @Keep private native Object nativeGetLineBlur(); + @Keep private native TransitionOptions nativeGetLineBlurTransition(); + @Keep private native void nativeSetLineBlurTransition(long duration, long delay); + @Keep private native Object nativeGetLineDasharray(); + @Keep private native TransitionOptions nativeGetLineDasharrayTransition(); + @Keep private native void nativeSetLineDasharrayTransition(long duration, long delay); + @Keep private native Object nativeGetLinePattern(); + @Keep private native TransitionOptions nativeGetLinePatternTransition(); + @Keep private native void nativeSetLinePatternTransition(long duration, long delay); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java index 1214f7b11c..83e228cba0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class RasterLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public RasterLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class RasterLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -285,47 +288,68 @@ public class RasterLayer extends Layer { return (PropertyValue<Float>) new PropertyValue("raster-fade-duration", nativeGetRasterFadeDuration()); } + @Keep private native Object nativeGetRasterOpacity(); + @Keep private native TransitionOptions nativeGetRasterOpacityTransition(); + @Keep private native void nativeSetRasterOpacityTransition(long duration, long delay); + @Keep private native Object nativeGetRasterHueRotate(); + @Keep private native TransitionOptions nativeGetRasterHueRotateTransition(); + @Keep private native void nativeSetRasterHueRotateTransition(long duration, long delay); + @Keep private native Object nativeGetRasterBrightnessMin(); + @Keep private native TransitionOptions nativeGetRasterBrightnessMinTransition(); + @Keep private native void nativeSetRasterBrightnessMinTransition(long duration, long delay); + @Keep private native Object nativeGetRasterBrightnessMax(); + @Keep private native TransitionOptions nativeGetRasterBrightnessMaxTransition(); + @Keep private native void nativeSetRasterBrightnessMaxTransition(long duration, long delay); + @Keep private native Object nativeGetRasterSaturation(); + @Keep private native TransitionOptions nativeGetRasterSaturationTransition(); + @Keep private native void nativeSetRasterSaturationTransition(long duration, long delay); + @Keep private native Object nativeGetRasterContrast(); + @Keep private native TransitionOptions nativeGetRasterContrastTransition(); + @Keep private native void nativeSetRasterContrastTransition(long duration, long delay); + @Keep private native Object nativeGetRasterResampling(); + @Keep private native Object nativeGetRasterFadeDuration(); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java index 4aefad3956..f2ddb600a5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -26,6 +27,7 @@ public class SymbolLayer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public SymbolLayer(long nativePtr) { super(nativePtr); } @@ -41,6 +43,7 @@ public class SymbolLayer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -982,155 +985,230 @@ public class SymbolLayer extends Layer { return (PropertyValue<String>) new PropertyValue("text-translate-anchor", nativeGetTextTranslateAnchor()); } + @Keep private native Object nativeGetSymbolPlacement(); + @Keep private native Object nativeGetSymbolSpacing(); + @Keep private native Object nativeGetSymbolAvoidEdges(); + @Keep private native Object nativeGetIconAllowOverlap(); + @Keep private native Object nativeGetIconIgnorePlacement(); + @Keep private native Object nativeGetIconOptional(); + @Keep private native Object nativeGetIconRotationAlignment(); + @Keep private native Object nativeGetIconSize(); + @Keep private native Object nativeGetIconTextFit(); + @Keep private native Object nativeGetIconTextFitPadding(); + @Keep private native Object nativeGetIconImage(); + @Keep private native Object nativeGetIconRotate(); + @Keep private native Object nativeGetIconPadding(); + @Keep private native Object nativeGetIconKeepUpright(); + @Keep private native Object nativeGetIconOffset(); + @Keep private native Object nativeGetIconAnchor(); + @Keep private native Object nativeGetIconPitchAlignment(); + @Keep private native Object nativeGetTextPitchAlignment(); + @Keep private native Object nativeGetTextRotationAlignment(); + @Keep private native Object nativeGetTextField(); + @Keep private native Object nativeGetTextFont(); + @Keep private native Object nativeGetTextSize(); + @Keep private native Object nativeGetTextMaxWidth(); + @Keep private native Object nativeGetTextLineHeight(); + @Keep private native Object nativeGetTextLetterSpacing(); + @Keep private native Object nativeGetTextJustify(); + @Keep private native Object nativeGetTextAnchor(); + @Keep private native Object nativeGetTextMaxAngle(); + @Keep private native Object nativeGetTextRotate(); + @Keep private native Object nativeGetTextPadding(); + @Keep private native Object nativeGetTextKeepUpright(); + @Keep private native Object nativeGetTextTransform(); + @Keep private native Object nativeGetTextOffset(); + @Keep private native Object nativeGetTextAllowOverlap(); + @Keep private native Object nativeGetTextIgnorePlacement(); + @Keep private native Object nativeGetTextOptional(); + @Keep private native Object nativeGetIconOpacity(); + @Keep private native TransitionOptions nativeGetIconOpacityTransition(); + @Keep private native void nativeSetIconOpacityTransition(long duration, long delay); + @Keep private native Object nativeGetIconColor(); + @Keep private native TransitionOptions nativeGetIconColorTransition(); + @Keep private native void nativeSetIconColorTransition(long duration, long delay); + @Keep private native Object nativeGetIconHaloColor(); + @Keep private native TransitionOptions nativeGetIconHaloColorTransition(); + @Keep private native void nativeSetIconHaloColorTransition(long duration, long delay); + @Keep private native Object nativeGetIconHaloWidth(); + @Keep private native TransitionOptions nativeGetIconHaloWidthTransition(); + @Keep private native void nativeSetIconHaloWidthTransition(long duration, long delay); + @Keep private native Object nativeGetIconHaloBlur(); + @Keep private native TransitionOptions nativeGetIconHaloBlurTransition(); + @Keep private native void nativeSetIconHaloBlurTransition(long duration, long delay); + @Keep private native Object nativeGetIconTranslate(); + @Keep private native TransitionOptions nativeGetIconTranslateTransition(); + @Keep private native void nativeSetIconTranslateTransition(long duration, long delay); + @Keep private native Object nativeGetIconTranslateAnchor(); + @Keep private native Object nativeGetTextOpacity(); + @Keep private native TransitionOptions nativeGetTextOpacityTransition(); + @Keep private native void nativeSetTextOpacityTransition(long duration, long delay); + @Keep private native Object nativeGetTextColor(); + @Keep private native TransitionOptions nativeGetTextColorTransition(); + @Keep private native void nativeSetTextColorTransition(long duration, long delay); + @Keep private native Object nativeGetTextHaloColor(); + @Keep private native TransitionOptions nativeGetTextHaloColorTransition(); + @Keep private native void nativeSetTextHaloColorTransition(long duration, long delay); + @Keep private native Object nativeGetTextHaloWidth(); + @Keep private native TransitionOptions nativeGetTextHaloWidthTransition(); + @Keep private native void nativeSetTextHaloWidthTransition(long duration, long delay); + @Keep private native Object nativeGetTextHaloBlur(); + @Keep private native TransitionOptions nativeGetTextHaloBlurTransition(); + @Keep private native void nativeSetTextHaloBlurTransition(long duration, long delay); + @Keep private native Object nativeGetTextTranslate(); + @Keep private native TransitionOptions nativeGetTextTranslateTransition(); + @Keep private native void nativeSetTextTranslateTransition(long duration, long delay); + @Keep private native Object nativeGetTextTranslateAnchor(); @Override + @Keep protected native void finalize() throws Throwable; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java index 6e6e4ca613..2a25302aed 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/TransitionOptions.java @@ -1,5 +1,7 @@ package com.mapbox.mapboxsdk.style.layers; +import android.support.annotation.Keep; + /** * Resembles transition property from the style specification. * @@ -28,6 +30,7 @@ public class TransitionOptions { * @param delay the delay to start the transition * @return a new transition property object */ + @Keep public static TransitionOptions fromTransitionOptions(long duration, long delay) { return new TransitionOptions(duration, delay); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java index 4abafcdbeb..b9898e72da 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/UnknownLayer.java @@ -1,11 +1,13 @@ package com.mapbox.mapboxsdk.style.layers; +import android.support.annotation.Keep; import android.support.annotation.UiThread; /** * An unknown type of layer */ @UiThread +@Keep public class UnknownLayer extends Layer { /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs index 21b0a1d59e..2d4db2b55d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs @@ -8,6 +8,7 @@ package com.mapbox.mapboxsdk.style.layers; import android.support.annotation.ColorInt; +import android.support.annotation.Keep; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -31,6 +32,7 @@ public class <%- camelize(type) %>Layer extends Layer { * * @param nativePtr pointer used by core */ + @Keep public <%- camelize(type) %>Layer(long nativePtr) { super(nativePtr); } @@ -46,6 +48,7 @@ public class <%- camelize(type) %>Layer extends Layer { initialize(layerId); } + @Keep protected native void initialize(String layerId); <% } else { -%> @@ -60,6 +63,7 @@ public class <%- camelize(type) %>Layer extends Layer { initialize(layerId, sourceId); } + @Keep protected native void initialize(String layerId, String sourceId); /** @@ -201,16 +205,20 @@ public class <%- camelize(type) %>Layer extends Layer { <% } -%> <% for (const property of properties) { -%> + @Keep private native Object nativeGet<%- camelize(property.name) %>(); <% if (property.transition) { -%> + @Keep private native TransitionOptions nativeGet<%- camelize(property.name) %>Transition(); + @Keep private native void nativeSet<%- camelize(property.name) %>Transition(long duration, long delay); <% } -%> <% } -%> @Override + @Keep protected native void finalize() throws Throwable; } |