Refactoring Route, Speed

app/src/main/java/com/kouros/navigation/ui/MainActivity.kt

@@ -41,12 +41,9 @@ import com.google.android.gms.location.LocationServices
 import com.kouros.navigation.MainApplication.Companion.navigationViewModel
 import com.kouros.navigation.data.Constants.DESTINATION_ARRIVAL_DISTANCE
 import com.kouros.navigation.data.Constants.homeLocation
-import com.kouros.navigation.data.NavigationRepository
 import com.kouros.navigation.data.StepData
-import com.kouros.navigation.data.valhalla.ValhallaRepository
 import com.kouros.navigation.model.MockLocation
 import com.kouros.navigation.model.RouteModel
-import com.kouros.navigation.model.ViewModel
 import com.kouros.navigation.ui.theme.NavigationTheme
 import com.kouros.navigation.utils.bearing
 import com.kouros.navigation.utils.calculateZoom
@@ -114,13 +111,16 @@ class MainActivity : ComponentActivity() {
         }
         locationManager = getSystemService(LOCATION_SERVICE) as LocationManager
         fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
-        if (useMock) {
-            mock = MockLocation(locationManager)
-            mock.setMockLocation(
-                homeLocation.latitude,
-                homeLocation.longitude
-            )
-        }
+        fusedLocationClient.lastLocation
+            .addOnSuccessListener { location : android.location.Location? ->
+                if (useMock) {
+                    mock = MockLocation(locationManager)
+                    mock.setMockLocation(
+                        location?.latitude ?: homeLocation.latitude,
+                        location?.longitude ?: homeLocation.longitude
+                    )
+                }
+            }
         enableEdgeToEdge()
         setContent {
             CheckPermissionScreen()
@@ -165,11 +165,6 @@ class MainActivity : ComponentActivity() {
         }
         val step: StepData? by stepData.observeAsState()
         val nextStep: StepData? by nextStepData.observeAsState()
-
-        fun openSheet() {
-            scope.launch { scaffoldState.bottomSheetState.expand() }
-        }
-
         fun closeSheet() {
             scope.launch {
                 scaffoldState.bottomSheetState.partialExpand()
@@ -242,7 +237,7 @@ class MainActivity : ComponentActivity() {
                     if (routeState.maneuverType == 39
                         && leftStepDistance() < DESTINATION_ARRIVAL_DISTANCE
                     ) {
-                        stopNavigation()
+                     //   stopNavigation()
                         routeState = routeState.copy(arrived = true)
                         routeData.value = ""
                     }
@@ -305,7 +300,7 @@ class MainActivity : ComponentActivity() {
         for ((index, step) in routeModel.legs.steps.withIndex()) {
             for ((windex, waypoint) in step.maneuver.waypoints.withIndex()) {
                 mock.setMockLocation(waypoint[1], waypoint[0])
-                delay(1000L) //
+                delay(600L) //
             }
         }
     }