Added location lib and exception handler lib as sub modules
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Binary file not shown.
@@ -167,30 +167,25 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
|
||||
public static int compass_sm=0x7f020005;
|
||||
public static int distance_background=0x7f020006;
|
||||
public static int icon=0x7f020007;
|
||||
public static int logoidea3=0x7f020008;
|
||||
public static int map_action_bar=0x7f020009;
|
||||
public static int map_mode_action_bar=0x7f02000a;
|
||||
public static int mark_my_location_action_bar=0x7f02000b;
|
||||
public static int my_location_action_bar=0x7f02000c;
|
||||
public static int nav_action_bar=0x7f02000d;
|
||||
public static int needle=0x7f02000e;
|
||||
public static int needle_lrg=0x7f02000f;
|
||||
public static int needle_med=0x7f020010;
|
||||
public static int needle_sm=0x7f020011;
|
||||
public static int notes_action_bar=0x7f020012;
|
||||
public static int settings_action_bar=0x7f020013;
|
||||
public static int show_car_black=0x7f020014;
|
||||
public static int show_car_white=0x7f020015;
|
||||
public static int skyhook_logo=0x7f020016;
|
||||
public static int skyhook_logo_alpha=0x7f020017;
|
||||
public static int skyhook_logo_alpha_small=0x7f020018;
|
||||
public static int tc_logo_complete=0x7f020019;
|
||||
public static int time_action_bar=0x7f02001a;
|
||||
public static int trash_action_bar=0x7f02001b;
|
||||
public static int user=0x7f02001c;
|
||||
public static int user_arrow_animation_1=0x7f02001d;
|
||||
public static int user_arrow_animation_2=0x7f02001e;
|
||||
public static int user_arrow_animation_3=0x7f02001f;
|
||||
public static int map_action_bar=0x7f020008;
|
||||
public static int map_mode_action_bar=0x7f020009;
|
||||
public static int mark_my_location_action_bar=0x7f02000a;
|
||||
public static int my_location_action_bar=0x7f02000b;
|
||||
public static int nav_action_bar=0x7f02000c;
|
||||
public static int needle=0x7f02000d;
|
||||
public static int needle_lrg=0x7f02000e;
|
||||
public static int needle_med=0x7f02000f;
|
||||
public static int needle_sm=0x7f020010;
|
||||
public static int notes_action_bar=0x7f020011;
|
||||
public static int settings_action_bar=0x7f020012;
|
||||
public static int show_car_black=0x7f020013;
|
||||
public static int show_car_white=0x7f020014;
|
||||
public static int time_action_bar=0x7f020015;
|
||||
public static int trash_action_bar=0x7f020016;
|
||||
public static int user=0x7f020017;
|
||||
public static int user_arrow_animation_1=0x7f020018;
|
||||
public static int user_arrow_animation_2=0x7f020019;
|
||||
public static int user_arrow_animation_3=0x7f02001a;
|
||||
}
|
||||
public static final class id {
|
||||
public static int TextView01=0x7f07000a;
|
||||
@@ -200,10 +195,10 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
|
||||
public static int btSetTimer=0x7f070022;
|
||||
public static int buttons=0x7f070011;
|
||||
public static int chNotify=0x7f07001d;
|
||||
public static int delete_car=0x7f070029;
|
||||
public static int delete_car=0x7f070026;
|
||||
public static int description=0x7f070007;
|
||||
public static int directions=0x7f070017;
|
||||
public static int distance_background=0x7f070027;
|
||||
public static int distance_background=0x7f070024;
|
||||
public static int distancebar=0x7f07000f;
|
||||
public static int editText=0x7f070019;
|
||||
public static int etNotify=0x7f07001f;
|
||||
@@ -213,7 +208,7 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
|
||||
public static int llButtons=0x7f070021;
|
||||
public static int mapProgressBar=0x7f070004;
|
||||
public static int map_fragment=0x7f070010;
|
||||
public static int map_mode=0x7f070028;
|
||||
public static int map_mode=0x7f070025;
|
||||
public static int mapview=0x7f070003;
|
||||
public static int mark_my_location=0x7f070014;
|
||||
public static int my_location=0x7f070013;
|
||||
@@ -223,11 +218,8 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
|
||||
public static int parking_timer=0x7f070016;
|
||||
public static int pickerlayout=0x7f07001a;
|
||||
public static int send=0x7f070006;
|
||||
public static int settings=0x7f07002a;
|
||||
public static int settings=0x7f070027;
|
||||
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=0x7f070012;
|
||||
@@ -254,139 +246,137 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
|
||||
public static int notes=0x7f03000a;
|
||||
public static int parking_timer_activity=0x7f03000b;
|
||||
public static int parkingtimer_layout=0x7f03000c;
|
||||
public static int powered_by_skyhook=0x7f03000d;
|
||||
}
|
||||
public static final class menu {
|
||||
public static int map_action_bar=0x7f0d0000;
|
||||
}
|
||||
public static final class string {
|
||||
public static int accept=0x7f05006b;
|
||||
public static int accept=0x7f05006a;
|
||||
public static int app_name=0x7f050000;
|
||||
public static int app_name_lite=0x7f050013;
|
||||
public static int application_error=0x7f050067;
|
||||
public static int before=0x7f05003a;
|
||||
public static int calculating=0x7f050072;
|
||||
public static int cancel=0x7f050038;
|
||||
public static int car_location=0x7f050024;
|
||||
public static int car_management=0x7f05004d;
|
||||
public static int check_license=0x7f050069;
|
||||
public static int close=0x7f050064;
|
||||
public static int compass=0x7f050053;
|
||||
public static int compass_optoions=0x7f05006a;
|
||||
public static int crash=0x7f050004;
|
||||
public static int decline=0x7f05006c;
|
||||
public static int default_location=0x7f050070;
|
||||
public static int delete=0x7f050063;
|
||||
public static int delete_car=0x7f05002d;
|
||||
public static int delete_car_dialog=0x7f05002e;
|
||||
public static int deleteing=0x7f050071;
|
||||
public static int description=0x7f050008;
|
||||
public static int directions=0x7f050050;
|
||||
public static int directions_description=0x7f05005e;
|
||||
public static int directions_empty_msg=0x7f050078;
|
||||
public static int distance=0x7f05002f;
|
||||
public static int eula=0x7f05006d;
|
||||
public static int eulaagreement=0x7f05006e;
|
||||
public static int feature_in_fmc_full=0x7f05005d;
|
||||
public static int feature_in_fmc_full_description=0x7f05006f;
|
||||
public static int first_boot=0x7f05000e;
|
||||
public static int fmc_options=0x7f050058;
|
||||
public static int found_car=0x7f050015;
|
||||
public static int gps_accuracy=0x7f050052;
|
||||
public static int app_name_lite=0x7f050012;
|
||||
public static int application_error=0x7f050066;
|
||||
public static int before=0x7f050039;
|
||||
public static int calculating=0x7f050071;
|
||||
public static int cancel=0x7f050037;
|
||||
public static int car_location=0x7f050023;
|
||||
public static int car_management=0x7f05004c;
|
||||
public static int check_license=0x7f050068;
|
||||
public static int close=0x7f050063;
|
||||
public static int compass=0x7f050052;
|
||||
public static int compass_optoions=0x7f050069;
|
||||
public static int crash=0x7f050003;
|
||||
public static int decline=0x7f05006b;
|
||||
public static int default_location=0x7f05006f;
|
||||
public static int delete=0x7f050062;
|
||||
public static int delete_car=0x7f05002c;
|
||||
public static int delete_car_dialog=0x7f05002d;
|
||||
public static int deleteing=0x7f050070;
|
||||
public static int description=0x7f050007;
|
||||
public static int directions=0x7f05004f;
|
||||
public static int directions_description=0x7f05005d;
|
||||
public static int directions_empty_msg=0x7f050077;
|
||||
public static int distance=0x7f05002e;
|
||||
public static int eula=0x7f05006c;
|
||||
public static int eulaagreement=0x7f05006d;
|
||||
public static int feature_in_fmc_full=0x7f05005c;
|
||||
public static int feature_in_fmc_full_description=0x7f05006e;
|
||||
public static int first_boot=0x7f05000d;
|
||||
public static int fmc_options=0x7f050057;
|
||||
public static int found_car=0x7f050014;
|
||||
public static int gps_accuracy=0x7f050051;
|
||||
public static int gps_fix=0x7f050001;
|
||||
public static int gps_is_disabled=0x7f050051;
|
||||
public static int help=0x7f050017;
|
||||
public static int hours=0x7f050035;
|
||||
public static int lat=0x7f05000f;
|
||||
public static int layers=0x7f050027;
|
||||
public static int layers_dialog=0x7f05002a;
|
||||
public static int lon=0x7f050010;
|
||||
public static int map=0x7f050076;
|
||||
public static int map_mode=0x7f050073;
|
||||
public static int mark_car=0x7f050022;
|
||||
public static int mark_car_button=0x7f050030;
|
||||
public static int mark_car_first=0x7f05001d;
|
||||
public static int mark_car_warning=0x7f05001b;
|
||||
public static int measurement_unit=0x7f050029;
|
||||
public static int measurement_unit_dialog=0x7f05001c;
|
||||
public static int minutes=0x7f050036;
|
||||
public static int my_location=0x7f050023;
|
||||
public static int nav_only_in_full=0x7f050079;
|
||||
public static int new_button=0x7f050065;
|
||||
public static int no=0x7f05002c;
|
||||
public static int no_gps_signal=0x7f05001a;
|
||||
public static int no_reports=0x7f05000a;
|
||||
public static int no_timer=0x7f050046;
|
||||
public static int gps_is_disabled=0x7f050050;
|
||||
public static int help=0x7f050016;
|
||||
public static int hours=0x7f050034;
|
||||
public static int lat=0x7f05000e;
|
||||
public static int layers=0x7f050026;
|
||||
public static int layers_dialog=0x7f050029;
|
||||
public static int lon=0x7f05000f;
|
||||
public static int map=0x7f050075;
|
||||
public static int map_mode=0x7f050072;
|
||||
public static int mark_car=0x7f050021;
|
||||
public static int mark_car_button=0x7f05002f;
|
||||
public static int mark_car_first=0x7f05001c;
|
||||
public static int mark_car_warning=0x7f05001a;
|
||||
public static int measurement_unit=0x7f050028;
|
||||
public static int measurement_unit_dialog=0x7f05001b;
|
||||
public static int minutes=0x7f050035;
|
||||
public static int my_location=0x7f050022;
|
||||
public static int nav_only_in_full=0x7f050078;
|
||||
public static int new_button=0x7f050064;
|
||||
public static int no=0x7f05002b;
|
||||
public static int no_gps_signal=0x7f050019;
|
||||
public static int no_reports=0x7f050009;
|
||||
public static int no_timer=0x7f050045;
|
||||
/** License specific strings
|
||||
*/
|
||||
public static int not_licensed=0x7f050066;
|
||||
public static int not_licensed_full=0x7f050068;
|
||||
public static int notes=0x7f050031;
|
||||
public static int notification_color_black=0x7f050061;
|
||||
public static int not_licensed=0x7f050065;
|
||||
public static int not_licensed_full=0x7f050067;
|
||||
public static int notes=0x7f050030;
|
||||
public static int notification_color_black=0x7f050060;
|
||||
/** Parking Notification Settings
|
||||
*/
|
||||
public static int notification_color_title=0x7f050060;
|
||||
public static int notification_color_white=0x7f050062;
|
||||
public static int notify_me=0x7f050037;
|
||||
public static int ok=0x7f050016;
|
||||
public static int ongoing_notification=0x7f05005c;
|
||||
public static int parking_timer=0x7f050034;
|
||||
public static int parking_timer_description=0x7f05005f;
|
||||
public static int parking_timer_options=0x7f050059;
|
||||
public static int parking_timer_service=0x7f050045;
|
||||
public static int pick_an_option=0x7f05003d;
|
||||
public static int pick_time_greaterthan_zero=0x7f05003f;
|
||||
public static int pick_timer_lessthan_24=0x7f05004f;
|
||||
public static int powered_by=0x7f050003;
|
||||
public static int prevent_phone_from_sleeping=0x7f050057;
|
||||
public static int quit=0x7f050026;
|
||||
public static int quit_dialog=0x7f050021;
|
||||
public static int quit_timer=0x7f050044;
|
||||
public static int removeTimer=0x7f05003c;
|
||||
public static int reporting_error=0x7f05000c;
|
||||
public static int reporting_error_msg=0x7f05000d;
|
||||
public static int saved=0x7f050075;
|
||||
public static int seconds=0x7f050055;
|
||||
public static int send=0x7f050007;
|
||||
public static int sending=0x7f050006;
|
||||
public static int sending_report=0x7f05000b;
|
||||
public static int set=0x7f050039;
|
||||
public static int setTimer=0x7f05003b;
|
||||
public static int set_timer=0x7f050033;
|
||||
public static int set_timer_warning=0x7f05003e;
|
||||
public static int settings=0x7f050077;
|
||||
public static int show_both=0x7f050025;
|
||||
public static int show_notes=0x7f050032;
|
||||
public static int sorry=0x7f050005;
|
||||
public static int notification_color_title=0x7f05005f;
|
||||
public static int notification_color_white=0x7f050061;
|
||||
public static int notify_me=0x7f050036;
|
||||
public static int ok=0x7f050015;
|
||||
public static int ongoing_notification=0x7f05005b;
|
||||
public static int parking_timer=0x7f050033;
|
||||
public static int parking_timer_description=0x7f05005e;
|
||||
public static int parking_timer_options=0x7f050058;
|
||||
public static int parking_timer_service=0x7f050044;
|
||||
public static int pick_an_option=0x7f05003c;
|
||||
public static int pick_time_greaterthan_zero=0x7f05003e;
|
||||
public static int pick_timer_lessthan_24=0x7f05004e;
|
||||
public static int prevent_phone_from_sleeping=0x7f050056;
|
||||
public static int quit=0x7f050025;
|
||||
public static int quit_dialog=0x7f050020;
|
||||
public static int quit_timer=0x7f050043;
|
||||
public static int removeTimer=0x7f05003b;
|
||||
public static int reporting_error=0x7f05000b;
|
||||
public static int reporting_error_msg=0x7f05000c;
|
||||
public static int saved=0x7f050074;
|
||||
public static int seconds=0x7f050054;
|
||||
public static int send=0x7f050006;
|
||||
public static int sending=0x7f050005;
|
||||
public static int sending_report=0x7f05000a;
|
||||
public static int set=0x7f050038;
|
||||
public static int setTimer=0x7f05003a;
|
||||
public static int set_timer=0x7f050032;
|
||||
public static int set_timer_warning=0x7f05003d;
|
||||
public static int settings=0x7f050076;
|
||||
public static int show_both=0x7f050024;
|
||||
public static int show_notes=0x7f050031;
|
||||
public static int sorry=0x7f050004;
|
||||
public static int sorry_theres_trouble=0x7f050002;
|
||||
public static int stay_awake=0x7f050028;
|
||||
public static int stay_awake_dialog=0x7f05001e;
|
||||
public static int stay_awake_off=0x7f050020;
|
||||
public static int stay_awake_on=0x7f05001f;
|
||||
public static int stay_awake_pref=0x7f050011;
|
||||
public static int store_your_notes_here=0x7f05007a;
|
||||
public static int the_vaule_was_not_a_number_update_interval_60=0x7f050056;
|
||||
public static int timer_already_set=0x7f050043;
|
||||
public static int timer_canceled=0x7f05004e;
|
||||
public static int timer_set_for=0x7f050040;
|
||||
public static int timer_set_for_hours=0x7f050041;
|
||||
public static int timer_set_for_minutes=0x7f050042;
|
||||
public static int unit_pref=0x7f050012;
|
||||
public static int update_interval=0x7f05005a;
|
||||
public static int update_interval_summary=0x7f05005b;
|
||||
public static int update_interval_updated_to=0x7f050054;
|
||||
public static int version=0x7f050009;
|
||||
public static int version_info=0x7f050074;
|
||||
public static int welcome=0x7f050018;
|
||||
public static int welcome_msg=0x7f050019;
|
||||
public static int yay=0x7f050014;
|
||||
public static int yes=0x7f05002b;
|
||||
public static int your_time_up_ticket=0x7f050047;
|
||||
public static int your_timer_almost_up_msg=0x7f05004c;
|
||||
public static int your_timer_almost_up_ticket=0x7f05004a;
|
||||
public static int your_timer_almost_up_title=0x7f05004b;
|
||||
public static int your_timer_up_msg=0x7f050049;
|
||||
public static int your_timer_up_title=0x7f050048;
|
||||
public static int stay_awake=0x7f050027;
|
||||
public static int stay_awake_dialog=0x7f05001d;
|
||||
public static int stay_awake_off=0x7f05001f;
|
||||
public static int stay_awake_on=0x7f05001e;
|
||||
public static int stay_awake_pref=0x7f050010;
|
||||
public static int store_your_notes_here=0x7f050079;
|
||||
public static int the_vaule_was_not_a_number_update_interval_60=0x7f050055;
|
||||
public static int timer_already_set=0x7f050042;
|
||||
public static int timer_canceled=0x7f05004d;
|
||||
public static int timer_set_for=0x7f05003f;
|
||||
public static int timer_set_for_hours=0x7f050040;
|
||||
public static int timer_set_for_minutes=0x7f050041;
|
||||
public static int unit_pref=0x7f050011;
|
||||
public static int update_interval=0x7f050059;
|
||||
public static int update_interval_summary=0x7f05005a;
|
||||
public static int update_interval_updated_to=0x7f050053;
|
||||
public static int version=0x7f050008;
|
||||
public static int version_info=0x7f050073;
|
||||
public static int welcome=0x7f050017;
|
||||
public static int welcome_msg=0x7f050018;
|
||||
public static int yay=0x7f050013;
|
||||
public static int yes=0x7f05002a;
|
||||
public static int your_time_up_ticket=0x7f050046;
|
||||
public static int your_timer_almost_up_msg=0x7f05004b;
|
||||
public static int your_timer_almost_up_ticket=0x7f050049;
|
||||
public static int your_timer_almost_up_title=0x7f05004a;
|
||||
public static int your_timer_up_msg=0x7f050048;
|
||||
public static int your_timer_up_title=0x7f050047;
|
||||
}
|
||||
public static final class style {
|
||||
public static int CustomTitlePageIndicator=0x7f0c0001;
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
android.library=true
|
||||
# Project target.
|
||||
target=Google Inc.:Google APIs:16
|
||||
target=Google Inc.:Google APIs:17
|
||||
|
||||
proguard.config=proguard.cfg
|
||||
android.library.reference.1=../../exception_handler_library/ExceptionHandlerLib
|
||||
android.library.reference.2=../../location_library/LocationLib
|
||||
android.library.reference.1=../exception_handler_library/ExceptionHandlerLib
|
||||
android.library.reference.2=../location_library/LocationLib
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/buttons"
|
||||
android:layout_below="@id/distancebar"
|
||||
class="com.TwentyCodes.android.fragments.SkyHoookUserOverlayMapFragment" >
|
||||
class="com.TwentyCodes.android.fragments.UserOverlayMapFragment" >
|
||||
</fragment>
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -15,13 +15,10 @@ import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.SharedPreferences.Editor;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.location.Location;
|
||||
import android.location.LocationManager;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.PowerManager;
|
||||
import android.os.PowerManager.WakeLock;
|
||||
import android.support.v4.app.Fragment;
|
||||
@@ -36,8 +33,6 @@ import com.TwentyCodes.android.FindMyCarLib.UI.fragments.DirectionsListFragment;
|
||||
import com.TwentyCodes.android.FindMyCarLib.UI.fragments.MapFragment;
|
||||
import com.TwentyCodes.android.FindMyCarLib.UI.fragments.MapFragment.MapFragmentListener;
|
||||
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.fragments.DirectionsListFragment.OnDirectionSelectedListener;
|
||||
import com.TwentyCodes.android.location.ReverseGeocoder;
|
||||
@@ -47,15 +42,12 @@ import com.google.ads.AdView;
|
||||
import com.google.android.maps.GeoPoint;
|
||||
import com.jakewharton.android.viewpagerindicator.TitlePageIndicator;
|
||||
import com.jakewharton.android.viewpagerindicator.TitledFragmentAdapter;
|
||||
import com.skyhookwireless.wps.RegistrationCallback;
|
||||
import com.skyhookwireless.wps.WPSContinuation;
|
||||
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, OnPageChangeListener, OnDirectionSelectedListener {
|
||||
public class Main extends FragmentActivity implements MapFragmentListener, OnPageChangeListener, OnDirectionSelectedListener {
|
||||
|
||||
private static final String SPLASH = "splash";
|
||||
private static final String TAG = "Main";
|
||||
@@ -143,16 +135,6 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* (non-Javadoc)
|
||||
* @see com.skyhookwireless.wps._sdkjc#done()
|
||||
* @author ricky barrette
|
||||
*/
|
||||
@Override
|
||||
public void done() {
|
||||
// UNUSED
|
||||
}
|
||||
|
||||
// /**
|
||||
// * displays lic dialog and welcome to find my car dialog
|
||||
// */
|
||||
@@ -175,31 +157,6 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF
|
||||
// .show();
|
||||
// }
|
||||
|
||||
/**
|
||||
* (non-Javadoc)
|
||||
* @see com.skyhookwireless.wps._sdkjc#handleError(com.skyhookwireless.wps.WPSReturnCode)
|
||||
* @param arg0
|
||||
* @return
|
||||
* @author ricky barrette
|
||||
*/
|
||||
@Override
|
||||
public WPSContinuation handleError(WPSReturnCode arg0) {
|
||||
|
||||
Log.e(TAG,"there was an error regestering you "+ arg0.toString());
|
||||
return WPSContinuation.WPS_CONTINUE;
|
||||
}
|
||||
|
||||
/**
|
||||
* called when skyhook successfully registers a new user.
|
||||
* @see com.skyhookwireless.wps.RegistrationCallback#handleSuccess()
|
||||
* @author ricky barrette
|
||||
*/
|
||||
@Override
|
||||
public void handleSuccess() {
|
||||
Log.d(TAG,"successfully registered new user");
|
||||
mSettings.edit().putBoolean(Settings.IS_REGISTERED, true).commit();
|
||||
}
|
||||
|
||||
/**
|
||||
* called when a car is deleted
|
||||
* (non-Javadoc)
|
||||
@@ -253,26 +210,7 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF
|
||||
ad.loadAd(new AdRequest());
|
||||
}
|
||||
|
||||
if(icicle != null){
|
||||
if (icicle.containsKey(SPLASH))
|
||||
// Show splash screen if still loading
|
||||
if (icicle.getBoolean(SPLASH)) {
|
||||
showSplashScreen();
|
||||
}
|
||||
|
||||
// Rebuild your UI with your saved state here
|
||||
} else {
|
||||
showSplashScreen();
|
||||
// Do your heavy loading here on a background thread
|
||||
// new Thread( new Runnable(){
|
||||
// @Override
|
||||
// public void run(){
|
||||
//registers user with skyhook
|
||||
new SkyHookRegistration(Main.this).registerNewUser(Main.this);
|
||||
//
|
||||
// }
|
||||
// }).start();
|
||||
|
||||
if(icicle == null){
|
||||
//remove notification from notification bar
|
||||
NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
|
||||
notificationManager.cancel(0);
|
||||
@@ -453,64 +391,6 @@ 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 ,
|
||||
* AppLon.txt ,
|
||||
* FirstBoot.txt ,
|
||||
* StayAwake.txt ,
|
||||
* Notes.txt ,
|
||||
* Address.txt ,
|
||||
* AppUnit.txt , &
|
||||
* AppService.txt
|
||||
* @return true if files were committed successful to shared_prefs settings.xml
|
||||
* @author ricky barrette
|
||||
*/
|
||||
private boolean parseOldSaveFilesToSharedPrefs(){
|
||||
/*
|
||||
* get the file stream class to read all old files
|
||||
* and get the editor for shared_prefs settings.xml
|
||||
*/
|
||||
FileStream fs = new FileStream(this);
|
||||
Editor editor = mSettings.edit();
|
||||
|
||||
/*
|
||||
* parse in the old files and save them
|
||||
*/
|
||||
editor.putInt(Settings.LAT, fs.readInteger("AppLat.txt"));
|
||||
editor.putInt(Settings.LON, fs.readInteger("AppLon.txt"));
|
||||
editor.putBoolean(Settings.STAY_AWAKE, fs.readBoolean("StayAwake.txt"));
|
||||
|
||||
if(fs.readBoolean("AppUnit.txt")){
|
||||
editor.putString(Settings.MEASUREMENT_UNIT, "Metric");
|
||||
} else {
|
||||
editor.putString(Settings.MEASUREMENT_UNIT, "Standard");
|
||||
}
|
||||
|
||||
editor.putBoolean(Settings.PARKING_TIMER_ALARM, fs.readBoolean("AppService.txt"));
|
||||
editor.putBoolean(Settings.FIRST_BOOT, fs.readBoolean("FirstBoot.txt"));
|
||||
editor.putString(Settings.NOTE, fs.readString("Notes.txt"));
|
||||
editor.putString(Settings.ADDRESS, fs.readString("Address.txt"));
|
||||
|
||||
/*
|
||||
* remove old files
|
||||
*/
|
||||
deleteFile("AppLat.txt");
|
||||
deleteFile("AppLon.txt");
|
||||
deleteFile("StayAwake.txt");
|
||||
deleteFile("AppUnit.txt");
|
||||
deleteFile("AppService.txt");
|
||||
deleteFile("FirstBoot.txt");
|
||||
deleteFile("Notes.txt");
|
||||
deleteFile("Address.txt");
|
||||
|
||||
/*
|
||||
* commit the changes
|
||||
*/
|
||||
return editor.commit();
|
||||
}
|
||||
|
||||
/**
|
||||
* displays a quit dialog
|
||||
* @since 0.0.2
|
||||
@@ -541,64 +421,5 @@ 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);
|
||||
mSplashDialog.setContentView(R.layout.powered_by_skyhook);
|
||||
mSplashDialog.setCancelable(false);
|
||||
mSplashDialog.show();
|
||||
|
||||
// Set Runnable to remove splash screen just in case
|
||||
final Handler handler = new Handler();
|
||||
handler.postDelayed(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
removeSplashScreen();
|
||||
|
||||
/*
|
||||
* uncomment the following to display the eula
|
||||
*/
|
||||
// //loads first boot dialog if this is the first boot
|
||||
// if (! mSettings.getBoolean(Settings.ACCEPTED, false) || Debug.FORCE_FIRSTBOOT_DIALOG)
|
||||
// eulaAlert();
|
||||
// else
|
||||
update();
|
||||
}
|
||||
}, 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
|
||||
*/
|
||||
private void update() {
|
||||
|
||||
/*
|
||||
* get build number and compare to saved build number, then check to see if there is something we need to do
|
||||
*/
|
||||
try {
|
||||
int build_number = this.getPackageManager().getPackageInfo(this.getPackageName(), 0).versionCode;
|
||||
|
||||
/*
|
||||
* if there is no build number saved && there is a FirstBoot.txt file then update old save file system to shared_prefs
|
||||
*/
|
||||
if(mSettings.getInt(Settings.BUILD_NUMBER, 0) == 0 && new FileStream(this).readBoolean("FirstBoot.txt")){
|
||||
Log.v(TAG, "updateding save files to shared_prefs");
|
||||
parseOldSaveFilesToSharedPrefs();
|
||||
}
|
||||
|
||||
/*
|
||||
* if this is the first time running this build display welcome dialog
|
||||
*/
|
||||
if(mSettings.getInt(Settings.BUILD_NUMBER, 0) < build_number || Debug.FORCE_FIRSTBOOT_DIALOG){
|
||||
displayWelcomeDialog();
|
||||
}
|
||||
|
||||
mSettings.edit().putInt(Settings.BUILD_NUMBER, build_number).commit();
|
||||
} catch (NameNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -38,7 +38,7 @@ import com.TwentyCodes.android.FindMyCarLib.ParkignTimerActivity;
|
||||
import com.TwentyCodes.android.FindMyCarLib.R;
|
||||
import com.TwentyCodes.android.FindMyCarLib.Settings;
|
||||
import com.TwentyCodes.android.FindMyCarLib.UI.FindMyCarOverlay;
|
||||
import com.TwentyCodes.android.fragments.SkyHoookUserOverlayMapFragment;
|
||||
import com.TwentyCodes.android.fragments.UserOverlayMapFragment;
|
||||
import com.TwentyCodes.android.location.GeoPointLocationListener;
|
||||
import com.TwentyCodes.android.location.GeoUtils;
|
||||
import com.TwentyCodes.android.location.MidPoint;
|
||||
@@ -72,7 +72,7 @@ public class MapFragment extends Fragment implements GeoPointLocationListener, O
|
||||
private ProgressDialog mProgress;
|
||||
protected DirectionsOverlay mDirections;
|
||||
private MapFragmentListener mListener;
|
||||
private SkyHoookUserOverlayMapFragment mMap;
|
||||
private UserOverlayMapFragment mMap;
|
||||
|
||||
/**
|
||||
* This listener will be used to notify it's parent about any changes tot eh map
|
||||
@@ -282,7 +282,7 @@ public class MapFragment extends Fragment implements GeoPointLocationListener, O
|
||||
|
||||
View view = inflater.inflate(R.layout.map, container, false);
|
||||
|
||||
mMap = (SkyHoookUserOverlayMapFragment) getFragmentManager().findFragmentById(R.id.map_fragment);
|
||||
mMap = (UserOverlayMapFragment) getFragmentManager().findFragmentById(R.id.map_fragment);
|
||||
mMap.setGeoPointLocationListener(this);
|
||||
setUiHandler();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user