tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve support for Andrioid M

Browse Source 
Checks for and requests runtime location permissions (fixes #2110)
Improved the styling of the location FAB
Removed redudant drawables
Fixed various Java and Android warnings and deprecated functions
A few other tweaks
This commit is contained in:
Leith Bade
2015-08-18 18:54:56 +10:00
parent ac86ce39ad
commit 6ad2006d3f
45 changed files with 68 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
View File

@@ -5,7 +5,5 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
</manifest>

21
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/BoundingBox.java
View File

@@ -119,15 +119,7 @@ public final class BoundingBox implements Parcelable, Serializable {
@Override
public String toString() {
return new StringBuffer().append("N:")
.append(this.mLatNorth)
.append("; E:")
.append(this.mLonEast)
.append("; S:")
.append(this.mLatSouth)
.append("; W:")
.append(this.mLonWest)
.toString();
return "N:" + this.mLatNorth + "; E:" + this.mLonEast + "; S:" + this.mLatSouth + "; W:" + this.mLonWest;
}
/**
@@ -164,17 +156,8 @@ public final class BoundingBox implements Parcelable, Serializable {
*/
public boolean equals(final BoundingBox other) {
if (other == null) {
return false;
}
if (other == this) {
return true;
}
return other != null && (other == this || mLatNorth == other.getLatNorth() && mLatSouth == other.getLatSouth() && mLonEast == other.getLonEast() && mLonWest == other.getLonWest());
return mLatNorth == other.getLatNorth()
&& mLatSouth == other.getLatSouth()
&& mLonEast == other.getLonEast()
&& mLonWest == other.getLonWest();
}
/**

12
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLng.java
View File

@@ -97,18 +97,8 @@ public class LatLng implements ILatLng, Parcelable, Serializable {
LatLng latLng = (LatLng) o;
if (Double.compare(latLng.altitude, altitude) != 0) {
return false;
}
return Double.compare(latLng.altitude, altitude) == 0 && Double.compare(latLng.latitude, latitude) == 0 && Double.compare(latLng.longitude, longitude) == 0;
if (Double.compare(latLng.latitude, latitude) != 0) {
return false;
}
if (Double.compare(latLng.longitude, longitude) != 0) {
return false;
}
return true;
}
@Override

5
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLngZoom.java
View File

@@ -56,11 +56,8 @@ public class LatLngZoom extends LatLng implements Parcelable, Serializable {
LatLngZoom that = (LatLngZoom) o;
if (Double.compare(that.zoom, zoom) != 0) {
return false;
}
return Double.compare(that.zoom, zoom) == 0;
return true;
}
@Override

8
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ProjectedMeters.java
View File

@@ -56,14 +56,8 @@ public class ProjectedMeters implements IProjectedMeters, Parcelable, Serializab
ProjectedMeters projectedMeters = (ProjectedMeters) o;
if (Double.compare(projectedMeters.easting, easting) != 0) {
return false;
}
if (Double.compare(projectedMeters.northing, northing) != 0) {
return false;
}
return Double.compare(projectedMeters.easting, easting) == 0 && Double.compare(projectedMeters.northing, northing) == 0;
return true;
}
@Override

25
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
View File

@@ -22,6 +22,7 @@ import android.net.NetworkInfo;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GestureDetectorCompat;
import android.support.v4.view.ScaleGestureDetectorCompat;
import android.text.TextUtils;
@@ -104,7 +105,6 @@ public class MapView extends FrameLayout implements LocationListener {
//
// Used to call JNI NativeMapView
private SurfaceView mSurfaceView;
private NativeMapView mNativeMapView;
// Used to handle DPI scaling
@@ -135,7 +135,7 @@ public class MapView extends FrameLayout implements LocationListener {
private Location mGpsLocation;
public enum UserLocationTrackingMode {
NONE, FOLLOW, FOLLOW_BEARING;
NONE, FOLLOW, FOLLOW_BEARING
}
private UserLocationTrackingMode mUserLocationTrackingMode = UserLocationTrackingMode.FOLLOW;
@@ -215,8 +215,8 @@ public class MapView extends FrameLayout implements LocationListener {
// Save the context
mContext = context;
mSurfaceView = new SurfaceView(mContext);
addView(mSurfaceView);
SurfaceView surfaceView = new SurfaceView(mContext);
addView(surfaceView);
// Check if we are in Eclipse UI editor
if (isInEditMode()) {
@@ -252,9 +252,9 @@ public class MapView extends FrameLayout implements LocationListener {
// Register the SurfaceHolder callbacks
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
mSurfaceView.getHolder().addCallback(new Callbacks2());
surfaceView.getHolder().addCallback(new Callbacks2());
} else {
mSurfaceView.getHolder().addCallback(new Callbacks());
surfaceView.getHolder().addCallback(new Callbacks());
}
// Touch gesture detectors
@@ -294,7 +294,7 @@ public class MapView extends FrameLayout implements LocationListener {
mCompassListener = new CompassListener();
mCompassView = new ImageView(mContext);
mCompassView.setImageDrawable(getResources().getDrawable(R.drawable.compass));
mCompassView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.compass));
mCompassView.setContentDescription(getResources().getString(R.string.compassContentDescription));
LayoutParams lp = new FrameLayout.LayoutParams((int)(48 * mScreenDensity), (int)(48 * mScreenDensity));
lp.gravity = Gravity.TOP | Gravity.END;
@@ -306,7 +306,7 @@ public class MapView extends FrameLayout implements LocationListener {
// Setup Support For Listener Tracking
// MapView's internal listener is setup in onCreate()
mOnMapChangedListener = new ArrayList<OnMapChangedListener>();
mOnMapChangedListener = new ArrayList<>();
// Load the attributes
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MapView, 0, 0);
@@ -560,7 +560,6 @@ public class MapView extends FrameLayout implements LocationListener {
}
private void validateStyleUrl(String url) {
String[] schemes = {"http", "https", "asset"};
url = url.replaceFirst("asset://", "http://");
HttpUrl parsedUrl = HttpUrl.parse(url);
if (parsedUrl == null) {
@@ -723,7 +722,9 @@ public class MapView extends FrameLayout implements LocationListener {
getContext().unregisterReceiver(mConnectivityReceiver);
mConnectivityReceiver = null;
toggleGps(!mIsMyLocationEnabled);
if (mIsMyLocationEnabled) {
toggleGps(false);
};
mNativeMapView.pause();
}
@@ -736,7 +737,9 @@ public class MapView extends FrameLayout implements LocationListener {
mConnectivityReceiver = new ConnectivityReceiver();
mContext.registerReceiver(mConnectivityReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
toggleGps(mIsMyLocationEnabled);
if (mIsMyLocationEnabled) {
toggleGps(true);
}
mNativeMapView.resume();
}