Many changes, began working on implementing filtering and route navigation within BusTimeActivity.

21 files changed, 193 insertions, 32 deletions

diff --git a/res/drawable/empty.xml b/res/drawable/empty.xml
new file mode 100644
index 0000000..840a0e7
--- /dev/null
+++ b/res/drawable/empty.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android:shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <android:size
+        android:height="0dp"
+        android:width="0dp" />
+
+</android:shape>
\ No newline at end of file
diff --git a/res/drawable/u1_back.xml b/res/drawable/u1_back.xml
index d9f615b..069eb8e 100644
--- a/res/drawable/u1_back.xml
+++ b/res/drawable/u1_back.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
+<android:shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
-    <solid android:color="#008BD0" >
-    </solid>
+    <android:solid android:color="#000000" >
+    </android:solid>
 
-    <corners
+    <android:corners
         android:bottomLeftRadius="7dp"
         android:bottomRightRadius="7dp"
         android:topLeftRadius="7dp"
         android:topRightRadius="7dp" />
 
-</shape>
\ No newline at end of file
+</android:shape>
\ No newline at end of file
diff --git a/res/drawable/u1_back_selected.xml b/res/drawable/u1_back_selected.xml
new file mode 100644
index 0000000..4040762
--- /dev/null
+++ b/res/drawable/u1_back_selected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android:shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <android:solid android:color="#008BD0" >
+    </android:solid>
+
+    <android:corners
+        android:bottomLeftRadius="7dp"
+        android:bottomRightRadius="7dp"
+        android:topLeftRadius="7dp"
+        android:topRightRadius="7dp" />
+
+</android:shape>
\ No newline at end of file
diff --git a/res/drawable/u1_radio_button.xml b/res/drawable/u1_radio_button.xml
new file mode 100644
index 0000000..5562342
--- /dev/null
+++ b/res/drawable/u1_radio_button.xml
@@ -0,0 +1,8 @@
+<android:selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android:item android:drawable="@drawable/u1_back_selected" android:state_checked="true" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u1_back" android:state_checked="false" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u1_back_selected" android:state_checked="true" android:state_pressed="true"/>
+    <android:item android:drawable="@drawable/u1_back" android:state_checked="false" android:state_pressed="true"/>
+
+</android:selector>
\ No newline at end of file
diff --git a/res/drawable/u1n_back.xml b/res/drawable/u1n_back.xml
index 3898629..069eb8e 100644
--- a/res/drawable/u1n_back.xml
+++ b/res/drawable/u1n_back.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
+<android:shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
-    <solid android:color="#002F6B" >
-    </solid>
+    <android:solid android:color="#000000" >
+    </android:solid>
 
-    <corners
+    <android:corners
         android:bottomLeftRadius="7dp"
         android:bottomRightRadius="7dp"
         android:topLeftRadius="7dp"
         android:topRightRadius="7dp" />
 
-</shape>
\ No newline at end of file
+</android:shape>
\ No newline at end of file
diff --git a/res/drawable/u1n_back_selected.xml b/res/drawable/u1n_back_selected.xml
new file mode 100644
index 0000000..3898629
--- /dev/null
+++ b/res/drawable/u1n_back_selected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <solid android:color="#002F6B" >
+    </solid>
+
+    <corners
+        android:bottomLeftRadius="7dp"
+        android:bottomRightRadius="7dp"
+        android:topLeftRadius="7dp"
+        android:topRightRadius="7dp" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/u1n_radio_button.xml b/res/drawable/u1n_radio_button.xml
new file mode 100644
index 0000000..b4bde8d
--- /dev/null
+++ b/res/drawable/u1n_radio_button.xml
@@ -0,0 +1,8 @@
+<android:selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android:item android:drawable="@drawable/u1n_back_selected" android:state_checked="true" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u1n_back" android:state_checked="false" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u1n_back_selected" android:state_checked="true" android:state_pressed="true"/>
+    <android:item android:drawable="@drawable/u1n_back" android:state_checked="false" android:state_pressed="true"/>
+
+</android:selector>
\ No newline at end of file
diff --git a/res/drawable/u2_back.xml b/res/drawable/u2_back.xml
index e1fa567..9feb0ef 100644
--- a/res/drawable/u2_back.xml
+++ b/res/drawable/u2_back.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
-    <solid android:color="#E2001A" >
+    <solid android:color="#000000" >
     </solid>
 
     <corners
