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

Fix crash at gpx track view

Browse source
This commit is contained in:
Alexey Kulish 2017-03-05 12:42:16 +03:00
parent 71245cfacf
commit 2aa3a7eaa7
3 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/activities/TrackActivity.java
View file

@ -1,6 +1,3 @@
/**
*
*/
package net.osmand.plus.activities;
import android.content.Intent;

8
OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
View file

@ -54,7 +54,6 @@ import net.osmand.plus.activities.TrackActivity;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.base.OsmandExpandableListFragment;
import net.osmand.plus.dialogs.DirectionsDialogs;
import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
import net.osmand.util.Algorithms;
import java.io.File;
@ -141,7 +140,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
}
private void setupListView(ListView listView) {
if (!adapter.isEmpty()) {
if (!adapter.isEmpty() && listView.getHeaderViewsCount() == 0) {
listView.addHeaderView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_header, null, false));
listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
}
@ -187,12 +186,15 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
public void setContent() {
setContent(listView);
expandAllGroups();
}
public void setContent(ExpandableListView listView) {
adapter.synchronizeGroups(filterGroups());
setupListView(listView);
listView.setAdapter(adapter);
if (listView.getAdapter() == null) {
listView.setAdapter(adapter);
}
}
protected List<GpxDisplayItem> flatten(List<GpxDisplayGroup> groups) {

48
OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
View file

@ -41,6 +41,7 @@ import net.osmand.AndroidUtils;
import net.osmand.data.PointDescription;
import net.osmand.plus.GPXDatabase;
import net.osmand.plus.GPXUtilities;
import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.GPXUtilities.GPXTrackAnalysis;
import net.osmand.plus.GpxSelectionHelper;
import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
@ -87,7 +88,8 @@ public class TrackSegmentFragment extends OsmAndListFragment {
public static final String ARG_TO_FILTER_SHORT_TRACKS = "ARG_TO_FILTER_SHORT_TRACKS";
private OsmandApplication app;
private ArrayAdapter<GpxDisplayItem> adapter;
private SegmentGPXAdapter adapter;
private View headerView;
private GpxDisplayItemType[] filterTypes = { GpxSelectionHelper.GpxDisplayItemType.TRACK_SEGMENT };
private List<String> options = new ArrayList<>();
@ -160,7 +162,7 @@ public class TrackSegmentFragment extends OsmAndListFragment {
}
}
private GPXUtilities.GPXFile getGpx() {
private GPXFile getGpx() {
return getMyActivity().getGpx();
}
@ -199,16 +201,18 @@ public class TrackSegmentFragment extends OsmAndListFragment {
}
private void setupListView(ListView listView) {
View view = getActivity().getLayoutInflater().inflate(R.layout.gpx_item_list_header, null, false);
listView.addHeaderView(view);
listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
final ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
final View splitColorView = view.findViewById(R.id.split_color_view);
final View divider = view.findViewById(R.id.divider);
final View splitIntervalView = view.findViewById(R.id.split_interval_view);
final View colorView = view.findViewById(R.id.color_view);
final SwitchCompat vis = (SwitchCompat) view.findViewById(R.id.showOnMapToggle);
vis.setChecked(app.getSelectedGpxHelper().getSelectedFileByPath(getGpx().path) != null);
if (headerView == null) {
headerView = getActivity().getLayoutInflater().inflate(R.layout.gpx_item_list_header, null, false);
listView.addHeaderView(headerView);
listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
}
final ImageView imageView = (ImageView) headerView.findViewById(R.id.imageView);
final View splitColorView = headerView.findViewById(R.id.split_color_view);
final View divider = headerView.findViewById(R.id.divider);
final View splitIntervalView = headerView.findViewById(R.id.split_interval_view);
final View colorView = headerView.findViewById(R.id.color_view);
final SwitchCompat vis = (SwitchCompat) headerView.findViewById(R.id.showOnMapToggle);
vis.setChecked(getGpx() != null && app.getSelectedGpxHelper().getSelectedFileByPath(getGpx().path) != null);
vis.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@ -322,6 +326,8 @@ public class TrackSegmentFragment extends OsmAndListFragment {
popup.show();
}
});
splitColorView.setVisibility(View.VISIBLE);
divider.setVisibility(View.VISIBLE);
} else {
splitColorView.setVisibility(View.GONE);
divider.setVisibility(View.GONE);
@ -366,8 +372,8 @@ public class TrackSegmentFragment extends OsmAndListFragment {
private void updateColorView(View colorView) {
final ImageView colorImageView = (ImageView) colorView.findViewById(R.id.colorImage);
int color = getGpxDataItem().getColor();
if (color == 0) {
int color = getGpxDataItem() != null ? getGpxDataItem().getColor() : 0;
if (color == 0 && getGpx() != null) {
color = getGpx().getColor(0);
}
if (color == 0) {
@ -426,10 +432,16 @@ public class TrackSegmentFragment extends OsmAndListFragment {
}
public void setContent(ListView listView) {
adapter = new SegmentGPXAdapter(new ArrayList<GpxDisplayItem>());
if (adapter == null) {
adapter = new SegmentGPXAdapter(new ArrayList<GpxDisplayItem>());
} else {
adapter.clear();
}
updateContent();
setupListView(listView);
setListAdapter(adapter);
if (listView.getAdapter() == null) {
setListAdapter(adapter);
}
}
protected void updateContent() {
@ -601,13 +613,13 @@ public class TrackSegmentFragment extends OsmAndListFragment {
}
}
enum GPXTabItemType {
private enum GPXTabItemType {
GPX_TAB_ITEM_GENERAL,
GPX_TAB_ITEM_ALTITUDE,
GPX_TAB_ITEM_SPEED
}
class GPXItemPagerAdapter extends PagerAdapter implements CustomTabProvider, ViewAtPositionInterface {
private class GPXItemPagerAdapter extends PagerAdapter implements CustomTabProvider, ViewAtPositionInterface {
protected SparseArray<View> views = new SparseArray<>();
private PagerSlidingTabStrip tabs;