[android] - move all layer, source, image, light and transition configurations to style.java

1 files changed, 14 insertions, 14 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java
index 773a81705d..5dc66ab77e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/geometry/GeoJsonConversionTest.java
@@ -30,12 +30,12 @@ public class GeoJsonConversionTest extends BaseActivityTest {
   public void testEmptyFeatureCollection() {
     validateTestSetup();
     onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
-      mapboxMap.addSource(
+      mapboxMap.getStyle().addSource(
         new CustomGeometrySource("test-id",
           new CustomProvider(fromFeatures(singletonList(fromGeometry(fromGeometries(emptyList())))))
         )
       );
-      mapboxMap.addLayer(new SymbolLayer("test-id", "test-id"));
+      mapboxMap.getStyle().addLayer(new SymbolLayer("test-id", "test-id"));
     }));
   }
 
@@ -43,12 +43,12 @@ public class GeoJsonConversionTest extends BaseActivityTest {
   public void testPointFeatureCollection() {
     validateTestSetup();
     onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
-      mapboxMap.addSource(
+      mapboxMap.getStyle().addSource(
         new CustomGeometrySource("test-id",
           new CustomProvider(fromFeatures(singletonList(fromGeometry(Point.fromLngLat(0.0,0.0)))))
         )
       );
-      mapboxMap.addLayer(new SymbolLayer("test-id", "test-id"));
+      mapboxMap.getStyle().addLayer(new SymbolLayer("test-id", "test-id"));
     }));
   }
 
@@ -56,12 +56,12 @@ public class GeoJsonConversionTest extends BaseActivityTest {
   public void testMultiPointFeatureCollection() {
     validateTestSetup();
     onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
-      mapboxMap.addSource(
+      mapboxMap.getStyle().addSource(
         new CustomGeometrySource("test-id",
           new CustomProvider(fromFeatures(singletonList(fromGeometry(fromLngLats(emptyList())))))
         )
       );
-      mapboxMap.addLayer(new SymbolLayer("test-id", "test-id"));
+      mapboxMap.getStyle().addLayer(new SymbolLayer("test-id", "test-id"));
     }));
   }
 
@@ -70,12 +70,12 @@ public class GeoJsonConversionTest extends BaseActivityTest {
   public void testPolygonFeatureCollection() {
     validateTestSetup();
     onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
-      mapboxMap.addSource(
+      mapboxMap.getStyle().addSource(
         new CustomGeometrySource("test-id",
           new CustomProvider(fromFeatures(singletonList(fromGeometry(Polygon.fromLngLats(emptyList())))))
         )
       );
-      mapboxMap.addLayer(new SymbolLayer("test-id", "test-id"));
+      mapboxMap.getStyle().addLayer(new SymbolLayer("test-id", "test-id"));
     }));
   }
 
@@ -83,12 +83,12 @@ public class GeoJsonConversionTest extends BaseActivityTest {
   public void testMultiPolygonFeatureCollection() {
     validateTestSetup();
     onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
-      mapboxMap.addSource(
+      mapboxMap.getStyle().addSource(
         new CustomGeometrySource("test-id",
           new CustomProvider(fromFeatures(singletonList(fromGeometry(fromPolygon(Polygon.fromLngLats(emptyList()))))))
         )
       );
-      mapboxMap.addLayer(new SymbolLayer("test-id", "test-id"));
+      mapboxMap.getStyle().addLayer(new SymbolLayer("test-id", "test-id"));
     }));
   }
 
@@ -96,12 +96,12 @@ public class GeoJsonConversionTest extends BaseActivityTest {
   public void testLineStringFeatureCollection() {
     validateTestSetup();
     onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
-      mapboxMap.addSource(
+      mapboxMap.getStyle().addSource(
         new CustomGeometrySource("test-id",
           new CustomProvider(fromFeatures(singletonList(fromGeometry(fromLngLats(emptyList())))))
         )
       );
-      mapboxMap.addLayer(new SymbolLayer("test-id", "test-id"));
+      mapboxMap.getStyle().addLayer(new SymbolLayer("test-id", "test-id"));
     }));
   }
 
@@ -109,12 +109,12 @@ public class GeoJsonConversionTest extends BaseActivityTest {
   public void testMultiLineStringFeatureCollection() {
     validateTestSetup();
     onMapView().perform(getMapboxMapAction((uiController, mapboxMap) -> {
-      mapboxMap.addSource(
+      mapboxMap.getStyle().addSource(
         new CustomGeometrySource("test-id",
           new CustomProvider(fromFeatures(singletonList(fromGeometry(fromLineString(fromLngLats(emptyList()))))))
         )
       );
-      mapboxMap.addLayer(new SymbolLayer("test-id", "test-id"));
+      mapboxMap.getStyle().addLayer(new SymbolLayer("test-id", "test-id"));
     }));
   }