Merge pull request #10787 from osmandapp/fix_gpx_context_menu_overview_actions_p3

Fix gpx context menu overview actions p3

OsmAnd/src/net/osmand/plus/measurementtool/SaveGpxRouteAsyncTask.java

@@ -10,11 +10,11 @@ import net.osmand.AndroidUtils;
 import net.osmand.FileUtils;
 import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.GPXUtilities.Metadata;
 import net.osmand.GPXUtilities.Route;
 import net.osmand.GPXUtilities.Track;
 import net.osmand.GPXUtilities.TrkSegment;
 import net.osmand.GPXUtilities.WptPt;
-import net.osmand.GPXUtilities.Metadata;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
@@ -104,6 +104,10 @@ class SaveGpxRouteAsyncTask extends AsyncTask<Void, Void, Exception> {
                 MeasurementToolFragment.showGpxOnMap(app, gpx, false);
             }
         }
+        if (res == null) {
+            savedGpxFile.addGeneralTrack();
+        }
+
         return res;
     }
 

OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java

@@ -0,0 +1,253 @@
+package net.osmand.plus.track;
+
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import net.osmand.AndroidUtils;
+import net.osmand.GPXUtilities.GPXTrackAnalysis;
+import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
+import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
+import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
+import net.osmand.plus.OsmAndFormatter;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
+import net.osmand.plus.myplaces.SegmentActionsListener;
+import net.osmand.plus.widgets.TextViewEx;
+import net.osmand.util.Algorithms;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GpxBlockStatisticsBuilder {
+
+	private final OsmandApplication app;
+	private RecyclerView blocksView;
+	private final SelectedGpxFile selectedGpxFile;
+	private final TrackDisplayHelper displayHelper;
+	private final GpxDisplayItemType[] filterTypes = {GpxDisplayItemType.TRACK_SEGMENT};
+
+	public GpxBlockStatisticsBuilder(OsmandApplication app, SelectedGpxFile selectedGpxFile, TrackDisplayHelper displayHelper) {
+		this.app = app;
+		this.selectedGpxFile = selectedGpxFile;
+		this.displayHelper = displayHelper;
+	}
+
+	public void setBlocksView(RecyclerView blocksView) {
+		this.blocksView = blocksView;
+	}
+
+	private GPXTrackAnalysis getAnalysis() {
+		return selectedGpxFile.getTrackAnalysis(app);
+	}
+
+	public void initStatBlocks(SegmentActionsListener actionsListener, @ColorInt int activeColor, boolean nightMode) {
+		GPXTrackAnalysis analysis = getAnalysis();
+		float totalDistance = analysis.totalDistance;
+		float timeSpan = analysis.timeSpan;
+		String asc = OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app);
+		String desc = OsmAndFormatter.getFormattedAlt(analysis.diffElevationDown, app);
+		String avg = OsmAndFormatter.getFormattedSpeed(analysis.avgSpeed, app);
+		String max = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app);
+		List<StatBlock> items = new ArrayList<>();
+
+		prepareData(analysis, items, app.getString(R.string.distance), OsmAndFormatter.getFormattedDistance(totalDistance, app),
+				R.drawable.ic_action_track_16, R.color.icon_color_default_light, GPXDataSetType.ALTITUDE, GPXDataSetType.SPEED, ItemType.ITEM_DISTANCE);
+		prepareData(analysis, items, app.getString(R.string.altitude_ascent), asc,
+				R.drawable.ic_action_arrow_up_16, R.color.gpx_chart_red, GPXDataSetType.SLOPE, null, ItemType.ITEM_ALTITUDE);
+		prepareData(analysis, items, app.getString(R.string.altitude_descent), desc,
+				R.drawable.ic_action_arrow_down_16, R.color.gpx_pale_green, GPXDataSetType.ALTITUDE, GPXDataSetType.SLOPE, ItemType.ITEM_ALTITUDE);
+		prepareData(analysis, items, app.getString(R.string.average_speed), avg,
+				R.drawable.ic_action_speed_16, R.color.icon_color_default_light, GPXDataSetType.SPEED, null, ItemType.ITEM_SPEED);
+		prepareData(analysis, items, app.getString(R.string.max_speed), max,
+				R.drawable.ic_action_max_speed_16, R.color.icon_color_default_light, GPXDataSetType.SPEED, null, ItemType.ITEM_SPEED);
+		prepareData(analysis, items, app.getString(R.string.shared_string_time_span),
+				Algorithms.formatDuration((int) (timeSpan / 1000), app.accessibilityEnabled()),
+				R.drawable.ic_action_time_span_16, R.color.icon_color_default_light, GPXDataSetType.SPEED, null, ItemType.ITEM_TIME);
+
+		if (Algorithms.isEmpty(items)) {
+			AndroidUiHelper.updateVisibility(blocksView, false);
+		} else {
+			final BlockStatisticsAdapter sbAdapter = new BlockStatisticsAdapter(items, actionsListener, activeColor, nightMode);
+			blocksView.setLayoutManager(new LinearLayoutManager(app, LinearLayoutManager.HORIZONTAL, false));
+			blocksView.setAdapter(sbAdapter);
+		}
+	}
+
+	public void prepareData(GPXTrackAnalysis analysis, List<StatBlock> listItems, String title,
+							String value, @DrawableRes int imageResId, @ColorRes int imageColorId,
+							GPXDataSetType firstType, GPXDataSetType secondType, ItemType itemType) {
+		StatBlock statBlock = new StatBlock(title, value, imageResId, imageColorId, firstType, secondType, itemType);
+		switch (statBlock.itemType) {
+			case ITEM_DISTANCE: {
+				if (analysis.totalDistance != 0f) {
+					listItems.add(statBlock);
+				}
+				break;
+			}
+			case ITEM_ALTITUDE: {
+				if (analysis.hasElevationData) {
+					listItems.add(statBlock);
+				}
+				break;
+			}
+			case ITEM_SPEED: {
+				if (analysis.isSpeedSpecified()) {
+					listItems.add(statBlock);
+				}
+				break;
+			}
+			case ITEM_TIME: {
+				if (analysis.hasSpeedData) {
+					listItems.add(statBlock);
+				}
+				break;
+			}
+		}
+	}
+
+	private void setImageDrawable(ImageView iv, @DrawableRes Integer resId, @ColorRes int color) {
+		Drawable icon = resId != null ? app.getUIUtilities().getIcon(resId, color)
+				: UiUtilities.tintDrawable(iv.getDrawable(), getResolvedColor(color));
+		iv.setImageDrawable(icon);
+	}
+
+	@ColorInt
+	protected int getResolvedColor(@ColorRes int colorId) {
+		return ContextCompat.getColor(app, colorId);
+	}
+
+	public class StatBlock {
+
+		private final String title;
+		private final String value;
+		private final int imageResId;
+		private final int imageColorId;
+		private final GPXDataSetType firstType;
+		private final GPXDataSetType secondType;
+		private final ItemType itemType;
+
+		public StatBlock(String title, String value, @DrawableRes int imageResId, @ColorRes int imageColorId,
+						 GPXDataSetType firstType, GPXDataSetType secondType, ItemType itemType) {
+			this.title = title;
+			this.value = value;
+			this.imageResId = imageResId;
+			this.imageColorId = imageColorId;
+			this.firstType = firstType;
+			this.secondType = secondType;
+			this.itemType = itemType;
+		}
+	}
+
+	public enum ItemType {
+		ITEM_DISTANCE,
+		ITEM_ALTITUDE,
+		ITEM_SPEED,
+		ITEM_TIME;
+	}
+
+	private class BlockStatisticsAdapter extends RecyclerView.Adapter<BlockStatisticsViewHolder> {
+
+		@ColorInt
+		private final int activeColor;
+		private final List<StatBlock> statBlocks;
+		private final boolean nightMode;
+		private final SegmentActionsListener actionsListener;
+
+		public BlockStatisticsAdapter(List<StatBlock> statBlocks, SegmentActionsListener actionsListener, @ColorInt int activeColor, boolean nightMode) {
+			this.statBlocks = statBlocks;
+			this.actionsListener = actionsListener;
+			this.activeColor = activeColor;
+			this.nightMode = nightMode;
+		}
+
+		@Override
+		public int getItemCount() {
+			return statBlocks.size();
+		}
+
+		@NonNull
+		@Override
+		public BlockStatisticsViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+			View itemView = LayoutInflater.from(parent.getContext())
+					.inflate(R.layout.item_gpx_stat_block, parent, false);
+			return new BlockStatisticsViewHolder(itemView);
+		}
+
+		@Override
+		public void onBindViewHolder(BlockStatisticsViewHolder holder, int position) {
+			final StatBlock item = statBlocks.get(position);
+			holder.valueText.setText(item.value);
+			holder.titleText.setText(item.title);
+			holder.valueText.setTextColor(activeColor);
+			holder.titleText.setTextColor(app.getResources().getColor(R.color.text_color_secondary_light));
+			holder.itemView.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					List<GpxDisplayGroup> groups = displayHelper.getDisplayGroups(filterTypes);
+					GpxDisplayGroup group = null;
+					for (GpxDisplayGroup g : groups) {
+						if (g.isGeneralTrack()) {
+							group = g;
+						}
+					}
+					if (group == null && !groups.isEmpty()) {
+						group = groups.get(0);
+					}
+					if (group != null) {
+						GpxDisplayItem displayItem = group.getModifiableList().get(0);
+						if (displayItem != null && displayItem.analysis != null) {
+							ArrayList<GPXDataSetType> list = new ArrayList<>();
+							if (displayItem.analysis.hasElevationData || displayItem.analysis.isSpeedSpecified() || displayItem.analysis.hasSpeedData) {
+								if (item.firstType != null) {
+									list.add(item.firstType);
+								}
+								if (item.secondType != null) {
+									list.add(item.secondType);
+								}
+							}
+							displayItem.chartTypes = list.size() > 0 ? list.toArray(new GPXDataSetType[0]) : null;
+							displayItem.locationOnMap = displayItem.locationStart;
+							actionsListener.openAnalyzeOnMap(displayItem);
+						}
+					}
+				}
+			});
+			setImageDrawable(holder.imageView, item.imageResId, item.imageColorId);
+			AndroidUtils.setBackgroundColor(app, holder.divider, nightMode, R.color.divider_color_light, R.color.divider_color_dark);
+			AndroidUiHelper.updateVisibility(holder.divider, position != statBlocks.size() - 1);
+		}
+	}
+
+	private class BlockStatisticsViewHolder extends RecyclerView.ViewHolder {
+
+		private final TextViewEx valueText;
+		private final TextView titleText;
+		private final AppCompatImageView imageView;
+		private final View divider;
+
+		public BlockStatisticsViewHolder(View view) {
+			super(view);
+			valueText = view.findViewById(R.id.value);
+			titleText = view.findViewById(R.id.title);
+			imageView = view.findViewById(R.id.image);
+			divider = view.findViewById(R.id.divider);
+		}
+	}
+}

