ricky/findmycar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finished converting FMC over to the new SkyHookUserOverlayMapFragment

Browse Source 
Change-Id: I9059afeec89b5e5fea735c3800b7465bb9ff6e72
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-03-04 14:43:23 -05:00
parent bdeb5cbe02
commit 186ad1703f
3 changed files with 388 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
FindMyCarLib/res/layout/map.xml
View File

@@ -12,23 +12,18 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
layout="@layout/distancebar" /> layout="@layout/distancebar" />
<!-- ricky beta release 0rKmsWMM0D-IRAEgcSZEqwZCs_8AUwxjYjj0bnA --> <fragment
<!-- ricky 0rKmsWMM0D-KC9KXr1WbA5aEb-2ozQ0SHTvV46g --> android:id="@+id/map_fragment"
<!-- TWENTYCODES 0rKmsWMM0D-K15bEM_kwabPbNhsn4dp4rcq2q5Q --> android:layout_width="match_parent"
android:layout_height="match_parent"
class="com.TwentyCodes.android.SkyHook.SkyHoookUserOverlayMapFragment" >
<com.TwentyCodes.android.location.MapView <!-- Preview: layout=@layout/map_fragment -->
xmlns:android="http://schemas.android.com/apk/res/android" </fragment>
android:id="@+id/mapview"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_above="@+id/buttons"
android:layout_below="@id/table"
android:apiKey="0rKmsWMM0D-K15bEM_kwabPbNhsn4dp4rcq2q5Q"
android:clickable="true" />
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@id/mapview" android:id="@id/map_fragment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_below="@id/table" /> android:layout_below="@id/table" />
@@ -47,7 +42,7 @@
android:textStyle="bold" /> android:textStyle="bold" />
<include <include
android:id="@id/buttons" android:id="@+id/buttons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"

15
FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/Main.java
View File

@@ -128,9 +128,9 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF
*/ */
if(!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) if(!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER))
enableGPSdialog(Main.this); enableGPSdialog(Main.this);
else // else
if(mMap != null) // if(mMap != null)
mMap.setGPSDialogEnabled(true); // mMap.setGPSDialogEnabled(true);
/* /*
* the map is no longer needed, clear it from memory * the map is no longer needed, clear it from memory
@@ -448,7 +448,7 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF
* Shows the splash screen over the full Activity * Shows the splash screen over the full Activity
*/ */
protected void showSplashScreen() { protected void showSplashScreen() {
mMap.setGPSDialogEnabled(false); // mMap.setGPSDialogEnabled(false);
mSplashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar_Fullscreen); mSplashDialog = new Dialog(this, android.R.style.Theme_Translucent_NoTitleBar_Fullscreen);
mSplashDialog.setContentView(R.layout.powered_by_skyhook); mSplashDialog.setContentView(R.layout.powered_by_skyhook);
mSplashDialog.setCancelable(false); mSplashDialog.setCancelable(false);
@@ -498,9 +498,10 @@ public class Main extends FragmentActivity implements RegistrationCallback, MapF
*/ */
if(mSettings.getInt(Settings.BUILD_NUMBER, 0) < build_number || Debug.FORCE_FIRSTBOOT_DIALOG){ if(mSettings.getInt(Settings.BUILD_NUMBER, 0) < build_number || Debug.FORCE_FIRSTBOOT_DIALOG){
displayWelcomeDialog(); displayWelcomeDialog();
} else { }
mMap.setGPSDialogEnabled(true); // else {
} // mMap.setGPSDialogEnabled(true);
// }
mSettings.edit().putInt(Settings.BUILD_NUMBER, build_number).commit(); mSettings.edit().putInt(Settings.BUILD_NUMBER, build_number).commit();
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {

729
FindMyCarLib/src/com/TwentyCodes/android/FindMyCarLib/UI/fragments/MapFragment.java
View File

File diff suppressed because it is too large Load Diff