diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
commit | cde3c08d7e9e486d7d1a795832ea1b767d96a4f3 (patch) | |
tree | f1af1424ebf5cb3a548a7d73257723395dccb267 /res | |
parent | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (diff) | |
parent | 5f2b8712079aeb5b7cee476b06b36013edac4fb3 (diff) | |
download | southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar.gz |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/building_activity.xml | 42 | ||||
-rw-r--r-- | res/layout/bus_activity.xml | 55 | ||||
-rw-r--r-- | res/layout/bus_route_activity.xml | 42 | ||||
-rw-r--r-- | res/layout/bus_stop_activity.xml | 16 | ||||
-rw-r--r-- | res/layout/find_activity.xml (renamed from res/layout/find.xml) | 0 | ||||
-rw-r--r-- | res/layout/map_activity.xml (renamed from res/layout/main.xml) | 0 | ||||
-rw-r--r-- | res/values/strings.xml | 6 | ||||
-rw-r--r-- | res/xml/preferences.xml | 9 |
8 files changed, 90 insertions, 80 deletions
diff --git a/res/layout/building_activity.xml b/res/layout/building_activity.xml index 6ed937f..777ad0a 100644 --- a/res/layout/building_activity.xml +++ b/res/layout/building_activity.xml @@ -10,31 +10,39 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" /> + <CheckBox + android:id="@+id/buildingActivityFavouriteCheckBox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bustimes_favourite_checkbox_label" /> + + <ImageButton + android:id="@+id/buildingActivityImage" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@null" + android:contentDescription="@string/buildingImageDescription" /> + <LinearLayout - android:id="@+id/linearLayout1" + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/buildingActivityLoadBarLayout" android:layout_width="fill_parent" - android:layout_height="wrap_content" > + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="vertical" > - <CheckBox - android:id="@+id/buildingActivityFavouriteCheckBox" + <ProgressBar + android:id="@+id/buildingActivityLoadBar" + style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/bustimes_favourite_checkbox_label" /> + android:layout_height="wrap_content" /> <TextView - android:id="@+id/buildingActivityID" + android:id="@+id/buildingActivityMessage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:text="" + android:textAppearance="?android:attr/textAppearanceLarge" /> </LinearLayout> - <ImageButton - android:id="@+id/buildingActivityImage" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@null" - android:contentDescription="@string/buildingImageDescription" /> - </LinearLayout>
\ No newline at end of file diff --git a/res/layout/bus_activity.xml b/res/layout/bus_activity.xml index 3037916..f8bbe59 100644 --- a/res/layout/bus_activity.xml +++ b/res/layout/bus_activity.xml @@ -17,61 +17,6 @@ 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 diff --git a/res/layout/bus_route_activity.xml b/res/layout/bus_route_activity.xml new file mode 100644 index 0000000..48cdadc --- /dev/null +++ b/res/layout/bus_route_activity.xml @@ -0,0 +1,42 @@ +<?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" > + + <TextView + android:id="@+id/busRouteActivityCode" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <LinearLayout + android:id="@+id/busRouteActivityHeaderLayout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <TextView + android:id="@+id/busRouteActivityLabel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dp" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/busRouteActivityID" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:visibility="gone" /> + </LinearLayout> + + <ListView + android:id="@+id/busRouteBusStops" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + </ListView> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/bus_stop_activity.xml b/res/layout/bus_stop_activity.xml index 24200c6..3f4dc98 100644 --- a/res/layout/bus_stop_activity.xml +++ b/res/layout/bus_stop_activity.xml @@ -27,7 +27,7 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:text="@string/U1" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> <CheckBox @@ -40,7 +40,7 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:text="@string/U1N" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> <CheckBox @@ -53,7 +53,7 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:text="@string/U2" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> <CheckBox @@ -66,7 +66,7 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:text="@string/U6" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> <CheckBox @@ -79,14 +79,15 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:text="@string/U9" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> <CheckBox android:id="@+id/favouriteCheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/bustimes_favourite_checkbox_label" /> + android:text="@string/bustimes_favourite_checkbox_label" + android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView android:id="@+id/busStopID" @@ -94,7 +95,8 @@ android:layout_height="wrap_content" android:paddingLeft="5dp" android:paddingRight="5dp" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone" /> </LinearLayout> <LinearLayout diff --git a/res/layout/find.xml b/res/layout/find_activity.xml index 6b19c67..6b19c67 100644 --- a/res/layout/find.xml +++ b/res/layout/find_activity.xml diff --git a/res/layout/main.xml b/res/layout/map_activity.xml index dff45bd..dff45bd 100644 --- a/res/layout/main.xml +++ b/res/layout/map_activity.xml diff --git a/res/values/strings.xml b/res/values/strings.xml index 6333664..f3850a3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -74,6 +74,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< </string-array> <!-- Preferences Messages --> + <string name="preferences_catagory_appearance">Appearance</string> + <string name="preferences_show_identifiers">Show Identifiers</string> + <string name="preferences_show_identifiers_enabled">Showing Identifiers</string> + <string name="preferences_show_identifiers_disabled">Hiding Identifiers</string> <string name="preferences_catagory_positioning">Positioning</string> <string name="preferences_gps">GPS</string> <string name="preferences_gps_enabled">GPS Enabled</string> @@ -102,7 +106,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.4 (alpha)</string> + <string name="about_version_summary">0.5 (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 4a12e1c..9de3a61 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -3,6 +3,15 @@ <PreferenceCategory android:orderingFromXml="true" + android:title="@string/preferences_catagory_appearance" > + <CheckBoxPreference + android:key="showIdentifiers" + android:summaryOff="@string/preferences_show_identifiers_disabled" + android:summaryOn="@string/preferences_show_identifiers_enabled" + android:title="@string/preferences_show_identifiers" /> + </PreferenceCategory> + <PreferenceCategory + android:orderingFromXml="true" android:title="@string/preferences_catagory_positioning" > <CheckBoxPreference android:key="GPSEnabled" |