Skip to content

Temporarily hided instructionview, zoom fixes, route updates #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: maplibre10_remove_bottom_sheet_behavior
Choose a base branch
from
Open

Temporarily hided instructionview, zoom fixes, route updates #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5034b16
Temporarily hided instructionview, zoom fixes, route updates
RetiredKnight Jan 25, 2025
d3d4dac
getting user position from args
RetiredKnight Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class NavigationUIActivity :

private var simulateRoute = false

private var isStarted = false

@SuppressLint("MissingPermission")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand All @@ -74,18 +76,36 @@ class NavigationUIActivity :
// getMapAsync(this@NavigationUIActivity)
// }

// binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
// simulateRoute = checked
// }
binding.simulateRouteSwitch.setOnCheckedChangeListener { _, checked ->
if (checked) {
binding.navigationView.resetCameraPosition()
} else {
binding.navigationView.updateCameraRouteOverview()
}
}

binding.startRouteButton.setOnClickListener {
val points = mutableListOf<Pair<Double, Double>>()
points.add(Pair(76.930137, 43.230361))
points.add(Pair(76.928316, 43.236109))
points.add(Pair(76.920187, 43.236783))
binding.navigationView.calculateRoute(MapRouteData("pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a", "getString(R.string.mapbox_access_token)",
points, Pair(76.930137, 43.230361), MapRouteData.DARK_THEME))
if (isStarted) {
binding.navigationView.stopNavigation()
isStarted = false
} else {
val points = mutableListOf<Pair<Double, Double>>()
points.add(Pair(76.930137, 43.230361))
points.add(Pair(76.928316, 43.236109))
points.add(Pair(76.920187, 43.236783))
binding.navigationView.calculateRoute(
MapRouteData(
"pk.cb243ba3-cb94-41c4-a91f-5f3074824d3a",
"getString(R.string.mapbox_access_token)",
points,
Pair(76.930137, 43.230361),
MapRouteData.DARK_THEME
)
)
isStarted = true
}
}

