[android] #3444 #3435 - added change listeners to location tracking and bearing tracking, added requires permissions checks and handled them in the test app, update javadoc to reflect changes, formatting commit of MapView, Reposition UserLocationView when location tracking becomes active

This commit is contained in:
Tobrun
2016-01-06 10:05:58 +01:00
parent 69cf21cece
commit 9d6cb1361c
4 changed files with 208 additions and 78 deletions

View File

@@ -8,6 +8,7 @@ import android.location.Location;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresPermission;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.NavigationView;
@@ -295,7 +296,7 @@ public class MainActivity extends AppCompatActivity {
switch (requestCode) {
case PERMISSIONS_LOCATION:
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
enableGps();
toggleGps(true);
}
break;
@@ -473,7 +474,20 @@ public class MainActivity extends AppCompatActivity {
new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION},
PERMISSIONS_LOCATION);
} else {
enableGps();
mMapView.setOnMyLocationChangeListener(new MapView.OnMyLocationChangeListener() {
@Override
public void onMyLocationChange(@Nullable Location location) {
if (location != null) {
mMapView.setZoomLevel(16);
mMapView.setCenterCoordinate(new LatLng(location));
mMapView.setOnMyLocationChangeListener(null);
}
}
});
mMapView.setMyLocationEnabled(true);
mMapView.setMyLocationTrackingMode(MyLocationTracking.TRACKING_NONE);
mMapView.setMyBearingTrackingMode(MyBearingTracking.GPS);
mLocationFAB.setColorFilter(ContextCompat.getColor(this, R.color.primary));
}
} else {
mMapView.setMyLocationEnabled(false);
@@ -481,23 +495,6 @@ public class MainActivity extends AppCompatActivity {
}
}
private void enableGps() {
mMapView.setOnMyLocationChangeListener(new MapView.OnMyLocationChangeListener() {
@Override
public void onMyLocationChange(@Nullable Location location) {
if (location != null) {
mMapView.setZoomLevel(16);
mMapView.setCenterCoordinate(new LatLng(location));
mMapView.setOnMyLocationChangeListener(null);
}
}
});
mMapView.setMyLocationEnabled(true);
mMapView.setMyLocationTrackingMode(MyLocationTracking.TRACKING_NONE);
mMapView.setMyBearingTrackingMode(MyBearingTracking.GPS);
mLocationFAB.setColorFilter(ContextCompat.getColor(this, R.color.primary));
}
/**
* Enable / Disable Annotations.
*

View File

@@ -12,6 +12,7 @@ import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
import android.widget.Toast;
import com.mapbox.mapboxsdk.constants.MyBearingTracking;
import com.mapbox.mapboxsdk.constants.MyLocationTracking;
@@ -45,20 +46,47 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
mLocationSpinner = (Spinner) findViewById(R.id.spinner_location);
mLocationSpinner.setAdapter(locationTrackingAdapter);
mLocationSpinner.setOnItemSelectedListener(this);
// mLocationSpinner.setEnabled(false);
ArrayAdapter<CharSequence> bearingTrackingAdapter = ArrayAdapter.createFromResource(actionBar.getThemedContext(), R.array.user_bearing_mode, android.R.layout.simple_spinner_item);
bearingTrackingAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
mBearingSpinner = (Spinner) findViewById(R.id.spinner_bearing);
mBearingSpinner.setAdapter(bearingTrackingAdapter);
mBearingSpinner.setOnItemSelectedListener(this);
// mBearingSpinner.setEnabled(false);
mMapView = (MapView) findViewById(R.id.mapView);
mMapView.setAccessToken(ApiAccess.getToken(this));
mMapView.onCreate(savedInstanceState);
mMapView.setOnMyLocationChangeListener(this);
mMapView.setMyLocationEnabled(true);
try {
mMapView.setMyLocationEnabled(true);
} catch (SecurityException e) {
//should not occur, permission was checked in MainActivity
Toast.makeText(this, "Location permission is not availlable", Toast.LENGTH_SHORT).show();
finish();
}
mMapView.setOnMyLocationTrackingModeChangeListener(new MapView.OnMyLocationTrackingModeChangeListener() {
@Override
public void onMyLocationTrackingModeChange(@MyLocationTracking.Mode int myLocationTrackingMode) {
if (MyLocationTracking.TRACKING_NONE == myLocationTrackingMode) {
mLocationSpinner.setOnItemSelectedListener(null);
mLocationSpinner.setSelection(0);
mLocationSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
}
}
});
mMapView.setOnMyBearingTrackingModeChangeListener(new MapView.OnMyBearingTrackingModeChangeListener() {
@Override
public void onMyBearingTrackingModeChange(@MyBearingTracking.Mode int myBearingTrackingMode) {
if (MyBearingTracking.NONE == myBearingTrackingMode) {
mBearingSpinner.setOnItemSelectedListener(null);
mBearingSpinner.setSelection(0);
mBearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
}
}
});
}
@Override
@@ -93,7 +121,7 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
}
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) throws SecurityException {
if (parent.getId() == R.id.spinner_location) {
switch (position) {
case 0:
@@ -117,10 +145,6 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
case 2:
mMapView.setMyBearingTrackingMode(MyBearingTracking.COMPASS);
break;
// case 3:
// mMapView.setMyBearingTrackingMode(MyBearingTracking.COMBINED);
// break;
}
}
}