From 61fb9af3d288bc1c04d24be2e17857900ea758c6 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Mon, 19 Mar 2012 12:22:41 -0400 Subject: [PATCH] Updated to meet Location Lib changes Change-Id: Ia78130ba8cdbf4ba9b7b4477ef289e8a515b4529 Signed-off-by: Ricky Barrette --- .../TwentyCodes/android/FindMyCarFull/R.java | 65 ++++++------- .../TwentyCodes/android/FindMyCarLib/R.java | 65 ++++++------- .../com/TwentyCodes/android/exception/R.java | 65 ++++++------- FindMyCarLib/bin/findmycarlib.jar | Bin 78572 -> 77946 bytes .../TwentyCodes/android/FindMyCarLib/R.java | 65 ++++++------- .../com/TwentyCodes/android/exception/R.java | 65 ++++++------- FindMyCarLib/res/values/theme.xml | 8 ++ .../android/FindMyCarLib/Main.java | 86 ++++++++---------- .../UI/fragments/DirectionsListFragment.java | 1 - 9 files changed, 217 insertions(+), 203 deletions(-) create mode 100644 FindMyCarLib/res/values/theme.xml diff --git a/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarFull/R.java b/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarFull/R.java index 1e7e50a..037c0b4 100644 --- a/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarFull/R.java +++ b/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarFull/R.java @@ -193,47 +193,47 @@ or to a theme attribute in the form "?[package:][type:]na public static final int user_arrow_animation_3=0x7f02001f; } public static final class id { - public static final int TextView01=0x7f070008; - public static final int TextView02=0x7f070009; - public static final int ad=0x7f07000a; + public static final int TextView01=0x7f07000a; + public static final int TextView02=0x7f07000b; + public static final int ad=0x7f07000c; public static final int btRemoveTimer=0x7f070023; public static final int btSetTimer=0x7f070022; - public static final int buttons=0x7f07000f; + public static final int buttons=0x7f070011; public static final int chNotify=0x7f07001d; public static final int delete_car=0x7f070029; - public static final int description=0x7f070005; - public static final int directions=0x7f070015; + public static final int description=0x7f070007; + public static final int directions=0x7f070017; public static final int distance_background=0x7f070027; - public static final int distancebar=0x7f07000d; + public static final int distancebar=0x7f07000f; public static final int editText=0x7f070019; public static final int etNotify=0x7f07001f; - public static final int exception_text=0x7f070007; - public static final int exception_title=0x7f070006; - public static final int indicator=0x7f07000b; + public static final int exception_text=0x7f070009; + public static final int exception_title=0x7f070008; + public static final int indicator=0x7f07000d; public static final int llButtons=0x7f070021; - public static final int mapProgressBar=0x7f070017; - public static final int map_fragment=0x7f07000e; + public static final int mapProgressBar=0x7f070004; + public static final int map_fragment=0x7f070010; public static final int map_mode=0x7f070028; - public static final int mapview=0x7f070016; - public static final int mark_my_location=0x7f070012; - public static final int my_location=0x7f070011; + public static final int mapview=0x7f070003; + public static final int mark_my_location=0x7f070014; + public static final int my_location=0x7f070013; public static final int none=0x7f070000; public static final int notiyfyme=0x7f07001c; - public static final int pager=0x7f07000c; - public static final int parking_timer=0x7f070014; + public static final int pager=0x7f07000e; + public static final int parking_timer=0x7f070016; public static final int pickerlayout=0x7f07001a; - public static final int send=0x7f070004; + public static final int send=0x7f070006; public static final int settings=0x7f07002a; - public static final int show_both=0x7f070013; + public static final int show_both=0x7f070015; public static final int skyhook_img=0x7f070024; public static final int tc_img=0x7f070026; public static final int text=0x7f070025; public static final int tpParkingTimerTimePicker=0x7f07001b; public static final int triangle=0x7f070001; - public static final int tvAccuracy=0x7f070010; + public static final int tvAccuracy=0x7f070012; public static final int tvAddress=0x7f070018; public static final int tvBefore=0x7f070020; - public static final int tvDistance=0x7f070003; + public static final int tvDistance=0x7f070005; public static final int tvNotify1=0x7f07001e; public static final int underline=0x7f070002; } @@ -241,16 +241,16 @@ or to a theme attribute in the form "?[package:][type:]na public static final int default_title_indicator_footer_indicator_style=0x7f0a0000; } public static final class layout { - public static final int distancebar=0x7f030000; - public static final int exception_activity=0x7f030001; - public static final int exception_list_item=0x7f030002; - public static final int list=0x7f030003; - public static final int list_row=0x7f030004; - public static final int listview=0x7f030005; - public static final int main=0x7f030006; - public static final int map=0x7f030007; - public static final int map_buttons=0x7f030008; - public static final int map_fragment=0x7f030009; + public static final int base_map_fragment=0x7f030000; + public static final int distancebar=0x7f030001; + public static final int exception_activity=0x7f030002; + public static final int exception_list_item=0x7f030003; + public static final int list=0x7f030004; + public static final int list_row=0x7f030005; + public static final int listview=0x7f030006; + public static final int main=0x7f030007; + public static final int map=0x7f030008; + public static final int map_buttons=0x7f030009; public static final int notes=0x7f03000a; public static final int parking_timer_activity=0x7f03000b; public static final int parkingtimer_layout=0x7f03000c; @@ -387,6 +387,9 @@ or to a theme attribute in the form "?[package:][type:]na } public static final class style { public static final int CustomTitlePageIndicator=0x7f0c0001; + /** Any customizations for your app running on pre-3.0 devices here + */ + public static final int MyTheme=0x7f0c0004; public static final int StyledIndicators=0x7f0c0000; /** Copyright (C) 2011 Jake Wharton Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ diff --git a/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarLib/R.java b/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarLib/R.java index c5ff4f8..170a7d5 100644 --- a/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarLib/R.java +++ b/FindMyCarFull/gen/com/TwentyCodes/android/FindMyCarLib/R.java @@ -193,47 +193,47 @@ or to a theme attribute in the form "?[package:][type:]na public static final int user_arrow_animation_3=0x7f02001f; } public static final class id { - public static final int TextView01=0x7f070008; - public static final int TextView02=0x7f070009; - public static final int ad=0x7f07000a; + public static final int TextView01=0x7f07000a; + public static final int TextView02=0x7f07000b; + public static final int ad=0x7f07000c; public static final int btRemoveTimer=0x7f070023; public static final int btSetTimer=0x7f070022; - public static final int buttons=0x7f07000f; + public static final int buttons=0x7f070011; public static final int chNotify=0x7f07001d; public static final int delete_car=0x7f070029; - public static final int description=0x7f070005; - public static final int directions=0x7f070015; + public static final int description=0x7f070007; + public static final int directions=0x7f070017; public static final int distance_background=0x7f070027; - public static final int distancebar=0x7f07000d; + public static final int distancebar=0x7f07000f; public static final int editText=0x7f070019; public static final int etNotify=0x7f07001f; - public static final int exception_text=0x7f070007; - public static final int exception_title=0x7f070006; - public static final int indicator=0x7f07000b; + public static final int exception_text=0x7f070009; + public static final int exception_title=0x7f070008; + public static final int indicator=0x7f07000d; public static final int llButtons=0x7f070021; - public static final int mapProgressBar=0x7f070017; - public static final int map_fragment=0x7f07000e; + public static final int mapProgressBar=0x7f070004; + public static final int map_fragment=0x7f070010; public static final int map_mode=0x7f070028; - public static final int mapview=0x7f070016; - public static final int mark_my_location=0x7f070012; - public static final int my_location=0x7f070011; + public static final int mapview=0x7f070003; + public static final int mark_my_location=0x7f070014; + public static final int my_location=0x7f070013; public static final int none=0x7f070000; public static final int notiyfyme=0x7f07001c; - public static final int pager=0x7f07000c; - public static final int parking_timer=0x7f070014; + public static final int pager=0x7f07000e; + public static final int parking_timer=0x7f070016; public static final int pickerlayout=0x7f07001a; - public static final int send=0x7f070004; + public static final int send=0x7f070006; public static final int settings=0x7f07002a; - public static final int show_both=0x7f070013; + public static final int show_both=0x7f070015; public static final int skyhook_img=0x7f070024; public static final int tc_img=0x7f070026; public static final int text=0x7f070025; public static final int tpParkingTimerTimePicker=0x7f07001b; public static final int triangle=0x7f070001; - public static final int tvAccuracy=0x7f070010; + public static final int tvAccuracy=0x7f070012; public static final int tvAddress=0x7f070018; public static final int tvBefore=0x7f070020; - public static final int tvDistance=0x7f070003; + public static final int tvDistance=0x7f070005; public static final int tvNotify1=0x7f07001e; public static final int underline=0x7f070002; } @@ -241,16 +241,16 @@ or to a theme attribute in the form "?[package:][type:]na public static final int default_title_indicator_footer_indicator_style=0x7f0a0000; } public static final class layout { - public static final int distancebar=0x7f030000; - public static final int exception_activity=0x7f030001; - public static final int exception_list_item=0x7f030002; - public static final int list=0x7f030003; - public static final int list_row=0x7f030004; - public static final int listview=0x7f030005; - public static final int main=0x7f030006; - public static final int map=0x7f030007; - public static final int map_buttons=0x7f030008; - public static final int map_fragment=0x7f030009; + public static final int base_map_fragment=0x7f030000; + public static final int distancebar=0x7f030001; + public static final int exception_activity=0x7f030002; + public static final int exception_list_item=0x7f030003; + public static final int list=0x7f030004; + public static final int list_row=0x7f030005; + public static final int listview=0x7f030006; + public static final int main=0x7f030007; + public static final int map=0x7f030008; + public static final int map_buttons=0x7f030009; public static final int notes=0x7f03000a; public static final int parking_timer_activity=0x7f03000b; public static final int parkingtimer_layout=0x7f03000c; @@ -387,6 +387,9 @@ or to a theme attribute in the form "?[package:][type:]na } public static final class style { public static final int CustomTitlePageIndicator=0x7f0c0001; + /** Any customizations for your app running on pre-3.0 devices here + */ + public static final int MyTheme=0x7f0c0004; public static final int StyledIndicators=0x7f0c0000; /** Copyright (C) 2011 Jake Wharton Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ diff --git a/FindMyCarFull/gen/com/TwentyCodes/android/exception/R.java b/FindMyCarFull/gen/com/TwentyCodes/android/exception/R.java index ba44fa8..b7896e4 100644 --- a/FindMyCarFull/gen/com/TwentyCodes/android/exception/R.java +++ b/FindMyCarFull/gen/com/TwentyCodes/android/exception/R.java @@ -193,47 +193,47 @@ or to a theme attribute in the form "?[package:][type:]na public static final int user_arrow_animation_3=0x7f02001f; } public static final class id { - public static final int TextView01=0x7f070008; - public static final int TextView02=0x7f070009; - public static final int ad=0x7f07000a; + public static final int TextView01=0x7f07000a; + public static final int TextView02=0x7f07000b; + public static final int ad=0x7f07000c; public static final int btRemoveTimer=0x7f070023; public static final int btSetTimer=0x7f070022; - public static final int buttons=0x7f07000f; + public static final int buttons=0x7f070011; public static final int chNotify=0x7f07001d; public static final int delete_car=0x7f070029; - public static final int description=0x7f070005; - public static final int directions=0x7f070015; + public static final int description=0x7f070007; + public static final int directions=0x7f070017; public static final int distance_background=0x7f070027; - public static final int distancebar=0x7f07000d; + public static final int distancebar=0x7f07000f; public static final int editText=0x7f070019; public static final int etNotify=0x7f07001f; - public static final int exception_text=0x7f070007; - public static final int exception_title=0x7f070006; - public static final int indicator=0x7f07000b; + public static final int exception_text=0x7f070009; + public static final int exception_title=0x7f070008; + public static final int indicator=0x7f07000d; public static final int llButtons=0x7f070021; - public static final int mapProgressBar=0x7f070017; - public static final int map_fragment=0x7f07000e; + public static final int mapProgressBar=0x7f070004; + public static final int map_fragment=0x7f070010; public static final int map_mode=0x7f070028; - public static final int mapview=0x7f070016; - public static final int mark_my_location=0x7f070012; - public static final int my_location=0x7f070011; + public static final int mapview=0x7f070003; + public static final int mark_my_location=0x7f070014; + public static final int my_location=0x7f070013; public static final int none=0x7f070000; public static final int notiyfyme=0x7f07001c; - public static final int pager=0x7f07000c; - public static final int parking_timer=0x7f070014; + public static final int pager=0x7f07000e; + public static final int parking_timer=0x7f070016; public static final int pickerlayout=0x7f07001a; - public static final int send=0x7f070004; + public static final int send=0x7f070006; public static final int settings=0x7f07002a; - public static final int show_both=0x7f070013; + public static final int show_both=0x7f070015; public static final int skyhook_img=0x7f070024; public static final int tc_img=0x7f070026; public static final int text=0x7f070025; public static final int tpParkingTimerTimePicker=0x7f07001b; public static final int triangle=0x7f070001; - public static final int tvAccuracy=0x7f070010; + public static final int tvAccuracy=0x7f070012; public static final int tvAddress=0x7f070018; public static final int tvBefore=0x7f070020; - public static final int tvDistance=0x7f070003; + public static final int tvDistance=0x7f070005; public static final int tvNotify1=0x7f07001e; public static final int underline=0x7f070002; } @@ -241,16 +241,16 @@ or to a theme attribute in the form "?[package:][type:]na public static final int default_title_indicator_footer_indicator_style=0x7f0a0000; } public static final class layout { - public static final int distancebar=0x7f030000; - public static final int exception_activity=0x7f030001; - public static final int exception_list_item=0x7f030002; - public static final int list=0x7f030003; - public static final int list_row=0x7f030004; - public static final int listview=0x7f030005; - public static final int main=0x7f030006; - public static final int map=0x7f030007; - public static final int map_buttons=0x7f030008; - public static final int map_fragment=0x7f030009; + public static final int base_map_fragment=0x7f030000; + public static final int distancebar=0x7f030001; + public static final int exception_activity=0x7f030002; + public static final int exception_list_item=0x7f030003; + public static final int list=0x7f030004; + public static final int list_row=0x7f030005; + public static final int listview=0x7f030006; + public static final int main=0x7f030007; + public static final int map=0x7f030008; + public static final int map_buttons=0x7f030009; public static final int notes=0x7f03000a; public static final int parking_timer_activity=0x7f03000b; public static final int parkingtimer_layout=0x7f03000c; @@ -387,6 +387,9 @@ or to a theme attribute in the form "?[package:][type:]na } public static final class style { public static final int CustomTitlePageIndicator=0x7f0c0001; + /** Any customizations for your app running on pre-3.0 devices here + */ + public static final int MyTheme=0x7f0c0004; public static final int StyledIndicators=0x7f0c0000; /** Copyright (C) 2011 Jake Wharton Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ diff --git a/FindMyCarLib/bin/findmycarlib.jar b/FindMyCarLib/bin/findmycarlib.jar index 6faee287608008c5b5e455cc666022a86e5ac74f..dead4c67937e404882417e570dfa83e19fb0aef3 100644 GIT binary patch delta 12629 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 EKdUK0V*mgE diff --git a/FindMyCarLib/gen/com/TwentyCodes/android/FindMyCarLib/R.java b/FindMyCarLib/gen/com/TwentyCodes/android/FindMyCarLib/R.java index 3e27aed..656deb3 100644 --- a/FindMyCarLib/gen/com/TwentyCodes/android/FindMyCarLib/R.java +++ b/FindMyCarLib/gen/com/TwentyCodes/android/FindMyCarLib/R.java @@ -193,47 +193,47 @@ or to a theme attribute in the form "?[package:][type:]na public static int user_arrow_animation_3=0x7f02001f; } public static final class id { - public static int TextView01=0x7f070008; - public static int TextView02=0x7f070009; - public static int ad=0x7f07000a; + public static int TextView01=0x7f07000a; + public static int TextView02=0x7f07000b; + public static int ad=0x7f07000c; public static int btRemoveTimer=0x7f070023; public static int btSetTimer=0x7f070022; - public static int buttons=0x7f07000f; + public static int buttons=0x7f070011; public static int chNotify=0x7f07001d; public static int delete_car=0x7f070029; - public static int description=0x7f070005; - public static int directions=0x7f070015; + public static int description=0x7f070007; + public static int directions=0x7f070017; public static int distance_background=0x7f070027; - public static int distancebar=0x7f07000d; + public static int distancebar=0x7f07000f; public static int editText=0x7f070019; public static int etNotify=0x7f07001f; - public static int exception_text=0x7f070007; - public static int exception_title=0x7f070006; - public static int indicator=0x7f07000b; + public static int exception_text=0x7f070009; + public static int exception_title=0x7f070008; + public static int indicator=0x7f07000d; public static int llButtons=0x7f070021; - public static int mapProgressBar=0x7f070017; - public static int map_fragment=0x7f07000e; + public static int mapProgressBar=0x7f070004; + public static int map_fragment=0x7f070010; public static int map_mode=0x7f070028; - public static int mapview=0x7f070016; - public static int mark_my_location=0x7f070012; - public static int my_location=0x7f070011; + public static int mapview=0x7f070003; + public static int mark_my_location=0x7f070014; + public static int my_location=0x7f070013; public static int none=0x7f070000; public static int notiyfyme=0x7f07001c; - public static int pager=0x7f07000c; - public static int parking_timer=0x7f070014; + public static int pager=0x7f07000e; + public static int parking_timer=0x7f070016; public static int pickerlayout=0x7f07001a; - public static int send=0x7f070004; + public static int send=0x7f070006; public static int settings=0x7f07002a; - public static int show_both=0x7f070013; + public static int show_both=0x7f070015; public static int skyhook_img=0x7f070024; public static int tc_img=0x7f070026; public static int text=0x7f070025; public static int tpParkingTimerTimePicker=0x7f07001b; public static int triangle=0x7f070001; - public static int tvAccuracy=0x7f070010; + public static int tvAccuracy=0x7f070012; public static int tvAddress=0x7f070018; public static int tvBefore=0x7f070020; - public static int tvDistance=0x7f070003; + public static int tvDistance=0x7f070005; public static int tvNotify1=0x7f07001e; public static int underline=0x7f070002; } @@ -241,16 +241,16 @@ or to a theme attribute in the form "?[package:][type:]na public static int default_title_indicator_footer_indicator_style=0x7f0a0000; } public static final class layout { - public static int distancebar=0x7f030000; - public static int exception_activity=0x7f030001; - public static int exception_list_item=0x7f030002; - public static int list=0x7f030003; - public static int list_row=0x7f030004; - public static int listview=0x7f030005; - public static int main=0x7f030006; - public static int map=0x7f030007; - public static int map_buttons=0x7f030008; - public static int map_fragment=0x7f030009; + public static int base_map_fragment=0x7f030000; + public static int distancebar=0x7f030001; + public static int exception_activity=0x7f030002; + public static int exception_list_item=0x7f030003; + public static int list=0x7f030004; + public static int list_row=0x7f030005; + public static int listview=0x7f030006; + public static int main=0x7f030007; + public static int map=0x7f030008; + public static int map_buttons=0x7f030009; public static int notes=0x7f03000a; public static int parking_timer_activity=0x7f03000b; public static int parkingtimer_layout=0x7f03000c; @@ -387,6 +387,9 @@ or to a theme attribute in the form "?[package:][type:]na } public static final class style { public static int CustomTitlePageIndicator=0x7f0c0001; + /** Any customizations for your app running on pre-3.0 devices here + */ + public static int MyTheme=0x7f0c0004; public static int StyledIndicators=0x7f0c0000; /** Copyright (C) 2011 Jake Wharton Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ diff --git a/FindMyCarLib/gen/com/TwentyCodes/android/exception/R.java b/FindMyCarLib/gen/com/TwentyCodes/android/exception/R.java index 2fa0ebe..9956b21 100644 --- a/FindMyCarLib/gen/com/TwentyCodes/android/exception/R.java +++ b/FindMyCarLib/gen/com/TwentyCodes/android/exception/R.java @@ -193,47 +193,47 @@ or to a theme attribute in the form "?[package:][type:]na public static int user_arrow_animation_3=0x7f02001f; } public static final class id { - public static int TextView01=0x7f070008; - public static int TextView02=0x7f070009; - public static int ad=0x7f07000a; + public static int TextView01=0x7f07000a; + public static int TextView02=0x7f07000b; + public static int ad=0x7f07000c; public static int btRemoveTimer=0x7f070023; public static int btSetTimer=0x7f070022; - public static int buttons=0x7f07000f; + public static int buttons=0x7f070011; public static int chNotify=0x7f07001d; public static int delete_car=0x7f070029; - public static int description=0x7f070005; - public static int directions=0x7f070015; + public static int description=0x7f070007; + public static int directions=0x7f070017; public static int distance_background=0x7f070027; - public static int distancebar=0x7f07000d; + public static int distancebar=0x7f07000f; public static int editText=0x7f070019; public static int etNotify=0x7f07001f; - public static int exception_text=0x7f070007; - public static int exception_title=0x7f070006; - public static int indicator=0x7f07000b; + public static int exception_text=0x7f070009; + public static int exception_title=0x7f070008; + public static int indicator=0x7f07000d; public static int llButtons=0x7f070021; - public static int mapProgressBar=0x7f070017; - public static int map_fragment=0x7f07000e; + public static int mapProgressBar=0x7f070004; + public static int map_fragment=0x7f070010; public static int map_mode=0x7f070028; - public static int mapview=0x7f070016; - public static int mark_my_location=0x7f070012; - public static int my_location=0x7f070011; + public static int mapview=0x7f070003; + public static int mark_my_location=0x7f070014; + public static int my_location=0x7f070013; public static int none=0x7f070000; public static int notiyfyme=0x7f07001c; - public static int pager=0x7f07000c; - public static int parking_timer=0x7f070014; + public static int pager=0x7f07000e; + public static int parking_timer=0x7f070016; public static int pickerlayout=0x7f07001a; - public static int send=0x7f070004; + public static int send=0x7f070006; public static int settings=0x7f07002a; - public static int show_both=0x7f070013; + public static int show_both=0x7f070015; public static int skyhook_img=0x7f070024; public static int tc_img=0x7f070026; public static int text=0x7f070025; public static int tpParkingTimerTimePicker=0x7f07001b; public static int triangle=0x7f070001; - public static int tvAccuracy=0x7f070010; + public static int tvAccuracy=0x7f070012; public static int tvAddress=0x7f070018; public static int tvBefore=0x7f070020; - public static int tvDistance=0x7f070003; + public static int tvDistance=0x7f070005; public static int tvNotify1=0x7f07001e; public static int underline=0x7f070002; } @@ -241,16 +241,16 @@ or to a theme attribute in the form "?[package:][type:]na public static int default_title_indicator_footer_indicator_style=0x7f0a0000; } public static final class layout { - public static int distancebar=0x7f030000; - public static int exception_activity=0x7f030001; - public static int exception_list_item=0x7f030002; - public static int list=0x7f030003; - public static int list_row=0x7f030004; - public static int listview=0x7f030005; - public static int main=0x7f030006; - public static int map=0x7f030007; - public static int map_buttons=0x7f030008; - public static int map_fragment=0x7f030009; + public static int base_map_fragment=0x7f030000; + public static int distancebar=0x7f030001; + public static int exception_activity=0x7f030002; + public static int exception_list_item=0x7f030003; + public static int list=0x7f030004; + public static int list_row=0x7f030005; + public static int listview=0x7f030006; + public static int main=0x7f030007; + public static int map=0x7f030008; + public static int map_buttons=0x7f030009; public static int notes=0x7f03000a; public static int parking_timer_activity=0x7f03000b; public static int parkingtimer_layout=0x7f03000c; @@ -387,6 +387,9 @@ or to a theme attribute in the form "?[package:][type:]na } public static final class style { public static int CustomTitlePageIndicator=0x7f0c0001; + /** Any customizations for your app running on pre-3.0 devices here + */ + public static int MyTheme=0x7f0c0004; public static int StyledIndicators=0x7f0c0000; /** Copyright (C) 2011 Jake Wharton Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ diff --git a/FindMyCarLib/res/values/theme.xml b/FindMyCarLib/res/values/theme.xml new file mode 100644 index 0000000..a714770 --- /dev/null +++ b/FindMyCarLib/res/values/theme.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/Main.java b/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/Main.java index 09943b5..e812921 100644 --- a/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/Main.java +++ b/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/Main.java @@ -39,7 +39,7 @@ import com.TwentyCodes.android.FindMyCarLib.UI.fragments.NotesFragment; import com.TwentyCodes.android.FindMyCarLib.debug.Debug; import com.TwentyCodes.android.SkyHook.SkyHookRegistration; import com.TwentyCodes.android.exception.ExceptionHandler; -import com.TwentyCodes.android.location.OnDirectionSelectedListener; +import com.TwentyCodes.android.fragments.DirectionsListFragment.OnDirectionSelectedListener; import com.TwentyCodes.android.location.ReverseGeocoder; import com.TwentyCodes.android.overlays.DirectionsOverlay; import com.google.ads.AdRequest; @@ -55,7 +55,7 @@ import com.skyhookwireless.wps.WPSReturnCode; * This is the Main Activity of FMC Full & Lite * @author ricky barrette */ -public class Main extends FragmentActivity implements RegistrationCallback, MapFragmentListener, OnDirectionSelectedListener, OnPageChangeListener { +public class Main extends FragmentActivity implements RegistrationCallback, MapFragmentListener, OnPageChangeListener, OnDirectionSelectedListener { private static final String SPLASH = "splash"; private static final String TAG = "Main"; @@ -132,9 +132,6 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF */ if(!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) enableGPSdialog(Main.this); -// else -// if(mMap != null) -// mMap.setGPSDialogEnabled(true); /* * the map is no longer needed, clear it from memory @@ -267,14 +264,14 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF } else { showSplashScreen(); // Do your heavy loading here on a background thread - new Thread( new Runnable(){ - @Override - public void run(){ +// new Thread( new Runnable(){ +// @Override +// public void run(){ //registers user with skyhook new SkyHookRegistration(Main.this).registerNewUser(Main.this); - - } - }).start(); +// +// } +// }).start(); //remove notification from notification bar NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); @@ -373,6 +370,30 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF + @Override + public void onPageScrolled(int arg0, float arg1, int arg2) { + // unused + + } + + /** + * called when the pager's page is changed + * we use this to dismiss the soft keyboard + * (non-Javadoc) + * @see android.support.v4.view.ViewPager.OnPageChangeListener#onPageScrollStateChanged(int) + */ + @Override + public void onPageScrollStateChanged(int arg0) { + InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(mPager.getWindowToken(), 0); + } + + @Override + public void onPageSelected(int arg0) { + // unused + + } + /** * called when the activity is going to be paused * we stop all location based services and release the wake lock if there is one @@ -388,7 +409,7 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF super.onPause(); } - + @Override protected void onResume() { super.onResume(); @@ -413,7 +434,7 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF icicle.getBoolean(SPLASH, mSplashDialog.isShowing()); super.onSaveInstanceState(icicle); } - + /** * called when activity is stopped. lifecycle method. * @author wwpowers @@ -430,6 +451,7 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF } + /** * parses all old save files from 2.0.6b34 and older into shared_prefs file settings.xml . it will parse the following files * AppLat.txt , @@ -486,7 +508,7 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF */ return editor.commit(); } - + /** * displays a quit dialog * @since 0.0.2 @@ -507,7 +529,7 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF }); builder.show(); } - + /** * Removes the Dialog that displays the splash screen */ @@ -517,14 +539,12 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF mSplashDialog = null; } } - - /** * Shows the splash screen over the full Activity */ protected void showSplashScreen() { // mMap.setGPSDialogEnabled(false); - mSplashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar_Fullscreen); + mSplashDialog = new Dialog(this, android.R.style.Theme_Translucent); mSplashDialog.setContentView(R.layout.powered_by_skyhook); mSplashDialog.setCancelable(false); mSplashDialog.show(); @@ -547,7 +567,6 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF } }, 2000); } - /** * check to see if there was an update installed. if the update needs to do any upgrades, it will be done here * @author ricky barrette @@ -574,37 +593,10 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF if(mSettings.getInt(Settings.BUILD_NUMBER, 0) < build_number || Debug.FORCE_FIRSTBOOT_DIALOG){ displayWelcomeDialog(); } -// else { -// mMap.setGPSDialogEnabled(true); -// } mSettings.edit().putInt(Settings.BUILD_NUMBER, build_number).commit(); } catch (NameNotFoundException e) { e.printStackTrace(); } - } - - /** - * called when the pager's page is changed - * we use this to dismiss the soft keyboard - * (non-Javadoc) - * @see android.support.v4.view.ViewPager.OnPageChangeListener#onPageScrollStateChanged(int) - */ - @Override - public void onPageScrollStateChanged(int arg0) { - InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(mPager.getWindowToken(), 0); - } - @Override - public void onPageScrolled(int arg0, float arg1, int arg2) { - // unused - - } - @Override - public void onPageSelected(int arg0) { - // unused - - } - - + } } \ No newline at end of file diff --git a/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/UI/fragments/DirectionsListFragment.java b/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/UI/fragments/DirectionsListFragment.java index e692e52..f6c779f 100644 --- a/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/UI/fragments/DirectionsListFragment.java +++ b/FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/UI/fragments/DirectionsListFragment.java @@ -8,7 +8,6 @@ package com.TwentyCodes.android.FindMyCarLib.UI.fragments; import com.TwentyCodes.android.FindMyCarLib.Main; import com.TwentyCodes.android.FindMyCarLib.R; -import com.TwentyCodes.android.location.OnDirectionSelectedListener; /** * This is our direction's list fragment.