// binding.clearPoints.setOnClickListener {
// if (::mapboxMap.isInitialized) {
// mapboxMap.markers.forEach {
Expand Down
35 changes: 11 additions & 24 deletions ...tion-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationRouteView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,20 @@ package com.mapbox.services.android.navigation.ui.v5
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.graphics.BitmapFactory
import android.graphics.drawable.Drawable
import android.location.Location
import android.os.Bundle
import android.util.AttributeSet
import android.util.Log
import android.widget.Button
import android.widget.ImageButton
import androidx.activity.ComponentActivity
import androidx.annotation.UiThread
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.graphics.drawable.toBitmap
import androidx.core.view.ViewCompat
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LifecycleRegistry
import androidx.lifecycle.ViewModelProvider
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.mapbox.api.directions.v5.DirectionsCriteria
import com.mapbox.api.directions.v5.models.DirectionsResponse
import com.mapbox.core.utils.TextUtils
import com.mapbox.geojson.Point
import com.mapbox.mapboxsdk.annotations.Icon
import com.mapbox.mapboxsdk.annotations.MarkerOptions
import com.mapbox.mapboxsdk.camera.CameraPosition
import com.mapbox.mapboxsdk.geometry.LatLng
Expand All @@ -39,8 +29,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
import com.mapbox.mapboxsdk.maps.Projection
import com.mapbox.mapboxsdk.maps.Style
import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
import com.mapbox.services.android.navigation.ui.v5.NavigationContract.View
import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera
import com.mapbox.services.android.navigation.ui.v5.instruction.ImageCreator
import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView
Expand Down Expand Up @@ -131,7 +119,7 @@ class NavigationRouteView @JvmOverloads constructor(
*
* @param savedInstanceState to restore state if not null
*/
fun onCreate(navigationCallback: OnNavigationReadyCallback, savedInstanceState: Bundle?, context: ComponentActivity, style: String) {
fun onCreate(navigationCallback: OnNavigationReadyCallback, savedInstanceState: Bundle?, context: Context, style: String) {
initializeNavigationViewModel(context)
initializeView()
ThemeSwitcher.setTheme(context, attrs, style)
Expand Down Expand Up @@ -282,13 +270,15 @@ class NavigationRouteView @JvmOverloads constructor(
mapboxMap.setStyle((builder)) {
isMapInitialized = true
enableLocationComponent(it)
mapboxMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
baseCameraPosition?.let {
mapboxMap.cameraPosition = it
}
}
} else {
mapboxMap.getStyle {
enableLocationComponent(it)
mapboxMap.cameraPosition = CameraPosition.Builder().zoom(16.0).build()
baseCameraPosition?.let {
mapboxMap.cameraPosition = it
}
Expand Down Expand Up @@ -324,15 +314,11 @@ class NavigationRouteView @JvmOverloads constructor(
}

fun calculateRoute(mapRouteData: MapRouteData) {

// startRouteButton.setOnClickListener {
val destination = Point.fromLngLat(76.930137, 43.230361)
val origin = Point.fromLngLat(mapRouteData.userLocation.first, mapRouteData.userLocation.second)
val userLocation = mapboxMap!!.locationComponent.lastKnownLocation

val navigationRouteBuilder = NavigationRoute.builder(context).apply {
this.accessToken(mapRouteData.accessToken)
this.origin(Point.fromLngLat(userLocation!!.longitude, userLocation.latitude))
this.origin(Point.fromLngLat(mapRouteData.userLocation.first, mapRouteData.userLocation.second))
this.voiceUnits(DirectionsCriteria.PROFILE_DRIVING)
this.alternatives(true)
// If you are using this with the GraphHopper Directions API, you need to uncomment user and profile here.
Expand Down Expand Up @@ -362,7 +348,6 @@ class NavigationRouteView @JvmOverloads constructor(

val options = NavigationLauncherOptions.builder()
.directionsRoute(route)
// .shouldSimulateRoute(simulateRoute)
.initialMapCameraPosition(
CameraPosition.Builder().target(
LatLng(
Expand Down Expand Up @@ -390,7 +375,6 @@ class NavigationRouteView @JvmOverloads constructor(
}
}
}
// binding.startRouteLayout.visibility = View.VISIBLE
}
}

Expand All @@ -404,6 +388,8 @@ class NavigationRouteView @JvmOverloads constructor(

override fun resetCameraPosition() {
if (navigationMap != null) {
updateWayNameVisibility(true);
hideRecenterBtn()
navigationMap!!.resetPadding()
navigationMap!!.resetCameraPositionWith(NavigationCamera.NAVIGATION_TRACKING_MODE_GPS)
}
Expand Down Expand Up @@ -532,6 +518,7 @@ class NavigationRouteView @JvmOverloads constructor(
*
* @since 0.16.0
*/
@SuppressLint("MissingPermission")
@UiThread
fun stopNavigation() {
instructionView!!.visibility = GONE
Expand All @@ -540,6 +527,7 @@ class NavigationRouteView @JvmOverloads constructor(
baseCameraPosition?.let {
mapboxMap!!.cameraPosition = it
}

if (navigationMap != null) {
navigationMap!!.removeOnCameraTrackingChangedListener(onTrackingChangedListener)
navigationMap!!.removeRoute()
Expand All @@ -548,6 +536,7 @@ class NavigationRouteView @JvmOverloads constructor(
mapboxMap!!.markers.forEach {
mapboxMap!!.removeMarker(it)
}
route = null
navigationMapRoute?.removeRoute()

}
Expand Down Expand Up @@ -671,7 +660,7 @@ class NavigationRouteView @JvmOverloads constructor(
wayNameView = findViewById(R.id.wayNameView)
}

fun initializeNavigationViewModel(context: ComponentActivity) {
fun initializeNavigationViewModel(context: Context) {
try {
navigationViewModel = NavigationViewModel(context)
} catch (exception: ClassCastException) {
Expand Down Expand Up @@ -773,7 +762,7 @@ class NavigationRouteView @JvmOverloads constructor(
initializeOnCameraTrackingChangedListener()
subscribeViewModels()
}
instructionView!!.visibility = VISIBLE
instructionView!!.visibility = GONE
}

private fun initializeClickListeners() {
Expand Down Expand Up @@ -931,8 +920,6 @@ class NavigationRouteView @JvmOverloads constructor(
// val markerOptions = MarkerOptions()
// .position(position)
// .icon(icon)
// mapboxMap!!.setOnMarkerClickListener {
// }
}

companion object {
Expand Down
Loading