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

Style.java #13484

Merged
merged 31 commits into from
Dec 10, 2018
Merged

Style.java #13484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
bf8b886
[android] - Style.java
tobrun Nov 7, 2018
a42eac3
[android] - cleanup old style java constants file, migrate style tran…
tobrun Nov 8, 2018
d1a593f
[android] - move all layer, source, image, light and transition confi…
tobrun Nov 8, 2018
799709a
[android] - remove style loaded listener
tobrun Nov 8, 2018
3a66f4e
[android] - expose style builder
tobrun Nov 8, 2018
f2b678c
[android] - move all style methods to Style.java
tobrun Nov 8, 2018
69c2277
[android] - don't load mapbox streets automatically
tobrun Nov 8, 2018
aa09797
[android] - decouple style loading from OnMapReady
tobrun Nov 8, 2018
e116a7e
[android] - update unit tests to be location component compatible
tobrun Dec 3, 2018
52ef68f
[android] - add more layer add options, add sdf support to image and …
tobrun Dec 3, 2018
f1a12fc
[android] - add class level javadoc to Style.java
tobrun Dec 3, 2018
1e0e958
[android] - ignore location component unit test, update light test, u…
tobrun Dec 3, 2018
8ec664e
[android] - fixup location component test to use initialize components
tobrun Dec 3, 2018
1d21852
[android] - update CircleLayer to be compatible
tobrun Dec 4, 2018
c53cfca
[android] - infer nullify on Style.java
tobrun Dec 4, 2018
6f1baf2
[android] - limit visibility, clear callbacks
tobrun Dec 4, 2018
efa5ace
[android] - introduce StyleCallback, make parent class for StateCallback
tobrun Dec 5, 2018
985283e
[android] - cleanup images
tobrun Dec 5, 2018
e6bb308
[android] move style callback invocation to MapboxMap
LukasPaczos Dec 5, 2018
b54775a
[android] - use builder json/url for constructing style object
tobrun Dec 5, 2018
99dc208
[android] - un-ignore location tests
tobrun Dec 5, 2018
d9a93e6
[android] fix LocationComponent unit test with Style.java object
LukasPaczos Dec 5, 2018
f4aea7a
[android] - add missing javadoc on public API methods around Style
tobrun Dec 6, 2018
209e103
[android] - add unit tests for Style.java API
tobrun Dec 6, 2018
11062cc
[android] - update sanity test to Style.java
tobrun Dec 6, 2018
85b79ce
[android] - update unit test to match NativeMapView#isDestroyed
tobrun Dec 6, 2018
db8cb59
[android] - make style part of location component activation, add tes…
tobrun Dec 7, 2018
a85263b
[android] - optimise loaded style for location component, expose isFu…
tobrun Dec 7, 2018
9535604
[android] - throw exception when another style is loading, correct Ru…
tobrun Dec 10, 2018
c01b259
[android] - introduce validateState, add illegal state exception to a…
tobrun Dec 10, 2018
3578d84
[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