mapbox · Guardiola31337 · Apr 28, 2020 · Apr 25, 2020
diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityJava.java b/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityJava.java
@@ -33,7 +33,7 @@
 import com.mapbox.navigation.base.metrics.MetricsObserver;
 import com.mapbox.navigation.base.options.MapboxOnboardRouterConfig;
 import com.mapbox.navigation.base.route.Router;
-import com.mapbox.navigation.core.accounts.MapboxNavigationAccounts;
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts;
 import com.mapbox.navigation.examples.R;
 import com.mapbox.navigation.examples.utils.Utils;
 import com.mapbox.navigation.metrics.MapboxMetricsReporter;

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/BaseRouterActivityKt.kt
@@ -36,7 +36,7 @@ import com.mapbox.navigation.base.metrics.MetricsObserver
 import com.mapbox.navigation.base.options.MapboxOnboardRouterConfig
 import com.mapbox.navigation.base.route.Router
 import com.mapbox.navigation.base.route.internal.RouteUrl.Companion.PROFILE_DRIVING_TRAFFIC
-import com.mapbox.navigation.core.accounts.MapboxNavigationAccounts
+import com.mapbox.navigation.core.internal.accounts.MapboxNavigationAccounts
 import com.mapbox.navigation.examples.R
 import com.mapbox.navigation.examples.utils.Utils
 import com.mapbox.navigation.metrics.MapboxMetricsReporter

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavigationActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/BasicNavigationActivity.kt
@@ -22,11 +22,11 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/DebugMapboxNavigationKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/DebugMapboxNavigationKt.kt
@@ -37,14 +37,14 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
 import com.mapbox.navigation.base.options.NavigationOptions
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -94,9 +94,9 @@ class DebugMapboxNavigationKt : AppCompatActivity(), OnMapReadyCallback,
         findViewById<Button>(R.id.btn_send_user_feedback)?.let { button ->
             button.setOnClickListener {
                 MapboxNavigation.postUserFeedback(
-                        FeedbackEvent.FEEDBACK_TYPE_GENERAL_ISSUE,
+                        FeedbackEvent.GENERAL_ISSUE,
                         "User feedback test at: ${Date().time}",
-                        FeedbackEvent.FEEDBACK_SOURCE_UI,
+                        FeedbackEvent.UI,
                         null
                 )
             }

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/FasterRouteActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/FasterRouteActivity.kt
@@ -24,12 +24,12 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.fasterroute.FasterRouteObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/FeedbackButtonActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/FeedbackButtonActivity.kt
@@ -27,7 +27,7 @@ import com.mapbox.navigation.base.internal.extensions.coordinates
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
-import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.Companion.FEEDBACK_SOURCE_UI
+import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.UI
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R
@@ -251,7 +251,7 @@ class FeedbackButtonActivity : AppCompatActivity(), OnMapReadyCallback,
                 MapboxNavigation.postUserFeedback(
                     feedback.feedbackType,
                     feedback.description,
-                    FEEDBACK_SOURCE_UI,
+                    UI,
                     encodeSnapshot(snapshot)
                 )
                 showFeedbackSent()

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/GuidanceViewActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/GuidanceViewActivity.kt
@@ -18,12 +18,12 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/InstructionViewActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/InstructionViewActivity.kt
@@ -29,13 +29,13 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
-import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.Companion.FEEDBACK_SOURCE_UI
+import com.mapbox.navigation.core.telemetry.events.FeedbackEvent.UI
 import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -196,7 +196,7 @@ class InstructionViewActivity : AppCompatActivity(), OnMapReadyCallback,
                 MapboxNavigation.postUserFeedback(
                     feedback.feedbackType,
                     feedback.description,
-                    FEEDBACK_SOURCE_UI,
+                    UI,
                     encodeSnapshot(snapshot)
                 )
             }

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/ReRouteActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/ReRouteActivity.kt
@@ -22,11 +22,11 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/SimpleMapboxNavigationKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/SimpleMapboxNavigationKt.kt
@@ -39,7 +39,6 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
 import com.mapbox.navigation.base.options.NavigationOptions
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
@@ -48,6 +47,7 @@ import com.mapbox.navigation.core.fasterroute.FasterRouteObserver
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -103,9 +103,9 @@ class SimpleMapboxNavigationKt : AppCompatActivity(), OnMapReadyCallback,
         findViewById<Button>(R.id.btn_send_user_feedback)?.let { button ->
             button.setOnClickListener {
                 MapboxNavigation.postUserFeedback(
-                    FeedbackEvent.FEEDBACK_TYPE_GENERAL_ISSUE,
+                    FeedbackEvent.GENERAL_ISSUE,
                     "User feedback test at: ${Date().time}",
-                    FeedbackEvent.FEEDBACK_SOURCE_UI,
+                    FeedbackEvent.UI,
                     null
                 )
             }

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/SummaryBottomSheetActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/SummaryBottomSheetActivity.kt
@@ -27,11 +27,11 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/TripServiceActivityKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/TripServiceActivityKt.kt
@@ -10,17 +10,17 @@ import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
+import com.mapbox.navigation.base.TimeFormat.TWENTY_FOUR_HOURS
+import com.mapbox.navigation.base.internal.VoiceUnit.METRIC
 import com.mapbox.navigation.base.internal.extensions.inferDeviceLocale
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.trip.model.RouteLegProgress
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.base.trip.model.RouteStepProgress
 import com.mapbox.navigation.base.trip.notification.NotificationAction
-import com.mapbox.navigation.base.typedef.METRIC
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.TWENTY_FOUR_HOURS
-import com.mapbox.navigation.core.MapboxDistanceFormatter
-import com.mapbox.navigation.core.trip.service.MapboxTripService
+import com.mapbox.navigation.core.Rounding
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter
+import com.mapbox.navigation.core.internal.trip.service.MapboxTripService
 import com.mapbox.navigation.examples.R
 import com.mapbox.navigation.trip.notification.MapboxTripNotification
 import com.mapbox.navigation.ui.route.NavigationMapRoute
@@ -79,7 +79,7 @@ class TripServiceActivityKt : AppCompatActivity(), OnMapReadyCallback {
         mapView.getMapAsync(this)
 
         val formatter = MapboxDistanceFormatter.builder(this)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(Rounding.INCREMENT_FIFTY)
             .withUnitType(METRIC)
             .withLocale(this.inferDeviceLocale())
             .build()

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/core/TripSessionActivityKt.kt b/examples/src/main/java/com/mapbox/navigation/examples/core/TripSessionActivityKt.kt
@@ -13,15 +13,15 @@ import com.mapbox.mapboxsdk.location.modes.RenderMode
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
+import com.mapbox.navigation.base.TimeFormat.TWENTY_FOUR_HOURS
+import com.mapbox.navigation.base.internal.VoiceUnit.METRIC
 import com.mapbox.navigation.base.internal.extensions.inferDeviceLocale
 import com.mapbox.navigation.base.options.NavigationOptions
-import com.mapbox.navigation.base.typedef.METRIC
-import com.mapbox.navigation.base.typedef.ROUNDING_INCREMENT_FIFTY
-import com.mapbox.navigation.base.typedef.TWENTY_FOUR_HOURS
-import com.mapbox.navigation.core.MapboxDistanceFormatter
-import com.mapbox.navigation.core.trip.service.MapboxTripService
+import com.mapbox.navigation.core.Rounding
+import com.mapbox.navigation.core.internal.MapboxDistanceFormatter
+import com.mapbox.navigation.core.internal.trip.service.MapboxTripService
+import com.mapbox.navigation.core.internal.trip.session.MapboxTripSession
 import com.mapbox.navigation.core.trip.session.LocationObserver
-import com.mapbox.navigation.core.trip.session.MapboxTripSession
 import com.mapbox.navigation.examples.R
 import com.mapbox.navigation.trip.notification.MapboxTripNotification
 import kotlinx.android.synthetic.main.activity_trip_session.*
@@ -92,7 +92,7 @@ class TripSessionActivityKt : AppCompatActivity(), OnMapReadyCallback {
 
         val formatter = MapboxDistanceFormatter.builder(this)
             .withUnitType(METRIC)
-            .withRoundingIncrement(ROUNDING_INCREMENT_FIFTY)
+            .withRoundingIncrement(Rounding.INCREMENT_FIFTY)
             .withLocale(this.inferDeviceLocale())
             .build()
 

diff --git a/...s/src/main/java/com/mapbox/navigation/examples/ui/ArrivalUiBuildingExtrusionActivityKt.kt b/...s/src/main/java/com/mapbox/navigation/examples/ui/ArrivalUiBuildingExtrusionActivityKt.kt
@@ -32,13 +32,13 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesObserver
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.fasterroute.FasterRouteObserver
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.examples.R

diff --git a/examples/src/main/java/com/mapbox/navigation/examples/ui/CustomUIComponentStyleActivity.kt b/examples/src/main/java/com/mapbox/navigation/examples/ui/CustomUIComponentStyleActivity.kt
@@ -33,14 +33,14 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.navigation.base.internal.extensions.applyDefaultParams
 import com.mapbox.navigation.base.internal.extensions.coordinates
-import com.mapbox.navigation.base.trip.RouteProgressObserver
 import com.mapbox.navigation.base.trip.model.RouteProgress
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.directions.session.RoutesRequestCallback
 import com.mapbox.navigation.core.replay.route.ReplayRouteLocationEngine
 import com.mapbox.navigation.core.telemetry.events.FeedbackEvent
 import com.mapbox.navigation.core.trip.session.BannerInstructionsObserver
 import com.mapbox.navigation.core.trip.session.LocationObserver
+import com.mapbox.navigation.core.trip.session.RouteProgressObserver
 import com.mapbox.navigation.core.trip.session.TripSessionState
 import com.mapbox.navigation.core.trip.session.TripSessionStateObserver
 import com.mapbox.navigation.core.trip.session.VoiceInstructionsObserver
@@ -210,7 +210,7 @@ class CustomUIComponentStyleActivity : AppCompatActivity(), OnMapReadyCallback,
                 MapboxNavigation.postUserFeedback(
                     feedback.feedbackType,
                     feedback.description,
-                    FeedbackEvent.FEEDBACK_SOURCE_UI,
+                    FeedbackEvent.UI,
                     encodeSnapshot(snapshot)
                 )
             }

diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/TimeFormat.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/TimeFormat.kt
@@ -0,0 +1,46 @@
+package com.mapbox.navigation.base
+
+import androidx.annotation.IntDef
+
+/**
+ * TimeFormat
+ */
+object TimeFormat {
+    /**
+     * Time format: defined by the device's settings
+     *
+     * Used at [Type]
+     */
+    const val NONE_SPECIFIED = -1
+
+    /**
+     * Time format: 12-hour (11.00PM)
+     *
+     * Used at [Type]
+     */
+    const val TWELVE_HOURS = 0
+
+    /**
+     * Time format: 24-hour (23.00)
+     *
+     * Used at [Type]
+     */
+    const val TWENTY_FOUR_HOURS = 1
+
+    /**
+     * Defines time format for calculation remaining trip time.
+     *
+     * When [TWELVE_HOURS] is selected -> 11.00PM
+     *
+     * When [TWENTY_FOUR_HOURS] is selected -> 23.00
+     *
+     * When [NONE_SPECIFIED] is selected -> Depends on user's device settings
+     */
+    @Retention(AnnotationRetention.SOURCE)
+    @IntDef(
+        NONE_SPECIFIED,
+        TWELVE_HOURS,
+        TWENTY_FOUR_HOURS
+    )
+    annotation class Type
+}
diff --git a/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/VoiceUnit.kt b/libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/VoiceUnit.kt
@@ -0,0 +1,29 @@
+package com.mapbox.navigation.base.internal
+
+import androidx.annotation.StringDef
+
+object VoiceUnit {
+    /**
+     * Change the units to imperial for voice and visual information. Note that this won't change
+     * other results such as raw distance measurements which will always be returned in meters.
+     */
+    const val IMPERIAL = "imperial"
+
+    /**
+     * Change the units to metric for voice and visual information. Note that this won't change
+     * other results such as raw distance measurements which will always be returned in meters.
+     */
+    const val METRIC = "metric"
+
+    /**
+     * Use to apply default units for a locale.
+     */
+    const val UNDEFINED = "undefined"
+
+    /**
+     * Retention policy for the various units of measurements.
+     */
+    @Retention(AnnotationRetention.SOURCE)
+    @StringDef(IMPERIAL, METRIC, UNDEFINED)
+    annotation class Type
+}