Merge pull request #1606 from cascheberg/fix-centerme

Improve map centering button

Author: crankycoder

Diff for: android/src/main/java/org/mozilla/mozstumbler/client/mapview/MapFragment.java

@@ -10,7 +10,6 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.location.Location;
-import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
@@ -30,7 +29,6 @@
 import org.mozilla.mozstumbler.BuildConfig;
 import org.mozilla.mozstumbler.R;
 import org.mozilla.mozstumbler.client.ClientPrefs;
-import org.mozilla.mozstumbler.client.ClientStumblerService;
 import org.mozilla.mozstumbler.client.MainApp;
 import org.mozilla.mozstumbler.client.ObservedLocationsReceiver;
 import org.mozilla.mozstumbler.client.mapview.tiles.AbstractMapOverlay;
@@ -83,8 +81,8 @@ public class MapFragment extends android.support.v4.app.Fragment
     private final Timer mGetUrl = new Timer();
     private MapView mMap;
     private AccuracyCircleOverlay mAccuracyOverlay;
-    private boolean mFirstLocationFix;
-    private boolean mUserPanning = false;
+    private static boolean sHadFirstLocationFix = false;
+    private static boolean sUserPanning = true;
     private ObservationPointsOverlay mObservationPointsOverlay;
     private MapLocationListener mMapLocationListener;
     private LowResMapOverlay mLowResMapOverlayHighZoom;
@@ -144,15 +142,15 @@ private void initializeMapControls() {
 
     private void initializeCenterMeListener() {
         final ImageButton centerMe = (ImageButton) mRootView.findViewById(R.id.my_location_button);
-        centerMe.setVisibility(View.INVISIBLE);
+        updateCenterButtonIcon();
         centerMe.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (mAccuracyOverlay == null || mAccuracyOverlay.getLocation() == null)
                     return;
                 mMap.getController().animateTo((mAccuracyOverlay.getLocation()));
-                mUserPanning = false;
-                centerMe.setBackgroundResource(R.drawable.ic_mylocation_android_assets);
+                sUserPanning = false;
+                updateCenterButtonIcon();
             }
         });
     }
@@ -163,8 +161,8 @@ private void initializeListeners() {
         mMap.getOverlays().add(new SwipeListeningOverlay(getActivity().getApplicationContext(), new SwipeListeningOverlay.OnSwipeListener() {
             @Override
             public void onSwipe() {
-                mUserPanning = true;
-                setCenterButtonToNotCenteredIcon();
+                sUserPanning = true;
+                updateCenterButtonIcon();
             }
         }));
 
@@ -199,13 +197,11 @@ private void initializeMapOverlays() {
     }
 
     private void initializeLastLocation(Bundle savedInstanceState) {
-        mFirstLocationFix = true;
         int zoomLevel;
         GeoPoint lastLoc = null;
         if (savedInstanceState != null) {
             zoomLevel = savedInstanceState.getInt(ZOOM_KEY, DEFAULT_ZOOM);
             if (savedInstanceState.containsKey(LAT_KEY) && savedInstanceState.containsKey(LON_KEY)) {
-                mFirstLocationFix = false;
                 final double latitude = savedInstanceState.getDouble(LAT_KEY);
                 final double longitude = savedInstanceState.getDouble(LON_KEY);
                 lastLoc = new GeoPoint(latitude, longitude);
@@ -504,24 +500,25 @@ private void showCopyright() {
         }
     }
 
-    private void setCenterButtonToNotCenteredIcon() {
+    private void updateCenterButtonIcon() {
         ImageButton centerMe = (ImageButton) mRootView.findViewById(R.id.my_location_button);
-        centerMe.setVisibility(View.VISIBLE);
-        centerMe.setBackgroundResource(R.drawable.ic_mylocation_no_dot_android_assets);
+        centerMe.setVisibility(sHadFirstLocationFix ? View.VISIBLE : View.INVISIBLE);
+        if (sUserPanning) {
+            centerMe.setBackgroundResource(R.drawable.ic_mylocation_no_dot_android_assets);
+        } else {
+            centerMe.setBackgroundResource(R.drawable.ic_mylocation_android_assets);
+        }
     }
 
     void setUserPositionAt(Location location) {
-        if (mAccuracyOverlay.getLocation() == null) {
-            setCenterButtonToNotCenteredIcon();
-        }
-
         mAccuracyOverlay.setLocation(location);
 
-        if (mFirstLocationFix) {
+        if (!sHadFirstLocationFix) {
             setCenterAndZoom(new GeoPoint(location), DEFAULT_ZOOM_AFTER_FIX);
-            mFirstLocationFix = false;
-            mUserPanning = false;
-        } else if (!mUserPanning) {
+            sHadFirstLocationFix = true;
+            sUserPanning = false;
+            updateCenterButtonIcon();
+        } else if (!sUserPanning) {
             mMap.getController().animateTo((mAccuracyOverlay.getLocation()));
         }
     }
@@ -715,8 +712,9 @@ protected void draw(Canvas c, MapView osmv, boolean shadow) {
         }
 
         @Override
-        public boolean onTouchEvent(final MotionEvent event, final MapView mapView) {
-            if (mOnSwipe != null && event.getAction() == MotionEvent.ACTION_MOVE) {
+        public boolean onScroll(final MotionEvent pEvent1, final MotionEvent pEvent2,
+                                final float pDistanceX, final float pDistanceY, final MapView pMapView) {
+            if (mOnSwipe != null) {
                 mOnSwipe.onSwipe();
             }
             return false;