Updated to meet Location Lib changes

Change-Id: Ia78130ba8cdbf4ba9b7b4477ef289e8a515b4529
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
2012-03-19 12:22:41 -04:00
parent 51748fee4c
commit 61fb9af3d2
9 changed files with 217 additions and 203 deletions

Binary file not shown.

View File

@@ -193,47 +193,47 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>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 "<code>?[<i>package</i>:][<i>type</i>:]<i>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 "<code>?[<i>package</i>:][<i>type</i>:]<i>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.
*/

View File

@@ -193,47 +193,47 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>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 "<code>?[<i>package</i>:][<i>type</i>:]<i>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 "<code>?[<i>package</i>:][<i>type</i>:]<i>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.
*/

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MyTheme" parent="@android:style/Theme">
<!-- Any customizations for your app running on pre-3.0 devices here -->
</style>
</resources>

View File

@@ -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
}
}
}

View File

@@ -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.