remove maneuver modifier and rely on the one exposed in mapbox-sdk-di…

…rections-models after bumping mapbox-sdk-services and mapbox-sdk-directions-models dependency versions to 5.2.1
mapbox · May 13, 2020 · 5d0830b · 5d0830b
1 parent 39bbb47
commit 5d0830b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 66 deletions.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -11,8 +11,8 @@ ext {
   version = [
       mapboxMapSdk              : '9.2.0',
       mapboxMapCarbon           : '10.0.0-alpha.4',
-      mapboxSdkServices         : '5.2.0',
-      mapboxSdkDirectionsModels : '5.2.0',
+      mapboxSdkServices         : '5.2.1',
+      mapboxSdkDirectionsModels : '5.2.1',
       mapboxEvents              : '5.0.1',
       mapboxCore                : '2.0.1',
       mapboxNavigator           : '11.0.2',

diff --git a/...vigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/maneuver/ManeuverView.java b/...vigation-ui/src/main/java/com/mapbox/navigation/ui/instruction/maneuver/ManeuverView.java
@@ -15,11 +15,11 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Pair;
 
+import com.mapbox.api.directions.v5.models.ManeuverModifier;
 import com.mapbox.api.directions.v5.models.StepManeuver;
 import com.mapbox.libnavigation.ui.R;
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper;
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconDrawer;
-import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier;
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuversStyleKit;
 
 import static com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.DEFAULT_ROUNDABOUT_ANGLE;

diff --git a/...tion-ui/src/main/java/com/mapbox/navigation/ui/instruction/turnlane/TurnLaneViewData.java b/...tion-ui/src/main/java/com/mapbox/navigation/ui/instruction/turnlane/TurnLaneViewData.java
@@ -1,6 +1,6 @@
 package com.mapbox.navigation.ui.instruction.turnlane;
 
-import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier;
+import com.mapbox.api.directions.v5.models.ManeuverModifier;
 
 class TurnLaneViewData {
 

diff --git a/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapFpsDelegate.java b/libnavigation-ui/src/main/java/com/mapbox/navigation/ui/map/MapFpsDelegate.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
+import com.mapbox.api.directions.v5.models.ManeuverModifier;
 import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier;
 import com.mapbox.navigation.base.trip.model.RouteLegProgress;
 import com.mapbox.navigation.base.trip.model.RouteProgress;
 import com.mapbox.navigation.core.MapboxNavigation;

diff --git a/...ification/src/main/java/com/mapbox/navigation/trip/notification/MapboxTripNotification.kt b/...ification/src/main/java/com/mapbox/navigation/trip/notification/MapboxTripNotification.kt
@@ -26,6 +26,7 @@ import com.mapbox.annotation.module.MapboxModule
 import com.mapbox.annotation.module.MapboxModuleType
 import com.mapbox.api.directions.v5.models.BannerInstructions
 import com.mapbox.api.directions.v5.models.BannerText
+import com.mapbox.api.directions.v5.models.ManeuverModifier
 import com.mapbox.api.directions.v5.models.StepManeuver
 import com.mapbox.api.directions.v5.models.StepManeuver.StepManeuverType
 import com.mapbox.navigation.base.formatter.DistanceFormatter
@@ -40,7 +41,6 @@ import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHel
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.ROUNDABOUT_MANEUVER_TYPES
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.adjustRoundaboutAngle
 import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverIconHelper.isManeuverIconNeedFlip
-import com.mapbox.navigation.trip.notification.internal.maneuver.ManeuverModifier
 import com.mapbox.navigation.utils.internal.END_NAVIGATION_ACTION
 import com.mapbox.navigation.utils.internal.NAVIGATION_NOTIFICATION_CHANNEL
 import com.mapbox.navigation.utils.internal.NOTIFICATION_CHANNEL

diff --git a/...main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverIconHelper.kt b/...main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverIconHelper.kt
@@ -3,6 +3,7 @@ package com.mapbox.navigation.trip.notification.internal.maneuver
 import android.graphics.Canvas
 import android.graphics.PointF
 import androidx.core.util.Pair
+import com.mapbox.api.directions.v5.models.ManeuverModifier
 import com.mapbox.api.directions.v5.models.StepManeuver
 
 /**

diff --git a/...c/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverModifier.kt b/...c/main/java/com/mapbox/navigation/trip/notification/internal/maneuver/ManeuverModifier.kt