diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location')
24 files changed, 41 insertions, 151 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java index 4bb20ba5a0..ea1817ab5e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraCompassBearingAnimator.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import java.util.List; @@ -17,7 +16,7 @@ class CameraCompassBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.On } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnCameraAnimationsValuesChangeListener listener : updateListeners) { listener.onNewCompassBearingValue((Float) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java index bd8e153d6e..f46cf805ff 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraGpsBearingAnimator.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import java.util.List; @@ -16,7 +15,7 @@ class CameraGpsBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.OnCame } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnCameraAnimationsValuesChangeListener listener : updateListeners) { listener.onNewGpsBearingValue((Float) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java index 8e515b85c8..533abfc335 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/CameraLatLngAnimator.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.List; @@ -18,7 +17,7 @@ class CameraLatLngAnimator extends MapboxLatLngAnimator<MapboxAnimator.OnCameraA } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnCameraAnimationsValuesChangeListener listener : updateListeners) { listener.onNewLatLngValue((LatLng) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java index c631b1b75d..fa966641fd 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java @@ -2,16 +2,14 @@ package com.mapbox.mapboxsdk.location; import android.animation.TypeEvaluator; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.geometry.LatLng; class LatLngEvaluator implements TypeEvaluator<LatLng> { private final LatLng latLng = new LatLng(); - @NonNull @Override - public LatLng evaluate(float fraction, @NonNull LatLng startValue, @NonNull LatLng endValue) { + public LatLng evaluate(float fraction, LatLng startValue, LatLng endValue) { latLng.setLatitude(startValue.getLatitude() + ((endValue.getLatitude() - startValue.getLatitude()) * fraction)); latLng.setLongitude(startValue.getLongitude() diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java index 90ed9a0603..e893f0fee9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerAccuracyAnimator.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import java.util.List; @@ -17,7 +16,7 @@ class LayerAccuracyAnimator extends MapboxFloatAnimator<MapboxAnimator.OnLayerAn } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnLayerAnimationsValuesChangeListener listener : updateListeners) { listener.onNewAccuracyRadiusValue((Float) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java index 4e25a082b9..6c9f063c18 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java @@ -5,7 +5,6 @@ import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.support.annotation.ColorInt; import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import com.mapbox.mapboxsdk.R; @@ -27,7 +26,7 @@ class LayerBitmapProvider { return getBitmapFromDrawable(drawable); } - Bitmap generateShadowBitmap(@NonNull LocationComponentOptions options) { + Bitmap generateShadowBitmap(LocationComponentOptions options) { Drawable shadowDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_user_icon_shadow); return generateShadow(shadowDrawable, options.elevation()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java index 3b06e0e174..e75eaca2b5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerCompassBearingAnimator.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import java.util.List; @@ -17,7 +16,7 @@ class LayerCompassBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.OnL } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnLayerAnimationsValuesChangeListener listener : updateListeners) { listener.onNewCompassBearingValue((Float) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java index faa83ea0e9..0be38dc4db 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerFeatureProvider.java @@ -13,7 +13,7 @@ import static com.mapbox.mapboxsdk.location.LocationComponentConstants.PROPERTY_ class LayerFeatureProvider { @NonNull - Feature generateLocationFeature(@Nullable Feature locationFeature, @NonNull LocationComponentOptions options) { + Feature generateLocationFeature(@Nullable Feature locationFeature, LocationComponentOptions options) { if (locationFeature != null) { return locationFeature; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java index 6301f31ee5..75cea13750 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerGpsBearingAnimator.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import java.util.List; @@ -16,7 +15,7 @@ class LayerGpsBearingAnimator extends MapboxFloatAnimator<MapboxAnimator.OnLayer } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnLayerAnimationsValuesChangeListener listener : updateListeners) { listener.onNewGpsBearingValue((Float) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java index 6bfec87430..f4dc2861cf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerLatLngAnimator.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.List; @@ -18,7 +17,7 @@ class LayerLatLngAnimator extends MapboxLatLngAnimator<MapboxAnimator.OnLayerAni } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnLayerAnimationsValuesChangeListener listener : updateListeners) { listener.onNewLatLngValue((LatLng) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java index cac513c2f9..d6198a7da8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerSourceProvider.java @@ -1,6 +1,5 @@ package com.mapbox.mapboxsdk.location; -import android.support.annotation.NonNull; import com.mapbox.geojson.Feature; import com.mapbox.mapboxsdk.style.layers.CircleLayer; import com.mapbox.mapboxsdk.style.layers.Layer; @@ -51,7 +50,6 @@ class LayerSourceProvider { private static final String EMPTY_STRING = ""; - @NonNull GeoJsonSource generateSource(Feature locationFeature) { return new GeoJsonSource( LOCATION_SOURCE, @@ -60,8 +58,7 @@ class LayerSourceProvider { ); } - @NonNull - Layer generateLayer(@NonNull String layerId) { + Layer generateLayer(String layerId) { SymbolLayer layer = new SymbolLayer(layerId, LOCATION_SOURCE); layer.setProperties( iconAllowOverlap(true), @@ -97,7 +94,6 @@ class LayerSourceProvider { return layer; } - @NonNull Layer generateAccuracyLayer() { return new CircleLayer(ACCURACY_LAYER, LOCATION_SOURCE) .withProperties( diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java index fd8537f23f..0a6c9b5ddc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java @@ -295,18 +295,18 @@ final class LocationAnimatorCoordinator { locationAnimatorSet.start(); } - void resetAllCameraAnimations(@NonNull CameraPosition currentCameraPosition, boolean isGpsNorth) { + void resetAllCameraAnimations(CameraPosition currentCameraPosition, boolean isGpsNorth) { resetCameraCompassAnimation(currentCameraPosition); boolean snap = resetCameraLocationAnimations(currentCameraPosition, isGpsNorth); playCameraLocationAnimators(snap ? 0 : TRANSITION_ANIMATION_DURATION_MS); } - private boolean resetCameraLocationAnimations(@NonNull CameraPosition currentCameraPosition, boolean isGpsNorth) { + private boolean resetCameraLocationAnimations(CameraPosition currentCameraPosition, boolean isGpsNorth) { resetCameraGpsBearingAnimation(currentCameraPosition, isGpsNorth); return resetCameraLatLngAnimation(currentCameraPosition); } - private boolean resetCameraLatLngAnimation(@NonNull CameraPosition currentCameraPosition) { + private boolean resetCameraLatLngAnimation(CameraPosition currentCameraPosition) { CameraLatLngAnimator animator = (CameraLatLngAnimator) animatorArray.get(ANIMATOR_CAMERA_LATLNG); if (animator == null) { return false; @@ -320,7 +320,7 @@ final class LocationAnimatorCoordinator { return immediateAnimation(previousCameraTarget, currentTarget, currentCameraPosition.zoom); } - private void resetCameraGpsBearingAnimation(@NonNull CameraPosition currentCameraPosition, boolean isGpsNorth) { + private void resetCameraGpsBearingAnimation(CameraPosition currentCameraPosition, boolean isGpsNorth) { CameraGpsBearingAnimator animator = (CameraGpsBearingAnimator) animatorArray.get(ANIMATOR_CAMERA_GPS_BEARING); if (animator == null) { return; @@ -334,7 +334,7 @@ final class LocationAnimatorCoordinator { new CameraGpsBearingAnimator(previousCameraBearing, normalizedCameraBearing, cameraListeners)); } - private void resetCameraCompassAnimation(@NonNull CameraPosition currentCameraPosition) { + private void resetCameraCompassAnimation(CameraPosition currentCameraPosition) { CameraCompassBearingAnimator animator = (CameraCompassBearingAnimator) animatorArray.get(ANIMATOR_CAMERA_COMPASS_BEARING); if (animator == null) { @@ -382,7 +382,7 @@ final class LocationAnimatorCoordinator { this.durationMultiplier = trackingAnimationDurationMultiplier; } - private boolean immediateAnimation(LatLng current, @NonNull LatLng target, double zoom) { + private boolean immediateAnimation(LatLng current, LatLng target, double zoom) { // TODO: calculate the value based on the projection double distance = current.distanceTo(target); if (zoom > 10) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java index 7a20ca8177..e3194df009 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java @@ -3,7 +3,6 @@ package com.mapbox.mapboxsdk.location; import android.content.Context; import android.graphics.PointF; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.view.MotionEvent; @@ -35,7 +34,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation Context context, MapboxMap mapboxMap, OnCameraTrackingChangedListener internalCameraTrackingChangedListener, - @NonNull LocationComponentOptions options, + LocationComponentOptions options, OnCameraMoveInvalidateListener onCameraMoveInvalidateListener) { this.mapboxMap = mapboxMap; @@ -93,7 +92,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation onCameraMoveInvalidateListener.onInvalidateCameraMove(); } - private void setLatLng(@NonNull LatLng latLng) { + private void setLatLng(LatLng latLng) { mapboxMap.moveCamera(CameraUpdateFactory.newLatLng(latLng)); onCameraMoveInvalidateListener.onInvalidateCameraMove(); } @@ -109,7 +108,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation } @Override - public void onNewLatLngValue(@NonNull LatLng latLng) { + public void onNewLatLngValue(LatLng latLng) { if (cameraMode == CameraMode.TRACKING || cameraMode == CameraMode.TRACKING_COMPASS || cameraMode == CameraMode.TRACKING_GPS @@ -188,7 +187,6 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation } } - @NonNull @VisibleForTesting MapboxMap.OnMoveListener onMoveListener = new MapboxMap.OnMoveListener() { private boolean interrupt; @@ -228,7 +226,6 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation } }; - @NonNull private MapboxMap.OnRotateListener onRotateListener = new MapboxMap.OnRotateListener() { @Override public void onRotateBegin(@NonNull RotateGestureDetector detector) { @@ -248,7 +245,6 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation } }; - @NonNull private MapboxMap.OnFlingListener onFlingListener = new MapboxMap.OnFlingListener() { @Override public void onFling() { @@ -263,7 +259,7 @@ final class LocationCameraController implements MapboxAnimator.OnCameraAnimation } @Override - public boolean onTouchEvent(@Nullable MotionEvent motionEvent) { + public boolean onTouchEvent(MotionEvent motionEvent) { if (motionEvent != null) { int action = motionEvent.getActionMasked(); if (action == MotionEvent.ACTION_UP) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java index d8ebf1b510..af48b5c4d4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java @@ -75,12 +75,9 @@ import static com.mapbox.mapboxsdk.location.LocationComponentConstants.DEFAULT_T public final class LocationComponent { private static final String TAG = "Mbgl-LocationComponent"; - @NonNull private final MapboxMap mapboxMap; private LocationComponentOptions options; - @Nullable private LocationEngine locationEngine; - @Nullable private CompassEngine compassEngine; private boolean usingInternalLocationEngine; @@ -93,7 +90,6 @@ public final class LocationComponent { * Holds last location which is being returned in the {@link #getLastKnownLocation()} * when there is no {@link #locationEngine} set or when the last location returned by the engine is null. */ - @Nullable private Location lastLocation; private CameraPosition lastCameraPosition; @@ -343,7 +339,7 @@ public final class LocationComponent { * * @param options to update the current style */ - public void applyStyle(@NonNull LocationComponentOptions options) { + public void applyStyle(LocationComponentOptions options) { this.options = options; locationLayerController.applyStyle(options); locationCameraController.initializeOptions(options); @@ -835,7 +831,7 @@ public final class LocationComponent { * * @param location the latest user location */ - private void updateLocation(@Nullable final Location location, boolean fromLastLocation) { + private void updateLocation(final Location location, boolean fromLastLocation) { if (location == null) { return; } else if (!isLayerReady) { @@ -906,7 +902,6 @@ public final class LocationComponent { locationAnimatorCoordinator.feedNewAccuracyRadius(Utils.calculateZoomLevelRadius(mapboxMap, location), noAnimation); } - @NonNull private OnCameraMoveListener onCameraMoveListener = new OnCameraMoveListener() { @Override public void onCameraMove() { @@ -914,7 +909,6 @@ public final class LocationComponent { } }; - @NonNull private OnCameraIdleListener onCameraIdleListener = new OnCameraIdleListener() { @Override public void onCameraIdle() { @@ -922,7 +916,6 @@ public final class LocationComponent { } }; - @NonNull private OnMapClickListener onMapClickListener = new OnMapClickListener() { @Override public void onMapClick(@NonNull LatLng point) { @@ -934,7 +927,6 @@ public final class LocationComponent { } }; - @NonNull private MapboxMap.OnMapLongClickListener onMapLongClickListener = new MapboxMap.OnMapLongClickListener() { @Override public void onMapLongClick(@NonNull LatLng point) { @@ -946,7 +938,6 @@ public final class LocationComponent { } }; - @NonNull private OnLocationStaleListener onLocationStaleListener = new OnLocationStaleListener() { @Override public void onStaleStateChange(boolean isStale) { @@ -958,7 +949,6 @@ public final class LocationComponent { } }; - @NonNull private OnCameraMoveInvalidateListener onCameraMoveInvalidateListener = new OnCameraMoveInvalidateListener() { @Override public void onInvalidateCameraMove() { @@ -966,7 +956,6 @@ public final class LocationComponent { } }; - @NonNull private CompassListener compassListener = new CompassListener() { @Override public void onCompassChanged(float userHeading) { @@ -979,7 +968,6 @@ public final class LocationComponent { } }; - @NonNull private LocationEngineListener locationEngineListener = new LocationEngineListener() { @Override @SuppressWarnings( {"MissingPermission"}) @@ -995,7 +983,6 @@ public final class LocationComponent { } }; - @NonNull private OnCameraTrackingChangedListener cameraTrackingChangedListener = new OnCameraTrackingChangedListener() { @Override public void onCameraTrackingDismissed() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java index b47f8d7afb..b53d909de3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java @@ -31,7 +31,6 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen private static final float ALPHA = 0.45f; private final WindowManager windowManager; - @NonNull private final SensorManager sensorManager; private final List<CompassListener> compassListeners = new ArrayList<>(); @@ -43,18 +42,14 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen @Nullable private Sensor magneticFieldSensor; - @NonNull private float[] truncatedRotationVectorValue = new float[4]; - @NonNull private float[] rotationMatrix = new float[9]; private float[] rotationVectorValue; private float lastHeading; private int lastAccuracySensorStatus; private long compassUpdateNextTimestamp; - @Nullable private float[] gravityValues = new float[3]; - @Nullable private float[] magneticValues = new float[3]; /** @@ -114,7 +109,7 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen } @Override - public void onSensorChanged(@NonNull SensorEvent event) { + public void onSensorChanged(SensorEvent event) { // check when the last time the compass was updated, return if too soon. long currentTime = SystemClock.elapsedRealtime(); if (currentTime < compassUpdateNextTimestamp) { @@ -238,8 +233,7 @@ class LocationComponentCompassEngine implements CompassEngine, SensorEventListen * @param smoothedValues array of float, that contains previous state * @return float filtered array of float */ - @Nullable - private float[] lowPassFilter(@NonNull float[] newValues, @Nullable float[] smoothedValues) { + private float[] lowPassFilter(float[] newValues, float[] smoothedValues) { if (smoothedValues == null) { return newValues; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java index f202d6267d..10dfff8694 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java @@ -82,37 +82,25 @@ public class LocationComponentOptions implements Parcelable { private float accuracyAlpha; private int accuracyColor; private int backgroundDrawableStale; - @Nullable private String backgroundStaleName; private int foregroundDrawableStale; - @Nullable private String foregroundStaleName; private int gpsDrawable; - @Nullable private String gpsName; private int foregroundDrawable; - @Nullable private String foregroundName; private int backgroundDrawable; - @Nullable private String backgroundName; private int bearingDrawable; - @Nullable private String bearingName; - @Nullable private Integer bearingTintColor; - @Nullable private Integer foregroundTintColor; - @Nullable private Integer backgroundTintColor; - @Nullable private Integer foregroundStaleTintColor; - @Nullable private Integer backgroundStaleTintColor; private float elevation; private boolean enableStaleState; private long staleStateTimeout; - @Nullable private int[] padding; private double maxZoom; private double minZoom; @@ -147,7 +135,7 @@ public class LocationComponentOptions implements Parcelable { float elevation, boolean enableStaleState, long staleStateTimeout, - @Nullable int[] padding, + int[] padding, double maxZoom, double minZoom, float maxZoomIconScale, @@ -204,7 +192,6 @@ public class LocationComponentOptions implements Parcelable { * @return a new {@link LocationComponentOptions} object with the settings you defined in your style * resource */ - @Nullable public static LocationComponentOptions createFromAttributes(@NonNull Context context, @StyleRes int styleRes) { @@ -329,7 +316,6 @@ public class LocationComponentOptions implements Parcelable { * * @return the builder which contains the values defined in this current instance as defaults. */ - @NonNull public Builder toBuilder() { return new Builder(this); } @@ -342,8 +328,7 @@ public class LocationComponentOptions implements Parcelable { * @param context your activities context used to acquire the style resource * @return the builder which contains the default values defined by the style resource */ - @NonNull - public static Builder builder(@NonNull Context context) { + public static Builder builder(Context context) { return LocationComponentOptions.createFromAttributes(context, R.style.mapbox_LocationComponent).toBuilder(); } @@ -641,7 +626,6 @@ public class LocationComponentOptions implements Parcelable { * * @return integer array of padding values */ - @Nullable @SuppressWarnings("mutable") public int[] padding() { return padding; @@ -739,7 +723,6 @@ public class LocationComponentOptions implements Parcelable { return trackingAnimationDurationMultiplier; } - @NonNull @Override public String toString() { return "LocationComponentOptions{" @@ -949,7 +932,7 @@ public class LocationComponentOptions implements Parcelable { }; @Override - public void writeToParcel(@NonNull Parcel dest, int flags) { + public void writeToParcel(Parcel dest, int flags) { dest.writeFloat(accuracyAlpha()); dest.writeInt(accuracyColor()); dest.writeInt(backgroundDrawableStale()); @@ -1072,37 +1055,25 @@ public class LocationComponentOptions implements Parcelable { private Float accuracyAlpha; private Integer accuracyColor; private Integer backgroundDrawableStale; - @Nullable private String backgroundStaleName; private Integer foregroundDrawableStale; - @Nullable private String foregroundStaleName; private Integer gpsDrawable; - @Nullable private String gpsName; private Integer foregroundDrawable; - @Nullable private String foregroundName; private Integer backgroundDrawable; - @Nullable private String backgroundName; private Integer bearingDrawable; - @Nullable private String bearingName; - @Nullable private Integer bearingTintColor; - @Nullable private Integer foregroundTintColor; - @Nullable private Integer backgroundTintColor; - @Nullable private Integer foregroundStaleTintColor; - @Nullable private Integer backgroundStaleTintColor; private Float elevation; private Boolean enableStaleState; private Long staleStateTimeout; - @Nullable private int[] padding; private Double maxZoom; private Double minZoom; @@ -1160,7 +1131,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_accuracyAlpha */ - @NonNull public LocationComponentOptions.Builder accuracyAlpha(float accuracyAlpha) { this.accuracyAlpha = accuracyAlpha; return this; @@ -1173,7 +1143,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_accuracyColor */ - @NonNull public LocationComponentOptions.Builder accuracyColor(int accuracyColor) { this.accuracyColor = accuracyColor; return this; @@ -1186,7 +1155,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_backgroundDrawableStale */ - @NonNull public LocationComponentOptions.Builder backgroundDrawableStale(int backgroundDrawableStale) { this.backgroundDrawableStale = backgroundDrawableStale; return this; @@ -1204,7 +1172,6 @@ public class LocationComponentOptions implements Parcelable { * @param backgroundStaleName String icon or maki-icon name * @return this builder for chaining options together */ - @NonNull public LocationComponentOptions.Builder backgroundStaleName(@Nullable String backgroundStaleName) { this.backgroundStaleName = backgroundStaleName; return this; @@ -1217,7 +1184,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_foregroundDrawableStale */ - @NonNull public LocationComponentOptions.Builder foregroundDrawableStale(int foregroundDrawableStale) { this.foregroundDrawableStale = foregroundDrawableStale; return this; @@ -1235,7 +1201,6 @@ public class LocationComponentOptions implements Parcelable { * @param foregroundStaleName String icon or maki-icon name * @return this builder for chaining options together */ - @NonNull public LocationComponentOptions.Builder foregroundStaleName(@Nullable String foregroundStaleName) { this.foregroundStaleName = foregroundStaleName; return this; @@ -1248,7 +1213,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_gpsDrawable */ - @NonNull public LocationComponentOptions.Builder gpsDrawable(int gpsDrawable) { this.gpsDrawable = gpsDrawable; return this; @@ -1266,7 +1230,6 @@ public class LocationComponentOptions implements Parcelable { * @param gpsName String icon or maki-icon name * @return this builder for chaining options together */ - @NonNull public LocationComponentOptions.Builder gpsName(@Nullable String gpsName) { this.gpsName = gpsName; return this; @@ -1279,7 +1242,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_foregroundDrawable */ - @NonNull public LocationComponentOptions.Builder foregroundDrawable(int foregroundDrawable) { this.foregroundDrawable = foregroundDrawable; return this; @@ -1297,7 +1259,6 @@ public class LocationComponentOptions implements Parcelable { * @param foregroundName String icon or maki-icon name * @return this builder for chaining options together */ - @NonNull public LocationComponentOptions.Builder foregroundName(@Nullable String foregroundName) { this.foregroundName = foregroundName; return this; @@ -1310,7 +1271,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_backgroundDrawable */ - @NonNull public LocationComponentOptions.Builder backgroundDrawable(int backgroundDrawable) { this.backgroundDrawable = backgroundDrawable; return this; @@ -1328,7 +1288,6 @@ public class LocationComponentOptions implements Parcelable { * @param backgroundName String icon or maki-icon name * @return this builder for chaining options together */ - @NonNull public LocationComponentOptions.Builder backgroundName(@Nullable String backgroundName) { this.backgroundName = backgroundName; return this; @@ -1341,7 +1300,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_bearingDrawable */ - @NonNull public LocationComponentOptions.Builder bearingDrawable(int bearingDrawable) { this.bearingDrawable = bearingDrawable; return this; @@ -1359,7 +1317,6 @@ public class LocationComponentOptions implements Parcelable { * @param bearingName String icon or maki-icon name * @return this builder for chaining options together */ - @NonNull public LocationComponentOptions.Builder bearingName(@Nullable String bearingName) { this.bearingName = bearingName; return this; @@ -1372,7 +1329,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_bearingTintColor */ - @NonNull public LocationComponentOptions.Builder bearingTintColor(@Nullable Integer bearingTintColor) { this.bearingTintColor = bearingTintColor; return this; @@ -1385,7 +1341,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_foregroundTintColor */ - @NonNull public LocationComponentOptions.Builder foregroundTintColor(@Nullable Integer foregroundTintColor) { this.foregroundTintColor = foregroundTintColor; return this; @@ -1398,7 +1353,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_backgroundTintColor */ - @NonNull public LocationComponentOptions.Builder backgroundTintColor(@Nullable Integer backgroundTintColor) { this.backgroundTintColor = backgroundTintColor; return this; @@ -1411,7 +1365,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_foregroundStaleTintColor */ - @NonNull public LocationComponentOptions.Builder foregroundStaleTintColor(@Nullable Integer foregroundStaleTintColor) { this.foregroundStaleTintColor = foregroundStaleTintColor; return this; @@ -1424,7 +1377,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_backgroundStaleTintColor */ - @NonNull public LocationComponentOptions.Builder backgroundStaleTintColor(@Nullable Integer backgroundStaleTintColor) { this.backgroundStaleTintColor = backgroundStaleTintColor; return this; @@ -1437,7 +1389,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_elevation */ - @NonNull public LocationComponentOptions.Builder elevation(float elevation) { this.elevation = elevation; return this; @@ -1451,7 +1402,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_enableStaleState */ - @NonNull public LocationComponentOptions.Builder enableStaleState(boolean enabled) { this.enableStaleState = enabled; return this; @@ -1467,7 +1417,6 @@ public class LocationComponentOptions implements Parcelable { * @return this builder for chaining options together * @attr ref R.styleable#LocationComponent_staleStateTimeout */ - @NonNull public LocationComponentOptions.Builder staleStateTimeout(long timeout) { this.staleStateTimeout = timeout; return this; @@ -1487,8 +1436,7 @@ public class LocationComponentOptions implements Parcelable { * * @param padding The margins for the map in pixels (left, top, right, bottom). */ - @NonNull - public LocationComponentOptions.Builder padding(@Nullable int[] padding) { + public LocationComponentOptions.Builder padding(int[] padding) { if (padding == null) { throw new NullPointerException("Null padding"); } @@ -1503,7 +1451,6 @@ public class LocationComponentOptions implements Parcelable { * * @param maxZoom The new maximum zoom level. */ - @NonNull public LocationComponentOptions.Builder maxZoom(double maxZoom) { this.maxZoom = maxZoom; return this; @@ -1514,7 +1461,6 @@ public class LocationComponentOptions implements Parcelable { * * @param minZoom The new minimum zoom level. */ - @NonNull public LocationComponentOptions.Builder minZoom(double minZoom) { this.minZoom = minZoom; return this; @@ -1529,7 +1475,6 @@ public class LocationComponentOptions implements Parcelable { * * @param maxZoomIconScale icon scale factor */ - @NonNull public LocationComponentOptions.Builder maxZoomIconScale(float maxZoomIconScale) { this.maxZoomIconScale = maxZoomIconScale; return this; @@ -1544,7 +1489,6 @@ public class LocationComponentOptions implements Parcelable { * * @param minZoomIconScale icon scale factor */ - @NonNull public LocationComponentOptions.Builder minZoomIconScale(float minZoomIconScale) { this.minZoomIconScale = minZoomIconScale; return this; @@ -1564,7 +1508,6 @@ public class LocationComponentOptions implements Parcelable { * @see Builder#trackingInitialMoveThreshold(float) * @see Builder#trackingMultiFingerMoveThreshold(float) */ - @NonNull public LocationComponentOptions.Builder trackingGesturesManagement(boolean trackingGesturesManagement) { this.trackingGesturesManagement = trackingGesturesManagement; return this; @@ -1575,7 +1518,6 @@ public class LocationComponentOptions implements Parcelable { * * @param moveThreshold the minimum movement */ - @NonNull public LocationComponentOptions.Builder trackingInitialMoveThreshold(float moveThreshold) { this.trackingInitialMoveThreshold = moveThreshold; return this; @@ -1587,7 +1529,6 @@ public class LocationComponentOptions implements Parcelable { * * @param moveThreshold the minimum movement */ - @NonNull public LocationComponentOptions.Builder trackingMultiFingerMoveThreshold(float moveThreshold) { this.trackingMultiFingerMoveThreshold = moveThreshold; return this; @@ -1598,7 +1539,6 @@ public class LocationComponentOptions implements Parcelable { * * @param layerBelow the id to set the location component below to. */ - @NonNull public LocationComponentOptions.Builder layerBelow(String layerBelow) { this.layerBelow = layerBelow; return this; @@ -1610,7 +1550,6 @@ public class LocationComponentOptions implements Parcelable { * @param trackingAnimationDurationMultiplier the tracking animation duration multiplier * @since 0.9.0 */ - @NonNull public LocationComponentOptions.Builder trackingAnimationDurationMultiplier( float trackingAnimationDurationMultiplier) { this.trackingAnimationDurationMultiplier = trackingAnimationDurationMultiplier; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java index 88a29b3927..da3144eea1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java @@ -73,7 +73,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV LocationLayerController(MapboxMap mapboxMap, LayerSourceProvider layerSourceProvider, LayerFeatureProvider featureProvider, LayerBitmapProvider bitmapProvider, - @NonNull LocationComponentOptions options) { + LocationComponentOptions options) { this.mapboxMap = mapboxMap; this.layerSourceProvider = layerSourceProvider; this.bitmapProvider = bitmapProvider; @@ -192,7 +192,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV return isHidden; } - private void setLayerVisibility(@NonNull String layerId, boolean visible) { + private void setLayerVisibility(String layerId, boolean visible) { Layer layer = mapboxMap.getLayer(layerId); if (layer != null) { String targetVisibility = visible ? VISIBLE : NONE; @@ -202,7 +202,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV } } - private void addLayers(@NonNull String idBelowLayer) { + private void addLayers(String idBelowLayer) { addSymbolLayer(BEARING_LAYER, idBelowLayer); addSymbolLayer(FOREGROUND_LAYER, BEARING_LAYER); addSymbolLayer(BACKGROUND_LAYER, FOREGROUND_LAYER); @@ -210,7 +210,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV addAccuracyLayer(); } - private void addSymbolLayer(@NonNull String layerId, @NonNull String beforeLayerId) { + private void addSymbolLayer(String layerId, String beforeLayerId) { Layer layer = layerSourceProvider.generateLayer(layerId); addLayerToMap(layer, beforeLayerId); } @@ -220,12 +220,12 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV addLayerToMap(accuracyLayer, BACKGROUND_LAYER); } - private void addLayerToMap(@NonNull Layer layer, @NonNull String idBelowLayer) { + private void addLayerToMap(Layer layer, @NonNull String idBelowLayer) { mapboxMap.addLayerBelow(layer, idBelowLayer); layerMap.add(layer.getId()); } - private void setBearingProperty(@NonNull String propertyId, float bearing) { + private void setBearingProperty(String propertyId, float bearing) { locationFeature.addNumberProperty(propertyId, bearing); refreshSource(); } @@ -276,7 +276,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV mapboxMap.addImage(BACKGROUND_STALE_ICON, backgroundStaleBitmap); } - private void styleShadow(@NonNull LocationComponentOptions options) { + private void styleShadow(LocationComponentOptions options) { mapboxMap.addImage(SHADOW_ICON, bitmapProvider.generateShadowBitmap(options)); } @@ -310,7 +310,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV mapboxMap.addImage(FOREGROUND_STALE_ICON, foregroundBitmapStale); } - private void styleScaling(@NonNull LocationComponentOptions options) { + private void styleScaling(LocationComponentOptions options) { for (String layerId : layerMap) { Layer layer = mapboxMap.getLayer(layerId); if (layer != null && layer instanceof SymbolLayer) { @@ -342,7 +342,6 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV refreshSource(); } - @Nullable private String buildIconString(@Nullable String bitmapName, @NonNull String drawableName) { if (bitmapName != null) { return bitmapName; @@ -362,7 +361,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV // Map click event // - boolean onMapClick(@NonNull LatLng point) { + boolean onMapClick(LatLng point) { PointF screenLoc = mapboxMap.getProjection().toScreenLocation(point); List<Feature> features = mapboxMap.queryRenderedFeatures(screenLoc, BACKGROUND_LAYER, diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java index b4f9051af8..89d27a38fa 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxCameraAnimatorAdapter.java @@ -10,7 +10,6 @@ import java.util.List; abstract class MapboxCameraAnimatorAdapter extends MapboxFloatAnimator<MapboxAnimator.OnCameraAnimationsValuesChangeListener> { - @Nullable private final MapboxMap.CancelableCallback cancelableCallback; MapboxCameraAnimatorAdapter(Float previous, Float target, diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java index d12e80a69d..4a6d8c3b73 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxFloatAnimator.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.FloatEvaluator; import android.animation.TypeEvaluator; -import android.support.annotation.NonNull; import java.util.List; @@ -11,7 +10,6 @@ abstract class MapboxFloatAnimator<L> extends MapboxAnimator<Float, L> { super(previous, target, updateListeners); } - @NonNull @Override TypeEvaluator provideEvaluator() { return new FloatEvaluator(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java index f2c5f9a239..b2f1b61a2d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/MapboxLatLngAnimator.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.TypeEvaluator; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.List; @@ -13,7 +12,6 @@ abstract class MapboxLatLngAnimator<L> extends MapboxAnimator<LatLng, L> { super(previous, target, updateListeners); } - @NonNull @Override TypeEvaluator provideEvaluator() { return new LatLngEvaluator(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java index c7447796e0..c8f6ed58b9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.os.Handler; -import android.support.annotation.NonNull; /** * Class controls the location stale state when the {@link android.location.Location} hasn't @@ -13,7 +12,6 @@ class StaleStateManager { private boolean isEnabled; private final OnLocationStaleListener innerOnLocationStaleListeners; - @NonNull private final Handler handler; private boolean isStale = true; private long delayTime; @@ -25,7 +23,6 @@ class StaleStateManager { delayTime = options.staleStateTimeout(); } - @NonNull private Runnable staleStateRunnable = new Runnable() { @Override public void run() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java index 640ce0a678..8ff0f97a70 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/TiltAnimator.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -20,7 +19,7 @@ class TiltAnimator extends MapboxCameraAnimatorAdapter { } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnCameraAnimationsValuesChangeListener listener : updateListeners) { listener.onNewTiltValue((Float) animation.getAnimatedValue()); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java index 8907b93b5f..553678709e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java @@ -65,9 +65,8 @@ public final class Utils { return bitmap; } - @Nullable static Drawable getDrawable(@NonNull Context context, @DrawableRes int drawableRes, - @Nullable @ColorInt Integer tintColor) { + @ColorInt Integer tintColor) { Drawable drawable = ContextCompat.getDrawable(context, drawableRes); if (tintColor == null) { return drawable; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java index e37dfc1113..323b51fa88 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/ZoomAnimator.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.location; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -21,7 +20,7 @@ class ZoomAnimator extends MapboxCameraAnimatorAdapter { } @Override - public void onAnimationUpdate(@NonNull ValueAnimator animation) { + public void onAnimationUpdate(ValueAnimator animation) { for (OnCameraAnimationsValuesChangeListener listener : updateListeners) { listener.onNewZoomValue((Float) animation.getAnimatedValue()); } |