diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox')
4 files changed, 79 insertions, 79 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationLayerFragmentActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt index fa2c84ab92..974dc5c571 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationLayerFragmentActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationFragmentActivity.kt @@ -17,11 +17,11 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.maps.MapView import com.mapbox.mapboxsdk.maps.MapboxMap -import com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerPlugin +import com.mapbox.mapboxsdk.location.LocationComponent import com.mapbox.mapboxsdk.testapp.R import kotlinx.android.synthetic.main.activity_location_layer_fragment.* -class LocationLayerFragmentActivity : AppCompatActivity() { +class LocationFragmentActivity : AppCompatActivity() { private lateinit var permissionsManager: PermissionsManager override fun onCreate(savedInstanceState: Bundle?) { @@ -46,13 +46,13 @@ class LocationLayerFragmentActivity : AppCompatActivity() { if (savedInstanceState == null) { fragmentManager .beginTransaction() - .replace(R.id.container, LocationLayerFragment.newInstance(), LocationLayerFragment.TAG) + .replace(R.id.container, LocationFragment.newInstance(), LocationFragment.TAG) .commit() } } else { permissionsManager = PermissionsManager(object : PermissionsListener { override fun onExplanationNeeded(permissionsToExplain: MutableList<String>?) { - Toast.makeText(this@LocationLayerFragmentActivity, "You need to accept location permissions.", + Toast.makeText(this@LocationFragmentActivity, "You need to accept location permissions.", Toast.LENGTH_SHORT).show() } @@ -61,7 +61,7 @@ class LocationLayerFragmentActivity : AppCompatActivity() { if (savedInstanceState == null) { fragmentManager .beginTransaction() - .replace(R.id.container, LocationLayerFragment.newInstance(), LocationLayerFragment.TAG) + .replace(R.id.container, LocationFragment.newInstance(), LocationFragment.TAG) .commit() } } else { @@ -78,17 +78,17 @@ class LocationLayerFragmentActivity : AppCompatActivity() { permissionsManager.onRequestPermissionsResult(requestCode, permissions, grantResults) } - class LocationLayerFragment : Fragment(), LocationEngineListener { + class LocationFragment : Fragment(), LocationEngineListener { companion object { - const val TAG = "LLFragment" - fun newInstance(): LocationLayerFragment { - return LocationLayerFragment() + const val TAG = "LFragment" + fun newInstance(): LocationFragment { + return LocationFragment() } } private lateinit var mapView: MapView private lateinit var mapboxMap: MapboxMap - private var plugin: LocationLayerPlugin? = null + private var component: LocationComponent? = null override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { mapView = MapView(inflater.context) @@ -100,16 +100,16 @@ class LocationLayerFragmentActivity : AppCompatActivity() { mapView.onCreate(savedInstanceState) mapView.getMapAsync { mapboxMap = it - plugin = mapboxMap.locationLayerPlugin - plugin?.activateLocationLayerPlugin(activity) - plugin?.locationEngine?.addLocationEngineListener(this) + component = mapboxMap.locationComponent + component?.activateLocationComponent(activity) + component?.locationEngine?.addLocationEngineListener(this) } } override fun onLocationChanged(location: Location?) { if (location != null) { mapboxMap.animateCamera(CameraUpdateFactory.newLatLngZoom(LatLng(location), 12.0)) - plugin?.locationEngine?.removeLocationEngineListener(this) + component?.locationEngine?.removeLocationEngineListener(this) } } @@ -150,7 +150,7 @@ class LocationLayerFragmentActivity : AppCompatActivity() { override fun onDestroyView() { super.onDestroyView() mapView.onDestroy() - plugin?.locationEngine?.removeLocationEngineListener(this) + component?.locationEngine?.removeLocationEngineListener(this) } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationLayerMapChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java index e59627d35e..6fa514e28b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationLayerMapChangeActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationMapChangeActivity.java @@ -13,13 +13,13 @@ import com.mapbox.android.core.permissions.PermissionsManager; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; -import com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerPlugin; -import com.mapbox.mapboxsdk.plugins.locationlayer.modes.RenderMode; +import com.mapbox.mapboxsdk.location.LocationComponent; +import com.mapbox.mapboxsdk.location.modes.RenderMode; import com.mapbox.mapboxsdk.testapp.R; import java.util.List; -public class LocationLayerMapChangeActivity extends AppCompatActivity implements OnMapReadyCallback { +public class LocationMapChangeActivity extends AppCompatActivity implements OnMapReadyCallback { private MapView mapView; private MapboxMap mapboxMap; @@ -51,14 +51,14 @@ public class LocationLayerMapChangeActivity extends AppCompatActivity implements permissionsManager = new PermissionsManager(new PermissionsListener() { @Override public void onExplanationNeeded(List<String> permissionsToExplain) { - Toast.makeText(LocationLayerMapChangeActivity.this, "You need to accept location permissions.", + Toast.makeText(LocationMapChangeActivity.this, "You need to accept location permissions.", Toast.LENGTH_SHORT).show(); } @Override public void onPermissionResult(boolean granted) { if (granted) { - mapView.getMapAsync(LocationLayerMapChangeActivity.this); + mapView.getMapAsync(LocationMapChangeActivity.this); } else { finish(); } @@ -77,14 +77,14 @@ public class LocationLayerMapChangeActivity extends AppCompatActivity implements @Override public void onMapReady(MapboxMap mapboxMap) { this.mapboxMap = mapboxMap; - activateLocationLayer(); + activateLocationComponent(); } @SuppressLint("MissingPermission") - private void activateLocationLayer() { - LocationLayerPlugin locationPlugin = mapboxMap.getLocationLayerPlugin(); - locationPlugin.activateLocationLayerPlugin(this); - locationPlugin.setRenderMode(RenderMode.COMPASS); + private void activateLocationComponent() { + LocationComponent locationComponent = mapboxMap.getLocationComponent(); + locationComponent.activateLocationComponent(this); + locationComponent.setRenderMode(RenderMode.COMPASS); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationLayerModesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java index 4c8c8eda4b..f2f57c854d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationLayerModesActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.java @@ -25,19 +25,19 @@ import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; -import com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerOptions; -import com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerPlugin; -import com.mapbox.mapboxsdk.plugins.locationlayer.OnCameraTrackingChangedListener; -import com.mapbox.mapboxsdk.plugins.locationlayer.OnLocationLayerClickListener; -import com.mapbox.mapboxsdk.plugins.locationlayer.modes.CameraMode; -import com.mapbox.mapboxsdk.plugins.locationlayer.modes.RenderMode; +import com.mapbox.mapboxsdk.location.LocationComponentOptions; +import com.mapbox.mapboxsdk.location.LocationComponent; +import com.mapbox.mapboxsdk.location.OnCameraTrackingChangedListener; +import com.mapbox.mapboxsdk.location.OnLocationComponentClickListener; +import com.mapbox.mapboxsdk.location.modes.CameraMode; +import com.mapbox.mapboxsdk.location.modes.RenderMode; import com.mapbox.mapboxsdk.testapp.R; import java.util.ArrayList; import java.util.List; -public class LocationLayerModesActivity extends AppCompatActivity implements OnMapReadyCallback, - LocationEngineListener, OnLocationLayerClickListener, OnCameraTrackingChangedListener { +public class LocationModesActivity extends AppCompatActivity implements OnMapReadyCallback, + LocationEngineListener, OnLocationComponentClickListener, OnCameraTrackingChangedListener { private MapView mapView; private Button locationModeBtn; @@ -45,7 +45,7 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM private PermissionsManager permissionsManager; - private LocationLayerPlugin locationLayerPlugin; + private LocationComponent locationComponent; private LocationEngine locationEngine; private MapboxMap mapboxMap; private boolean customStyle; @@ -63,7 +63,7 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM locationModeBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (locationLayerPlugin == null) { + if (locationComponent == null) { return; } showModeListDialog(); @@ -74,7 +74,7 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM locationTrackingBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (locationLayerPlugin == null) { + if (locationComponent == null) { return; } showTrackingListDialog(); @@ -89,14 +89,14 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM permissionsManager = new PermissionsManager(new PermissionsListener() { @Override public void onExplanationNeeded(List<String> permissionsToExplain) { - Toast.makeText(LocationLayerModesActivity.this, "You need to accept location permissions.", + Toast.makeText(LocationModesActivity.this, "You need to accept location permissions.", Toast.LENGTH_SHORT).show(); } @Override public void onPermissionResult(boolean granted) { if (granted) { - mapView.getMapAsync(LocationLayerModesActivity.this); + mapView.getMapAsync(LocationModesActivity.this); } else { finish(); } @@ -125,11 +125,11 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM locationEngine.addLocationEngineListener(this); locationEngine.activate(); - locationLayerPlugin = mapboxMap.getLocationLayerPlugin(); - locationLayerPlugin.addOnLocationClickListener(this); - locationLayerPlugin.addOnCameraTrackingChangedListener(this); + locationComponent = mapboxMap.getLocationComponent(); + locationComponent.addOnLocationClickListener(this); + locationComponent.addOnCameraTrackingChangedListener(this); - activateLocationLayer(); + activateLocationComponent(); } @Override @@ -141,7 +141,7 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM @SuppressLint("MissingPermission") @Override public boolean onOptionsItemSelected(MenuItem item) { - if (locationLayerPlugin == null) { + if (locationComponent == null) { return super.onOptionsItemSelected(item); } @@ -152,19 +152,19 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM } else if (id == R.id.action_map_style_change) { toggleMapStyle(); return true; - } else if (id == R.id.action_plugin_disable) { - locationLayerPlugin.deactivateLocationLayerPlugin(); + } else if (id == R.id.action_component_disable) { + locationComponent.deactivateLocationComponent(); return true; - } else if (id == R.id.action_plugin_enabled) { - activateLocationLayer(); + } else if (id == R.id.action_component_enabled) { + activateLocationComponent(); return true; } return super.onOptionsItemSelected(item); } - private void activateLocationLayer() { - if (locationLayerPlugin != null) { + private void activateLocationComponent() { + if (locationComponent != null) { int[] padding; if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { padding = new int[] {0, 750, 0, 0}; @@ -173,30 +173,30 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM } if (savedInstanceState == null) { - LocationLayerOptions options = LocationLayerOptions.builder(this) + LocationComponentOptions options = LocationComponentOptions.builder(this) .padding(padding) .layerBelow("waterway-label") .build(); - locationLayerPlugin.activateLocationLayerPlugin(locationEngine, options); + locationComponent.activateLocationComponent(locationEngine, options); } else { - LocationLayerOptions options = locationLayerPlugin - .getLocationLayerOptions() + LocationComponentOptions options = locationComponent + .getLocationComponentOptions() .toBuilder() .padding(padding) .build(); - locationLayerPlugin.setLocationEngine(locationEngine); - locationLayerPlugin.applyStyle(options); + locationComponent.setLocationEngine(locationEngine); + locationComponent.applyStyle(options); } } } public void toggleStyle() { customStyle = !customStyle; - locationLayerPlugin.applyStyle( + locationComponent.applyStyle( this, - customStyle ? R.style.CustomLocationLayer : R.style.mapbox_LocationLayer); + customStyle ? R.style.CustomLocationComponent : R.style.mapbox_LocationComponent); } public void toggleMapStyle() { @@ -274,8 +274,8 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM } @Override - public void onLocationLayerClick() { - Toast.makeText(this, "OnLocationLayerClick", Toast.LENGTH_LONG).show(); + public void onLocationComponentClick() { + Toast.makeText(this, "OnlocationComponentClick", Toast.LENGTH_LONG).show(); } private void showModeListDialog() { @@ -304,7 +304,7 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM } private void setRendererMode(@RenderMode.Mode int mode) { - locationLayerPlugin.setRenderMode(mode); + locationComponent.setRenderMode(mode); if (mode == RenderMode.NORMAL) { locationModeBtn.setText("Normal"); } else if (mode == RenderMode.COMPASS) { @@ -330,20 +330,20 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM String selectedTrackingType = trackingTypes.get(position); locationTrackingBtn.setText(selectedTrackingType); if (selectedTrackingType.contentEquals("None")) { - locationLayerPlugin.setCameraMode(CameraMode.NONE); + locationComponent.setCameraMode(CameraMode.NONE); } else if (selectedTrackingType.contentEquals("Tracking")) { - locationLayerPlugin.setCameraMode(CameraMode.TRACKING); + locationComponent.setCameraMode(CameraMode.TRACKING); } else if (selectedTrackingType.contentEquals("Tracking Compass")) { - locationLayerPlugin.setCameraMode(CameraMode.TRACKING_COMPASS); + locationComponent.setCameraMode(CameraMode.TRACKING_COMPASS); } else if (selectedTrackingType.contentEquals("Tracking GPS")) { - locationLayerPlugin.setCameraMode(CameraMode.TRACKING_GPS); + locationComponent.setCameraMode(CameraMode.TRACKING_GPS); } else if (selectedTrackingType.contentEquals("Tracking GPS North")) { - locationLayerPlugin.setCameraMode(CameraMode.TRACKING_GPS_NORTH); + locationComponent.setCameraMode(CameraMode.TRACKING_GPS_NORTH); } listPopup.dismiss(); - if (locationLayerPlugin.getCameraMode() != CameraMode.NONE) { - locationLayerPlugin.zoomWhileTracking(15, 750, new MapboxMap.CancelableCallback() { + if (locationComponent.getCameraMode() != CameraMode.NONE) { + locationComponent.zoomWhileTracking(15, 750, new MapboxMap.CancelableCallback() { @Override public void onCancel() { // No impl @@ -351,7 +351,7 @@ public class LocationLayerModesActivity extends AppCompatActivity implements OnM @Override public void onFinish() { - locationLayerPlugin.tiltWhileTracking(45); + locationComponent.tiltWhileTracking(45); } }); } else { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java index 3e9f0853ea..5750e97d63 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/ManualLocationUpdatesActivity.java @@ -18,8 +18,8 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; -import com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerPlugin; -import com.mapbox.mapboxsdk.plugins.locationlayer.modes.RenderMode; +import com.mapbox.mapboxsdk.location.LocationComponent; +import com.mapbox.mapboxsdk.location.modes.RenderMode; import com.mapbox.mapboxsdk.testapp.R; import java.util.List; @@ -30,7 +30,7 @@ public class ManualLocationUpdatesActivity extends AppCompatActivity implements LocationEngineListener { private MapView mapView; - private LocationLayerPlugin locationLayerPlugin; + private LocationComponent locationComponent; private LocationEngine locationEngine; private PermissionsManager permissionsManager; @@ -43,8 +43,8 @@ public class ManualLocationUpdatesActivity extends AppCompatActivity implements fabManualUpdate.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (locationLayerPlugin != null && locationLayerPlugin.getLocationEngine() == null) { - locationLayerPlugin.forceLocationUpdate( + if (locationComponent != null && locationComponent.getLocationEngine() == null) { + locationComponent.forceLocationUpdate( Utils.getRandomLocation(LatLngBounds.from(60, 25, 40, -5))); } } @@ -55,11 +55,11 @@ public class ManualLocationUpdatesActivity extends AppCompatActivity implements fabToggle.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (locationLayerPlugin != null) { - locationLayerPlugin.setLocationEngine(locationLayerPlugin.getLocationEngine() == null ? locationEngine : + if (locationComponent != null) { + locationComponent.setLocationEngine(locationComponent.getLocationEngine() == null ? locationEngine : null); - if (locationLayerPlugin.getLocationEngine() == null) { + if (locationComponent.getLocationEngine() == null) { fabToggle.setImageResource(R.drawable.ic_layers_clear); fabManualUpdate.setEnabled(true); fabManualUpdate.setAlpha(1f); @@ -118,9 +118,9 @@ public class ManualLocationUpdatesActivity extends AppCompatActivity implements locationEngine.addLocationEngineListener(this); locationEngine.setPriority(LocationEnginePriority.HIGH_ACCURACY); locationEngine.activate(); - locationLayerPlugin = mapboxMap.getLocationLayerPlugin(); - locationLayerPlugin.activateLocationLayerPlugin(this, locationEngine); - locationLayerPlugin.setRenderMode(RenderMode.COMPASS); + locationComponent = mapboxMap.getLocationComponent(); + locationComponent.activateLocationComponent(this, locationEngine); + locationComponent.setRenderMode(RenderMode.COMPASS); } @Override |