diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment')
5 files changed, 36 insertions, 16 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java index 125f7bf539..472b9b7d57 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java @@ -44,7 +44,6 @@ public class MapFragmentActivity extends AppCompatActivity implements MapFragmen private MapboxMapOptions createFragmentOptions() { MapboxMapOptions options = new MapboxMapOptions(); - options.styleUrl(Style.OUTDOORS); options.scrollGesturesEnabled(false); options.zoomGesturesEnabled(false); @@ -72,6 +71,7 @@ public class MapFragmentActivity extends AppCompatActivity implements MapFragmen @Override public void onMapReady(@NonNull MapboxMap map) { mapboxMap = map; + mapboxMap.setStyle(Style.OUTDOORS); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java index 2305fdf16c..f16f01e2d5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MultiMapActivity.java @@ -1,8 +1,10 @@ package com.mapbox.mapboxsdk.testapp.activity.fragment; import android.os.Bundle; +import android.support.v4.app.FragmentManager; import android.support.v7.app.AppCompatActivity; - +import com.mapbox.mapboxsdk.maps.Style; +import com.mapbox.mapboxsdk.maps.SupportMapFragment; import com.mapbox.mapboxsdk.testapp.R; /** @@ -14,5 +16,16 @@ public class MultiMapActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_multi_map); + + FragmentManager fragmentManager = getSupportFragmentManager(); + initFragmentStyle(fragmentManager, R.id.map1, Style.MAPBOX_STREETS); + initFragmentStyle(fragmentManager, R.id.map2, Style.LIGHT); + initFragmentStyle(fragmentManager, R.id.map3, Style.SATELLITE_STREETS); + initFragmentStyle(fragmentManager, R.id.map4, Style.DARK); + } + + private void initFragmentStyle(FragmentManager fragmentManager, int fragmentId, String styleId) { + ((SupportMapFragment) fragmentManager.findFragmentById(fragmentId)) + .getMapAsync(mapboxMap -> mapboxMap.setStyle(styleId)); } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt index c44d544e40..f8f53f9ffd 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt @@ -16,6 +16,7 @@ import android.widget.TextView import com.mapbox.mapboxsdk.camera.CameraPosition import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.maps.MapboxMapOptions +import com.mapbox.mapboxsdk.maps.OnMapReadyCallback import com.mapbox.mapboxsdk.maps.Style import com.mapbox.mapboxsdk.maps.SupportMapFragment import com.mapbox.mapboxsdk.testapp.R @@ -113,26 +114,27 @@ class NestedViewPagerActivity : AppCompatActivity() { options.zoomGesturesEnabled(false) when (position) { 0 -> { - options.styleUrl(Style.MAPBOX_STREETS) options.camera(CameraPosition.Builder().target(LatLng(34.920526, 102.634774)).zoom(3.0).build()) - return SupportMapFragment.newInstance(options) + val fragment = SupportMapFragment.newInstance(options) + fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.MAPBOX_STREETS) } + return fragment } 1 -> { return EmptyFragment.newInstance() } 2 -> { - options.styleUrl(Style.DARK) options.camera(CameraPosition.Builder().target(LatLng(62.326440, 92.764913)).zoom(3.0).build()) - return SupportMapFragment.newInstance(options) - } + val fragment = SupportMapFragment.newInstance(options) + fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.DARK) } + return fragment } 3 -> { return EmptyFragment.newInstance() } 4 -> { - options.styleUrl(Style.SATELLITE) options.camera(CameraPosition.Builder().target(LatLng(-25.007786, 133.623852)).zoom(3.0).build()) - return SupportMapFragment.newInstance(options) - } + val fragment = SupportMapFragment.newInstance(options) + fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.SATELLITE) } + return fragment } 5 -> { return EmptyFragment.newInstance() } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java index 30e6fa0565..4baf40d51b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java @@ -45,7 +45,6 @@ public class SupportMapFragmentActivity extends AppCompatActivity implements Map private MapboxMapOptions createFragmentOptions() { MapboxMapOptions options = new MapboxMapOptions(); - options.styleUrl(Style.MAPBOX_STREETS); options.scrollGesturesEnabled(false); options.zoomGesturesEnabled(false); @@ -73,6 +72,7 @@ public class SupportMapFragmentActivity extends AppCompatActivity implements Map @Override public void onMapReady(@NonNull MapboxMap map) { mapboxMap = map; + mapboxMap.setStyle(Style.SATELLITE); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.java index 826281554d..63c63b690e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.java @@ -6,11 +6,10 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; - import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapboxMapOptions; +import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.maps.SupportMapFragment; import com.mapbox.mapboxsdk.testapp.R; @@ -52,19 +51,25 @@ public class ViewPagerActivity extends AppCompatActivity { switch (position) { case 0: - options.styleUrl(Style.MAPBOX_STREETS); options.camera(new CameraPosition.Builder().target(new LatLng(34.920526, 102.634774)).zoom(3).build()); fragment = SupportMapFragment.newInstance(options); + fragment.getMapAsync(mapboxMap -> { + mapboxMap.setStyle(Style.MAPBOX_STREETS); + }); break; case 1: - options.styleUrl(Style.DARK); options.camera(new CameraPosition.Builder().target(new LatLng(62.326440, 92.764913)).zoom(3).build()); fragment = SupportMapFragment.newInstance(options); + fragment.getMapAsync(mapboxMap -> { + mapboxMap.setStyle(Style.DARK); + }); break; case 2: - options.styleUrl(Style.SATELLITE); options.camera(new CameraPosition.Builder().target(new LatLng(-25.007786, 133.623852)).zoom(3).build()); fragment = SupportMapFragment.newInstance(options); + fragment.getMapAsync(mapboxMap -> { + mapboxMap.setStyle(Style.SATELLITE); + }); break; } return fragment; |