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

Review

Browse source
This commit is contained in:
androiddevkotlin 2021-03-15 10:47:31 +02:00
parent 44e7bf18df
commit 175f937319
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/TrackEditCard.java
View file

@ -82,28 +82,26 @@ public class TrackEditCard extends BaseCard {
} }
GpxUiHelper.updateGpxInfoView(view, title, gpxInfo, dataItem, false, app); GpxUiHelper.updateGpxInfoView(view, title, gpxInfo, dataItem, false, app);
if (gpxFile.getNonEmptySegmentsCount() > 1) if (gpxFile.getNonEmptySegmentsCount() > 1 && routeParams != null)
if (routeParams != null) if (routeParams.getSelectedSegment() != -1 && gpxFile.getNonEmptySegmentsCount() > routeParams.getSelectedSegment()) {
if (routeParams.getSelectedSegment() != -1) TextView distanceView = view.findViewById(R.id.distance);
if (gpxFile.getNonEmptySegmentsCount() > routeParams.getSelectedSegment()) { TextView timeView = view.findViewById(R.id.time);
TextView distanceView = view.findViewById(R.id.distance); ImageView timeIcon = view.findViewById(R.id.time_icon);
TextView timeView = view.findViewById(R.id.time); AndroidUiHelper.updateVisibility(view.findViewById(R.id.points_icon), false);
ImageView timeIcon = view.findViewById(R.id.time_icon); AndroidUiHelper.updateVisibility(view.findViewById(R.id.points_count), false);
AndroidUiHelper.updateVisibility(view.findViewById(R.id.points_icon), false); List<GPXUtilities.TrkSegment> segments = gpxFile.getNonEmptyTrkSegments(false);
AndroidUiHelper.updateVisibility(view.findViewById(R.id.points_count), false); GPXUtilities.TrkSegment segment = segments.get(routeParams.getSelectedSegment());
List<GPXUtilities.TrkSegment> segments = gpxFile.getNonEmptyTrkSegments(false); double distance = TrackSelectSegmentAdapter.getDistance(segment);
GPXUtilities.TrkSegment segment = segments.get(routeParams.getSelectedSegment()); long time = TrackSelectSegmentAdapter.getSegmentTime(segment);
double distance = TrackSelectSegmentAdapter.getDistance(segment); boolean timeAvailable = time != 1;
long time = TrackSelectSegmentAdapter.getSegmentTime(segment); if (timeAvailable) {
boolean timeAvailable = time != 1; timeView.setText(Algorithms.formatDuration((int) (time / 1000),
if (timeAvailable) { app.accessibilityEnabled()));
timeView.setText(Algorithms.formatDuration((int) (time / 1000),
app.accessibilityEnabled()));
}
AndroidUiHelper.updateVisibility(timeView, timeAvailable);
AndroidUiHelper.updateVisibility(timeIcon, timeAvailable);
distanceView.setText(OsmAndFormatter.getFormattedDistance((float) distance, app));
} }
AndroidUiHelper.updateVisibility(timeView, timeAvailable);
AndroidUiHelper.updateVisibility(timeIcon, timeAvailable);
distanceView.setText(OsmAndFormatter.getFormattedDistance((float) distance, app));
}
ImageButton editButton = view.findViewById(R.id.show_on_map); ImageButton editButton = view.findViewById(R.id.show_on_map);
editButton.setVisibility(View.VISIBLE); editButton.setVisibility(View.VISIBLE);