diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java new file mode 100644 index 000000000..936f3943e --- /dev/null +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java @@ -0,0 +1,36 @@ +package com.mapbox.mapboxsdk.constants; + +import android.support.annotation.StringDef; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +public class Style { + + @StringDef({MAPBOX_STREETS, EMERALD, LIGHT, DARK, SATELLITE}) + @Retention(RetentionPolicy.SOURCE) + public @interface StyleUrl { + } + + /** + * Mapbox Streets: Our signature style. + */ + public static final String MAPBOX_STREETS = "asset://styles/streets-v8.json"; + /** + * Emerald: Great for transportation and outdoor terrain. + */ + public static final String EMERALD = "asset://styles/emerald-v8.json"; + /** + * Light: Light-colored style that is great for data overlay. + */ + public static final String LIGHT = "asset://styles/light-v8.json"; + /** + * Dark: Dark-colored style that is great for data overlay. + */ + public static final String DARK = "asset://styles/dark-v8.json"; + /** + * Satellite: The best-looking, most accurate, and most up-to-date satellite imagery available anywhere. + */ + public static final String SATELLITE = "asset://styles/satellite-v8.json"; + +} diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index 4af2278ea..72fa9983d 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -61,6 +61,7 @@ import com.mapbox.mapboxsdk.annotations.Polygon; import com.mapbox.mapboxsdk.annotations.PolygonOptions; import com.mapbox.mapboxsdk.annotations.Polyline; import com.mapbox.mapboxsdk.annotations.PolylineOptions; +import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.exceptions.InvalidAccessTokenException; import com.mapbox.mapboxsdk.geometry.BoundingBox; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -243,41 +244,6 @@ public final class MapView extends FrameLayout { // Inner classes // - // These provide easy access to the bundled styles - - /** - * StyleUrls provides URLs to several professional styles designed by Mapbox. - *
- * These styles are all ready to go in your app. To load one, pass it into {@link MapView#setStyleUrl(String)} - * - * @see MapView#setStyleUrl(String) - */ - public static final class StyleUrls { - private StyleUrls() { - } - - /** - * Mapbox Streets: Our signature style. - */ - public static final String MAPBOX_STREETS = "asset://styles/streets-v8.json"; - /** - * Emerald: Great for transportation and outdoor terrain. - */ - public static final String EMERALD = "asset://styles/emerald-v8.json"; - /** - * Light: Light-colored style that is great for data overlay. - */ - public static final String LIGHT = "asset://styles/light-v8.json"; - /** - * Dark: Dark-colored style that is great for data overlay. - */ - public static final String DARK = "asset://styles/dark-v8.json"; - /** - * Satellite: The best-looking, most accurate, and most up-to-date satellite imagery available anywhere. - */ - public static final String SATELLITE = "asset://styles/satellite-v8.json"; - } - // // Enums // @@ -1335,7 +1301,7 @@ public final class MapView extends FrameLayout { * * {@code url} can take the following forms: *