OsmAnd/src/net/osmand/plus/track/OverviewCard.java

@@ -2,73 +2,46 @@ package net.osmand.plus.track;
 
 import android.annotation.SuppressLint;
 import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatImageView;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import net.osmand.AndroidUtils;
 import net.osmand.GPXUtilities.GPXFile;
-import net.osmand.GPXUtilities.GPXTrackAnalysis;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
-import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
-import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
-import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
-import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
 import net.osmand.plus.myplaces.SegmentActionsListener;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard;
-import net.osmand.plus.widgets.TextViewEx;
-import net.osmand.util.Algorithms;
-
-import java.util.ArrayList;
-import java.util.List;
 
 import static net.osmand.plus.myplaces.TrackActivityFragmentAdapter.isGpxFileSelected;
 import static net.osmand.plus.track.OptionsCard.APPEARANCE_BUTTON_INDEX;
 import static net.osmand.plus.track.OptionsCard.DIRECTIONS_BUTTON_INDEX;
 import static net.osmand.plus.track.OptionsCard.EDIT_BUTTON_INDEX;
 import static net.osmand.plus.track.OptionsCard.SHOW_ON_MAP_BUTTON_INDEX;
-import static net.osmand.plus.track.OverviewCard.StatBlock.ItemType.*;
 
 public class OverviewCard extends BaseCard {
 
-	private RecyclerView rvOverview;
 	private View showButton;
 	private View appearanceButton;
 	private View editButton;
 	private View directionsButton;
-
+	private final SegmentActionsListener actionsListener;
-	private final TrackDisplayHelper displayHelper;
+	private final SelectedGpxFile selectedGpxFile;
-	private final GPXFile gpxFile;
+	private final GpxBlockStatisticsBuilder blockStatisticsBuilder;
-	private final GpxDisplayItemType[] filterTypes = {GpxDisplayItemType.TRACK_SEGMENT};
-	private final SegmentActionsListener listener;
-	private boolean gpxFileSelected;
-	private GpxDisplayItem gpxItem;
 
 	public OverviewCard(@NonNull MapActivity mapActivity, @NonNull TrackDisplayHelper displayHelper,
-						@NonNull SegmentActionsListener listener) {
+						@NonNull SegmentActionsListener actionsListener, SelectedGpxFile selectedGpxFile) {
 		super(mapActivity);
-		this.displayHelper = displayHelper;
+		this.actionsListener = actionsListener;
-		this.listener = listener;
+		this.selectedGpxFile = selectedGpxFile;
-		gpxFile = displayHelper.getGpx();
+		blockStatisticsBuilder = new GpxBlockStatisticsBuilder(app, selectedGpxFile, displayHelper);
-		gpxFileSelected = isGpxFileSelected(app, gpxFile);
-		List<GpxDisplayGroup> groups = displayHelper.getOriginalGroups(filterTypes);
-		if (!Algorithms.isEmpty(groups)) {
-			gpxItem = TrackDisplayHelper.flatten(displayHelper.getOriginalGroups(filterTypes)).get(0);
-		}
 	}
 
 	@Override
@@ -80,13 +53,15 @@ public class OverviewCard extends BaseCard {
 	protected void updateContent() {
 		int iconColorDef = nightMode ? R.color.icon_color_active_dark : R.color.icon_color_active_light;
 		int iconColorPres = R.color.active_buttons_and_links_text_dark;
+		GPXFile gpxFile = getGPXFile();
 		boolean fileAvailable = gpxFile.path != null && !gpxFile.showCurrentTrack;
 
 		showButton = view.findViewById(R.id.show_button);
 		appearanceButton = view.findViewById(R.id.appearance_button);
 		editButton = view.findViewById(R.id.edit_button);
 		directionsButton = view.findViewById(R.id.directions_button);
-		rvOverview = view.findViewById(R.id.recycler_overview);
+		RecyclerView blocksView = view.findViewById(R.id.recycler_overview);
+		blockStatisticsBuilder.setBlocksView(blocksView);
 
 		initShowButton(iconColorDef, iconColorPres);
 		initAppearanceButton(iconColorDef, iconColorPres);
@@ -94,51 +69,16 @@ public class OverviewCard extends BaseCard {
 			initEditButton(iconColorDef, iconColorPres);
 			initDirectionsButton(iconColorDef, iconColorPres);
 		}
-		initStatBlocks();
+		blockStatisticsBuilder.initStatBlocks(actionsListener, getActiveColor(), nightMode);
 	}
 
-	void initStatBlocks() {
+	private GPXFile getGPXFile() {
-		if (gpxItem != null) {
+		return selectedGpxFile.getGpxFile();
-			GPXTrackAnalysis analysis = gpxItem.analysis;
-			boolean joinSegments = displayHelper.isJoinSegments();
-			float totalDistance = !joinSegments && gpxItem.isGeneralTrack() ? analysis.totalDistanceWithoutGaps : analysis.totalDistance;
-			float timeSpan = !joinSegments && gpxItem.isGeneralTrack() ? analysis.timeSpanWithoutGaps : analysis.timeSpan;
-			String asc = OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app);
-			String desc = OsmAndFormatter.getFormattedAlt(analysis.diffElevationDown, app);
-			String avg = OsmAndFormatter.getFormattedSpeed(analysis.avgSpeed, app);
-			String max = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app);
-			List<StatBlock> items = new ArrayList<>();
-
-			StatBlock.prepareData(analysis, items, app.getString(R.string.distance), OsmAndFormatter.getFormattedDistance(totalDistance, app),
-					R.drawable.ic_action_track_16, R.color.icon_color_default_light, GPXDataSetType.ALTITUDE, GPXDataSetType.SPEED, ITEM_DISTANCE);
-			StatBlock.prepareData(analysis, items, app.getString(R.string.altitude_ascent), asc,
-					R.drawable.ic_action_arrow_up_16, R.color.gpx_chart_red, GPXDataSetType.SLOPE, null, ITEM_ALTITUDE);
-			StatBlock.prepareData(analysis, items, app.getString(R.string.altitude_descent), desc,
-					R.drawable.ic_action_arrow_down_16, R.color.gpx_pale_green, GPXDataSetType.ALTITUDE, GPXDataSetType.SLOPE, ITEM_ALTITUDE);
-			StatBlock.prepareData(analysis, items, app.getString(R.string.average_speed), avg,
-					R.drawable.ic_action_speed_16, R.color.icon_color_default_light, GPXDataSetType.SPEED, null, ITEM_SPEED);
-			StatBlock.prepareData(analysis, items, app.getString(R.string.max_speed), max,
-					R.drawable.ic_action_max_speed_16, R.color.icon_color_default_light, GPXDataSetType.SPEED, null, ITEM_SPEED);
-			StatBlock.prepareData(analysis, items, app.getString(R.string.shared_string_time_span),
-					Algorithms.formatDuration((int) (timeSpan / 1000), app.accessibilityEnabled()),
-					R.drawable.ic_action_time_span_16, R.color.icon_color_default_light, GPXDataSetType.SPEED, null, ITEM_TIME);
-
-			if (Algorithms.isEmpty(items)) {
-				AndroidUiHelper.updateVisibility(rvOverview, false);
-			} else {
-				final StatBlockAdapter sbAdapter = new StatBlockAdapter(items);
-				rvOverview.setLayoutManager(new LinearLayoutManager(app, LinearLayoutManager.HORIZONTAL, false));
-				rvOverview.setAdapter(sbAdapter);
-			}
-		} else {
-			AndroidUiHelper.updateVisibility(rvOverview, false);
-		}
 	}
 
 	@DrawableRes
 	private int getActiveShowHideIcon() {
-		gpxFileSelected = isGpxFileSelected(app, gpxFile);
+		return isGpxFileSelected(app, getGPXFile()) ? R.drawable.ic_action_view : R.drawable.ic_action_hide;
-		return gpxFileSelected ? R.drawable.ic_action_view : R.drawable.ic_action_hide;
 	}
 
 	private void initShowButton(final int iconColorDef, final int iconColorPres) {
@@ -207,135 +147,4 @@ public class OverviewCard extends BaseCard {
 			}
 		});
 	}
