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

Fix #3603

Browse source
This commit is contained in:
Alexander Sytnyk 2017-05-30 15:30:51 +03:00
parent 1940c54587
commit 2165882f46
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -1330,7 +1330,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
}); });
GPXTrackAnalysis analysis; GPXTrackAnalysis analysis;
if ((analysis = getGpxTrackAnalysis(gpxInfo, app, null)) != null) { if ((analysis = getGpxTrackAnalysis(gpxInfo, app)) != null) {
if (analysis.totalDistance != 0) { if (analysis.totalDistance != 0) {
item = optionsMenu.getMenu().add(R.string.analyze_on_map).setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_info_dark)); item = optionsMenu.getMenu().add(R.string.analyze_on_map).setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_info_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@ -1748,7 +1748,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
} else { } else {
viewName.setTypeface(Typeface.DEFAULT, Typeface.NORMAL); viewName.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
} }
GPXTrackAnalysis analysis = getGpxTrackAnalysis(child, app, icon); if (getSelectedGpxFile(child, app) != null) {
icon.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_polygom_dark, R.color.color_distance));
}
GPXTrackAnalysis analysis = getGpxTrackAnalysis(child, app);
boolean sectionRead = analysis == null; boolean sectionRead = analysis == null;
if (sectionRead) { if (sectionRead) {
v.findViewById(R.id.read_section).setVisibility(View.GONE); v.findViewById(R.id.read_section).setVisibility(View.GONE);
@ -1809,16 +1812,17 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
v.findViewById(R.id.check_item).setVisibility(View.GONE); v.findViewById(R.id.check_item).setVisibility(View.GONE);
} }
@Nullable private static SelectedGpxFile getSelectedGpxFile(GpxInfo gpxInfo, OsmandApplication app) {
private static GPXTrackAnalysis getGpxTrackAnalysis(GpxInfo gpxInfo, OsmandApplication app, ImageView icon) {
GpxSelectionHelper selectedGpxHelper = app.getSelectedGpxHelper(); GpxSelectionHelper selectedGpxHelper = app.getSelectedGpxHelper();
SelectedGpxFile sgpx = gpxInfo.currentlyRecordingTrack ? selectedGpxHelper.getSelectedCurrentRecordingTrack() : return gpxInfo.currentlyRecordingTrack ? selectedGpxHelper.getSelectedCurrentRecordingTrack() :
selectedGpxHelper.getSelectedFileByName(gpxInfo.getFileName()); selectedGpxHelper.getSelectedFileByName(gpxInfo.getFileName());
}
@Nullable
private static GPXTrackAnalysis getGpxTrackAnalysis(GpxInfo gpxInfo, OsmandApplication app) {
SelectedGpxFile sgpx = getSelectedGpxFile(gpxInfo, app);
GPXTrackAnalysis analysis = null; GPXTrackAnalysis analysis = null;
if (sgpx != null) { if (sgpx != null) {
if (icon != null) {
icon.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_action_polygom_dark, R.color.color_distance));
}
analysis = sgpx.getTrackAnalysis(); analysis = sgpx.getTrackAnalysis();
} else if (gpxInfo.currentlyRecordingTrack) { } else if (gpxInfo.currentlyRecordingTrack) {
analysis = app.getSavingTrackHelper().getCurrentTrack().getTrackAnalysis(); analysis = app.getSavingTrackHelper().getCurrentTrack().getTrackAnalysis();