diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-25 15:53:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-25 15:53:16 +0200 |
commit | b0485bccd9ddc5d6a3589c433cd1f3a103f857ea (patch) | |
tree | 87011b5b07e10697301ea9a7d135056f8bd1325b /platform/android/MapboxGLAndroidSDKTestApp/src | |
parent | 94b1a53f06750926a88b62f8e1cedd42d1df91da (diff) | |
download | qtlocation-mapboxgl-b0485bccd9ddc5d6a3589c433cd1f3a103f857ea.tar.gz |
[android] - remove timer from compassView, make fading when facing north optional. (#6786)
save state for recreating map view
fix review comments
unit test covering default value for fading and setting a new value
fixup setter, fix default value
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src')
3 files changed, 10 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java index d8c3cb6011..dd80b2ba5a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java @@ -58,6 +58,7 @@ public class PolygonActivity extends AppCompatActivity implements OnMapReadyCall .attributionTintColor(RED_COLOR) // deprecated feature! .textureMode(true) + .compassFadesWhenFacingNorth(false) .styleUrl(Style.MAPBOX_STREETS) .camera(new CameraPosition.Builder() .target(new LatLng(45.520486, -122.673541)) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml index 1b1dca5327..d6507559ec 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml @@ -28,6 +28,7 @@ android:layout_height="match_parent" app:center_latitude="51.506675" app:center_longitude="-0.128699" + app:compass_fade_facing_north="false" app:direction="90" app:tilt="40" app:zoom="10" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java index 300ed1d73a..14fc84723d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java @@ -7,6 +7,7 @@ import org.junit.Test; import org.mockito.InjectMocks; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -57,6 +58,13 @@ public class UiSettingsTest { } @Test + public void testCompassFadeWhenFacingNorth(){ + assertTrue("Compass should fade when facing north by default.", uiSettings.isCompassFadeWhenFacingNorth()); + uiSettings.setCompassFadeFacingNorth(false); + assertFalse("Compass fading should be disabled", uiSettings.isCompassFadeWhenFacingNorth()); + } + + @Test public void testLogoEnabled() { uiSettings.setLogoEnabled(true); assertEquals("Logo should be enabled", true, uiSettings.isLogoEnabled()); |