-
-	private class StatBlockAdapter extends RecyclerView.Adapter<StatBlockViewHolder> {
-
-		private final List<StatBlock> statBlocks;
-
-		public StatBlockAdapter(List<StatBlock> StatBlocks) {
-			this.statBlocks = StatBlocks;
-		}
-
-		@Override
-		public int getItemCount() {
-			return statBlocks.size();
-		}
-
-		@NonNull
-		@Override
-		public StatBlockViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-			View itemView = LayoutInflater.from(parent.getContext())
-					.inflate(R.layout.item_gpx_stat_block, parent, false);
-			return new StatBlockViewHolder(itemView);
-		}
-
-		@Override
-		public void onBindViewHolder(StatBlockViewHolder holder, int position) {
-			final StatBlock item = statBlocks.get(position);
-			holder.valueText.setText(item.value);
-			holder.titleText.setText(item.title);
-			holder.valueText.setTextColor(getActiveColor());
-			holder.titleText.setTextColor(app.getResources().getColor(R.color.text_color_secondary_light));
-			holder.itemView.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (gpxItem != null && gpxItem.analysis != null) {
-						ArrayList<GPXDataSetType> list = new ArrayList<>();
-						if (gpxItem.analysis.hasElevationData || gpxItem.analysis.isSpeedSpecified() || gpxItem.analysis.hasSpeedData) {
-							if (item.firstType != null) {
-								list.add(item.firstType);
-							}
-							if (item.secondType != null) {
-								list.add(item.secondType);
-							}
-						}
-						gpxItem.chartTypes = list.size() > 0 ? list.toArray(new GPXDataSetType[0]) : null;
-						gpxItem.locationOnMap = gpxItem.locationStart;
-
-						listener.openAnalyzeOnMap(gpxItem);
-					}
-				}
-			});
-			setImageDrawable(holder.imageView, item.imageResId, item.imageColorId);
-			AndroidUtils.setBackgroundColor(view.getContext(), holder.divider, nightMode, R.color.divider_color_light, R.color.divider_color_dark);
-			AndroidUiHelper.updateVisibility(holder.divider, position != statBlocks.size() - 1);
-		}
-	}
-
-	private static class StatBlockViewHolder extends RecyclerView.ViewHolder {
-
-		private final TextViewEx valueText;
-		private final TextView titleText;
-		private final AppCompatImageView imageView;
-		private final View divider;
-
-		StatBlockViewHolder(View view) {
-			super(view);
-			valueText = view.findViewById(R.id.value);
-			titleText = view.findViewById(R.id.title);
-			imageView = view.findViewById(R.id.image);
-			divider = view.findViewById(R.id.divider);
-		}
-	}
-
-	protected static class StatBlock {
-
-		private final String title;
-		private final String value;
-		private final int imageResId;
-		private final int imageColorId;
-		private final GPXDataSetType firstType;
-		private final GPXDataSetType secondType;
-		private final ItemType itemType;
-
-		public StatBlock(String title, String value, @DrawableRes int imageResId, @ColorRes int imageColorId,
-						 GPXDataSetType firstType, GPXDataSetType secondType, ItemType itemType) {
-			this.title = title;
-			this.value = value;
-			this.imageResId = imageResId;
-			this.imageColorId = imageColorId;
-			this.firstType = firstType;
-			this.secondType = secondType;
-			this.itemType = itemType;
-		}
-
-		public static void prepareData(GPXTrackAnalysis analysis, List<StatBlock> listItems, String title,
-									   String value, @DrawableRes int imageResId, @ColorRes int imageColorId,
-									   GPXDataSetType firstType, GPXDataSetType secondType, ItemType itemType) {
-			StatBlock statBlock = new StatBlock(title, value, imageResId, imageColorId, firstType, secondType, itemType);
-			switch (statBlock.itemType) {
-				case ITEM_DISTANCE: {
-					if (analysis.totalDistance != 0f) {
-						listItems.add(statBlock);
-					}
-					break;
-				}
-				case ITEM_ALTITUDE: {
-					if (analysis.hasElevationData) {
-						listItems.add(statBlock);
-					}
-					break;
-				}
-				case ITEM_SPEED: {
-					if (analysis.isSpeedSpecified()) {
-						listItems.add(statBlock);
-					}
-					break;
-				}
-				case ITEM_TIME: {
-					if (analysis.hasSpeedData) {
-						listItems.add(statBlock);
-					}
-					break;
-				}
-			}
-		}
-
-		public enum ItemType {
-			ITEM_DISTANCE,
-			ITEM_ALTITUDE,
-			ITEM_SPEED,
-			ITEM_TIME;
-		}
-	}
 }

OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java

@@ -312,7 +312,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 				}
 				headerContainer.addView(overviewCard.getView());
 			} else {
-				overviewCard = new OverviewCard(getMapActivity(), displayHelper, this);
+				overviewCard = new OverviewCard(getMapActivity(), displayHelper, this, selectedGpxFile);
 				overviewCard.setListener(this);
 				headerContainer.addView(overviewCard.build(getMapActivity()));
 			}
@@ -897,6 +897,9 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 
 	@Override
 	public void updateContent() {
+		if (overviewCard != null) {
+			overviewCard.updateContent();
+		}
 		if (segmentsCard != null) {
 			segmentsCard.updateContent();
 		}