Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.VIEW"/>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious 🤔 Why is this needed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

screen shot 2018-10-23 at 9 33 21 am

This lint warning was highlighting the whole AndroidManifest.xml

</intent-filter>
</activity>

Expand Down Expand Up @@ -110,6 +111,8 @@
android:value=".MainActivity"/>
</activity>

<activity android:name=".activity.HistoryActivity"/>

<!-- Testing -->
<activity android:name=".test.TestNavigationActivity"/>
</application>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package com.mapbox.services.android.navigation.testapp.activity;

import android.location.Location;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;

import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation;
import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener;
import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;

import java.text.SimpleDateFormat;
import java.util.Date;

public class HistoryActivity extends AppCompatActivity {

private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
private static final String JSON_EXTENSION = ".json";

private MapboxNavigation navigation;
private String filename;

public void addNavigationForHistory(@NonNull MapboxNavigation navigation) {
if (navigation == null) {
throw new IllegalArgumentException("MapboxNavigation cannot be null");
}
this.navigation = navigation;
navigation.addProgressChangeListener(progressHistoryListener);
navigation.toggleHistory(true);
filename = buildFileName();
}

@Override
protected void onDestroy() {
super.onDestroy();
navigation.toggleHistory(false);
}

private String buildFileName() {
StringBuilder sb = new StringBuilder();
sb.append(obtainCurrentTimeStamp());
sb.append(JSON_EXTENSION);
return sb.toString();
}

private String obtainCurrentTimeStamp() {
Date now = new Date();
String strDate = DATE_FORMAT.format(now);
return strDate;
}

private ProgressChangeListener progressHistoryListener = new ProgressChangeListener() {
@Override
public void onProgressChange(Location location, RouteProgress routeProgress) {
new StoreHistoryTask(navigation, filename).execute();
}
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Toast;

Expand Down Expand Up @@ -52,7 +51,7 @@
import retrofit2.Response;
import timber.log.Timber;

public class RerouteActivity extends AppCompatActivity implements OnMapReadyCallback, LocationEngineListener,
public class RerouteActivity extends HistoryActivity implements OnMapReadyCallback, LocationEngineListener,
Callback<DirectionsResponse>, MapboxMap.OnMapClickListener, NavigationEventListener, OffRouteListener,
ProgressChangeListener, MilestoneEventListener {

Expand Down Expand Up @@ -89,6 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
navigation = new MapboxNavigation(getApplicationContext(), Mapbox.getAccessToken(), options);
navigation.addNavigationEventListener(this);
navigation.addMilestoneEventListener(this);
addNavigationForHistory(navigation);

instructionView.retrieveSoundButton().show();
instructionView.retrieveSoundButton().addOnClickListener(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.services.android.navigation.testapp.activity.navigationui;
package com.mapbox.services.android.navigation.testapp.activity;

import android.os.AsyncTask;
import android.os.Environment;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.transition.TransitionManager;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import com.mapbox.android.core.location.LocationEngine;
Expand All @@ -32,6 +31,7 @@
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.services.android.navigation.testapp.R;
import com.mapbox.services.android.navigation.testapp.activity.HistoryActivity;
import com.mapbox.services.android.navigation.testapp.activity.location.FusedLocationEngine;
import com.mapbox.services.android.navigation.ui.v5.camera.DynamicCamera;
import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView;
Expand All @@ -48,8 +48,6 @@
import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener;
import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Locale;

Expand All @@ -61,7 +59,7 @@
import retrofit2.Response;
import timber.log.Timber;

public class ComponentNavigationActivity extends AppCompatActivity implements OnMapReadyCallback,
public class ComponentNavigationActivity extends HistoryActivity implements OnMapReadyCallback,
MapboxMap.OnMapLongClickListener, LocationEngineListener, ProgressChangeListener,
MilestoneEventListener, OffRouteListener {

Expand All @@ -77,8 +75,6 @@ public class ComponentNavigationActivity extends AppCompatActivity implements On
private static final double DEFAULT_TILT = 0d;
private static final double DEFAULT_BEARING = 0d;
private static final int ONE_SECOND_INTERVAL = 1000;
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
private static final String JSON_EXTENSION = ".json";

@BindView(R.id.componentNavigationLayout)
ConstraintLayout navigationLayout;
Expand All @@ -103,7 +99,6 @@ public class ComponentNavigationActivity extends AppCompatActivity implements On
private DirectionsRoute route;
private Point destination;
private MapState mapState;
private String filename;

private enum MapState {
INFO,
Expand Down Expand Up @@ -174,8 +169,6 @@ public void onStartNavigationClick(FloatingActionButton floatingActionButton) {

// Start navigation
adjustMapPaddingForNavigation();
navigation.toggleHistory(true);
filename = buildFileName();
navigation.startNavigation(route);

// Location updates will be received from ProgressChangeListener
Expand Down Expand Up @@ -232,8 +225,6 @@ public void onLocationChanged(Location location) {

@Override
public void onProgressChange(Location location, RouteProgress routeProgress) {
new StoreHistoryTask(navigation, filename).execute();

// Cache "snapped" Locations for re-route Directions API requests
updateLocation(location);

Expand Down Expand Up @@ -343,6 +334,7 @@ private void initializeNavigation(MapboxMap mapboxMap) {
navigation.addMilestoneEventListener(this);
navigation.addOffRouteListener(this);
navigationMap.addProgressChangeListener(navigation);
addNavigationForHistory(navigation);
}

private void showSnackbar(String text, int duration) {
Expand Down Expand Up @@ -417,7 +409,6 @@ private void resetMapAfterNavigation() {
navigationMap.removeRoute();
navigationMap.clearMarkers();
navigation.stopNavigation();
navigation.toggleHistory(false);
moveCameraOverhead();
}

Expand Down Expand Up @@ -476,17 +467,4 @@ private void vibrate() {
vibrator.vibrate(ONE_HUNDRED_MILLISECONDS);
}
}

private String buildFileName() {
StringBuilder sb = new StringBuilder();
sb.append(obtainCurrentTimeStamp());
sb.append(JSON_EXTENSION);
return sb.toString();
}

private String obtainCurrentTimeStamp() {
Date now = new Date();
String strDate = DATE_FORMAT.format(now);
return strDate;
}
}