Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

WIP - Style.java #10971

Closed
wants to merge 2 commits into from
Closed

WIP - Style.java #10971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb76dce
[android] - expose Style.java as public api
tobrun Jan 19, 2018
f588815
[android] - simple JNI Style class
tobrun Jan 23, 2018
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
87 changes: 0 additions & 87 deletions platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .../MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private static class AttributionBuilder {

private Set<Attribution> build() {
List<String> attributions = new ArrayList<>();
for (Source source : mapboxMap.getSources()) {
for (Source source : mapboxMap.getStyle().getSources()) {
attributions.add(source.getAttribution());
}

Expand Down
3 changes: 1 addition & 2 deletions platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.mapbox.mapboxsdk.annotations.Annotation;
import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.constants.Style;
import com.mapbox.mapboxsdk.maps.renderer.MapRenderer;
import com.mapbox.mapboxsdk.maps.renderer.glsurfaceview.GLSurfaceViewMapRenderer;
import com.mapbox.mapboxsdk.maps.renderer.textureview.TextureViewMapRenderer;
Expand Down Expand Up @@ -528,7 +527,7 @@ public void setStyleUrl(@NonNull String url) {
mapboxMapOptions.styleUrl(url);
return;
}
nativeMapView.setStyleUrl(url);
mapboxMap.setStyle(Style.fromUrl(url));
}

//
Expand Down
Loading