37 merged to master

AMOS-Project-TU-Berlin-Team-2 · Dec 13, 2018 · 34c9452 · 34c9452
1 parent ac1f480
commit 34c9452
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,6 +16,7 @@ android {
     }
     buildTypes {
         release {
+            debuggable true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }

diff --git a/app/src/main/java/amos/corridornavigation/MainActivity.java b/app/src/main/java/amos/corridornavigation/MainActivity.java
@@ -176,14 +176,14 @@ public void onNavigateButtonClicked(View view) {
         try {
             boolean simulateRoute = true;
             NavigationLauncherOptions options = NavigationLauncherOptions.builder()
-                    .directionsRoute(super.locationMarker.currentRoute)
-                    .shouldSimulateRoute(simulateRoute)
+                    .defaultMilestonesEnabled(false)
+                    .directionsRoute(super.locationMarker.currentRoute.get(0))
                     .build();
 
 
             int max=options.directionsRoute().legs().get(0).steps().size();
             for(int i = 0; i<max;i++) {
-                Log.d("instruction", options.directionsRoute().legs().get(0).steps().get(i).maneuver().instruction());
+//                Log.d("instruction", options.directionsRoute().legs().get(0).steps().get(i).maneuver().instruction());
             }
 
             // Call this method with Context from within an Activity

diff --git a/app/src/main/java/amos/corridornavigation/Router.java b/app/src/main/java/amos/corridornavigation/Router.java
@@ -13,6 +13,8 @@
 import com.mapbox.services.android.navigation.ui.v5.route.NavigationMapRoute;
 import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute;
 
+import java.util.List;
+
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -23,7 +25,7 @@ public class Router {
     private Marker destinationMarkerPosition;
     protected LatLng destinationCoord;
 
-    protected DirectionsRoute currentRoute;
+    public List<DirectionsRoute> currentRoute;
     private NavigationMapRoute navigationMapRoute;
 
     public Router()
@@ -81,15 +83,15 @@ public void onResponse(Call<DirectionsResponse> call, Response<DirectionsRespons
                             return;
                         }
 
-                        currentRoute = response.body().routes().get(0);
+                        currentRoute = response.body().routes();
 
                         // Draw the route on the map
                         if (navigationMapRoute != null) {
                             navigationMapRoute.removeRoute();
                         } else {
                             int condition = 0;
                             if (condition == 0) {
-                                navigationMapRoute = new NavigationMapRoute(null, context.mapView, context.mapboxMap, R.style.NavigationMapRouteGreen);
+                                navigationMapRoute = new NavigationMapRoute(null, context.mapView, context.mapboxMap, R.style.NavigationMapRoute);
                             }
                             else if (condition == 1) {
                                 navigationMapRoute = new NavigationMapRoute(null, context.mapView, context.mapboxMap, R.style.NavigationMapRouteYellow);
@@ -99,7 +101,7 @@ else if (condition == 1) {
                             }
                             //navigationMapRoute = new NavigationMapRoute(null, context.mapView, context.mapboxMap, R.style.NavigationMapRoute);
                         }
-                        navigationMapRoute.addRoute(currentRoute);
+                        navigationMapRoute.addRoutes(currentRoute);
                     }
 
                     @Override

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -4,4 +4,8 @@
     <color name="colorPrimaryDark">#727E8D</color>
     <color name="colorAccent">#ffffff</color>
     <color name="colorSearchbar">#ffffff</color>
+    <color name="mapbox_navigation_route_alternative_color">#7ebcfb</color>
+    <color name="mapbox_navigation_route_alternative_congestion_red">#e9646d</color>
+    <color name="mapbox_navigation_route_alternative_congestion_yellow">#f3b773</color>
+
 </resources>