package rename

zoomController visibility fix

AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jventrib.ignDroid"
+    package="com.hexagon.map"
     android:versionCode="1"
     android:versionName="0.5" >
 
@@ -25,7 +25,7 @@
         android:required="true" />
 
     <application
-        android:name="com.jventrib.ignDroid.IgnDroidApplication"
+        android:name="com.hexagon.map.HexagonMapApplication"
         android:allowBackup="true"
         android:allowTaskReparenting="false"
         android:hardwareAccelerated="true"
@@ -49,7 +49,7 @@
                 <data android:scheme="geo" />
             </intent-filter>
         </activity>
-        <activity android:name=".preference.IgnPreferenceActivity" >
+        <activity android:name=".preference.MapPreferenceActivity" >
         </activity>
         <activity
             android:name="com.google.ads.AdActivity"

src/com/jventrib/ignDroid/AbstractLocationListener.java → src/com/hexagon/map/AbstractLocationListener.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.jventrib.ignDroid;
+package com.hexagon.map;
 
 
 import android.location.Location;

src/com/jventrib/ignDroid/IgnDroidApplication.java → src/com/hexagon/map/HexagonMapApplication.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid;
+package com.hexagon.map;
 
 import org.acra.ACRA;
 import org.acra.ReportingInteractionMode;
@@ -7,7 +7,7 @@
 import android.app.Application;
 
 @ReportsCrashes(formKey = "dHR0SUQ4WDEwekpVbHMwOHhGT3ZQeHc6MQ", mode=ReportingInteractionMode.TOAST)
