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

Convert Markers to dashboard. Add sorting

Browse source
This commit is contained in:
Alexey Kulish 2016-02-08 20:15:17 +03:00
parent 1456b5e328
commit ac4d6b16a4
8 changed files with 229 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/AndroidManifest.xml
View file

@ -166,7 +166,6 @@
<activity android:name="net.osmand.plus.activities.PluginsActivity" />
<activity android:name="net.osmand.plus.activities.PluginActivity" />
<activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
<activity android:name="net.osmand.plus.activities.MapMarkersActivity"/>
<activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation" />

1
OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
View file

@ -30,6 +30,7 @@ public class MapMarkersHelper {
public int colorIndex;
public int index;
public boolean history;
public int dist;
public MapMarker(LatLon point, PointDescription name, int colorIndex, int index) {
this.point = point;

16
OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
View file

@ -1,15 +1,11 @@
package net.osmand.plus;
import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import android.app.Activity;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.data.LocationPoint;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.MapMarkersActivity;
import net.osmand.plus.activities.PluginsActivity;
import net.osmand.plus.activities.SettingsActivity;
import net.osmand.plus.activities.TrackActivity;
@ -20,7 +16,11 @@ import net.osmand.plus.helpers.WaypointHelper;
import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.routing.RouteCalculationResult;
import net.osmand.plus.views.OsmandMapTileView;
import android.app.Activity;
import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Map;
public class OsmAndAppCustomization {
@ -68,10 +68,6 @@ public class OsmAndAppCustomization {
return FavoritesActivity.class;
}
public Class<MapMarkersActivity> getMapMarkersActivity(){
return MapMarkersActivity.class;
}
public Class<? extends Activity> getDownloadIndexActivity() {
return DownloadActivity.class;
}

11
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -577,8 +577,8 @@ public class MapActivityActions implements DialogProvider {
@Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
MapActivity.clearPrevActivityIntent();
openMapMarkersActivity();
return true;
mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.MAP_MARKERS);
return false;
}
}).reg();
optionsMenuHelper.item(R.string.get_directions).iconColor(R.drawable.ic_action_gdirections_dark)
@ -746,13 +746,6 @@ public class MapActivityActions implements DialogProvider {
return optionsMenuHelper;
}
public void openMapMarkersActivity() {
Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization()
.getMapMarkersActivity());
newIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
mapActivity.startActivity(newIntent);
}
public void openIntermediatePointsDialog() {
mapActivity.getDashboard().setDashboardVisibility(true, DashboardType.WAYPOINTS);
}

