From 5abe0d447fa1eb87a3e790bc42315cd7bd84a250 Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Tue, 30 May 2017 16:22:04 +0200 Subject: fixup formatting --- .../java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 18 +++--- .../mapbox/mapboxsdk/maps/TrackingSettings.java | 28 ++++----- .../mapboxsdk/maps/widgets/MyLocationView.java | 70 +++++++++++----------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index 8bf0150c3c..b39734cbd3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -470,7 +470,7 @@ public final class MapboxMap { */ @UiThread public void setMinZoomPreference( - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double minZoom) { + @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, to = MapboxConstants.MAXIMUM_ZOOM) double minZoom) { transform.setMinZoom(minZoom); } @@ -499,7 +499,7 @@ public final class MapboxMap { */ @UiThread public void setMaxZoomPreference(@FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) double maxZoom) { + to = MapboxConstants.MAXIMUM_ZOOM) double maxZoom) { transform.setMaxZoom(maxZoom); } @@ -1154,7 +1154,7 @@ public final class MapboxMap { @UiThread @NonNull public List addMarkerViews(@NonNull List markerViewOptions) { + BaseMarkerViewOptions> markerViewOptions) { return annotationManager.addMarkerViews(markerViewOptions, this); } @@ -1183,7 +1183,7 @@ public final class MapboxMap { @UiThread @NonNull public List addMarkers(@NonNull List markerOptionsList) { + BaseMarkerOptions> markerOptionsList) { return annotationManager.addMarkers(markerOptionsList, this); } @@ -1746,7 +1746,7 @@ public final class MapboxMap { */ @UiThread public void setOnInfoWindowLongClickListener(@Nullable OnInfoWindowLongClickListener - listener) { + listener) { annotationManager.getInfoWindowManager().setOnInfoWindowLongClickListener(listener); } @@ -1828,14 +1828,13 @@ public final class MapboxMap { */ @UiThread public void setOnMyLocationChangeListener(@Nullable MapboxMap.OnMyLocationChangeListener - listener) { + listener) { trackingSettings.setOnMyLocationChangeListener(listener); } /** * Removes custom location source of the my-location layer and brings back default {@link LocationSource} * location source. - * */ @UiThread public void removeLocationSource() { @@ -1846,7 +1845,6 @@ public final class MapboxMap { * Replaces the location source of the my-location layer. * * @param locationSource A {@link LocationEngine} location source to use in the my-location layer. - * */ @UiThread public void setLocationSource(@Nullable LocationEngine locationSource) { @@ -1861,7 +1859,7 @@ public final class MapboxMap { */ @UiThread public void setOnMyLocationTrackingModeChangeListener( - @Nullable MapboxMap.OnMyLocationTrackingModeChangeListener listener) { + @Nullable MapboxMap.OnMyLocationTrackingModeChangeListener listener) { trackingSettings.setOnMyLocationTrackingModeChangeListener(listener); } @@ -1900,7 +1898,7 @@ public final class MapboxMap { @UiThread @NonNull public List queryRenderedFeatures(@NonNull PointF coordinates, @Nullable String... - layerIds) { + layerIds) { return nativeMapView.queryRenderedFeatures(coordinates, layerIds, null); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java index 24d58a0ed4..c249101e83 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java @@ -59,31 +59,31 @@ public final class TrackingSettings { outState.putBoolean(MapboxConstants.STATE_MY_BEARING_TRACKING_DISMISS, isDismissBearingTrackingOnGesture()); outState.putBoolean(MapboxConstants.STATE_MY_LOCATION_ENABLED, isMyLocationEnabled()); outState.putBoolean(MapboxConstants.STATE_MY_TRACKING_MODE_DISMISS_FOR_CAMERA, - isDismissTrackingModesForCameraPositionChange()); + isDismissTrackingModesForCameraPositionChange()); outState.putBoolean(MapboxConstants.STATE_USING_CUSTOM_LOCATION_SOURCE, isCustomLocationSource()); } void onRestoreInstanceState(Bundle savedInstanceState) { try { setMyLocationEnabled( - savedInstanceState.getBoolean(MapboxConstants.STATE_MY_LOCATION_ENABLED), - savedInstanceState.getBoolean(MapboxConstants.STATE_USING_CUSTOM_LOCATION_SOURCE) + savedInstanceState.getBoolean(MapboxConstants.STATE_MY_LOCATION_ENABLED), + savedInstanceState.getBoolean(MapboxConstants.STATE_USING_CUSTOM_LOCATION_SOURCE) ); } catch (SecurityException ignore) { // User did not accept location permissions } // noinspection ResourceType setMyLocationTrackingMode(savedInstanceState.getInt( - MapboxConstants.STATE_MY_LOCATION_TRACKING_MODE, MyLocationTracking.TRACKING_NONE)); + MapboxConstants.STATE_MY_LOCATION_TRACKING_MODE, MyLocationTracking.TRACKING_NONE)); // noinspection ResourceType setMyBearingTrackingMode(savedInstanceState.getInt( - MapboxConstants.STATE_MY_BEARING_TRACKING_MODE, MyBearingTracking.NONE)); + MapboxConstants.STATE_MY_BEARING_TRACKING_MODE, MyBearingTracking.NONE)); setDismissLocationTrackingOnGesture(savedInstanceState.getBoolean( - MapboxConstants.STATE_MY_LOCATION_TRACKING_DISMISS, true)); + MapboxConstants.STATE_MY_LOCATION_TRACKING_DISMISS, true)); setDismissBearingTrackingOnGesture(savedInstanceState.getBoolean( - MapboxConstants.STATE_MY_BEARING_TRACKING_DISMISS, true)); + MapboxConstants.STATE_MY_BEARING_TRACKING_DISMISS, true)); setDismissTrackingModeForCameraPositionChange(savedInstanceState.getBoolean( - MapboxConstants.STATE_MY_TRACKING_MODE_DISMISS_FOR_CAMERA, true)); + MapboxConstants.STATE_MY_TRACKING_MODE_DISMISS_FOR_CAMERA, true)); } /** @@ -247,9 +247,9 @@ public final class TrackingSettings { // The user settings are enabled AND; // EITHER bearing tracking is dismissed on gesture OR there is no bearing tracking return uiSettings.isRotateGesturesEnabled() - && (dismissBearingTrackingOnGesture - || myLocationView.getMyBearingTrackingMode() == MyBearingTracking.NONE - || myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE); + && (dismissBearingTrackingOnGesture + || myLocationView.getMyBearingTrackingMode() == MyBearingTracking.NONE + || myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE); } /** @@ -259,8 +259,8 @@ public final class TrackingSettings { */ public boolean isScrollGestureCurrentlyEnabled() { return uiSettings.isScrollGesturesEnabled() - && (dismissLocationTrackingOnGesture - || myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE); + && (dismissLocationTrackingOnGesture + || myLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE); } /** @@ -371,7 +371,7 @@ public final class TrackingSettings { private void setMyLocationEnabled(boolean locationEnabled, boolean isCustomLocationSource) { if (!PermissionsManager.areLocationPermissionsGranted(myLocationView.getContext())) { Timber.e("Could not activate user location tracking: " - + "user did not accept the permission or permissions were not requested."); + + "user did not accept the permission or permissions were not requested."); return; } myLocationEnabled = locationEnabled; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java index da741d7396..abf0c3ba44 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java @@ -70,12 +70,12 @@ public class MyLocationView extends View { private ValueAnimator directionAnimator; private ValueAnimator.AnimatorUpdateListener invalidateSelfOnUpdateListener = - new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - invalidate(); - } - }; + new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + invalidate(); + } + }; private Drawable foregroundDrawable; private Drawable foregroundBearingDrawable; @@ -134,8 +134,8 @@ public class MyLocationView extends View { // setup LayoutParams ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT); + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); setLayoutParams(lp); matrix = new Matrix(); @@ -165,7 +165,7 @@ public class MyLocationView extends View { } if (defaultDrawable.getIntrinsicWidth() != bearingDrawable.getIntrinsicWidth() - || defaultDrawable.getIntrinsicHeight() != bearingDrawable.getIntrinsicHeight()) { + || defaultDrawable.getIntrinsicHeight() != bearingDrawable.getIntrinsicHeight()) { throw new RuntimeException("The dimensions from location and bearing drawables should be match"); } @@ -232,8 +232,8 @@ public class MyLocationView extends View { int horizontalOffset = backgroundOffsetLeft - backgroundOffsetRight; int verticalOffset = backgroundOffsetTop - backgroundOffsetBottom; backgroundBounds = new Rect(-backgroundWidth / 2 + horizontalOffset, - -backgroundHeight / 2 + verticalOffset, backgroundWidth / 2 + horizontalOffset, backgroundHeight / 2 - + verticalOffset); + -backgroundHeight / 2 + verticalOffset, backgroundWidth / 2 + horizontalOffset, backgroundHeight / 2 + + verticalOffset); backgroundDrawable.setBounds(backgroundBounds); int foregroundWidth = foregroundDrawable.getIntrinsicWidth(); @@ -251,7 +251,7 @@ public class MyLocationView extends View { super.onDraw(canvas); if (location == null || foregroundBounds == null || backgroundBounds == null || accuracyAnimator == null - || screenLocation == null) { + || screenLocation == null) { // Not ready yet return; } @@ -429,10 +429,11 @@ public class MyLocationView extends View { private void toggleGps(boolean enableGps, boolean isCustomLocationSource) { if (enableGps) { if (locationSource == null) { - if (!isCustomLocationSource) + if (!isCustomLocationSource) { locationSource = LocationSource.getLocationEngine(this.getContext()); - else + } else { return; + } } // Set an initial location if one available Location lastLocation = locationSource.getLastLocation(); @@ -450,8 +451,9 @@ public class MyLocationView extends View { locationSource.setPriority(LocationEnginePriority.HIGH_ACCURACY); } else { - if (locationSource == null) + if (locationSource == null) { return; + } // Disable location and user dot location = null; locationSource.removeLocationUpdates(); @@ -499,17 +501,17 @@ public class MyLocationView extends View { // center map directly mapboxMap.getTrackingSettings().setDismissTrackingModeForCameraPositionChange(false); mapboxMap.easeCamera(CameraUpdateFactory.newLatLng(new LatLng(location)), 0, false /*linear interpolator*/, - new MapboxMap.CancelableCallback() { - @Override - public void onCancel() { + new MapboxMap.CancelableCallback() { + @Override + public void onCancel() { - } + } - @Override - public void onFinish() { - mapboxMap.getTrackingSettings().setDismissTrackingModeForCameraPositionChange(true); - } - }); + @Override + public void onFinish() { + mapboxMap.getTrackingSettings().setDismissTrackingModeForCameraPositionChange(true); + } + }); } else { // do not use interpolated location from tracking mode latLng = null; @@ -687,17 +689,17 @@ public class MyLocationView extends View { builder.bearing(rotation); mapboxMap.getTrackingSettings().setDismissTrackingModeForCameraPositionChange(false); mapboxMap.easeCamera(CameraUpdateFactory.newCameraPosition(builder.build()), COMPASS_UPDATE_RATE_MS, - false /*linear interpolator*/, new MapboxMap.CancelableCallback() { - @Override - public void onCancel() { + false /*linear interpolator*/, new MapboxMap.CancelableCallback() { + @Override + public void onCancel() { - } + } - @Override - public void onFinish() { - mapboxMap.getTrackingSettings().setDismissTrackingModeForCameraPositionChange(true); - } - }); + @Override + public void onFinish() { + mapboxMap.getTrackingSettings().setDismissTrackingModeForCameraPositionChange(true); + } + }); } @Override @@ -874,7 +876,7 @@ public class MyLocationView extends View { locationChangeAnimator = ValueAnimator.ofFloat(0.0f, 1.0f); locationChangeAnimator.setDuration(locationUpdateDuration); locationChangeAnimator.addUpdateListener(new MarkerCoordinateAnimatorListener(this, - latLng, newLocation + latLng, newLocation )); locationChangeAnimator.start(); latLng = newLocation; -- cgit v1.2.1