Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maps SDK 7.0.0 and required breaking changes refactoring #789

Merged
merged 14 commits into from
Jan 8, 2019
Merged

Maps SDK 7.0.0 and required breaking changes refactoring #789

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
083c6bd
initial changes
langsmith Dec 15, 2018
3272810
[LLP] remove the source code of the LocationLayerPlugin
LukasPaczos Dec 17, 2018
9564ec8
[localization] Update localization plugin with the Maps SDK v7.0.0
LukasPaczos Dec 17, 2018
f05f472
[localization] Update localization plugin tests with the Maps SDK v7.0.0
LukasPaczos Dec 18, 2018
b4fd68d
[marker-view] Update marker position only when the frame is fully ren…
LukasPaczos Dec 18, 2018
f581515
[annotation] AnnotationPlugin with Maps SDK 7.0.0
LukasPaczos Dec 20, 2018
7cf38ad
[annotation] save AnnotationPlugin's state across style changes
LukasPaczos Dec 20, 2018
d516620
[building] Update building plugin with Maps SDK 7.0.0
LukasPaczos Dec 18, 2018
3d76da5
[traffic] Update traffic plugin with the Maps SDK v7.0.0
LukasPaczos Dec 18, 2018
2aa1c0e
correct test suite
LukasPaczos Dec 21, 2018
970a5b8
bumped version to the 7.0.0-beta.2
LukasPaczos Jan 2, 2019
05ced2a
bumped dependency to stable 7.0.0
Jan 8, 2019
58a414a
[marker-view] add style toggle to the example activity
LukasPaczos Jan 8, 2019
fb92a04
[offline] improve OfflineRegionDetailActivity's camera position init
LukasPaczos Jan 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ dependencies {

// Plugin modules
implementation project(':plugin-traffic')
implementation project(':plugin-locationlayer')
implementation project(':plugin-building')
implementation project(':plugin-places')
implementation project(':plugin-offline')
Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
import android.support.test.runner.AndroidJUnit4;

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -26,13 +28,13 @@ public class CircleManagerTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupCircleManager() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
circleManager = new CircleManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
circleManager = new CircleManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
});
}

Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.utils.ColorUtils;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -31,13 +33,13 @@ public class CircleTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupAnnotation() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
CircleManager circleManager = new CircleManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
CircleManager circleManager = new CircleManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
circle = circleManager.create(new CircleOptions().withLatLng(new LatLng()));
});
}
Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
import android.support.test.runner.AndroidJUnit4;

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -26,13 +28,13 @@ public class FillManagerTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupFillManager() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
fillManager = new FillManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
fillManager = new FillManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
});
}

Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.utils.ColorUtils;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -31,13 +33,13 @@ public class FillTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupAnnotation() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
FillManager fillManager = new FillManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
FillManager fillManager = new FillManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
List<LatLng>innerLatLngs = new ArrayList<>();
innerLatLngs.add(new LatLng());
innerLatLngs.add(new LatLng(1,1));
Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
import android.support.test.runner.AndroidJUnit4;

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -26,13 +28,13 @@ public class LineManagerTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupLineManager() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
lineManager = new LineManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
lineManager = new LineManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
});
}

Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.utils.ColorUtils;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -31,13 +33,13 @@ public class LineTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupAnnotation() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
LineManager lineManager = new LineManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
LineManager lineManager = new LineManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
List<LatLng>latLngs = new ArrayList<>();
latLngs.add(new LatLng());
latLngs.add(new LatLng(1,1));
Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
import android.support.test.runner.AndroidJUnit4;

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -26,13 +28,13 @@ public class SymbolManagerTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupSymbolManager() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
symbolManager = new SymbolManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
symbolManager = new SymbolManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
});
}

Expand Down
8 changes: 5 additions & 3 deletions app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@

import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
import com.mapbox.mapboxsdk.plugins.testapp.activity.building.BuildingActivity;
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;
import com.mapbox.mapboxsdk.utils.ColorUtils;
import timber.log.Timber;

import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Objects;

import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke;
import static org.junit.Assert.*;
import static com.mapbox.mapboxsdk.style.layers.Property.*;
Expand All @@ -31,13 +33,13 @@ public class SymbolTest extends BaseActivityTest {

@Override
protected Class getActivityClass() {
return BuildingActivity.class;
return TestActivity.class;
}

private void setupAnnotation() {
Timber.i("Retrieving layer");
invoke(mapboxMap, (uiController, mapboxMap) -> {
SymbolManager symbolManager = new SymbolManager(((BuildingActivity) rule.getActivity()).getMapView(), mapboxMap);
SymbolManager symbolManager = new SymbolManager(idlingResource.getMapView(), mapboxMap, Objects.requireNonNull(mapboxMap.getStyle()));
symbol = symbolManager.create(new SymbolOptions().withLatLng(new LatLng()));
});
}
Expand Down
Loading