From 72c2f5a95be032ae4b9a7be8d97f6da9d9363c54 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Wed, 24 Feb 2016 09:34:17 +0100 Subject: [PATCH] [android] #4089 - remove mapboxmapsettings integration --- .../mapbox/mapboxsdk/maps/MapFragment.java | 8 -- .../mapboxsdk/maps/MapboxMapOptions.java | 116 ------------------ .../mapboxsdk/maps/SupportMapFragment.java | 8 -- 3 files changed, 132 deletions(-) delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java index 76d825516..4b5aa0cba 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java @@ -34,14 +34,6 @@ public class MapFragment extends Fragment { return new MapFragment(); } - public static MapFragment newInstance(MapboxMapOptions mapboxMapOptions) { - final MapFragment mapFragment = new MapFragment(); - Bundle bundle = new Bundle(); - bundle.putParcelable(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS, mapboxMapOptions); - mapFragment.setArguments(bundle); - return mapFragment; - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java deleted file mode 100644 index cb6407986..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.mapbox.mapboxsdk.maps; - -import android.content.Context; -import android.os.Parcel; -import android.os.Parcelable; -import android.util.AttributeSet; - -import com.mapbox.mapboxsdk.camera.CameraPosition; - -/** - * Builder for composing {@link MapboxMap} objects. These options can be used when adding a - * map to your application programmatically (as opposed to via XML). If you are using a MapFragment, - * you can pass these options in using the static factory method newInstance(MapboxMapOptions). - * If you are using a MapView, you can pass these options in using the constructor MapView(Context, MapboxMapOptions). - */ -public class MapboxMapOptions implements Parcelable { - - private MapboxMap mMapboxMap; - private UiSettings mUiSettings; - - public MapboxMapOptions(MapboxMap mapboxMap) { - mMapboxMap = mapboxMap; - mUiSettings = mapboxMap.getUiSettings(); - } - - public MapboxMapOptions(Parcel in) { - throw new UnsupportedOperationException(); - } - - public MapboxMapOptions camera(CameraPosition camera) { - mMapboxMap.setCameraPosition(camera); - return this; - } - - public CameraPosition getCamera() { - return mMapboxMap.getCameraPosition(); - } - - public MapboxMapOptions compassEnabled(boolean enabled) { - mUiSettings.setCompassEnabled(enabled); - return this; - } - - public boolean getCompassEnabled() { - return mUiSettings.isCompassEnabled(); - } - - public MapboxMapOptions rotateEnabled(boolean rotateEnabled) { - mUiSettings.setRotateGesturesEnabled(rotateEnabled); - return this; - } - - public MapboxMapOptions rotateGesturesEnabled(boolean enabled) { - mUiSettings.setRotateGesturesEnabled(enabled); - return this; - } - - public boolean getRotateGesturesEnabled() { - return mUiSettings.isRotateGesturesEnabled(); - } - - public MapboxMapOptions scrollGesturesEnabled(boolean enabled) { - mUiSettings.setScrollGesturesEnabled(enabled); - return this; - } - - public boolean getScrollGesturesEnabled() { - return mUiSettings.isScrollGesturesEnabled(); - } - - public MapboxMapOptions tiltGesturesEnabled(boolean enabled) { - mUiSettings.setTiltGesturesEnabled(enabled); - return this; - } - - public boolean getTiltGesturesEnabled() { - return mUiSettings.isTiltGesturesEnabled(); - } - - public MapboxMapOptions zoomControlsEnabled(boolean enabled) { - mUiSettings.setZoomControlsEnabled(enabled); - return this; - } - - public boolean getZoomControlsEnabled() { - return mUiSettings.isZoomControlsEnabled(); - } - - public boolean getZoomGesturesEnabled() { - return mUiSettings.isZoomGesturesEnabled(); - } - - public MapboxMapOptions createFromAttributes(Context context, AttributeSet attrs) { - throw new UnsupportedOperationException(); - } - - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - public MapboxMapOptions createFromParcel(Parcel in) { - return new MapboxMapOptions(in); - } - - public MapboxMapOptions[] newArray(int size) { - return new MapboxMapOptions[size]; - } - }; - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - throw new UnsupportedOperationException(); - } -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index d736cc2a1..8783712e1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -34,14 +34,6 @@ public class SupportMapFragment extends Fragment { return new SupportMapFragment(); } - public static SupportMapFragment newInstance(MapboxMapOptions mapboxMapOptions) { - final SupportMapFragment mapFragment = new SupportMapFragment(); - Bundle bundle = new Bundle(); - bundle.putParcelable(MapboxConstants.FRAG_ARG_MAPBOXMAPOPTIONS, mapboxMapOptions); - mapFragment.setArguments(bundle); - return mapFragment; - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState);