From 730309fda05dbb0ed18d532d6063e5f37bab8dff Mon Sep 17 00:00:00 2001
From: unknown <barsik107@gmail.com>
Date: Fri, 27 Jun 2014 14:15:42 +0300
Subject: [PATCH] created functionality to select whether package was delivered
 or not

---
 OsmAnd/res/layout/package_delivered.xml       |  23 +++
 OsmAnd/res/values/routepoints.xml             |   1 +
 .../RoutePointsPlugin.java                    | 131 ++++++++++++------
 3 files changed, 113 insertions(+), 42 deletions(-)
 create mode 100644 OsmAnd/res/layout/package_delivered.xml

diff --git a/OsmAnd/res/layout/package_delivered.xml b/OsmAnd/res/layout/package_delivered.xml
new file mode 100644
index 0000000000..0e38f322ff
--- /dev/null
+++ b/OsmAnd/res/layout/package_delivered.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/package_delivered"/>
+    <LinearLayout android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+        <Button android:id="@+id/delivered_yes"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/default_buttons_yes"/>
+        <Button android:id="@+id/delivered_no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/default_buttons_no"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/routepoints.xml b/OsmAnd/res/values/routepoints.xml
index 98d1a295e3..f18c7f3108 100644
--- a/OsmAnd/res/values/routepoints.xml
+++ b/OsmAnd/res/values/routepoints.xml
@@ -12,4 +12,5 @@
     <string name="map_widget_route_points">Route points</string>
     <string name="route_points_activity">Route Points</string>
     <string name="navigate_dialog">Navigate dialog</string>
+    <string name="package_delivered">Was the package delivered?</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
index 2948fc541d..4c98974365 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
@@ -1,12 +1,11 @@
 package net.osmand.plus.routepointsnavigation;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.widget.Button;
 import net.osmand.data.LatLon;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.GPXUtilities;
@@ -38,10 +37,14 @@ public class RoutePointsPlugin extends OsmandPlugin {
 	public static final String ID = "osmand.route.stepsPlugin";
 
 	private static final String VISITED_KEY = "VISITED_KEY";
+	private static final String DELIVERED_KEY = "DELIVERED_KEY";
 
 	private OsmandApplication app;
 	private TextInfoWidget routeStepsControl;
 	private SelectedRouteGpxFile currentRoute;
+	MapActivity map;
+
+	private View deliveredView;
 
 	private RoutePointsLayer routePointsLayer;
 
@@ -63,16 +66,37 @@ public class RoutePointsPlugin extends OsmandPlugin {
 		}
 	}
 
+	private void prepareDeliveredView() {
+		LayoutInflater vi = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+		deliveredView = vi.inflate(R.layout.package_delivered, null);
+
+		Button btnY = (Button) deliveredView.findViewById(R.id.delivered_yes);
+
+		btnY.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				currentRoute.navigateToNextPoint(true);
+			}
+		});
+
+		Button btnN = (Button) deliveredView.findViewById(R.id.delivered_no);
+
+		btnN.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				currentRoute.navigateToNextPoint(false);
+			}
+		});
+	}
+
 
 	@Override
 	public boolean destinationReached() {
 		if (currentRoute != null) {
-			boolean naviateToNextPoint = currentRoute.navigateToNextPoint();
-			
-			if (naviateToNextPoint) {
-				return false;
-			}
+			//TODO: add delivered view to map
+
 		}
+
 		return true;
 	}
 
@@ -109,7 +133,8 @@ public class RoutePointsPlugin extends OsmandPlugin {
 	@Override
 	public void registerLayers(MapActivity activity) {
 		super.registerLayers(activity);
-
+		prepareDeliveredView();
+		map = activity;
 		if (routePointsLayer != null) {
 			activity.getMapView().removeLayer(routePointsLayer);
 		}
@@ -121,7 +146,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
 
 	@Override
 	public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {
-		if (routePointsLayer == null){
+		if (routePointsLayer == null) {
 			registerLayers(activity);
 		}
 
@@ -216,6 +241,10 @@ public class RoutePointsPlugin extends OsmandPlugin {
 			return new LatLon(wpt.lat, wpt.lon);
 		}
 
+		public void setDelivered(boolean delivered) {
+			wpt.getExtensionsToWrite().put(DELIVERED_KEY, String.valueOf(delivered));
+		}
+
 		public void setVisitedTime(long currentTimeMillis) {
 			visitedTime = currentTimeMillis;
 			wpt.getExtensionsToWrite().put(VISITED_KEY, visitedTime + "");
@@ -276,23 +305,27 @@ public class RoutePointsPlugin extends OsmandPlugin {
 		}
 
 		public boolean navigateToNextPoint() {
-			if (!currentPoints.isEmpty()) {
-				RoutePoint rp = currentPoints.get(0);
-				if (rp.isNextNavigate) {
-					rp.setVisitedTime(System.currentTimeMillis());
-					rp.isNextNavigate = false;
-					sortPoints();
-				}
-				RoutePoint first = currentPoints.get(0);
-				if (!first.isVisited()) {
-					app.getTargetPointsHelper().navigateToPoint(first.getPoint(), true, -1, first.getName());
-					first.isNextNavigate = true;
-					return true;
-				} else {
-					app.getTargetPointsHelper().clearPointToNavigate(true);
-				}
+			if (currentPoints.isEmpty()) {
+				return false;
+			}
+
+			RoutePoint rp = currentPoints.get(0);
+			if (rp.isNextNavigate) {
+				rp.setVisitedTime(System.currentTimeMillis());
+				rp.isNextNavigate = false;
+				sortPoints();
+			}
+
+			RoutePoint first = currentPoints.get(0);
+			if (!first.isVisited()) {
+				app.getTargetPointsHelper().navigateToPoint(first.getPoint(), true, -1, first.getName());
+				first.isNextNavigate = true;
+				return true;
+			} else {
+				app.getTargetPointsHelper().clearPointToNavigate(true);
 			}
 			return false;
+
 		}
 
 		private void sortPoints() {
@@ -408,24 +441,38 @@ public class RoutePointsPlugin extends OsmandPlugin {
 			}
 			return null;
 		}
-	}
-	
-	public void saveGPXAsync() {
-		new AsyncTask<RoutePointsPlugin.SelectedRouteGpxFile, Void, Void>() {
-			
-			protected void onPreExecute() {
+
+		public boolean navigateToNextPoint(boolean delivered) {
+			if (currentPoints.isEmpty()) {
+				return false;
 			}
 
-			@Override
-			protected Void doInBackground(RoutePointsPlugin.SelectedRouteGpxFile... params) {
-				if(getCurrentRoute() != null) {
-					getCurrentRoute().saveFile();
+			RoutePoint rp = currentPoints.get(0);
+			if (rp.isNextNavigate) {
+				rp.setDelivered(delivered);
+				return navigateToNextPoint();
+			}
+
+			return false;
+		}
+
+		public void saveGPXAsync() {
+			new AsyncTask<RoutePointsPlugin.SelectedRouteGpxFile, Void, Void>() {
+
+				protected void onPreExecute() {
 				}
-				return null;
-			}
 
-			protected void onPostExecute(Void result) {
-			}
-		}.execute(getCurrentRoute());
+				@Override
+				protected Void doInBackground(RoutePointsPlugin.SelectedRouteGpxFile... params) {
+					if (getCurrentRoute() != null) {
+						getCurrentRoute().saveFile();
+					}
+					return null;
+				}
+
+				protected void onPostExecute(Void result) {
+				}
+			}.execute(getCurrentRoute());
+		}
 	}
 }