diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/UserLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/UserLocationView.java index 208ab9886..ed0133eb6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/UserLocationView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/UserLocationView.java @@ -123,13 +123,10 @@ public final class UserLocationView extends View { // setBackgroundColor(ContextCompat.getColor(context,android.R.color.darker_gray)); accurancyPaint = new Paint(); - accurancyPaint.setColor(Color.RED); + accurancyPaint.setColor(ContextCompat.getColor(context, R.color.mapbox_blue)); accurancyPaint.setAlpha(80); - setShadowDrawable(ContextCompat.getDrawable(context, R.drawable.ic_userlocationview_shadow)); - setShadowDrawableTint(Color.BLACK); - setForegroundDrawable(ContextCompat.getDrawable(context, R.drawable.ic_userlocationview_bearing)); setOnClickListener(new OnClickListener() { @Override @@ -138,7 +135,6 @@ public final class UserLocationView extends View { } }); - setForegroundDrawableTint(Color.RED); mBearingChangeListener = new MyBearingListener(context); } @@ -327,8 +323,8 @@ public final class UserLocationView extends View { // markerScreenPoint = new PointF(((uiSettings.getWidth() - getWidth() + contentPadding[0] - contentPadding[2]) / 2) // , ((uiSettings.getHeight() - getHeight() - contentPadding[3] + contentPadding[1]) / 2)); - setX(markerScreenPoint.x-getWidth()/2); - setY(markerScreenPoint.y-getHeight()/2); + setX(markerScreenPoint.x - getWidth() / 2); + setY(markerScreenPoint.y - getHeight() / 2); } else if (myLocationTrackingMode == MyLocationTracking.TRACKING_FOLLOW) { double bearing = 0; if (showDirection) { @@ -344,23 +340,23 @@ public final class UserLocationView extends View { // only update if there is an actual change if ((!currentMapViewCoordinate.equals(markerScreenCoordinate)) || (!(mCurrentBearing == bearing))) { - CameraPosition cameraPosition = new CameraPosition.Builder() - .target(markerScreenCoordinate) - .bearing(bearing) - .build(); - mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 300, null); + CameraPosition cameraPosition = new CameraPosition.Builder() + .target(markerScreenCoordinate) + .bearing(bearing) + .build(); + mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition), 300, null); // mMarkerScreenMatrix.reset(); - markerScreenPoint = getMarkerScreenPoint(); + markerScreenPoint = getMarkerScreenPoint(); // mMarkerScreenMatrix.setTranslate(mMarkerScreenPoint.x, mMarkerScreenPoint.y); - // set values for next check for actual change - currentMapViewCoordinate = markerScreenCoordinate; - mCurrentBearing = bearing; - } + // set values for next check for actual change + currentMapViewCoordinate = markerScreenCoordinate; + mCurrentBearing = bearing; } + } - // rotate so arrow in points to bearing + // rotate so arrow in points to bearing if (showDirection) { if (myBearingTrackingMode == MyBearingTracking.COMPASS && myLocationTrackingMode == MyLocationTracking.TRACKING_NONE) { setDirection(compassDirection); @@ -405,10 +401,10 @@ public final class UserLocationView extends View { // mMarkerScreenMatrix.mapRect(mDirtyRectF, largerBounds); // mDirtyRectF.roundOut(mDirtyRect); // invalidate(mDirtyRect); // the new marker location - } else { - setVisibility(View.INVISIBLE); - } + } else { + setVisibility(View.INVISIBLE); } + } public PointF getMarkerScreenPoint() { if (myLocationTrackingMode == MyLocationTracking.TRACKING_NONE) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_bearing.png index e5ff0808e..5a589a9cf 100644 Binary files a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_bearing.png and b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_bearing.png differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_normal.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_normal.png index 74d035d1a..cb31dca8d 100644 Binary files a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_normal.png and b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_userlocationview_normal.png differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml index 0793acbba..d98b69eca 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml @@ -9,6 +9,6 @@ 10dp 16dp 76dp - 19dp - 20dp + 18dp + 22dp diff --git a/platform/android/resources/dot-arrow.svg b/platform/android/resources/dot-arrow.svg new file mode 100644 index 000000000..4c2841a54 --- /dev/null +++ b/platform/android/resources/dot-arrow.svg @@ -0,0 +1,11 @@ + + + + + + + + + +