-public class IgnDroidApplication extends Application {
+public class HexagonMapApplication extends Application {
 	@Override
 	public void onCreate() {
 		super.onCreate();

src/com/jventrib/ignDroid/Image.java → src/com/hexagon/map/Image.java

@@ -1,14 +1,14 @@
-package com.jventrib.ignDroid;
+package com.hexagon.map;
 
 import org.apache.http.client.methods.HttpGet;
 
 import android.graphics.Bitmap;
 import android.os.Build;
 
-import com.jventrib.ignDroid.download.CacheBitmapDownloadService;
-import com.jventrib.ignDroid.enums.LoadState;
-import com.jventrib.ignDroid.preference.Preferences;
-import com.jventrib.ignDroid.util.JveLog;
+import com.hexagon.map.download.CacheBitmapDownloadService;
+import com.hexagon.map.enums.LoadState;
+import com.hexagon.map.preference.Preferences;
+import com.hexagon.map.util.JveLog;
 
 public class Image {
 

src/com/jventrib/ignDroid/MapActivity.java → src/com/hexagon/map/MapActivity.java

@@ -1,12 +1,9 @@
-package com.jventrib.ignDroid;
+package com.hexagon.map;
 
 import java.io.File;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.acra.ReportingInteractionMode;
-import org.acra.annotation.ReportsCrashes;
-
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Context;
@@ -46,13 +43,13 @@
 import android.widget.ZoomButtonsController.OnZoomListener;
 
 import com.actionbarsherlock.app.SherlockActivity;
+import com.hexagon.map.async.AsyncTaskCompleteListener;
+import com.hexagon.map.geo.Point;
+import com.hexagon.map.location.SearchService;
+import com.hexagon.map.preference.MapPreferenceActivity;
+import com.hexagon.map.preference.Preferences;
+import com.hexagon.map.util.JveLog;
 import com.jhlabs.map.awt.Point2D;
-import com.jventrib.ignDroid.async.AsyncTaskCompleteListener;
-import com.jventrib.ignDroid.geo.Point;
-import com.jventrib.ignDroid.location.SearchService;
-import com.jventrib.ignDroid.preference.IgnPreferenceActivity;
-import com.jventrib.ignDroid.preference.Preferences;
-import com.jventrib.ignDroid.util.JveLog;
 
 public class MapActivity extends SherlockActivity implements OnGestureListener,
 		OnDoubleTapListener, SensorEventListener {
@@ -324,6 +321,21 @@ private void initDisplay() {
 
 		main = new MapView(this, this);
 
+
+		setContentView(R.layout.main);
+		LinearLayout content = (LinearLayout) findViewById(R.id.mapLayout);
+
+		content.addView(main);
+
+		initSearch();
+
+		// adView = (AdView) findViewById(R.id.ad);
+		// adView.setVisibility(View.VISIBLE);
+		// adView.loadAd(new AdRequest());
+
+		handleFullScreen(Preferences.isFullScreen());
+
+
 		controller = new ZoomButtonsController(main);
 		controller.setOnZoomListener(new OnZoomListener() {
 
@@ -335,26 +347,13 @@ public void onZoom(boolean zoomIn) {
 				}
 			}
 
-			public void onVisibilityChanged(boolean arg0) {
-
+			public void onVisibilityChanged(boolean visible) {
+				controller.setVisible(visible);
 			}
 		});
-		controller.setVisible(true);
+//		controller.setVisible(true);
 		controller.setAutoDismissed(true);
 
-		setContentView(R.layout.main);
-		LinearLayout content = (LinearLayout) findViewById(R.id.mapLayout);
-
-		content.addView(main);
-
-		initSearch();
-
-		// adView = (AdView) findViewById(R.id.ad);
-		// adView.setVisibility(View.VISIBLE);
-		// adView.loadAd(new AdRequest());
-
-		handleFullScreen(Preferences.isFullScreen());
-
 	}
 
 	/**
@@ -654,7 +653,7 @@ public boolean onOptionsItemSelected(
 			// Toast.LENGTH_SHORT).show();
 			// return true;
 		case R.id.preferences:
-			Intent intent = new Intent(this, IgnPreferenceActivity.class);
+			Intent intent = new Intent(this, MapPreferenceActivity.class);
 			startActivity(intent);
 
 			return true;

src/com/jventrib/ignDroid/MapView.java → src/com/hexagon/map/MapView.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.jventrib.ignDroid;
+package com.hexagon.map;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -10,8 +10,8 @@
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-import com.jventrib.ignDroid.MapActivity.MapRenderThread;
-import com.jventrib.ignDroid.preference.Preferences;
+import com.hexagon.map.MapActivity.MapRenderThread;
+import com.hexagon.map.preference.Preferences;
 
 /**
  * Main view class

src/com/jventrib/ignDroid/Tile.java → src/com/hexagon/map/Tile.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid;
+package com.hexagon.map;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,9 +9,9 @@
 import android.graphics.Paint;
 import android.os.Handler;
 
-import com.jventrib.ignDroid.geo.AbstractPositionableElement;
-import com.jventrib.ignDroid.preference.Preferences;
-import com.jventrib.ignDroid.util.JveLog;
+import com.hexagon.map.geo.AbstractPositionableElement;
+import com.hexagon.map.preference.Preferences;
+import com.hexagon.map.util.JveLog;
 
 public class Tile extends AbstractPositionableElement {
 

src/com/jventrib/ignDroid/Viewport.java → src/com/hexagon/map/Viewport.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid;
+package com.hexagon.map;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,12 +26,11 @@
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Transformation;
 
+import com.hexagon.map.geo.AbstractPositionableElement;
+import com.hexagon.map.geo.LocationablePoint;
+import com.hexagon.map.geo.Point;
 import com.jhlabs.map.awt.Point2D;
-import com.jhlabs.map.awt.Point2D.Float;
 import com.jhlabs.map.proj.MercatorProjection;
-import com.jventrib.ignDroid.geo.AbstractPositionableElement;
-import com.jventrib.ignDroid.geo.LocationablePoint;
-import com.jventrib.ignDroid.geo.Point;
 
 public class Viewport extends AbstractPositionableElement implements
 		LocationListener {
@@ -146,7 +145,7 @@ public void init(Context context, DisplayMetrics dm) {
 		// opt.inDither = true;
 		opt.inPreferredConfig = Bitmap.Config.RGB_565; //
 		noSrcBmp = BitmapFactory.decodeResource(context.getResources(),
-				com.jventrib.ignDroid.R.drawable.nosrc, opt);
+				R.drawable.nosrc, opt);
 
 		listener = new AbstractLocationListener() {
 
@@ -379,7 +378,7 @@ public void moveToLocation(Location location) {
 			if (lock) {
 				float longitude = new java.lang.Float(location.getLongitude());
 				float latitude = new java.lang.Float(location.getLatitude());
-				Float pos = new Float(longitude, latitude);
+				Point2D.Float pos = new Point2D.Float(longitude, latitude);
 				moveToPositionAnimated(pos);
 			}
 		}

src/com/jventrib/ignDroid/async/AsyncTaskCompleteListener.java → src/com/hexagon/map/async/AsyncTaskCompleteListener.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.async;
+package com.hexagon.map.async;
 
 public interface AsyncTaskCompleteListener<T> {
 	public void onTaskComplete(T result);

src/com/jventrib/ignDroid/download/CacheBitmapDownloadService.java → src/com/hexagon/map/download/CacheBitmapDownloadService.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.download;
+package com.hexagon.map.download;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -15,11 +15,11 @@
 import android.os.Build;
 import android.util.Log;
 
-import com.jventrib.ignDroid.Image;
-import com.jventrib.ignDroid.MapActivity;
-import com.jventrib.ignDroid.Viewport;
-import com.jventrib.ignDroid.enums.LoadState;
-import com.jventrib.ignDroid.preference.Preferences;
+import com.hexagon.map.Image;
+import com.hexagon.map.MapActivity;
+import com.hexagon.map.Viewport;
+import com.hexagon.map.enums.LoadState;
+import com.hexagon.map.preference.Preferences;
 
 public class CacheBitmapDownloadService {
 

src/com/jventrib/ignDroid/download/HttpBitmapDownloadService.java → src/com/hexagon/map/download/HttpBitmapDownloadService.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.download;
+package com.hexagon.map.download;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -25,12 +25,12 @@
 import android.graphics.BitmapFactory;
 import android.os.Build;
 
-import com.jventrib.ignDroid.Viewport;
-import com.jventrib.ignDroid.Image;
-import com.jventrib.ignDroid.MapActivity;
-import com.jventrib.ignDroid.enums.LoadState;
-import com.jventrib.ignDroid.preference.Preferences;
-import com.jventrib.ignDroid.util.JveLog;
+import com.hexagon.map.Image;
+import com.hexagon.map.MapActivity;
+import com.hexagon.map.Viewport;
+import com.hexagon.map.enums.LoadState;
+import com.hexagon.map.preference.Preferences;
+import com.hexagon.map.util.JveLog;
 
 public class HttpBitmapDownloadService {
 

src/com/jventrib/ignDroid/enums/LoadState.java → src/com/hexagon/map/enums/LoadState.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.enums;
+package com.hexagon.map.enums;
 
 public enum LoadState {
 	LOADING, LOADED, CLEARED, ABORTED;

src/com/jventrib/ignDroid/geo/AbstractPositionableElement.java → src/com/hexagon/map/geo/AbstractPositionableElement.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.geo;
+package com.hexagon.map.geo;
 
 import com.jhlabs.map.awt.Point2D.Float;
 import com.jhlabs.map.proj.MercatorProjection;

src/com/jventrib/ignDroid/geo/LocationablePoint.java → src/com/hexagon/map/geo/LocationablePoint.java

@@ -1,14 +1,14 @@
-package com.jventrib.ignDroid.geo;
+package com.hexagon.map.geo;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.location.Location;
 import android.location.LocationListener;
 import android.os.Bundle;
 
+import com.hexagon.map.AbstractLocationListener;
 import com.jhlabs.map.awt.Point2D.Float;
 import com.jhlabs.map.proj.MercatorProjection;
-import com.jventrib.ignDroid.AbstractLocationListener;
 
 public class LocationablePoint extends Point implements LocationListener {
 

src/com/jventrib/ignDroid/geo/Point.java → src/com/hexagon/map/geo/Point.java

@@ -1,6 +1,6 @@
-package com.jventrib.ignDroid.geo;
+package com.hexagon.map.geo;
 
-import com.jventrib.ignDroid.Viewport;
+import com.hexagon.map.Viewport;
 
 import android.location.Location;
 

src/com/jventrib/ignDroid/location/LocationService.java → src/com/hexagon/map/location/LocationService.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.location;
+package com.hexagon.map.location;
 
 import android.location.Location;
 

src/com/jventrib/ignDroid/location/SearchService.java → src/com/hexagon/map/location/SearchService.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.location;
+package com.hexagon.map.location;
 
 import java.io.StringReader;
 import java.net.URI;
@@ -23,10 +23,10 @@
 import android.os.AsyncTask;
 import android.util.Log;
 
-import com.jventrib.ignDroid.MapActivity;
-import com.jventrib.ignDroid.R;
-import com.jventrib.ignDroid.async.AsyncTaskCompleteListener;
-import com.jventrib.ignDroid.util.JveLog;
+import com.hexagon.map.MapActivity;
+import com.hexagon.map.R;
+import com.hexagon.map.async.AsyncTaskCompleteListener;
+import com.hexagon.map.util.JveLog;
 
 public class SearchService extends AsyncTask<String, Void, com.jhlabs.map.awt.Point2D.Float> {
 

src/com/jventrib/ignDroid/preference/Eula.java → src/com/hexagon/map/preference/Eula.java

@@ -1,4 +1,4 @@
-package com.jventrib.ignDroid.preference;
+package com.hexagon.map.preference;
 
 import java.io.BufferedReader;
 import java.io.Closeable;
@@ -10,7 +10,7 @@
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 
-import com.jventrib.ignDroid.R;
+import com.hexagon.map.R;
 
 class Eula {
         private static final String ASSET_EULA = "EULA";