deleted unused file
This commit is contained in:
unknown
parent
d4c626d24a
commit
521e69d5bb
1 changed files with 0 additions and 326 deletions
|
|
@ -1,326 +0,0 @@
|
||||||
package net.osmand.plus.routepointsnavigation;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.osmand.CallbackWithObject;
|
|
||||||
import net.osmand.data.LatLon;
|
|
||||||
import net.osmand.plus.GPXUtilities;
|
|
||||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
|
||||||
import net.osmand.plus.OsmandApplication;
|
|
||||||
import net.osmand.plus.OsmandPlugin;
|
|
||||||
import net.osmand.plus.R;
|
|
||||||
import net.osmand.plus.activities.MapActivity;
|
|
||||||
import net.osmand.plus.activities.OsmandListActivity;
|
|
||||||
import net.osmand.plus.helpers.GpxUiHelper;
|
|
||||||
import net.osmand.plus.routepointsnavigation.RoutePointsPlugin.RoutePoint;
|
|
||||||
import net.osmand.plus.routepointsnavigation.RoutePointsPlugin.SelectedRouteGpxFile;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.os.AsyncTask;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.text.SpannableString;
|
|
||||||
import android.text.method.LinkMovementMethod;
|
|
||||||
import android.text.style.ClickableSpan;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.ListView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import com.actionbarsherlock.view.ActionMode;
|
|
||||||
import com.actionbarsherlock.view.Menu;
|
|
||||||
import com.actionbarsherlock.view.MenuItem;
|
|
||||||
import com.actionbarsherlock.view.Window;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by Bars on 13.06.2014.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class RoutePointsActivity extends OsmandListActivity {
|
|
||||||
|
|
||||||
private static final int NAVIGATE_DIALOG_ID = 4;
|
|
||||||
private static final int OK_ID = 5;
|
|
||||||
protected static final int MARK_AS_CURRENT_ID = 6;
|
|
||||||
protected static final int AS_VISITED_ID = 7;
|
|
||||||
protected static final int POI_ON_MAP_ID = 8;
|
|
||||||
private RoutePointsPlugin plugin;
|
|
||||||
private OsmandApplication app;
|
|
||||||
|
|
||||||
private RoutePoint selectedItem;
|
|
||||||
private PointItemAdapter adapter;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
this.app = (OsmandApplication) getApplication();
|
|
||||||
plugin = OsmandPlugin.getEnabledPlugin(RoutePointsPlugin.class);
|
|
||||||
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setSupportProgressBarIndeterminateVisibility(false);
|
|
||||||
getSupportActionBar().setTitle(R.string.route_points_activity);
|
|
||||||
super.setContentView(R.layout.route_steps_main);
|
|
||||||
if (plugin.getCurrentRoute() == null) {
|
|
||||||
selectGPX();
|
|
||||||
} else {
|
|
||||||
prepareView();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void selectGPX() {
|
|
||||||
GpxUiHelper.selectGPXFile(this, false, false, new CallbackWithObject<GPXUtilities.GPXFile[]>() {
|
|
||||||
@Override
|
|
||||||
public boolean processResult(GPXUtilities.GPXFile[] result) {
|
|
||||||
final GPXFile gpx = result[0];
|
|
||||||
app.getSelectedGpxHelper().clearAllGpxFileToShow();
|
|
||||||
app.getSelectedGpxHelper().setGpxFileToDisplay(gpx);
|
|
||||||
plugin.setCurrentRoute(gpx);
|
|
||||||
SelectedRouteGpxFile sgpx = plugin.getCurrentRoute();
|
|
||||||
if (!sgpx.getCurrentPoints().isEmpty() &&
|
|
||||||
!sgpx.getCurrentPoints().get(0).isNextNavigate){
|
|
||||||
sgpx.naviateToNextPoint();
|
|
||||||
}
|
|
||||||
prepareView();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
if(plugin.getCurrentRoute() != null) {
|
|
||||||
plugin.getCurrentRoute().updateCurrentTargetPoint();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void prepareView() {
|
|
||||||
TextView gpxName = (TextView) findViewById(R.id.gpx_name);
|
|
||||||
SelectedRouteGpxFile route = plugin.getCurrentRoute();
|
|
||||||
String fileName;
|
|
||||||
if(route != null) {
|
|
||||||
fileName = getString(R.string.rp_current_route) + " " + route.getName();
|
|
||||||
} else {
|
|
||||||
fileName = getString(R.string.rp_current_route_not_available);
|
|
||||||
}
|
|
||||||
SpannableString content = new SpannableString(fileName);
|
|
||||||
content.setSpan(new ClickableSpan() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(View widget) {
|
|
||||||
selectGPX();
|
|
||||||
}
|
|
||||||
}, 0, content.length(), 0);
|
|
||||||
gpxName.setText(content);
|
|
||||||
gpxName.setMovementMethod(LinkMovementMethod.getInstance());
|
|
||||||
|
|
||||||
TextView visited = (TextView) findViewById(R.id.points_count);
|
|
||||||
visited.setText("(" + plugin.getVisitedAllString() + ")");
|
|
||||||
|
|
||||||
adapter = new PointItemAdapter(this, R.layout.route_point_info,
|
|
||||||
route == null ? new ArrayList<RoutePoint>() :
|
|
||||||
route.getCurrentPoints());
|
|
||||||
ListView listView = getListView();
|
|
||||||
listView.setAdapter(adapter);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onListItemClick(ListView l, View v, int position, long id) {
|
|
||||||
super.onListItemClick(l, v, position, id);
|
|
||||||
RoutePoint rp = adapter.getItem(position);
|
|
||||||
getSherlock().startActionMode(getPointActionModeCallback(rp));
|
|
||||||
adapter.notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
private class PointItemAdapter extends ArrayAdapter<RoutePoint> {
|
|
||||||
|
|
||||||
public PointItemAdapter(Context context, int textViewResourceId, List<RoutePoint> pointsList) {
|
|
||||||
super(context, textViewResourceId, pointsList);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class ViewHolder {
|
|
||||||
ImageView image;
|
|
||||||
TextView name;
|
|
||||||
TextView dateOrDistance;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View getView(final int position, View convertView, ViewGroup parent) {
|
|
||||||
ViewHolder holder = null;
|
|
||||||
if (convertView == null) {
|
|
||||||
LayoutInflater vi = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
|
||||||
convertView = vi.inflate(R.layout.route_point_info, null);
|
|
||||||
|
|
||||||
holder = new ViewHolder();
|
|
||||||
holder.dateOrDistance = (TextView) convertView.findViewById(R.id.date_or_distance);
|
|
||||||
holder.name = (TextView) convertView.findViewById(R.id.name);
|
|
||||||
holder.image = (ImageView) convertView.findViewById(R.id.point_icon);
|
|
||||||
convertView.setTag(holder);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
holder = (ViewHolder) convertView.getTag();
|
|
||||||
}
|
|
||||||
|
|
||||||
RoutePoint point = getItem(position);
|
|
||||||
holder.name.setText(point.getName());
|
|
||||||
if (selectedItem == point) {
|
|
||||||
convertView.setBackgroundColor(getResources().getColor(R.color.row_selection_color));
|
|
||||||
} else {
|
|
||||||
convertView.setBackgroundColor(Color.TRANSPARENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (point.isVisited()) {
|
|
||||||
holder.image.setImageResource(R.drawable.ic_action_ok_dark);
|
|
||||||
holder.name.setTextColor(getResources().getColor(R.color.osmbug_closed));
|
|
||||||
holder.dateOrDistance.setTextColor(getResources().getColor(R.color.color_unknown));
|
|
||||||
holder.dateOrDistance.setText(point.getTime());
|
|
||||||
} else {
|
|
||||||
if (point.isNextNavigate()) {
|
|
||||||
holder.image.setImageResource(R.drawable.ic_action_signpost_dark);
|
|
||||||
} else {
|
|
||||||
holder.image.setImageResource(R.drawable.ic_action_marker_dark);
|
|
||||||
}
|
|
||||||
if(position > 0) {
|
|
||||||
holder.dateOrDistance.setText(point.getDistance(getItem(position - 1)));
|
|
||||||
} else {
|
|
||||||
holder.dateOrDistance.setText("");
|
|
||||||
}
|
|
||||||
holder.name.setTextColor(getResources().getColor(R.color.color_update));
|
|
||||||
holder.dateOrDistance.setTextColor(getResources().getColor(R.color.color_distance));
|
|
||||||
}
|
|
||||||
return convertView;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void saveGPXAsync() {
|
|
||||||
new AsyncTask<SelectedRouteGpxFile, Void, Void>() {
|
|
||||||
protected void onPreExecute() {
|
|
||||||
getSherlock().setProgressBarIndeterminateVisibility(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Void doInBackground(SelectedRouteGpxFile... params) {
|
|
||||||
if(plugin.getCurrentRoute() != null) {
|
|
||||||
plugin.getCurrentRoute().saveFile();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void onPostExecute(Void result) {
|
|
||||||
getSherlock().setProgressBarIndeterminateVisibility(false);
|
|
||||||
|
|
||||||
}
|
|
||||||
}.execute(plugin.getCurrentRoute());
|
|
||||||
}
|
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
private ActionMode.Callback mGpxActionModeCallback = new ActionMode.Callback() {
|
|
||||||
@Override
|
|
||||||
public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
|
|
||||||
createMenuItem(menu, GPX_SELECT_ID, R.string.select_gpx, R.drawable.ic_action_layers_light, R.drawable.ic_action_layers_dark,
|
|
||||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
|
|
||||||
if (menuItem.getItemId() == GPX_SELECT_ID) {
|
|
||||||
selectGPX();
|
|
||||||
}
|
|
||||||
actionMode.finish();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroyActionMode(ActionMode actionMode) {
|
|
||||||
adapter.notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
>>>>>>> Fixed issue with selection in LIstView
|
|
||||||
|
|
||||||
private ActionMode.Callback getPointActionModeCallback(final RoutePoint rp) {
|
|
||||||
return new ActionMode.Callback() {
|
|
||||||
@Override
|
|
||||||
public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
|
|
||||||
selectedItem = rp;
|
|
||||||
createMenuItem(menu, MARK_AS_CURRENT_ID, R.string.mark_as_current, R.drawable.ic_action_signpost_light, R.drawable.ic_action_signpost_dark,
|
|
||||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
|
||||||
createMenuItem(menu, AS_VISITED_ID, !rp.isVisited() ?
|
|
||||||
R.string.mark_as_visited : R.string.mark_as_not_visited, R.drawable.ic_action_ok_light, R.drawable.ic_action_ok_dark,
|
|
||||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
|
||||||
createMenuItem(menu, POI_ON_MAP_ID, R.string.show_poi_on_map, R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark,
|
|
||||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onPrepareActionMode(ActionMode actionMode, Menu menu) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
|
|
||||||
if (menuItem.getItemId() == MARK_AS_CURRENT_ID) {
|
|
||||||
plugin.getCurrentRoute().navigateToPoint(rp);
|
|
||||||
saveGPXAsync();
|
|
||||||
prepareView();
|
|
||||||
} else if (menuItem.getItemId() == POI_ON_MAP_ID) {
|
|
||||||
LatLon point = rp.getPoint();
|
|
||||||
app.getSettings().setMapLocationToShow(point.getLatitude(), point.getLongitude(),
|
|
||||||
app.getSettings().getMapZoomToShow());
|
|
||||||
finish();
|
|
||||||
} else if (menuItem.getItemId() == AS_VISITED_ID) {
|
|
||||||
// inverts selection state of item
|
|
||||||
plugin.getCurrentRoute().markPoint(rp, !rp.isVisited());
|
|
||||||
saveGPXAsync();
|
|
||||||
prepareView();
|
|
||||||
}
|
|
||||||
actionMode.finish();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroyActionMode(ActionMode actionMode) {
|
|
||||||
selectedItem = null;
|
|
||||||
adapter.notifyDataSetChanged();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu) {
|
|
||||||
createMenuItem(menu, OK_ID, R.string.default_buttons_ok,
|
|
||||||
R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark ,
|
|
||||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
|
||||||
createMenuItem(menu, NAVIGATE_DIALOG_ID, R.string.navigate_dialog,
|
|
||||||
R.drawable.ic_action_gdirections_light, R.drawable.ic_action_gdirections_dark,
|
|
||||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
|
||||||
return super.onCreateOptionsMenu(menu);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
|
|
||||||
if (item.getItemId() == OK_ID) {
|
|
||||||
finish();
|
|
||||||
return true;
|
|
||||||
} else if (item.getItemId() == NAVIGATE_DIALOG_ID){
|
|
||||||
app.getSettings().navigateDialog();
|
|
||||||
MapActivity.launchMapActivityMoveToTop(getMyApplication());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue