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

Add the ability to drag and drop start point

Browse source
This commit is contained in:
Alexander Sytnyk 2018-01-25 17:45:21 +02:00
parent e0f43048a7
commit a2b0790565
2 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,6 +55,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.TargetPointsHelper.TargetPoint; import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.tools.DashFragmentData; import net.osmand.plus.dashboard.tools.DashFragmentData;
@ -244,6 +245,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
&& (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT)) { && (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT)) {
List<Object> activeObjects = ((StableArrayAdapter) listAdapter).getActiveObjects(); List<Object> activeObjects = ((StableArrayAdapter) listAdapter).getActiveObjects();
Object obj = listAdapter.getItem(position); Object obj = listAdapter.getItem(position);
if (obj instanceof LocationPointWrapper) {
LocationPointWrapper w = (LocationPointWrapper) obj;
return !((TargetPoint) w.getPoint()).start;
}
return activeObjects.contains(obj); return activeObjects.contains(obj);
} }
return false; return false;
@ -287,10 +292,11 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
@Override @Override
public String getTitle() { public String getTitle() {
List<Object> activeObjects;
if ((visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) if ((visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT)
&& (getMyApplication().getRoutingHelper().isRoutePlanningMode() || getMyApplication().getRoutingHelper().isFollowingMode()) && (getMyApplication().getRoutingHelper().isRoutePlanningMode() || getMyApplication().getRoutingHelper().isFollowingMode())
&& item != null && item != null
&& stableAdapter.getActiveObjects().size() == 0) { && ((activeObjects = stableAdapter.getActiveObjects()).isEmpty() || isContainsOnlyStart(activeObjects))) {
return mapActivity.getResources().getString(R.string.cancel_navigation); return mapActivity.getResources().getString(R.string.cancel_navigation);
} else { } else {
return null; return null;
@ -307,7 +313,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) { if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
onItemsSwapped(stableAdapter.getActiveObjects()); onItemsSwapped(stableAdapter.getActiveObjects());
} }
if (stableAdapter.getActiveObjects().size() == 0) { List<Object> activeObjects = stableAdapter.getActiveObjects();
if (activeObjects.isEmpty() || isContainsOnlyStart(activeObjects)) {
hideDashboard(); hideDashboard();
if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) { if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
mapActivity.getMapActions().stopNavigationWithoutConfirm(); mapActivity.getMapActions().stopNavigationWithoutConfirm();
@ -319,6 +326,17 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
} }
} }
} }
private boolean isContainsOnlyStart(List<Object> items) {
if (items.size() == 1) {
Object item = items.get(0);
if (item instanceof LocationPointWrapper) {
LocationPointWrapper w = (LocationPointWrapper) item;
return ((TargetPoint) w.getPoint()).start;
}
}
return false;
}
}); });
gradientToolbar = ContextCompat.getDrawable(mapActivity, R.drawable.gradient_toolbar).mutate(); gradientToolbar = ContextCompat.getDrawable(mapActivity, R.drawable.gradient_toolbar).mutate();
@ -1471,10 +1489,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
LocationPointWrapper p = (LocationPointWrapper) obj; LocationPointWrapper p = (LocationPointWrapper) obj;
if (p.getPoint() instanceof TargetPoint) { if (p.getPoint() instanceof TargetPoint) {
TargetPoint t = (TargetPoint) p.getPoint(); TargetPoint t = (TargetPoint) p.getPoint();
if (!t.start) { t.intermediate = true;
t.intermediate = true; allTargets.add(t);
allTargets.add(t);
}
} }
} }
} }
@ -1482,9 +1498,15 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
allTargets.get(allTargets.size() - 1).intermediate = false; allTargets.get(allTargets.size() - 1).intermediate = false;
} }
} }
getMyApplication().getTargetPointsHelper().reorderAllTargetPoints(allTargets, false); TargetPointsHelper targetPointsHelper = getMyApplication().getTargetPointsHelper();
if (allTargets.size() > 0) {
TargetPoint start = allTargets.remove(0);
targetPointsHelper.setStartPoint(new LatLon(start.getLatitude(), start.getLongitude()),
false, start.getPointDescription(getMyApplication()));
}
targetPointsHelper.reorderAllTargetPoints(allTargets, false);
newRouteIsCalculated(false, new ValueHolder<Boolean>()); newRouteIsCalculated(false, new ValueHolder<Boolean>());
getMyApplication().getTargetPointsHelper().updateRouteAndRefresh(true); targetPointsHelper.updateRouteAndRefresh(true);
} }
} }

21
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -213,7 +213,7 @@ public class WaypointDialogHelper {
for (Object p : points) { for (Object p : points) {
if (p instanceof LocationPointWrapper) { if (p instanceof LocationPointWrapper) {
LocationPointWrapper w = (LocationPointWrapper) p; LocationPointWrapper w = (LocationPointWrapper) p;
if (w.type == WaypointHelper.TARGETS && !((TargetPoint) w.point).start) { if (w.type == WaypointHelper.TARGETS) {
activePoints.add(p); activePoints.add(p);
} }
} }
@ -431,10 +431,6 @@ public class WaypointDialogHelper {
} }
}); });
} }
if (startPoint) {
move.setVisibility(View.GONE); // TODO
}
} }
return v; return v;
@ -623,7 +619,20 @@ public class WaypointDialogHelper {
public void onClick(View v) { public void onClick(View v) {
boolean hasActivePoints = false; boolean hasActivePoints = false;
if (thisAdapter instanceof StableArrayAdapter) { if (thisAdapter instanceof StableArrayAdapter) {
hasActivePoints = ((StableArrayAdapter) thisAdapter).getActiveObjects().size() > 0; List<Object> items = ((StableArrayAdapter) thisAdapter).getActiveObjects();
if (items.size() > 0) {
if (items.size() > 1) {
hasActivePoints = true;
} else {
Object item = items.get(0);
if (item instanceof LocationPointWrapper) {
LocationPointWrapper w = (LocationPointWrapper) item;
hasActivePoints = !((TargetPoint) w.point).start;
} else {
hasActivePoints = true;
}
}
}
} }
final PopupMenu optionsMenu = new PopupMenu(ctx, moreBtn); final PopupMenu optionsMenu = new PopupMenu(ctx, moreBtn);