diff --git a/res/drawable/u2_back_selected.xml b/res/drawable/u2_back_selected.xml
new file mode 100644
index 0000000..e1fa567
--- /dev/null
+++ b/res/drawable/u2_back_selected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <solid android:color="#E2001A" >
+    </solid>
+
+    <corners
+        android:bottomLeftRadius="7dp"
+        android:bottomRightRadius="7dp"
+        android:topLeftRadius="7dp"
+        android:topRightRadius="7dp" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/u2_radio_button.xml b/res/drawable/u2_radio_button.xml
new file mode 100644
index 0000000..a6ec1e6
--- /dev/null
+++ b/res/drawable/u2_radio_button.xml
@@ -0,0 +1,8 @@
+<android:selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android:item android:drawable="@drawable/u2_back_selected" android:state_checked="true" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u2_back" android:state_checked="false" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u2_back_selected" android:state_checked="true" android:state_pressed="true"/>
+    <android:item android:drawable="@drawable/u2_back" android:state_checked="false" android:state_pressed="true"/>
+
+</android:selector>
\ No newline at end of file
diff --git a/res/drawable/u6_back.xml b/res/drawable/u6_back.xml
index cd60db7..9feb0ef 100644
--- a/res/drawable/u6_back.xml
+++ b/res/drawable/u6_back.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
-    <solid android:color="#F7A800" >
+    <solid android:color="#000000" >
     </solid>
 
     <corners
diff --git a/res/drawable/u6_back_selected.xml b/res/drawable/u6_back_selected.xml
new file mode 100644
index 0000000..cd60db7
--- /dev/null
+++ b/res/drawable/u6_back_selected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <solid android:color="#F7A800" >
+    </solid>
+
+    <corners
+        android:bottomLeftRadius="7dp"
+        android:bottomRightRadius="7dp"
+        android:topLeftRadius="7dp"
+        android:topRightRadius="7dp" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/u6_radio_button.xml b/res/drawable/u6_radio_button.xml
new file mode 100644
index 0000000..1d28ba1
--- /dev/null
+++ b/res/drawable/u6_radio_button.xml
@@ -0,0 +1,20 @@
+<android:selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <android:item
+        android:drawable="@drawable/u6_back_selected"
+        android:state_checked="true"
+        android:state_pressed="false" />
+    <android:item
+        android:drawable="@drawable/u6_back"
+        android:state_checked="false"
+        android:state_pressed="false" />
+    <android:item
+        android:drawable="@drawable/u6_back_selected"
+        android:state_checked="true"
+        android:state_pressed="true" />
+    <android:item
+        android:drawable="@drawable/u6_back"
+        android:state_checked="false"
+        android:state_pressed="true" />
+
+</android:selector>
\ No newline at end of file
diff --git a/res/drawable/u9_back.xml b/res/drawable/u9_back.xml
index 6216ebc..9feb0ef 100644
--- a/res/drawable/u9_back.xml
+++ b/res/drawable/u9_back.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
 
-    <solid android:color="#E75294" >
+    <solid android:color="#000000" >
     </solid>
 
     <corners
diff --git a/res/drawable/u9_back_selected.xml b/res/drawable/u9_back_selected.xml
new file mode 100644
index 0000000..6216ebc
--- /dev/null
+++ b/res/drawable/u9_back_selected.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <solid android:color="#E75294" >
+    </solid>
+
+    <corners
+        android:bottomLeftRadius="7dp"
+        android:bottomRightRadius="7dp"
+        android:topLeftRadius="7dp"
+        android:topRightRadius="7dp" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/u9_radio_button.xml b/res/drawable/u9_radio_button.xml
new file mode 100644
index 0000000..22443a5
--- /dev/null
+++ b/res/drawable/u9_radio_button.xml
@@ -0,0 +1,8 @@
+<android:selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android:item android:drawable="@drawable/u9_back_selected" android:state_checked="true" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u9_back" android:state_checked="false" android:state_pressed="false"/>
+    <android:item android:drawable="@drawable/u9_back_selected" android:state_checked="true" android:state_pressed="true"/>
+    <android:item android:drawable="@drawable/u9_back" android:state_checked="false" android:state_pressed="true"/>
+
+</android:selector>
\ No newline at end of file
diff --git a/res/layout/bustimes.xml b/res/layout/bustimes.xml
index b076274..1928c79 100644
--- a/res/layout/bustimes.xml
+++ b/res/layout/bustimes.xml
@@ -17,56 +17,65 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
 
