Add callout manager to show callout on a route (#1339)

Author: tobrun

app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.kt

@@ -10,11 +10,12 @@ import com.mapbox.services.android.navigation.testapp.example.utils.DelegatesExt
 import com.squareup.leakcanary.LeakCanary
 import timber.log.Timber
 
+private const val DEFAULT_MAPBOX_ACCESS_TOKEN = "YOUR_MAPBOX_ACCESS_TOKEN_GOES_HERE"
+
 class NavigationApplication : Application() {
 
   companion object {
     var instance: NavigationApplication by DelegatesExt.notNullSingleValue()
-    const val DEFAULT_MAPBOX_ACCESS_TOKEN = "YOUR_MAPBOX_ACCESS_TOKEN_GOES_HERE"
   }
 
   override fun onCreate() {

app/src/main/java/com/mapbox/services/android/navigation/testapp/example/ui/ExampleActivity.kt

@@ -32,15 +32,16 @@ import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation
 import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress
 import kotlinx.android.synthetic.main.activity_example.*
 
+private const val ZERO_PADDING = 0
+private const val BOTTOMSHEET_MULTIPLIER = 4
+
 class ExampleActivity : AppCompatActivity(), ExampleView {
 
   private val permissionsManager = PermissionsManager(this)
-  private lateinit var presenter: ExamplePresenter
   private var map: NavigationMapboxMap? = null
-
-  companion object {
-    const val ZERO_PADDING = 0
-    const val BOTTOMSHEET_MULTIPLIER = 4
+  private val presenter by lazy(mode = LazyThreadSafetyMode.NONE) {
+    val viewModel = ViewModelProviders.of(this).get(ExampleViewModel::class.java)
+    ExamplePresenter(this, viewModel)
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -202,11 +203,11 @@ class ExampleActivity : AppCompatActivity(), ExampleView {
   }
 
   override fun updateInstructionViewWith(progress: RouteProgress) {
-    instructionView.update(progress)
+    instructionView.updateDistanceWith(progress)
   }
 
-  override fun updateInstructionViewWith(progress: RouteProgress, milestone: Milestone) {
-    TODO("not implemented")
+  override fun updateInstructionViewWith(milestone: Milestone) {
+    instructionView.updateBannerInstructionsWith(milestone)
   }
 
   override fun addMapProgressChangeListener(navigation: MapboxNavigation) {
@@ -259,9 +260,6 @@ class ExampleActivity : AppCompatActivity(), ExampleView {
   }
 
   private fun setupWith(savedInstanceState: Bundle?) {
-    val viewModel = ViewModelProviders.of(this).get(ExampleViewModel::class.java)
-    presenter = ExamplePresenter(this, viewModel)
-
     mapView.onCreate(savedInstanceState)
 
     instructionView.retrieveFeedbackButton().hide()

app/src/main/java/com/mapbox/services/android/navigation/testapp/example/ui/ExamplePresenter.kt

@@ -23,15 +23,13 @@ import com.mapbox.services.android.navigation.ui.v5.camera.DynamicCamera
 import com.mapbox.services.android.navigation.v5.milestone.Milestone
 import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress
 
-class ExamplePresenter(private val view: ExampleView, private val viewModel: ExampleViewModel) {
+private const val DEFAULT_ZOOM = 12.0
+private const val DEFAULT_BEARING = 0.0
+private const val DEFAULT_TILT = 0.0
+private const val TWO_SECONDS = 2000
+private const val ONE_SECOND = 1000
 
-  companion object {
-    const val DEFAULT_ZOOM = 12.0
-    const val DEFAULT_BEARING = 0.0
-    const val DEFAULT_TILT = 0.0
-    const val TWO_SECONDS = 2000
-    const val ONE_SECOND = 1000
-  }
+class ExamplePresenter(private val view: ExampleView, private val viewModel: ExampleViewModel) {
 
   private var state: PresenterState = PresenterState.SHOW_LOCATION
 
@@ -174,13 +172,13 @@ class ExamplePresenter(private val view: ExampleView, private val viewModel: Exa
 
   fun onProgressUpdate(progress: RouteProgress?) {
     progress?.let {
-      view.updateInstructionViewWith(progress)
+      view.updateInstructionViewWith(it)
     }
   }
 
   fun onMilestoneUpdate(milestone: Milestone?) {
     milestone?.let {
-      // TODO update instructionview -- fix API
+      view.updateInstructionViewWith(it)
     }
   }
 
@@ -245,7 +243,6 @@ class ExamplePresenter(private val view: ExampleView, private val viewModel: Exa
       val top = resources.getDimension(R.dimen.route_overview_padding_top).toInt()
       val right = resources.getDimension(R.dimen.route_overview_padding_right).toInt()
       val bottom = resources.getDimension(R.dimen.route_overview_padding_bottom).toInt()
-      // left top right bottom
       val padding = intArrayOf(left, top, right, bottom)
       view.updateMapCameraFor(bounds, padding, TWO_SECONDS)
     }

app/src/main/java/com/mapbox/services/android/navigation/testapp/example/ui/ExampleView.kt

@@ -56,7 +56,7 @@ interface ExampleView: PermissionsListener, OnMapReadyCallback,
 
   fun updateInstructionViewWith(progress: RouteProgress)
 
-  fun updateInstructionViewWith(progress: RouteProgress, milestone: Milestone)
+  fun updateInstructionViewWith(milestone: Milestone)
 
   fun addMapProgressChangeListener(navigation: MapboxNavigation)
 

app/src/main/java/com/mapbox/services/android/navigation/testapp/example/ui/ExampleViewModel.kt

@@ -29,11 +29,9 @@ import retrofit2.Response
 import timber.log.Timber
 import java.util.Locale.US
 
-class ExampleViewModel(application: Application) : AndroidViewModel(application) {
+private const val ONE_SECOND_INTERVAL = 1000
 
-  companion object {
-    const val ONE_SECOND_INTERVAL = 1000
-  }
+class ExampleViewModel(application: Application) : AndroidViewModel(application) {
 
   val location: MutableLiveData<Location> = MutableLiveData()
   val routes: MutableLiveData<List<DirectionsRoute>> = MutableLiveData()

app/src/main/java/com/mapbox/services/android/navigation/testapp/example/ui/navigation/ExampleRouteFinder.kt

@@ -13,14 +13,12 @@ import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
 
+private const val BEARING_TOLERANCE = 90.0
+
 class ExampleRouteFinder(private val viewModel: ExampleViewModel,
                          private val routes: MutableLiveData<List<DirectionsRoute>>,
                          private val accessToken: String) : Callback<DirectionsResponse> {
 
-  companion object {
-    const val BEARING_TOLERANCE = 90.0
-  }
-
   fun findRoute(location: Location, destination: Point) {
     find(location, destination)
   }
@@ -59,6 +57,7 @@ class ExampleRouteFinder(private val viewModel: ExampleViewModel,
 
     // Handle off-route scenarios
     if (viewModel.isOffRoute) {
+      viewModel.isOffRoute = false
       viewModel.startNavigation()
     }
   }