aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/bus_activity.xml99
-rw-r--r--res/layout/bus_stop_dialog.xml15
-rw-r--r--res/layout/poi_dialog.xml (renamed from res/layout/favourite_dialog.xml)4
-rw-r--r--res/menu/stop_menu.xml8
-rw-r--r--res/raw/ormlite_config.txt2
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/xml/preferences.xml2
7 files changed, 125 insertions, 8 deletions
diff --git a/res/layout/bus_activity.xml b/res/layout/bus_activity.xml
new file mode 100644
index 0000000..3037916
--- /dev/null
+++ b/res/layout/bus_activity.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:gravity="center|top"
+ android:orientation="vertical"
+ android:theme="@android:style/Theme.NoTitleBar" >
+
+ <LinearLayout
+ android:id="@+id/busActivityHeaderLayout"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" >
+
+ <TextView
+ android:id="@+id/busActivityBusID"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView
+ android:id="@+id/busActivityU1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u1_back_selected"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:text="@string/U1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#FFFFFF" />
+
+ <TextView
+ android:id="@+id/busActivityU1N"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u1n_back_selected"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:text="@string/U1N"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#FFFFFF" />
+
+ <TextView
+ android:id="@+id/busActivityU2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u2_back_selected"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:text="@string/U2"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#FFFFFF" />
+
+ <TextView
+ android:id="@+id/busActivityU6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u6_back_selected"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:text="@string/U6"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#FFFFFF" />
+
+ <TextView
+ android:id="@+id/busActivityU9"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u9_back_selected"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:text="@string/U9"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#FFFFFF" />
+ </LinearLayout>
+
+ <LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/busActivityContentLayout"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:gravity="center"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/busActivityMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <ListView
+ android:id="@+id/busActivityTimes"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" >
+ </ListView>
+ </LinearLayout>
+
+</LinearLayout> \ No newline at end of file
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/layout/favourite_dialog.xml b/res/layout/poi_dialog.xml
index 44cb02a..cf97083 100644
--- a/res/layout/favourite_dialog.xml
+++ b/res/layout/poi_dialog.xml
@@ -4,7 +4,9 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
- android:padding="10dp" >
+ android:paddingBottom="10dp"
+ android:paddingLeft="10dp"
+ android:paddingRight="10dp" >
<TextView
android:id="@+id/favouriteDialogMessage"
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/res/raw/ormlite_config.txt b/res/raw/ormlite_config.txt
index 60f9ade..2268ae9 100644
--- a/res/raw/ormlite_config.txt
+++ b/res/raw/ormlite_config.txt
@@ -1,3 +1,3 @@
#
-# generated on 2012/02/01 07:59:58
+# generated on 2012/02/19 09:50:39
#
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3bde7e1..c602a26 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,7 @@
<string name="U9">U9</string>
<string name="menu_about">About</string>
<string name="menu_favourites">Favourites</string>
+ <string name="favourites_dialog_title">Favourites</string>
<!-- Help Messages -->
<string name="map_help_message">You can drag the map to move it, you can use pinch motions to zoom in and out, this can also be done with the buttons at the bottom of the screen. Taping the building markers will show you there full name, and tapping the bus stop markers will show the live times at that stop. Presing and holding a marker, will add the item to the favourites list.</string>
@@ -101,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.<
<!-- About Strings -->
<string name="about">About</string>
<string name="about_version">Version</string>
- <string name="about_version_summary">0.2.2 (alpha)</string>
+ <string name="about_version_summary">0.3 (alpha)</string>
<string name="about_copyright">Copyright</string>
<string name="about_copyright_summary">© 2012, Christopher Baines</string>
<string name="about_license">License</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index f4cdd9f..4a12e1c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -28,7 +28,7 @@
android:orderingFromXml="true"
android:title="@string/preferences_catagory_data" >
<CheckBoxPreference
- android:key="nonUniLinkBusStop"
+ android:key="nonUniLinkBusStops"
android:summaryOff="@string/preferences_non_uni_link_disabled"
android:summaryOn="@string/preferences_non_uni_link_enabled"
android:title="@string/preferences_non_uni_link" />