[android] removed LocationComponentOptions from LocationAnimatorCoordinator class and test for pulsing circle

4 files changed, 7 insertions, 19 deletions

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 a522fbaaa1..48af2da606 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
@@ -52,7 +52,6 @@ final class LocationAnimatorCoordinator {
   private final MapboxAnimatorSetProvider animatorSetProvider;
   private boolean compassAnimationEnabled;
   private boolean accuracyAnimationEnabled;
-  private LocationComponentOptions locationComponentOptions;
 
   @VisibleForTesting
   int maxAnimationFps = Integer.MAX_VALUE;
@@ -61,12 +60,10 @@ final class LocationAnimatorCoordinator {
   final SparseArray<MapboxAnimator.AnimationsValueChangeListener> listeners = new SparseArray<>();
 
   LocationAnimatorCoordinator(@NonNull Projection projection, @NonNull MapboxAnimatorSetProvider animatorSetProvider,
-                              @NonNull MapboxAnimatorProvider animatorProvider,
-                              @NonNull LocationComponentOptions locationComponentOptions) {
+                              @NonNull MapboxAnimatorProvider animatorProvider) {
     this.projection = projection;
     this.animatorProvider = animatorProvider;
     this.animatorSetProvider = animatorSetProvider;
-    this.locationComponentOptions = locationComponentOptions;
   }
 
   void updateAnimatorListenerHolders(@NonNull Set<AnimatorListenerHolder> listenerHolders) {
@@ -164,13 +161,12 @@ final class LocationAnimatorCoordinator {
   void startLocationComponentCirclePulsing(LocationComponentOptions options) {
     cancelAnimator(ANIMATOR_PULSING_CIRCLE);
     MapboxAnimator.AnimationsValueChangeListener listener = listeners.get(ANIMATOR_PULSING_CIRCLE);
-    locationComponentOptions = options;
     PulsingLocationCircleAnimator pulsingLocationCircleAnimator = animatorProvider.pulsingCircleAnimator(
         listener,
         maxAnimationFps,
-        locationComponentOptions.pulseSingleDuration(),
-        locationComponentOptions.pulseMaxRadius(),
-        locationComponentOptions.pulseInterpolator());
+      options.pulseSingleDuration(),
+      options.pulseMaxRadius(),
+      options.pulseInterpolator());
     if (listener != null) {
       animatorArray.put(ANIMATOR_PULSING_CIRCLE, pulsingLocationCircleAnimator);
     }
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 b13ffa2e26..ddf516c0c2 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
@@ -1275,8 +1275,7 @@ public final class LocationComponent {
     locationAnimatorCoordinator = new LocationAnimatorCoordinator(
       mapboxMap.getProjection(),
       MapboxAnimatorSetProvider.getInstance(),
-      MapboxAnimatorProvider.getInstance(), options
-    );
+      MapboxAnimatorProvider.getInstance());
     locationAnimatorCoordinator.setTrackingAnimationDurationMultiplier(options
       .trackingAnimationDurationMultiplier());
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt
index 282a138e11..f27d575e49 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt
@@ -1,7 +1,6 @@
 package com.mapbox.mapboxsdk.location
 
 import android.animation.Animator
-import android.content.Context
 import android.location.Location
 import android.util.SparseArray
 import android.view.animation.LinearInterpolator
@@ -27,7 +26,6 @@ import org.robolectric.RobolectricTestRunner
 class LocationAnimatorCoordinatorTest {
 
   private lateinit var locationAnimatorCoordinator: LocationAnimatorCoordinator
-  private lateinit var locationComponentOptions: LocationComponentOptions
   private val cameraPosition: CameraPosition = CameraPosition.DEFAULT
 
   private val animatorProvider: MapboxAnimatorProvider = mockk()
@@ -37,14 +35,9 @@ class LocationAnimatorCoordinatorTest {
 
   @Before
   fun setUp() {
-    val context: Context = mockk(relaxed = true)
-
-    locationComponentOptions = LocationComponentOptions.builder(context)
-      .build()
-
     locationAnimatorCoordinator = LocationAnimatorCoordinator(projection,
       animatorSetProvider,
-      animatorProvider, locationComponentOptions)
+      animatorProvider)
     configureAnimatorProvider()
     every { projection.getMetersPerPixelAtLatitude(any()) } answers { 1.0 }
     every { animatorSetProvider.startAnimation(any(), any(), any()) } answers {}
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java
index b1e1f14cb1..81d4e1bfa0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java
@@ -72,7 +72,7 @@ public class LocationComponentOptionsTest {
   public void passingBothLayerPositionOptions_throwsException() throws Exception {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("You cannot set both layerAbove and layerBelow options."
-      + "Choose one or the other.");
+      + " Choose one or the other.");
     LocationComponentOptions.builder(context)
       .layerAbove("above")
       .layerBelow("below")