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

Cherry pick style.java, return boolean from removeSource/Layer #13533

Merged
merged 33 commits into from
Dec 10, 2018
Merged

Cherry pick style.java, return boolean from removeSource/Layer #13533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ed0ca39
nativeRemoveSource() and nativeRemoveLayer() methods should return a …
osana Dec 7, 2018
56f5efb
[android] - update clustering example with filter configuration to av…
tobrun Dec 7, 2018
8524570
[android] - Style.java
tobrun Nov 7, 2018
6db63be
[android] - cleanup old style java constants file, migrate style tran…
tobrun Nov 8, 2018
946cfd5
[android] - move all layer, source, image, light and transition confi…
tobrun Nov 8, 2018
303ad6a
[android] - remove style loaded listener
tobrun Nov 8, 2018
a032494
[android] - expose style builder
tobrun Nov 8, 2018
b72195c
[android] - move all style methods to Style.java
tobrun Nov 8, 2018
c333fb0
[android] - don't load mapbox streets automatically
tobrun Nov 8, 2018
3cc0fbd
[android] - decouple style loading from OnMapReady
tobrun Nov 8, 2018
cb16802
[android] - update unit tests to be location component compatible
tobrun Dec 3, 2018
1a39629
[android] - add more layer add options, add sdf support to image and …
tobrun Dec 3, 2018
98d6cbf
[android] - add class level javadoc to Style.java
tobrun Dec 3, 2018
d165971
[android] - ignore location component unit test, update light test, u…
tobrun Dec 3, 2018
8881069
[android] - fixup location component test to use initialize components
tobrun Dec 3, 2018
703430a
[android] - update CircleLayer to be compatible
tobrun Dec 4, 2018
d0ece4e
[android] - infer nullify on Style.java
tobrun Dec 4, 2018
b0be9bc
[android] - limit visibility, clear callbacks
tobrun Dec 4, 2018
64e3db2
[android] - introduce StyleCallback, make parent class for StateCallback
tobrun Dec 5, 2018
a16868b
[android] - cleanup images
tobrun Dec 5, 2018
92a68d8
[android] move style callback invocation to MapboxMap
LukasPaczos Dec 5, 2018
fd728f7
[android] - use builder json/url for constructing style object
tobrun Dec 5, 2018
dd38e4a
[android] - un-ignore location tests
tobrun Dec 5, 2018
3397150
[android] fix LocationComponent unit test with Style.java object
LukasPaczos Dec 5, 2018
7c1f621
[android] - add missing javadoc on public API methods around Style
tobrun Dec 6, 2018
7af7487
[android] - add unit tests for Style.java API
tobrun Dec 6, 2018
0ac1e2e
[android] - update sanity test to Style.java
tobrun Dec 6, 2018
db001bc
[android] - update unit test to match NativeMapView#isDestroyed
tobrun Dec 6, 2018
328c130
[android] - make style part of location component activation, add tes…
tobrun Dec 7, 2018
9dcdaef
[android] - optimise loaded style for location component, expose isFu…
tobrun Dec 7, 2018
2aae12b
[android] - throw exception when another style is loading, correct Ru…
tobrun Dec 10, 2018
20ecb8b
[android] - introduce validateState, add illegal state exception to a…
tobrun Dec 10, 2018
7dbd421
[android] - remove style config from mapboxMapOptions and attributes
tobrun Dec 10, 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
1 change: 1 addition & 0 deletions platform/android/MapboxGLAndroidSDK/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies {
implementation dependenciesList.okhttp3
testImplementation dependenciesList.junit
testImplementation dependenciesList.mockito
testImplementation dependenciesList.mockk
testImplementation dependenciesList.robolectric
testImplementation dependenciesList.kotlinLib
}
Expand Down
6 changes: 5 additions & 1 deletion ...roid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ public class MapboxConstants {
*/
public static final String FRAG_ARG_MAPBOXMAPOPTIONS = "MapboxMapOptions";

/**
* Layer Id of annotations layer
*/
public static final String LAYER_ID_ANNOTATIONS = "com.mapbox.annotations.points";

// Save instance state keys
public static final String STATE_HAS_SAVED_STATE = "mapbox_savedState";
public static final String STATE_CAMERA_POSITION = "mapbox_cameraPosition";
Expand All @@ -126,7 +131,6 @@ public class MapboxConstants {
public static final String STATE_TILT_ENABLED = "mapbox_tiltEnabled";
public static final String STATE_DOUBLE_TAP_ENABLED = "mapbox_doubleTapEnabled";
public static final String STATE_DEBUG_ACTIVE = "mapbox_debugActive";
public static final String STATE_STYLE_URL = "mapbox_styleUrl";
public static final String STATE_COMPASS_ENABLED = "mapbox_compassEnabled";
public static final String STATE_COMPASS_GRAVITY = "mapbox_compassGravity";
public static final String STATE_COMPASS_MARGIN_LEFT = "mapbox_compassMarginLeft";
Expand Down
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.

1 change: 0 additions & 1 deletion ...boxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.view.MotionEvent;

import com.mapbox.android.gestures.AndroidGesturesManager;
import com.mapbox.android.gestures.MoveGestureDetector;
import com.mapbox.android.gestures.RotateGestureDetector;
Expand Down
Loading