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

Try to keep list scroll

Browse source
This commit is contained in:
Victor Shcherb 2015-08-03 23:11:01 +02:00
parent 6231f0c1ed
commit 533ca31762
1 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
View file

@ -24,7 +24,6 @@ import android.widget.CheckBox;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.access.AccessibleToast; import net.osmand.access.AccessibleToast;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -55,7 +54,7 @@ import java.util.List;
*/ */
public class OsmEditsFragment extends OsmAndListFragment { public class OsmEditsFragment extends OsmAndListFragment {
OsmEditingPlugin plugin; OsmEditingPlugin plugin;
private ArrayList<OsmPoint> dataPoints;
private OsmEditsAdapter listAdapter; private OsmEditsAdapter listAdapter;
private boolean selectionMode = false; private boolean selectionMode = false;
@ -139,7 +138,8 @@ public class OsmEditsFragment extends OsmAndListFragment {
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
new BackupOpenstreetmapPointAsyncTask().execute(dataPoints.toArray(new OsmPoint[0])); new BackupOpenstreetmapPointAsyncTask().execute(
listAdapter.dataPoints.toArray(new OsmPoint[0]));
return true; return true;
} }
}); });
@ -319,22 +319,26 @@ public class OsmEditsFragment extends OsmAndListFragment {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
dataPoints = new ArrayList<>(); ArrayList<OsmPoint> dataPoints = new ArrayList<>();
List<OpenstreetmapPoint> l1 = plugin.getDBPOI().getOpenstreetmapPoints(); List<OpenstreetmapPoint> l1 = plugin.getDBPOI().getOpenstreetmapPoints();
List<OsmNotesPoint> l2 = plugin.getDBBug().getOsmbugsPoints(); List<OsmNotesPoint> l2 = plugin.getDBBug().getOsmbugsPoints();
dataPoints.addAll(l1); dataPoints.addAll(l1);
dataPoints.addAll(l2); dataPoints.addAll(l2);
listAdapter = new OsmEditsAdapter(dataPoints); if (listAdapter == null) {
getListView().setAdapter(listAdapter); listAdapter = new OsmEditsAdapter(dataPoints);
getListView().setOnItemClickListener(new OnItemClickListener() { getListView().setAdapter(listAdapter);
getListView().setOnItemClickListener(new OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
OsmPoint it = listAdapter.getItem(position); OsmPoint it = listAdapter.getItem(position);
openPopUpMenu(view, it); openPopUpMenu(view, it);
} }
}); });
} else {
listAdapter.setNewList(dataPoints);
}
} }
@ -362,10 +366,27 @@ public class OsmEditsFragment extends OsmAndListFragment {
} }
protected class OsmEditsAdapter extends ArrayAdapter<OsmPoint> { protected class OsmEditsAdapter extends ArrayAdapter<OsmPoint> {
private List<OsmPoint> dataPoints;
public OsmEditsAdapter(List<OsmPoint> points) { public OsmEditsAdapter(List<OsmPoint> points) {
super(getActivity(), net.osmand.plus.R.layout.note, points); super(getActivity(), net.osmand.plus.R.layout.note, points);
} }
public void setNewList(List<OsmPoint> dp) {
dataPoints = dp;
setNotifyOnChange(false);
clear();
for(OsmPoint pnt : dp) {
add(pnt);
}
setNotifyOnChange(true);
notifyDataSetChanged();
}
public List<OsmPoint> getDataPoints() {
return dataPoints;
}
public void delete(OsmPoint i) { public void delete(OsmPoint i) {
dataPoints.remove(i); dataPoints.remove(i);