From b5d0db004eaf72e9eeff0dfd7f612591d670b139 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 28 Feb 2012 14:01:42 +0000 Subject: Added a BusRoute activity, and moved more stuff over to the new uri system. --- gen/net/cbaines/suma/R.java | 104 +++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 49 deletions(-) (limited to 'gen/net/cbaines/suma/R.java') diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java index 06657e6..20027e0 100644 --- a/gen/net/cbaines/suma/R.java +++ b/gen/net/cbaines/suma/R.java @@ -68,65 +68,71 @@ public final class R { public static final int busActivityU2=0x7f0a000d; public static final int busActivityU6=0x7f0a000e; public static final int busActivityU9=0x7f0a000f; - public static final int busStopID=0x7f0a001a; - public static final int busStopListItems=0x7f0a0021; - public static final int busStopLoadBar=0x7f0a001f; - public static final int busStopMessage=0x7f0a001c; - public static final int busStopName=0x7f0a0013; - public static final int busStopTimes=0x7f0a001d; - public static final int busTimeContentLayout=0x7f0a001b; - public static final int centerLoadBar=0x7f0a001e; - public static final int check1=0x7f0a0030; - public static final int childname=0x7f0a002f; - public static final int donateBitcoinAddress=0x7f0a0027; + public static final int busRouteActivityCode=0x7f0a0015; + public static final int busRouteActivityHeaderLayout=0x7f0a0013; + public static final int busRouteActivityID=0x7f0a0016; + public static final int busRouteActivityLabel=0x7f0a0014; + public static final int busRouteBusStops=0x7f0a0017; + public static final int busStopID=0x7f0a001f; + public static final int busStopListItems=0x7f0a0026; + public static final int busStopLoadBar=0x7f0a0024; + public static final int busStopMessage=0x7f0a0021; + public static final int busStopName=0x7f0a0018; + public static final int busStopTimes=0x7f0a0022; + public static final int busTimeContentLayout=0x7f0a0020; + public static final int centerLoadBar=0x7f0a0023; + public static final int check1=0x7f0a0035; + public static final int childname=0x7f0a0034; + public static final int donateBitcoinAddress=0x7f0a002c; public static final int donateButton=0x7f0a0003; - public static final int donateDialogErrorMessage=0x7f0a0026; - public static final int donateDialogMessage=0x7f0a0023; - public static final int donateDialogMessageLayout=0x7f0a0025; - public static final int donateDialogProgress=0x7f0a0024; - public static final int favouriteCheckBox=0x7f0a0019; - public static final int favouriteDialogMessage=0x7f0a002d; - public static final int favouriteListItems=0x7f0a002e; - public static final int findContentLayout=0x7f0a0029; - public static final int findListItems=0x7f0a002b; - public static final int findLoadBar=0x7f0a002a; + public static final int donateDialogErrorMessage=0x7f0a002b; + public static final int donateDialogMessage=0x7f0a0028; + public static final int donateDialogMessageLayout=0x7f0a002a; + public static final int donateDialogProgress=0x7f0a0029; + public static final int favouriteCheckBox=0x7f0a001e; + public static final int favouriteDialogMessage=0x7f0a0032; + public static final int favouriteListItems=0x7f0a0033; + public static final int findContentLayout=0x7f0a002e; + public static final int findListItems=0x7f0a0030; + public static final int findLoadBar=0x7f0a002f; public static final int helpExpandableListView=0x7f0a0002; - public static final int layout_root=0x7f0a0020; + public static final int layout_root=0x7f0a0025; public static final int linearLayout1=0x7f0a0005; - public static final int linearLayout2=0x7f0a0022; - public static final int mapview=0x7f0a002c; - public static final int menu_about=0x7f0a0036; - public static final int menu_favourites=0x7f0a0037; - public static final int menu_find=0x7f0a0032; - public static final int menu_find_my_location=0x7f0a0034; - public static final int menu_next_stop=0x7f0a003a; - public static final int menu_preferences=0x7f0a0033; - public static final int menu_previous_stop=0x7f0a0038; - public static final int menu_refresh_stop=0x7f0a0039; - public static final int menu_view=0x7f0a0035; - public static final int radio_u1=0x7f0a0014; - public static final int radio_u1n=0x7f0a0015; - public static final int radio_u2=0x7f0a0016; - public static final int radio_u6=0x7f0a0017; - public static final int radio_u9=0x7f0a0018; - public static final int searchBar=0x7f0a0028; + public static final int linearLayout2=0x7f0a0027; + public static final int mapview=0x7f0a0031; + public static final int menu_about=0x7f0a003b; + public static final int menu_favourites=0x7f0a003c; + public static final int menu_find=0x7f0a0037; + public static final int menu_find_my_location=0x7f0a0039; + public static final int menu_next_stop=0x7f0a003f; + public static final int menu_preferences=0x7f0a0038; + public static final int menu_previous_stop=0x7f0a003d; + public static final int menu_refresh_stop=0x7f0a003e; + public static final int menu_view=0x7f0a003a; + public static final int radio_u1=0x7f0a0019; + public static final int radio_u1n=0x7f0a001a; + public static final int radio_u2=0x7f0a001b; + public static final int radio_u6=0x7f0a001c; + public static final int radio_u9=0x7f0a001d; + public static final int searchBar=0x7f0a002d; public static final int textView1=0x7f0a0000; public static final int textView2=0x7f0a0001; - public static final int view_list=0x7f0a0031; + public static final int view_list=0x7f0a0036; } public static final class layout { public static final int about_dialog=0x7f030000; public static final int building_activity=0x7f030001; public static final int bus_activity=0x7f030002; - public static final int bus_stop_activity=0x7f030003; - public static final int bus_stop_dialog=0x7f030004; - public static final int donate_dialog=0x7f030005; - public static final int find=0x7f030006; - public static final int main=0x7f030007; - public static final int poi_dialog=0x7f030008; - public static final int view_child_row=0x7f030009; - public static final int view_dialog=0x7f03000a; - public static final int view_group_row=0x7f03000b; + public static final int bus_route_activity=0x7f030003; + public static final int bus_stop_activity=0x7f030004; + public static final int bus_stop_dialog=0x7f030005; + public static final int donate_dialog=0x7f030006; + public static final int find=0x7f030007; + public static final int main=0x7f030008; + public static final int poi_dialog=0x7f030009; + public static final int view_child_row=0x7f03000a; + public static final int view_dialog=0x7f03000b; + public static final int view_group_row=0x7f03000c; } public static final class menu { public static final int map_menu=0x7f090000; -- cgit v1.2.3 From 0b5aefbe0ff01638dd264222c5368ad02a0fe1ee Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 28 Feb 2012 19:09:23 +0000 Subject: Fixed two bugs relating to the query on the database not being ordered?, and implemented a new preference option. --- gen/net/cbaines/suma/R.java | 110 +++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 53 deletions(-) (limited to 'gen/net/cbaines/suma/R.java') diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java index 20027e0..aec5afc 100644 --- a/gen/net/cbaines/suma/R.java +++ b/gen/net/cbaines/suma/R.java @@ -68,10 +68,10 @@ public final class R { public static final int busActivityU2=0x7f0a000d; public static final int busActivityU6=0x7f0a000e; public static final int busActivityU9=0x7f0a000f; - public static final int busRouteActivityCode=0x7f0a0015; - public static final int busRouteActivityHeaderLayout=0x7f0a0013; + public static final int busRouteActivityCode=0x7f0a0013; + public static final int busRouteActivityHeaderLayout=0x7f0a0014; public static final int busRouteActivityID=0x7f0a0016; - public static final int busRouteActivityLabel=0x7f0a0014; + public static final int busRouteActivityLabel=0x7f0a0015; public static final int busRouteBusStops=0x7f0a0017; public static final int busStopID=0x7f0a001f; public static final int busStopListItems=0x7f0a0026; @@ -156,47 +156,47 @@ public final class R { public static final int U9=0x7f07000d; /** About Strings */ - public static final int about=0x7f070034; - public static final int about_android_market=0x7f070041; - public static final int about_android_market_summary=0x7f070042; - public static final int about_copyright=0x7f070037; - public static final int about_copyright_summary=0x7f070038; - public static final int about_data=0x7f07003f; - public static final int about_data_summary=0x7f070040; - public static final int about_database=0x7f07004b; - public static final int about_database_summary=0x7f07004c; - public static final int about_developer=0x7f07003d; - public static final int about_developer_summary=0x7f07003e; - public static final int about_donate=0x7f07004d; - public static final int about_donate_summary=0x7f07004e; + public static final int about=0x7f070038; + public static final int about_android_market=0x7f070045; + public static final int about_android_market_summary=0x7f070046; + public static final int about_copyright=0x7f07003b; + public static final int about_copyright_summary=0x7f07003c; + public static final int about_data=0x7f070043; + public static final int about_data_summary=0x7f070044; + public static final int about_database=0x7f07004f; + public static final int about_database_summary=0x7f070050; + public static final int about_developer=0x7f070041; + public static final int about_developer_summary=0x7f070042; + public static final int about_donate=0x7f070051; + public static final int about_donate_summary=0x7f070052; public static final int about_help_message=0x7f070016; - public static final int about_license=0x7f070039; - public static final int about_license_summary=0x7f07003a; - public static final int about_map_data=0x7f070043; - public static final int about_map_data_summary=0x7f070044; - public static final int about_map_icons=0x7f070045; - public static final int about_map_icons_summary=0x7f070046; - public static final int about_map_tiles=0x7f070049; - public static final int about_map_tiles_summary=0x7f07004a; + public static final int about_license=0x7f07003d; + public static final int about_license_summary=0x7f07003e; + public static final int about_map_data=0x7f070047; + public static final int about_map_data_summary=0x7f070048; + public static final int about_map_icons=0x7f070049; + public static final int about_map_icons_summary=0x7f07004a; + public static final int about_map_tiles=0x7f07004d; + public static final int about_map_tiles_summary=0x7f07004e; /** About Messages */ - public static final int about_menu_instruction_text=0x7f07002d; - public static final int about_osm_map=0x7f070047; - public static final int about_osm_map_summary=0x7f070048; - public static final int about_project=0x7f07003b; - public static final int about_project_summary=0x7f07003c; - public static final int about_version=0x7f070035; - public static final int about_version_summary=0x7f070036; + public static final int about_menu_instruction_text=0x7f070031; + public static final int about_osm_map=0x7f07004b; + public static final int about_osm_map_summary=0x7f07004c; + public static final int about_project=0x7f07003f; + public static final int about_project_summary=0x7f070040; + public static final int about_version=0x7f070039; + public static final int about_version_summary=0x7f07003a; public static final int app_name=0x7f070004; public static final int bitcoin_error_message=0x7f07001b; - public static final int buildingImageDescription=0x7f07004f; + public static final int buildingImageDescription=0x7f070053; public static final int building_non_residential=0x7f070007; public static final int building_residential=0x7f070006; - public static final int bustimes_favourite_checkbox_label=0x7f07002e; + public static final int bustimes_favourite_checkbox_label=0x7f070032; public static final int credits_help_message=0x7f070019; public static final int donate_button=0x7f07001a; - public static final int donate_dialog_error_title=0x7f070030; - public static final int donate_dialog_message=0x7f07002f; + public static final int donate_dialog_error_title=0x7f070034; + public static final int donate_dialog_message=0x7f070033; public static final int favourites_dialog_message=0x7f07001d; public static final int favourites_dialog_title=0x7f070010; public static final int favourites_help_message=0x7f070017; @@ -211,31 +211,35 @@ public final class R { public static final int menu_favourites=0x7f07000f; public static final int menu_find=0x7f070000; public static final int menu_find_my_location=0x7f070003; - public static final int menu_next_stop=0x7f070032; + public static final int menu_next_stop=0x7f070036; public static final int menu_preferences=0x7f070001; - public static final int menu_previous_stop=0x7f070031; - public static final int menu_refresh_stop=0x7f070033; + public static final int menu_previous_stop=0x7f070035; + public static final int menu_refresh_stop=0x7f070037; public static final int menu_view=0x7f070002; public static final int pref_bus_stop=0x7f070008; public static final int preferences=0x7f07001c; - public static final int preferences_catagory_data=0x7f070029; - public static final int preferences_catagory_live_bus_times=0x7f070022; /** Preferences Messages */ - public static final int preferences_catagory_positioning=0x7f07001e; - public static final int preferences_gps=0x7f07001f; - public static final int preferences_gps_disabled=0x7f070021; - public static final int preferences_gps_enabled=0x7f070020; + public static final int preferences_catagory_appearance=0x7f07001e; + public static final int preferences_catagory_data=0x7f07002d; + public static final int preferences_catagory_live_bus_times=0x7f070026; + public static final int preferences_catagory_positioning=0x7f070022; + public static final int preferences_gps=0x7f070023; + public static final int preferences_gps_disabled=0x7f070025; + public static final int preferences_gps_enabled=0x7f070024; public static final int preferences_help_message=0x7f070013; - public static final int preferences_non_uni_link=0x7f07002a; - public static final int preferences_non_uni_link_disabled=0x7f07002c; - public static final int preferences_non_uni_link_enabled=0x7f07002b; - public static final int preferences_non_uni_link_live_bus_times=0x7f070026; - public static final int preferences_non_uni_link_live_bus_times_disabled=0x7f070028; - public static final int preferences_non_uni_link_live_bus_times_enabled=0x7f070027; - public static final int preferences_uni_link_live_bus_times=0x7f070023; - public static final int preferences_uni_link_live_bus_times_disabled=0x7f070025; - public static final int preferences_uni_link_live_bus_times_enabled=0x7f070024; + public static final int preferences_non_uni_link=0x7f07002e; + public static final int preferences_non_uni_link_disabled=0x7f070030; + public static final int preferences_non_uni_link_enabled=0x7f07002f; + public static final int preferences_non_uni_link_live_bus_times=0x7f07002a; + public static final int preferences_non_uni_link_live_bus_times_disabled=0x7f07002c; + public static final int preferences_non_uni_link_live_bus_times_enabled=0x7f07002b; + public static final int preferences_show_identifiers=0x7f07001f; + public static final int preferences_show_identifiers_disabled=0x7f070021; + public static final int preferences_show_identifiers_enabled=0x7f070020; + public static final int preferences_uni_link_live_bus_times=0x7f070027; + public static final int preferences_uni_link_live_bus_times_disabled=0x7f070029; + public static final int preferences_uni_link_live_bus_times_enabled=0x7f070028; public static final int view_help_message=0x7f070015; } public static final class xml { -- cgit v1.2.3 From 5f2b8712079aeb5b7cee476b06b36013edac4fb3 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 28 Feb 2012 22:22:27 +0000 Subject: Next release, many improvements. --- gen/net/cbaines/suma/R.java | 119 +++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 61 deletions(-) (limited to 'gen/net/cbaines/suma/R.java') diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java index aec5afc..f7f3034 100644 --- a/gen/net/cbaines/suma/R.java +++ b/gen/net/cbaines/suma/R.java @@ -54,70 +54,67 @@ public final class R { public static final int u9_radio_button=0x7f02001d; } public static final class id { - public static final int buildingActivityFavouriteCheckBox=0x7f0a0006; - public static final int buildingActivityID=0x7f0a0007; - public static final int buildingActivityImage=0x7f0a0008; + public static final int buildingActivityFavouriteCheckBox=0x7f0a0005; + public static final int buildingActivityImage=0x7f0a0006; + public static final int buildingActivityLoadBar=0x7f0a0008; + public static final int buildingActivityLoadBarLayout=0x7f0a0007; + public static final int buildingActivityMessage=0x7f0a0009; public static final int buildingActivityName=0x7f0a0004; - public static final int busActivityBusID=0x7f0a000a; - public static final int busActivityContentLayout=0x7f0a0010; - public static final int busActivityHeaderLayout=0x7f0a0009; - public static final int busActivityMessage=0x7f0a0011; - public static final int busActivityTimes=0x7f0a0012; - public static final int busActivityU1=0x7f0a000b; - public static final int busActivityU1N=0x7f0a000c; - public static final int busActivityU2=0x7f0a000d; - public static final int busActivityU6=0x7f0a000e; - public static final int busActivityU9=0x7f0a000f; - public static final int busRouteActivityCode=0x7f0a0013; - public static final int busRouteActivityHeaderLayout=0x7f0a0014; - public static final int busRouteActivityID=0x7f0a0016; - public static final int busRouteActivityLabel=0x7f0a0015; - public static final int busRouteBusStops=0x7f0a0017; - public static final int busStopID=0x7f0a001f; - public static final int busStopListItems=0x7f0a0026; - public static final int busStopLoadBar=0x7f0a0024; - public static final int busStopMessage=0x7f0a0021; - public static final int busStopName=0x7f0a0018; - public static final int busStopTimes=0x7f0a0022; - public static final int busTimeContentLayout=0x7f0a0020; - public static final int centerLoadBar=0x7f0a0023; - public static final int check1=0x7f0a0035; - public static final int childname=0x7f0a0034; - public static final int donateBitcoinAddress=0x7f0a002c; + public static final int busActivityBusID=0x7f0a000b; + public static final int busActivityContentLayout=0x7f0a000c; + public static final int busActivityHeaderLayout=0x7f0a000a; + public static final int busActivityMessage=0x7f0a000d; + public static final int busActivityTimes=0x7f0a000e; + public static final int busRouteActivityCode=0x7f0a000f; + public static final int busRouteActivityHeaderLayout=0x7f0a0010; + public static final int busRouteActivityID=0x7f0a0012; + public static final int busRouteActivityLabel=0x7f0a0011; + public static final int busRouteBusStops=0x7f0a0013; + public static final int busStopID=0x7f0a001c; + public static final int busStopListItems=0x7f0a0023; + public static final int busStopLoadBar=0x7f0a0021; + public static final int busStopMessage=0x7f0a001e; + public static final int busStopName=0x7f0a0014; + public static final int busStopTimes=0x7f0a001f; + public static final int busTimeContentLayout=0x7f0a001d; + public static final int centerLoadBar=0x7f0a0020; + public static final int check1=0x7f0a0032; + public static final int childname=0x7f0a0031; + public static final int donateBitcoinAddress=0x7f0a0029; public static final int donateButton=0x7f0a0003; - public static final int donateDialogErrorMessage=0x7f0a002b; - public static final int donateDialogMessage=0x7f0a0028; - public static final int donateDialogMessageLayout=0x7f0a002a; - public static final int donateDialogProgress=0x7f0a0029; - public static final int favouriteCheckBox=0x7f0a001e; - public static final int favouriteDialogMessage=0x7f0a0032; - public static final int favouriteListItems=0x7f0a0033; - public static final int findContentLayout=0x7f0a002e; - public static final int findListItems=0x7f0a0030; - public static final int findLoadBar=0x7f0a002f; + public static final int donateDialogErrorMessage=0x7f0a0028; + public static final int donateDialogMessage=0x7f0a0025; + public static final int donateDialogMessageLayout=0x7f0a0027; + public static final int donateDialogProgress=0x7f0a0026; + public static final int favouriteCheckBox=0x7f0a001b; + public static final int favouriteDialogMessage=0x7f0a002f; + public static final int favouriteListItems=0x7f0a0030; + public static final int findContentLayout=0x7f0a002b; + public static final int findListItems=0x7f0a002d; + public static final int findLoadBar=0x7f0a002c; public static final int helpExpandableListView=0x7f0a0002; - public static final int layout_root=0x7f0a0025; - public static final int linearLayout1=0x7f0a0005; - public static final int linearLayout2=0x7f0a0027; - public static final int mapview=0x7f0a0031; - public static final int menu_about=0x7f0a003b; - public static final int menu_favourites=0x7f0a003c; - public static final int menu_find=0x7f0a0037; - public static final int menu_find_my_location=0x7f0a0039; - public static final int menu_next_stop=0x7f0a003f; - public static final int menu_preferences=0x7f0a0038; - public static final int menu_previous_stop=0x7f0a003d; - public static final int menu_refresh_stop=0x7f0a003e; - public static final int menu_view=0x7f0a003a; - public static final int radio_u1=0x7f0a0019; - public static final int radio_u1n=0x7f0a001a; - public static final int radio_u2=0x7f0a001b; - public static final int radio_u6=0x7f0a001c; - public static final int radio_u9=0x7f0a001d; - public static final int searchBar=0x7f0a002d; + public static final int layout_root=0x7f0a0022; + public static final int linearLayout1=0x7f0a0015; + public static final int linearLayout2=0x7f0a0024; + public static final int mapview=0x7f0a002e; + public static final int menu_about=0x7f0a0038; + public static final int menu_favourites=0x7f0a0039; + public static final int menu_find=0x7f0a0034; + public static final int menu_find_my_location=0x7f0a0036; + public static final int menu_next_stop=0x7f0a003c; + public static final int menu_preferences=0x7f0a0035; + public static final int menu_previous_stop=0x7f0a003a; + public static final int menu_refresh_stop=0x7f0a003b; + public static final int menu_view=0x7f0a0037; + public static final int radio_u1=0x7f0a0016; + public static final int radio_u1n=0x7f0a0017; + public static final int radio_u2=0x7f0a0018; + public static final int radio_u6=0x7f0a0019; + public static final int radio_u9=0x7f0a001a; + public static final int searchBar=0x7f0a002a; public static final int textView1=0x7f0a0000; public static final int textView2=0x7f0a0001; - public static final int view_list=0x7f0a0036; + public static final int view_list=0x7f0a0033; } public static final class layout { public static final int about_dialog=0x7f030000; @@ -127,8 +124,8 @@ public final class R { public static final int bus_stop_activity=0x7f030004; public static final int bus_stop_dialog=0x7f030005; public static final int donate_dialog=0x7f030006; - public static final int find=0x7f030007; - public static final int main=0x7f030008; + public static final int find_activity=0x7f030007; + public static final int map_activity=0x7f030008; public static final int poi_dialog=0x7f030009; public static final int view_child_row=0x7f03000a; public static final int view_dialog=0x7f03000b; -- cgit v1.2.3