124
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -41,6 +41,8 @@ import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
import net.osmand.plus.IconsCache;
import net.osmand.plus.MapMarkersHelper;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
@ -54,6 +56,7 @@ import net.osmand.plus.dialogs.ConfigureMapMenu;
import net.osmand.plus.dialogs.RasterMapMenu;
import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.MapMarkerDialogHelper;
import net.osmand.plus.helpers.WaypointDialogHelper;
import net.osmand.plus.helpers.WaypointDialogHelper.WaypointDialogHelperCallbacks;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
@ -68,6 +71,7 @@ import net.osmand.plus.views.controls.DynamicListView;
import net.osmand.plus.views.controls.DynamicListViewCallbacks;
import net.osmand.plus.views.controls.StableArrayAdapter;
import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener;
import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener.DismissCallbacks;
import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener.Undoable;
import java.lang.ref.WeakReference;
@ -141,6 +145,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
int baseColor;
private WaypointDialogHelper waypointDialogHelper;
private MapMarkerDialogHelper mapMarkerDialogHelper;
private final int[] running = new int[]{-1};
private List<LocationPointWrapper> deletedPoints = new ArrayList<>();
private Drawable gradientToolbar;
@ -159,7 +164,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
ROUTE_PREFERENCES,
DASHBOARD,
OVERLAY_MAP,
UNDERLAY_MAP
UNDERLAY_MAP,
MAP_MARKERS
}
private Map<DashboardActionButtonType, DashboardActionButton> actionButtons = new HashMap<>();
@ -184,6 +190,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
baseColor = mapActivity.getResources().getColor(R.color.osmand_orange) & 0x00ffffff;
waypointDialogHelper = new WaypointDialogHelper(mapActivity);
waypointDialogHelper.setWaypointDialogHelperCallbacks(this);
mapMarkerDialogHelper = new MapMarkerDialogHelper(mapActivity);
landscape = !AndroidUiHelper.isOrientationPortrait(mapActivity);
dashboardView = (FrameLayout) mapActivity.findViewById(R.id.dashboard);
final View.OnClickListener listener = new View.OnClickListener() {
@ -204,11 +211,14 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
// the pressed state (the list selector), handling list item clicks, etc.
swipeDismissListener = new SwipeDismissListViewTouchListener(
listView,
new SwipeDismissListViewTouchListener.DismissCallbacks() {
new DismissCallbacks() {
private List<Object> deletedMarkers = new ArrayList<>();
@Override
public boolean canDismiss(int position) {
boolean res = false;
if (visibleType == DashboardType.WAYPOINTS && listAdapter instanceof StableArrayAdapter) {
if (listAdapter instanceof StableArrayAdapter) {
List<Object> activeObjects = ((StableArrayAdapter) listAdapter).getActiveObjects();
Object obj = listAdapter.getItem(position);
res = activeObjects.contains(obj);
@ -225,6 +235,12 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
stableAdapter = (StableArrayAdapter) listAdapter;
item = stableAdapter.getItem(position);
if (visibleType == DashboardType.MAP_MARKERS) {
if (!((MapMarker) item).history) {
deletedMarkers.add(item);
}
}
stableAdapter.setNotifyOnChange(false);
stableAdapter.remove(item);
stableAdapter.getObjects().remove(item);
@ -247,13 +263,19 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
stableAdapter.getObjects().add(position, item);
stableAdapter.getActiveObjects().add(activeObjPos, item);
stableAdapter.refreshData();
onItemsSwapped(stableAdapter.getActiveObjects());
if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
onItemsSwapped(stableAdapter.getActiveObjects());
} else if (visibleType == DashboardType.MAP_MARKERS) {
deletedMarkers.remove(item);
updateMapMarkers(stableAdapter.getActiveObjects());
reloadAdapter();
}
}
}
@Override
public String getTitle() {
if (visibleType == DashboardType.WAYPOINTS
if ((visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT)
&& (getMyApplication().getRoutingHelper().isRoutePlanningMode() || getMyApplication().getRoutingHelper().isFollowingMode())
&& item != null
&& stableAdapter.getActiveObjects().size() == 0) {
@ -270,14 +292,45 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
if (listAdapter instanceof StableArrayAdapter) {
StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
stableAdapter.refreshData();
onItemsSwapped(stableAdapter.getActiveObjects());
if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
onItemsSwapped(stableAdapter.getActiveObjects());
} else if (visibleType == DashboardType.MAP_MARKERS) {
updateMapMarkers(stableAdapter.getActiveObjects());
}
if (stableAdapter.getActiveObjects().size() == 0) {
hideDashboard();
mapActivity.getMapActions().stopNavigationWithoutConfirm();
mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
mapActivity.getMapActions().stopNavigationWithoutConfirm();
mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
}
} else {
if (visibleType == DashboardType.MAP_MARKERS) {
reloadAdapter();
}
}
}
}
private void updateMapMarkers(List<Object> objects) {
List<MapMarker> markers = new ArrayList<>();
List<MapMarker> markersHistory = new ArrayList<>();
for (Object obj : objects) {
MapMarker marker = (MapMarker) obj;
if (!marker.history) {
markers.add(marker);
} else {
markersHistory.add(marker);
}
}
for (int i = deletedMarkers.size() - 1; i >= 0; i--) {
markersHistory.add(0, (MapMarker) deletedMarkers.get(i));
}
deletedMarkers.clear();
getMyApplication().getMapMarkersHelper().saveMapMarkers(markers, markersHistory);
}
});
gradientToolbar = mapActivity.getResources().getDrawable(R.drawable.gradient_toolbar).mutate();
@ -358,6 +411,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
tv.setText(R.string.map_underlay);
} else if (visibleType == DashboardType.OVERLAY_MAP) {
tv.setText(R.string.map_overlay);
} else if (visibleType == DashboardType.MAP_MARKERS) {
tv.setText(R.string.map_markers);
}
ImageView edit = (ImageView) dashboardView.findViewById(R.id.toolbar_edit);
edit.setVisibility(View.GONE);
@ -399,17 +454,19 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
});
}
}
// if (waypointsEdit) {
// ok.setVisibility(View.VISIBLE);
// ok.setOnClickListener(new View.OnClickListener() {
//
// @Override
// public void onClick(View v) {
// mapActivity.getMyApplication().getWaypointHelper().removeVisibleLocationPoint(deletedPoints);
// hideDashboard();
// }
// });
// }
if (visibleType == DashboardType.MAP_MARKERS
&& getMyApplication().getMapMarkersHelper().getActiveMapMarkers().size() > 0) {
sort.setVisibility(View.VISIBLE);
sort.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mapMarkerDialogHelper.setSorted(!mapMarkerDialogHelper.isSorted());
reloadAdapter();
}
});
}
if (visibleType == DashboardType.DASHBOARD || visibleType == DashboardType.LIST_MENU) {
settingsButton.setVisibility(View.VISIBLE);
settingsButton.setOnClickListener(new View.OnClickListener() {
@ -672,7 +729,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
} else {
listView.setBackgroundColor(mapActivity.getResources().getColor(R.color.ctx_menu_info_view_bg_dark));
}
if (visibleType != DashboardType.WAYPOINTS) {
if (visibleType != DashboardType.WAYPOINTS && visibleType != DashboardType.MAP_MARKERS) {
Drawable d = new ColorDrawable(mapActivity.getResources().getColor(R.color.dashboard_divider_dark));
listView.setDivider(d);
listView.setDividerHeight(dpToPx(1f));
@ -685,7 +742,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
} else {
listView.setBackgroundColor(mapActivity.getResources().getColor(R.color.ctx_menu_info_view_bg_light));
}
if (visibleType != DashboardType.WAYPOINTS) {
if (visibleType != DashboardType.WAYPOINTS && visibleType != DashboardType.MAP_MARKERS) {
Drawable d = new ColorDrawable(mapActivity.getResources().getColor(R.color.dashboard_divider_light));
listView.setDivider(d);
listView.setDividerHeight(dpToPx(1f));
@ -703,6 +760,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
private void updateListAdapter() {
ContextMenuAdapter cm = null;
if (DashboardType.WAYPOINTS == visibleType || DashboardType.WAYPOINTS_FLAT == visibleType) {
StableArrayAdapter listAdapter = waypointDialogHelper.getWaypointsDrawerAdapter(true, deletedPoints, mapActivity, running,
DashboardType.WAYPOINTS_FLAT == visibleType, nightMode);
OnItemClickListener listener = waypointDialogHelper.getDrawerItemClickListener(mapActivity, running,
@ -714,7 +772,20 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
updateListAdapter(listAdapter, listener);
} else if (DashboardType.MAP_MARKERS == visibleType) {
mapMarkerDialogHelper.setNightMode(nightMode);
StableArrayAdapter listAdapter = mapMarkerDialogHelper.getMapMarkersListAdapter();
OnItemClickListener listener = mapMarkerDialogHelper.getItemClickListener(listAdapter);
DynamicListView dynamicListView = (DynamicListView) listView;
dynamicListView.setItemsList(listAdapter.getObjects());
dynamicListView.setActiveItemsList(listAdapter.getActiveObjects());
updateListAdapter(listAdapter, listener);
} else {
if (DashboardType.CONFIGURE_SCREEN == visibleType) {
cm = mapActivity.getMapLayers().getMapWidgetRegistry().getViewConfigureMenuAdapter(mapActivity);
} else if (DashboardType.CONFIGURE_MAP == visibleType) {
@ -749,7 +820,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
}
public void refreshContent(boolean force) {
if (visibleType == DashboardType.WAYPOINTS || force) {
if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.MAP_MARKERS || force) {
updateListAdapter();
} else if (visibleType == DashboardType.CONFIGURE_MAP || visibleType == DashboardType.ROUTE_PREFERENCES) {
int index = listView.getFirstVisiblePosition();
@ -1254,10 +1325,13 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
@Override
public void reloadAdapter() {
if ((DashboardType.WAYPOINTS == visibleType || DashboardType.WAYPOINTS_FLAT == visibleType)
&& listAdapter != null && listAdapter instanceof StableArrayAdapter) {
if (listAdapter != null && listAdapter instanceof StableArrayAdapter) {
StableArrayAdapter stableAdapter = (StableArrayAdapter) listAdapter;
waypointDialogHelper.reloadListAdapter(stableAdapter);
if (DashboardType.WAYPOINTS == visibleType || DashboardType.WAYPOINTS_FLAT == visibleType) {
waypointDialogHelper.reloadListAdapter(stableAdapter);
} else if (DashboardType.MAP_MARKERS == visibleType) {
mapMarkerDialogHelper.reloadListAdapter(stableAdapter);
}
if (listView instanceof DynamicListView) {
DynamicListView dynamicListView = (DynamicListView) listView;
dynamicListView.setItemsList(stableAdapter.getObjects());

319
OsmAnd/src/net/osmand/plus/activities/MapMarkersActivity.java → OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
View file

@ -1,14 +1,14 @@
package net.osmand.plus.activities;
package net.osmand.plus.helpers;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.Shape;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@ -23,152 +23,62 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.views.controls.DynamicListView;
import net.osmand.plus.views.controls.DynamicListViewCallbacks;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.views.controls.ListDividerShape;
import net.osmand.plus.views.controls.StableArrayAdapter;
import net.osmand.plus.views.controls.SwipeDismissListViewTouchListener;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
public class MapMarkersActivity extends OsmandListActivity implements DynamicListViewCallbacks {
public class MapMarkerDialogHelper {
public static final int ACTIVE_MARKERS = 0;
public static final int MARKERS_HISTORY = 1;
private SwipeDismissListViewTouchListener swipeDismissListener;
private MapActivity mapActivity;
private OsmandApplication app;
private boolean sorted;
private boolean nightMode;
@Override
protected void onCreate(Bundle savedInstanceState) {
getMyApplication().applyTheme(this);
super.onCreate(savedInstanceState);
setContentView(R.layout.map_markers);
getSupportActionBar().setTitle(R.string.map_markers);
((DynamicListView) getListView()).setDynamicListViewCallbacks(this);
swipeDismissListener = new SwipeDismissListViewTouchListener(getListView(),
new SwipeDismissListViewTouchListener.DismissCallbacks() {
private List<Object> deletedMarkers = new ArrayList<>();
@Override
public boolean canDismiss(int position) {
List<Object> activeObjects = getListAdapter().getActiveObjects();
Object obj = getListAdapter().getItem(position);
return activeObjects.contains(obj);
}
@Override
public SwipeDismissListViewTouchListener.Undoable onDismiss(final int position) {
final StableArrayAdapter stableAdapter = getListAdapter();
final int activeObjPos;
final Object item = stableAdapter.getItem(position);
if (item != null) {
if (!((MapMarker) item).history) {
deletedMarkers.add(item);
}
stableAdapter.setNotifyOnChange(false);
stableAdapter.remove(item);
stableAdapter.getObjects().remove(item);
activeObjPos = stableAdapter.getActiveObjects().indexOf(item);
stableAdapter.getActiveObjects().remove(item);
stableAdapter.refreshData();
stableAdapter.notifyDataSetChanged();
return new SwipeDismissListViewTouchListener.Undoable() {
@Override
public void undo() {
stableAdapter.setNotifyOnChange(false);
stableAdapter.insert(item, position);
stableAdapter.getObjects().add(position, item);
stableAdapter.getActiveObjects().add(activeObjPos, item);
stableAdapter.refreshData();
deletedMarkers.remove(item);
updateMapMarkers(stableAdapter.getActiveObjects());
reloadListAdapter();
}
};
} else {
return null;
}
}
@Override
public void onHidePopup() {
StableArrayAdapter stableAdapter = getListAdapter();
stableAdapter.refreshData();
updateMapMarkers(stableAdapter.getActiveObjects());
if (stableAdapter.getActiveObjects().size() == 0) {
finish();
} else {
reloadListAdapter();
}
}
private void updateMapMarkers(List<Object> objects) {
List<MapMarker> markers = new ArrayList<>();
List<MapMarker> markersHistory = new ArrayList<>();
for (Object obj : objects) {
MapMarker marker = (MapMarker) obj;
if (!marker.history) {
markers.add(marker);
} else {
markersHistory.add(marker);
}
}
for (int i = deletedMarkers.size() - 1; i >= 0; i--) {
markersHistory.add(0, (MapMarker) deletedMarkers.get(i));
}
deletedMarkers.clear();
getMyApplication().getMapMarkersHelper().saveMapMarkers(markers, markersHistory);
}
});
//nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
nightMode = !getMyApplication().getSettings().isLightContent();
setListAdapter(getMapMarkersListAdapter());
public MapMarkerDialogHelper(MapActivity mapActivity) {
this.mapActivity = mapActivity;
app = mapActivity.getMyApplication();
}
@Override
protected void onStart() {
super.onStart();
if (nightMode) {
getListView().setBackgroundColor(getResources().getColor(R.color.ctx_menu_info_view_bg_dark));
} else {
getListView().setBackgroundColor(getResources().getColor(R.color.ctx_menu_info_view_bg_light));
}
public boolean isNightMode() {
return nightMode;
}
@Override
public StableArrayAdapter getListAdapter() {
return (StableArrayAdapter) super.getListAdapter();
public void setNightMode(boolean nightMode) {
this.nightMode = nightMode;
}
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Object obj = getListAdapter().getItem(position);
if (obj instanceof MapMarker) {
MapMarker marker = (MapMarker) obj;
if (!marker.history) {
showOnMap(marker);
} else {
showHistoryOnMap(marker);
public boolean isSorted() {
return sorted;
}
public void setSorted(boolean sorted) {
this.sorted = sorted;
}
public AdapterView.OnItemClickListener getItemClickListener(final ArrayAdapter<Object> listAdapter) {
return new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int item, long l) {
Object obj = listAdapter.getItem(item);
if (obj instanceof MapMarker) {
MapMarker marker = (MapMarker) obj;
if (!marker.history) {
showOnMap(marker);
} else {
showHistoryOnMap(marker);
}
}
}
}
}
@Override
protected void onResume() {
super.onResume();
getListAdapter().notifyDataSetChanged();
};
}
public StableArrayAdapter getMapMarkersListAdapter() {
@ -176,7 +86,7 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
final List<Object> objects = getListObjects();
List<Object> activeObjects = getActiveObjects(objects);
final StableArrayAdapter listAdapter = new StableArrayAdapter(getMyApplication(),
final StableArrayAdapter listAdapter = new StableArrayAdapter(mapActivity,
R.layout.waypoint_reached, R.id.title, objects, activeObjects) {
@Override
@ -199,16 +109,16 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
boolean topDividerView = (obj instanceof Boolean) && ((Boolean) obj);
boolean bottomDividerView = (obj instanceof Boolean) && !((Boolean) obj);
if (labelView) {
v = createItemForCategory((Integer) obj);
AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
v = createItemForCategory(this, (Integer) obj);
AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
} else if (topDividerView) {
v = getLayoutInflater().inflate(R.layout.card_top_divider, null);
v = mapActivity.getLayoutInflater().inflate(R.layout.card_top_divider, null);
} else if (bottomDividerView) {
v = getLayoutInflater().inflate(R.layout.card_bottom_divider, null);
v = mapActivity.getLayoutInflater().inflate(R.layout.card_bottom_divider, null);
} else if (obj instanceof MapMarker) {
MapMarker marker = (MapMarker) obj;
v = updateMapMarkerItemView(v, marker);
AndroidUtils.setListItemBackground(MapMarkersActivity.this, v, nightMode);
AndroidUtils.setListItemBackground(mapActivity, v, nightMode);
}
return v;
}
@ -218,15 +128,15 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
if (p instanceof MapMarker) {
final MapMarker marker = (MapMarker) p;
if (marker.getOriginalPointDescription() != null
&& marker.getOriginalPointDescription().isSearchingAddress(this)) {
&& marker.getOriginalPointDescription().isSearchingAddress(mapActivity)) {
GeocodingLookupService.AddressLookupRequest lookupRequest
= new GeocodingLookupService.AddressLookupRequest(marker.point, new GeocodingLookupService.OnAddressLookupResult() {
@Override
public void geocodingDone(String address) {
reloadListAdapter();
reloadListAdapter(listAdapter);
}
}, null);
getMyApplication().getGeocodingLookupService().lookupAddress(lookupRequest);
app.getGeocodingLookupService().lookupAddress(lookupRequest);
}
}
}
@ -237,18 +147,18 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
private List<Drawable> getCustomDividers(List<Object> points) {
int color;
if (nightMode) {
color = getResources().getColor(R.color.dashboard_divider_dark);
color = mapActivity.getResources().getColor(R.color.dashboard_divider_dark);
} else {
color = getResources().getColor(R.color.dashboard_divider_light);
color = mapActivity.getResources().getColor(R.color.dashboard_divider_light);
}
Shape fullDividerShape = new ListDividerShape(color, 0);
Shape halfDividerShape = new ListDividerShape(color, AndroidUtils.dpToPx(this, 56f));
Shape halfDividerShape = new ListDividerShape(color, AndroidUtils.dpToPx(mapActivity, 56f));
final ShapeDrawable fullDivider = new ShapeDrawable(fullDividerShape);
final ShapeDrawable halfDivider = new ShapeDrawable(halfDividerShape);
int divHeight = AndroidUtils.dpToPx(this, 1f);
int divHeight = AndroidUtils.dpToPx(mapActivity, 1f);
fullDivider.setIntrinsicHeight(divHeight);
halfDivider.setIntrinsicHeight(divHeight);
@ -283,41 +193,41 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
return res;
}
protected View createItemForCategory(final int type) {
View v = getLayoutInflater().inflate(R.layout.waypoint_header, null);
protected View createItemForCategory(final ArrayAdapter<Object> listAdapter, final int type) {
View v = mapActivity.getLayoutInflater().inflate(R.layout.waypoint_header, null);
v.findViewById(R.id.check_item).setVisibility(View.GONE);
v.findViewById(R.id.ProgressBar).setVisibility(View.GONE);
final Button btn = (Button) v.findViewById(R.id.header_button);
btn.setTextColor(!nightMode ? getResources().getColor(R.color.map_widget_blue)
: getResources().getColor(R.color.osmand_orange));
btn.setText(getString(R.string.shared_string_clear));
btn.setTextColor(!nightMode ? mapActivity.getResources().getColor(R.color.map_widget_blue)
: mapActivity.getResources().getColor(R.color.osmand_orange));
btn.setText(mapActivity.getString(R.string.shared_string_clear));
btn.setVisibility(View.VISIBLE);
btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (type == MARKERS_HISTORY) {
AlertDialog.Builder builder = new AlertDialog.Builder(MapMarkersActivity.this);
builder.setMessage(getString(R.string.clear_markers_history_q))
AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
builder.setMessage(mapActivity.getString(R.string.clear_markers_history_q))
.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
getListAdapter().notifyDataSetInvalidated();
getMyApplication().getMapMarkersHelper().removeMarkersHistory();
reloadListAdapter();
listAdapter.notifyDataSetInvalidated();
app.getMapMarkersHelper().removeMarkersHistory();
reloadListAdapter(listAdapter);
}
})
.setNegativeButton(R.string.shared_string_no, null)
.show();
} else if (type == ACTIVE_MARKERS) {
AlertDialog.Builder builder = new AlertDialog.Builder(MapMarkersActivity.this);
builder.setMessage(getString(R.string.clear_active_markers_q))
AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
builder.setMessage(mapActivity.getString(R.string.clear_active_markers_q))
.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
getListAdapter().notifyDataSetInvalidated();
getMyApplication().getMapMarkersHelper().removeActiveMarkers();
reloadListAdapter();
listAdapter.notifyDataSetInvalidated();
app.getMapMarkersHelper().removeActiveMarkers();
reloadListAdapter(listAdapter);
}
})
.setNegativeButton(R.string.shared_string_no, null)
@ -327,14 +237,14 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
});
TextView tv = (TextView) v.findViewById(R.id.header_text);
AndroidUtils.setTextPrimaryColor(this, tv, nightMode);
AndroidUtils.setTextPrimaryColor(mapActivity, tv, nightMode);
tv.setText(getHeader(type));
return v;
}
protected View updateMapMarkerItemView(View v, final MapMarker marker) {
if (v == null || v.findViewById(R.id.info_close) == null) {
v = getLayoutInflater().inflate(R.layout.waypoint_reached, null);
v = mapActivity.getLayoutInflater().inflate(R.layout.waypoint_reached, null);
}
updateMapMarkerInfoView(v, marker);
final View more = v.findViewById(R.id.all_points);
@ -347,26 +257,23 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
}
protected void updateMapMarkerInfoView(View localView, final MapMarker marker) {
OsmandApplication app = getMyApplication();
TextView text = (TextView) localView.findViewById(R.id.waypoint_text);
TextView textShadow = (TextView) localView.findViewById(R.id.waypoint_text_shadow);
TextView textDist = (TextView) localView.findViewById(R.id.waypoint_dist);
if (!marker.history) {
((ImageView) localView.findViewById(R.id.waypoint_icon))
.setImageDrawable(getMapMarkerIcon(app, marker.colorIndex));
AndroidUtils.setTextPrimaryColor(this, text, nightMode);
textDist.setTextColor(getResources().getColor(R.color.color_myloc_distance));
AndroidUtils.setTextPrimaryColor(mapActivity, text, nightMode);
textDist.setTextColor(mapActivity.getResources().getColor(R.color.color_myloc_distance));
} else {
((ImageView) localView.findViewById(R.id.waypoint_icon))
.setImageDrawable(getMyApplication().getIconsCache()
.setImageDrawable(app.getIconsCache()
.getContentIcon(R.drawable.ic_action_flag_dark, !nightMode));
AndroidUtils.setTextSecondaryColor(this, text, nightMode);
AndroidUtils.setTextSecondaryColor(this, textDist, nightMode);
AndroidUtils.setTextSecondaryColor(mapActivity, text, nightMode);
AndroidUtils.setTextSecondaryColor(mapActivity, textDist, nightMode);
}
LatLon lastKnownMapLocation = app.getSettings().getLastKnownMapLocation();
int dist = (int) (MapUtils.getDistance(marker.getLatitude(), marker.getLongitude(),
lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude()));
int dist = marker.dist;
//if (dist > 0) {
textDist.setText(OsmAndFormatter.getFormattedDistance(dist, app));
@ -411,62 +318,81 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
}
public void showOnMap(MapMarker marker) {
getMyApplication().getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
15, marker.getPointDescription(this), true, marker);
MapActivity.launchMapActivityMoveToTop(this);
app.getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
15, marker.getPointDescription(mapActivity), true, marker);
MapActivity.launchMapActivityMoveToTop(mapActivity);
}
public void showHistoryOnMap(MapMarker marker) {
getMyApplication().getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
15, new PointDescription(PointDescription.POINT_TYPE_LOCATION, marker.getPointDescription(this).getName()),
app.getSettings().setMapLocationToShow(marker.getLatitude(), marker.getLongitude(),
15, new PointDescription(PointDescription.POINT_TYPE_LOCATION,
marker.getPointDescription(mapActivity).getName()),
false, null);
MapActivity.launchMapActivityMoveToTop(this);
MapActivity.launchMapActivityMoveToTop(mapActivity);
}
protected String getHeader(int type) {
String str = getString(R.string.map_markers);
String str = mapActivity.getString(R.string.map_markers);
switch (type) {
case ACTIVE_MARKERS:
str = getString(R.string.active_markers);
str = mapActivity.getString(R.string.active_markers);
break;
case MARKERS_HISTORY:
str = getString(R.string.shared_string_history);
str = mapActivity.getString(R.string.shared_string_history);
break;
}
return str;
}
public void reloadListAdapter() {
StableArrayAdapter listAdapter = getListAdapter();
public void reloadListAdapter(ArrayAdapter<Object> listAdapter) {
listAdapter.setNotifyOnChange(false);
listAdapter.clear();
List<Object> objects = getListObjects();
for (Object point : objects) {
listAdapter.add(point);
}
listAdapter.updateObjects(objects, getActiveObjects(objects));
if (listAdapter instanceof StableArrayAdapter) {
((StableArrayAdapter) listAdapter).updateObjects(objects, getActiveObjects(objects));
}
listAdapter.notifyDataSetChanged();
}
DynamicListView dynamicListView = (DynamicListView) getListView();
dynamicListView.setItemsList(listAdapter.getObjects());
dynamicListView.setActiveItemsList(listAdapter.getActiveObjects());
public void calcDistance(LatLon anchor, List<MapMarker> markers) {
for (MapMarker m : markers) {
m.dist = (int) (MapUtils.getDistance(m.getLatitude(), m.getLongitude(),
anchor.getLatitude(), anchor.getLongitude()));
}
}
protected List<Object> getListObjects() {
final List<Object> objects = new ArrayList<>();
final MapMarkersHelper markersHelper = getMyApplication().getMapMarkersHelper();
final MapMarkersHelper markersHelper = app.getMapMarkersHelper();
List<MapMarker> activeMarkers = markersHelper.getActiveMapMarkers();
LatLon mapLocation =
new LatLon(mapActivity.getMapView().getLatitude(), mapActivity.getMapView().getLongitude());
List<MapMarker> activeMarkers = new ArrayList<>(markersHelper.getActiveMapMarkers());
calcDistance(mapLocation, activeMarkers);
if (sorted) {
Collections.sort(activeMarkers, new Comparator<MapMarker>() {
@Override
public int compare(MapMarker lhs, MapMarker rhs) {
return lhs.dist < rhs.dist ? -1 : (lhs.dist == rhs.dist ? 0 : 1);
}
});
}
if (activeMarkers.size() > 0) {
objects.add(true);
objects.add(ACTIVE_MARKERS);
objects.addAll(activeMarkers);
objects.add(false);
}
List<MapMarker> markersHistory = markersHelper.getMapMarkersHistory();
List<MapMarker> markersHistory = new ArrayList<>(markersHelper.getMapMarkersHistory());
calcDistance(mapLocation, markersHistory);
if (markersHistory.size() > 0) {
objects.add(true);
if (activeMarkers.size() > 0) {
objects.add(true);
}
objects.add(MARKERS_HISTORY);
objects.addAll(markersHistory);
objects.add(false);
@ -502,19 +428,4 @@ public class MapMarkersActivity extends OsmandListActivity implements DynamicLis
return iconsCache.getIcon(R.drawable.map_marker_blue);
}
}
@Override
public void onWindowVisibilityChanged(int visibility) {
if (visibility != View.VISIBLE && swipeDismissListener != null) {
swipeDismissListener.discardUndo();
}
}
@Override
public void onItemsSwapped(List<Object> items) {
}
@Override
public void onItemSwapping(int position) {
}
}
}

5
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -22,6 +22,7 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashboardOnMap;
import net.osmand.plus.dialogs.DirectionsDialogs;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.mapcontextmenu.MenuController.MenuState;
@ -471,7 +472,9 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
if (pointDescription.isDestination()) {
mapActivity.getMapActions().editWaypoints();
} else if (pointDescription.isMapMarker()) {
mapActivity.getMapActions().openMapMarkersActivity();
hide();
MapActivity.clearPrevActivityIntent();
mapActivity.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAP_MARKERS);
} else {
mapActivity.getMapActions().addMapMarker(latLon.getLatitude(), latLon.getLongitude(),
pointDescription);

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
View file

@ -8,7 +8,7 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.MapMarkersActivity;
import net.osmand.plus.helpers.MapMarkerDialogHelper;
import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.util.Algorithms;
@ -61,7 +61,7 @@ public class MapMarkerMenuController extends MenuController {
@Override
public Drawable getLeftIcon() {
return MapMarkersActivity.getMapMarkerIcon(getMapActivity().getMyApplication(), mapMarker.colorIndex);
return MapMarkerDialogHelper.getMapMarkerIcon(getMapActivity().getMyApplication(), mapMarker.colorIndex);
}
@Override