-        <TextView
-            android:id="@+id/busStopU1"
+        <CheckBox
+            android:id="@+id/radio_u1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="3dp"
-            android:background="@drawable/u1_back"
+            android:background="@drawable/u1_radio_button"
+            android:button="@drawable/empty"
+            android:checked="true"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U1"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#FFFFFF" />
 
-        <TextView
-            android:id="@+id/busStopU1N"
+        <CheckBox
+            android:id="@+id/radio_u1n"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/u1n_back"
+            android:background="@drawable/u1n_radio_button"
+            android:button="@drawable/empty"
+            android:checked="true"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U1N"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#FFFFFF" />
 
-        <TextView
-            android:id="@+id/busStopU2"
+        <CheckBox
+            android:id="@+id/radio_u2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/u2_back"
+            android:background="@drawable/u2_radio_button"
+            android:button="@drawable/empty"
+            android:checked="true"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U2"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#FFFFFF" />
 
-        <TextView
-            android:id="@+id/busStopU6"
+        <CheckBox
+            android:id="@+id/radio_u6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/u6_back"
+            android:background="@drawable/u6_radio_button"
+            android:button="@drawable/empty"
+            android:checked="true"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U6"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#FFFFFF" />
 
-        <TextView
-            android:id="@+id/busStopU9"
+        <CheckBox
+            android:id="@+id/radio_u9"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/u9_back"
+            android:background="@drawable/u9_radio_button"
+            android:button="@drawable/empty"
+            android:checked="true"
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:text="@string/U9"
@@ -86,7 +95,6 @@
             android:paddingLeft="5dp"
             android:paddingRight="5dp"
             android:textAppearance="?android:attr/textAppearanceSmall" />
-
     </LinearLayout>
 
     <LinearLayout
diff --git a/res/menu/map_menu.xml b/res/menu/map_menu.xml
index 29f9342..2734461 100644
--- a/res/menu/map_menu.xml
+++ b/res/menu/map_menu.xml
@@ -12,8 +12,7 @@
     <item
         android:id="@+id/menu_find_my_location"
         android:icon="@android:drawable/ic_menu_mylocation"
-        android:title="@string/menu_find_my_location">
-    </item>
+        android:title="@string/menu_find_my_location"/>
     <item
         android:id="@+id/menu_view"
         android:icon="@android:drawable/ic_menu_more"
diff --git a/res/menu/stop_menu.xml b/res/menu/stop_menu.xml
new file mode 100644
index 0000000..3b1bb40
--- /dev/null
+++ b/res/menu/stop_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_previous_stop"
+        android:icon="@android:drawable/ic_menu_search"
+        android:title="@string/menu_previous_stop"/>
+    <item
+        android:id="@+id/menu_refresh_stop"
+        android:icon="@android:drawable/ic_menu_search"
+        android:title="@string/menu_refresh_stop"/>
+    <item
+        android:id="@+id/menu_next_stop"
+        android:icon="@android:drawable/ic_menu_search"
+        android:title="@string/menu_next_stop"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/raw/ormlite_config.txt b/res/raw/ormlite_config.txt
new file mode 100644
index 0000000..f807b08
--- /dev/null
+++ b/res/raw/ormlite_config.txt
@@ -0,0 +1,3 @@
+#
+# generated on 2012/01/24 10:55:14
+#
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59e4696..f1060fe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -81,5 +81,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
     <string name="bustimes_favourite_checkbox_label">Favourite</string>
     <string name="donate_dialog_message">Loading bitcoin client</string>
     <string name="donate_dialog_error_title">Error</string>
+    <string name="menu_previous_stop">Previous</string>
+    <string name="menu_next_stop">Next</string>
+    <string name="menu_refresh_stop">Refresh</string>
 
 </resources>
\ No newline at end of file