Add Imperial / Metric support for UI & Notification #501
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danesfeder
added
⚠️ DO NOT MERGE
| */ | ||
| public static void startNavigation(Activity activity, DirectionsRoute route, | ||
| String awsPoolId, boolean simulateRoute) { | ||
| public static void startNavigation(Activity activity, DirectionsRoute route, NavigationViewOptions options) { |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
| */ | ||
| public static void startNavigation(Activity activity, Point origin, Point destination, | ||
| String awsPoolId, boolean simulateRoute) { | ||
| NavigationViewOptions options) { |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
| */ | ||
| public void startNavigation(Activity activity) { | ||
| routeViewModel.extractLaunchData(activity); | ||
| public void startNavigation(NavigationViewOptions options) { |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
| private boolean shouldShowThenStep; | ||
|
|
||
| public InstructionModel(RouteProgress progress, DecimalFormat decimalFormat) { | ||
| public InstructionModel(RouteProgress progress, DecimalFormat decimalFormat, |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
| * @since 0.6.2 | ||
| */ | ||
| @SuppressWarnings("UnusedDeclaration") | ||
| public void update(RouteProgress routeProgress) { | ||
| public void update(RouteProgress routeProgress, @NavigationUnitType.UnitType int unitType) { |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
| */ | ||
| public void extractLaunchData(Activity activity) { | ||
| public void extractLaunchData(NavigationViewOptions options) { |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
| */ | ||
| @SuppressWarnings("UnusedDeclaration") | ||
| public void update(RouteProgress routeProgress) { | ||
| public void update(RouteProgress routeProgress, @NavigationUnitType.UnitType int unitType) { |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
| public SummaryModel(RouteProgress progress, DecimalFormat decimalFormat) { | ||
| distanceRemaining = distanceFormatterBold(progress.distanceRemaining(), decimalFormat, false); | ||
| public SummaryModel(RouteProgress progress, DecimalFormat decimalFormat, | ||
| @NavigationUnitType.UnitType int unitType) { |
There was a problem hiding this comment.
Are we ok here breaking SemVer?
Guardiola31337
approved these changes
Nov 21, 2017
| int unitType) { | ||
|
|
||
| boolean isImperialUnitType = unitType == NavigationUnitType.TYPE_IMPERIAL; | ||
| String largeUnitFormat = isImperialUnitType ? " mi" : " km"; |
|
|
||
| boolean isImperialUnitType = unitType == NavigationUnitType.TYPE_IMPERIAL; | ||
| String largeUnitFormat = isImperialUnitType ? " mi" : " km"; | ||
| String smallUnitFormat = isImperialUnitType ? " ft" : " m"; |
| return TurfConversion.convertDistance(distance, TurfConstants.UNIT_METERS, TurfConstants.UNIT_MILES) < 10 | ||
| && TurfConversion.convertDistance(distance, TurfConstants.UNIT_METERS, TurfConstants.UNIT_FEET) > 401; | ||
| private static boolean mediumDistance(double distance, String largeFinalUnit, String smallFinalUnit) { | ||
| return TurfConversion.convertDistance(distance, TurfConstants.UNIT_METERS, largeFinalUnit) < 10 |
| private static boolean longDistance(double distance) { | ||
| return TurfConversion.convertDistance(distance, TurfConstants.UNIT_METERS, TurfConstants.UNIT_MILES) > 10; | ||
| private static boolean longDistance(double distance, String largeFinalUnit) { | ||
| return TurfConversion.convertDistance(distance, TurfConstants.UNIT_METERS, largeFinalUnit) > 10; |
| @@ -37,6 +37,7 @@ public void setUp() throws Exception { | |||
| route = response.routes().get(0); | |||
| } | |||
|
|
|||
| @Ignore | |||
There was a problem hiding this comment.
Could we remove sanity test if it's not worth it anymore?
danesfeder
force-pushed
the
dan-metric-support
branch
from
2a24720 to
a713254
Compare
danesfeder
force-pushed
the
dan-metric-support
branch
from
a713254 to
85839ad
Compare
Guardiola31337
added
the
backwards incompatible
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NavigationViewOptionsto consolidate variables passed into the drop-in UIViewModels now look for unit type in preferencesRouteProgress+NavigationUnitType(if you want to use the views individually)int unitTypetoMapboxNavigationOptionsto set the correct distance in the notificationTODO:
NavigationViewOptionsfor transferringDirectionsRouteorPointdatacc @ericrwolfe