Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9849 from osmandapp/minor_fixes

Browse source 
Fix icon after gpx approximation in options dialog
This commit is contained in:
vshcherb 2020-09-18 17:36:19 +02:00 committed by GitHub
commit 12ff34ceb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -319,9 +319,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
mainView.findViewById(R.id.options_button).setOnClickListener(new OnClickListener() { mainView.findViewById(R.id.options_button).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
boolean trackSnappedToRoad = editingCtx.isTrackSnappedToRoad() || editingCtx.isNewData() || approximationApplied;
OptionsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(), OptionsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
MeasurementToolFragment.this, MeasurementToolFragment.this,
editingCtx.isTrackSnappedToRoad() || editingCtx.isNewData(), trackSnappedToRoad,
editingCtx.getAppMode().getStringKey() editingCtx.getAppMode().getStringKey()
); );
} }

11
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -1633,7 +1633,16 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
String via = generateViaDescription(); String via = generateViaDescription();
GPXRouteParamsBuilder routeParamsBuilder = app.getRoutingHelper().getCurrentGPXRoute(); GPXRouteParamsBuilder routeParamsBuilder = app.getRoutingHelper().getCurrentGPXRoute();
if (routeParamsBuilder != null) { if (routeParamsBuilder != null) {
String fileName = new File(routeParamsBuilder.getFile().path).getName(); GPXFile gpxFile = routeParamsBuilder.getFile();
String fileName = null;
if (!Algorithms.isEmpty(gpxFile.path)) {
fileName = new File(gpxFile.path).getName();
} else if (!Algorithms.isEmpty(gpxFile.tracks)) {
fileName = gpxFile.tracks.get(0).name;
}
if (Algorithms.isEmpty(fileName)) {
fileName = app.getString(R.string.shared_string_gpx_track);
}
title.setText(GpxUiHelper.getGpxTitle(fileName)); title.setText(GpxUiHelper.getGpxTitle(fileName));
description.setText(R.string.follow_track); description.setText(R.string.follow_track);
buttonDescription.setText(R.string.shared_string_add); buttonDescription.setText(R.string.shared_string_add);