Merge branch 'dev-stop-movement' into dev

6 files changed, 181 insertions, 66 deletions

diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index c18db21..c08b7d0 100644
--- a/gen/net/cbaines/suma/R.java
+++ b/gen/net/cbaines/suma/R.java
@@ -54,59 +54,63 @@ public final class R {
         public static final int u9_radio_button=0x7f02001d;
     }
     public static final class id {
-        public static final int busStopID=0x7f0a000c;
-        public static final int busStopLoadBar=0x7f0a0011;
-        public static final int busStopMessage=0x7f0a000e;
-        public static final int busStopName=0x7f0a0004;
-        public static final int busStopTimes=0x7f0a000f;
-        public static final int busTimeContentLayout=0x7f0a000d;
-        public static final int centerLoadBar=0x7f0a0010;
-        public static final int check1=0x7f0a0021;
-        public static final int childname=0x7f0a0020;
-        public static final int donateBitcoinAddress=0x7f0a0018;
+        public static final int busStopID=0x7f0a000e;
+        public static final int busStopListItems=0x7f0a0005;
+        public static final int busStopLoadBar=0x7f0a0013;
+        public static final int busStopMessage=0x7f0a0010;
+        public static final int busStopName=0x7f0a0006;
+        public static final int busStopTimes=0x7f0a0011;
+        public static final int busTimeContentLayout=0x7f0a000f;
+        public static final int centerLoadBar=0x7f0a0012;
+        public static final int check1=0x7f0a0022;
+        public static final int childname=0x7f0a0021;
+        public static final int donateBitcoinAddress=0x7f0a0019;
         public static final int donateButton=0x7f0a0003;
-        public static final int donateDialogErrorMessage=0x7f0a0017;
-        public static final int donateDialogMessage=0x7f0a0014;
-        public static final int donateDialogMessageLayout=0x7f0a0016;
-        public static final int donateDialogProgress=0x7f0a0015;
-        public static final int favouriteCheckBox=0x7f0a000b;
-        public static final int favouriteDialogMessage=0x7f0a0019;
-        public static final int favouriteListItems=0x7f0a001a;
-        public static final int findContentLayout=0x7f0a001c;
-        public static final int findListItems=0x7f0a001e;
-        public static final int findLoadBar=0x7f0a001d;
+        public static final int donateDialogErrorMessage=0x7f0a0018;
+        public static final int donateDialogMessage=0x7f0a0015;
+        public static final int donateDialogMessageLayout=0x7f0a0017;
+        public static final int donateDialogProgress=0x7f0a0016;
+        public static final int favouriteCheckBox=0x7f0a000d;
+        public static final int favouriteDialogMessage=0x7f0a001a;
+        public static final int favouriteListItems=0x7f0a001b;
+        public static final int findContentLayout=0x7f0a001d;
+        public static final int findListItems=0x7f0a001f;
+        public static final int findLoadBar=0x7f0a001e;
         public static final int helpExpandableListView=0x7f0a0002;
-        public static final int layout_root=0x7f0a0012;
-        public static final int linearLayout1=0x7f0a0005;
-        public static final int linearLayout2=0x7f0a0013;
-        public static final int mapview=0x7f0a001f;
-        public static final int menu_about=0x7f0a0027;
-        public static final int menu_favourites=0x7f0a0028;
-        public static final int menu_find=0x7f0a0023;
-        public static final int menu_find_my_location=0x7f0a0025;
-        public static final int menu_preferences=0x7f0a0024;
-        public static final int menu_refresh_stop=0x7f0a0029;
-        public static final int menu_view=0x7f0a0026;
-        public static final int radio_u1=0x7f0a0006;
-        public static final int radio_u1n=0x7f0a0007;
-        public static final int radio_u2=0x7f0a0008;
-        public static final int radio_u6=0x7f0a0009;
-        public static final int radio_u9=0x7f0a000a;
-        public static final int searchBar=0x7f0a001b;
+        public static final int layout_root=0x7f0a0004;
+        public static final int linearLayout1=0x7f0a0007;
+        public static final int linearLayout2=0x7f0a0014;
+        public static final int mapview=0x7f0a0020;
+        public static final int menu_about=0x7f0a0028;
+        public static final int menu_favourites=0x7f0a0029;
+        public static final int menu_find=0x7f0a0024;
+        public static final int menu_find_my_location=0x7f0a0026;
+        public static final int menu_next_stop=0x7f0a002c;
+        public static final int menu_preferences=0x7f0a0025;
+        public static final int menu_previous_stop=0x7f0a002a;
+        public static final int menu_refresh_stop=0x7f0a002b;
+        public static final int menu_view=0x7f0a0027;
+        public static final int radio_u1=0x7f0a0008;
+        public static final int radio_u1n=0x7f0a0009;
+        public static final int radio_u2=0x7f0a000a;
+        public static final int radio_u6=0x7f0a000b;
+        public static final int radio_u9=0x7f0a000c;
+        public static final int searchBar=0x7f0a001c;
         public static final int textView1=0x7f0a0000;
         public static final int textView2=0x7f0a0001;
-        public static final int view_list=0x7f0a0022;
+        public static final int view_list=0x7f0a0023;
     }
     public static final class layout {
         public static final int about_dialog=0x7f030000;
-        public static final int bustimes=0x7f030001;
-        public static final int donate_dialog=0x7f030002;
-        public static final int favourite_dialog=0x7f030003;
-        public static final int find=0x7f030004;
-        public static final int main=0x7f030005;
-        public static final int view_child_row=0x7f030006;
-        public static final int view_dialog=0x7f030007;
-        public static final int view_group_row=0x7f030008;
+        public static final int bus_stop_dialog=0x7f030001;
+        public static final int bustimes=0x7f030002;
+        public static final int donate_dialog=0x7f030003;
+        public static final int favourite_dialog=0x7f030004;
+        public static final int find=0x7f030005;
+        public static final int main=0x7f030006;
+        public static final int view_child_row=0x7f030007;
+        public static final int view_dialog=0x7f030008;
+        public static final int view_group_row=0x7f030009;
     }
     public static final class menu {
         public static final int map_menu=0x7f090000;
diff --git a/res/layout/bus_stop_dialog.xml b/res/layout/bus_stop_dialog.xml
new file mode 100644
index 0000000..24148c6
--- /dev/null
+++ b/res/layout/bus_stop_dialog.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_root"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal"
+    android:padding="10dp" >
+    
+    <ListView
+        android:id="@+id/busStopListItems"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/stop_menu.xml b/res/menu/stop_menu.xml
index 408e536..c44efa2 100644
--- a/res/menu/stop_menu.xml
+++ b/res/menu/stop_menu.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <!--<item
+    <item
         android:id="@+id/menu_previous_stop"
         android:icon="@drawable/ic_menu_back"
-        android:title="@string/menu_previous_stop"/>-->
+        android:title="@string/menu_previous_stop"/>
     <item
         android:id="@+id/menu_refresh_stop"
         android:icon="@drawable/ic_menu_refresh"
         android:title="@string/menu_refresh_stop"/>
-    <!--<item
+    <item
         android:id="@+id/menu_next_stop"
         android:icon="@drawable/ic_menu_forward"
-        android:title="@string/menu_next_stop"/>-->
+        android:title="@string/menu_next_stop"/>
 
 </menu>
\ No newline at end of file
diff --git a/src/net/cbaines/suma/BusRoute.java b/src/net/cbaines/suma/BusRoute.java
index 5af89e7..96cf0ce 100644
--- a/src/net/cbaines/suma/BusRoute.java
+++ b/src/net/cbaines/suma/BusRoute.java
@@ -121,20 +121,18 @@ public class BusRoute {
 
 	if (forwardDirection != null) {
 
-	    if (direction == null) {
-		return null;
-	    }
+	    if (direction != null) {
 
-	    if (forwardDirection.equals(direction)) {
+		if (forwardDirection.equals(direction)) {
 
-	    } else if (reverseDirection.equals(direction)) {
-		moveAmount = -moveAmount;
-	    } else {
-		Log.e("BusRoute", "Direction (" + direction + ") doesnt match either the forward direction (" + forwardDirection + ") or reverse direction ("
-			+ reverseDirection + ")");
-		return null;
+		} else if (reverseDirection.equals(direction)) {
+		    moveAmount = -moveAmount;
+		} else {
+		    Log.e("BusRoute", "Direction (" + direction + ") doesnt match either the forward direction (" + forwardDirection
+			    + ") or reverse direction (" + reverseDirection + ")");
+		    return null;
+		}
 	    }
-
 	}
 
 	try {
@@ -147,12 +145,12 @@ public class BusRoute {
 
 	    List<RouteStops> routeStopsFound = routeStopsDao.query(routeStopsPreparedQuery);
 	    Log.v("BusRoute", "Found " + routeStopsFound.size() + " stops");
-	    
+
 	    int stopIndex = 0;
-	    
+
 	    for (RouteStops routeStop : routeStopsFound) {
 		if (routeStop.stop.id.equals(stop.id)) {
-		    stopIndex = routeStop.sequence -1;
+		    stopIndex = routeStop.sequence - 1;
 		}
 	    }
 
diff --git a/src/net/cbaines/suma/BusStopActivity.java b/src/net/cbaines/suma/BusStopActivity.java
index 6c46d03..1f99b8a 100644
--- a/src/net/cbaines/suma/BusStopActivity.java
+++ b/src/net/cbaines/suma/BusStopActivity.java
@@ -334,7 +334,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 	// Handle item selection
-	if (false) { // (item.getItemId() == R.id.menu_previous_stop || item.getItemId() == R.id.menu_next_stop) {
+	if (item.getItemId() == R.id.menu_previous_stop || item.getItemId() == R.id.menu_next_stop) {
 	    Log.v(TAG, "Got a request for the stop movement");
 
 	    Log.v(TAG, routes.size() + " routes avalible from this stop");
@@ -343,7 +343,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> impleme
 
 	    for (BusRoute route : routes) {
 		try {
-		    if (false) { // (item.getItemId() == R.id.menu_next_stop) {
+		    if (item.getItemId() == R.id.menu_next_stop) {
 			busStops.add(route.moveInRoute(this, getHelper().getBusStopDao().queryForId(busStopID), null, 1));
 		    } else {
 			busStops.add(route.moveInRoute(this, getHelper().getBusStopDao().queryForId(busStopID), null, -1));
diff --git a/src/net/cbaines/suma/BusStopDialog.java b/src/net/cbaines/suma/BusStopDialog.java
new file mode 100644
index 0000000..670fc96
--- /dev/null
+++ b/src/net/cbaines/suma/BusStopDialog.java
@@ -0,0 +1,98 @@
+/*
+ * Southampton University Map App
+ * Copyright (C) 2011  Christopher Baines
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package net.cbaines.suma;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.j256.ormlite.android.apptools.OpenHelperManager;
+import com.j256.ormlite.dao.Dao;
+
+public class BusStopDialog extends Dialog {
+
+    private static final String TAG = "BusStopDialog";
+    private ListView listItems;
+
+    private final Context context;
+
+    protected POIArrayAdapter adapter;
+
+    private ArrayList<BusStop> busStops;
+
+    public BusStopDialog(Context context) {
+	super(context);
+
+	this.context = context;
+
+	setContentView(R.layout.bus_stop_dialog);
+	setTitle("Favourite Items");
+
+	busStops = new ArrayList<BusStop>();
+
+	listItems = (ListView) findViewById(R.id.favouriteListItems);
+
+	refresh();
+    }
+
+    public void refresh() {
+
+	DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+
+	try {
+	    
+	    if (busStops.size() == 0) {
+		Log.e(TAG, "Error");
+	    } else {
+		listItems.post(new Runnable() {
+		    public void run() {
+			adapter = new POIArrayAdapter(context, busStops);
+
+			listItems.setVisibility(View.VISIBLE);
+			listItems.setAdapter(adapter);
+
+		    }
+		});
+
+	    }
+	} catch (SQLException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	}
+    }
+
+    void setOnItemClickListener(OnItemClickListener item) {
+	listItems.setOnItemClickListener(item);
+
+    }
+
+    void setOnItemLongClickListener(OnItemLongClickListener item) {
+	listItems.setOnItemLongClickListener(item);
+    }
+
+}