tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #4800 - correct background offsets from attributes

Browse Source
This commit is contained in:
Tobrun
2016-04-26 20:54:57 +02:00
parent e2510fce79
commit bf493f96cd
7 changed files with 34 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationCustomisationActivity.java
View File

@@ -1,9 +1,11 @@
package com.mapbox.mapboxsdk.testapp.activity.userlocation;
import android.content.res.Resources;
import android.graphics.Color;
import android.location.Location;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
@@ -56,12 +58,17 @@ public class MyLocationCustomisationActivity extends AppCompatActivity implement
.tilt(25)
.build());
mapboxMapOptions.myLocationForegroundDrawables(ContextCompat.getDrawable(this, R.drawable.ic_chelsea),
ContextCompat.getDrawable(this, R.drawable.ic_chelsea));
mapboxMapOptions.myLocationBackgroundDrawable(ContextCompat.getDrawable(this, R.drawable.ic_arsenal));
mapboxMapOptions.myLocationForegroundTintColor(Color.GREEN);
mapboxMapOptions.myLocationBackgroundTintColor(Color.YELLOW);
// mapboxMapOptions.myLocationBackgroundPadding(new int[]{32, 32, 0, 0});
mapboxMapOptions.myLocationBackgroundPadding(new int[]{0, 0,
(int) getResources().getDimension(R.dimen.locationview_background_drawable_padding),
(int) getResources().getDimension(R.dimen.locationview_background_drawable_padding)});
// mapboxMapOptions.myLocationAccuracyTint(Color.RED);
// mapboxMapOptions.myLocationAccuracyAlpha(155);
mapboxMapOptions.myLocationAccuracyTint(Color.RED);
mapboxMapOptions.myLocationAccuracyAlpha(155);
mapView = new MapView(this, mapboxMapOptions);
ViewGroup parent = (ViewGroup) findViewById(R.id.container);

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
View File

@@ -7,6 +7,6 @@
<dimen name="map_padding_bottom">256dp</dimen>
<dimen name="map_padding_right">32dp</dimen>
<dimen name="toolbar_shadow">4dp</dimen>
<dimen name="locationview_background_drawable_padding">2dp</dimen>
<dimen name="locationview_padding_top">350dp</dimen>
</resources>

11
platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java
View File

@@ -49,14 +49,9 @@ public class MyLocationViewSettingsTest {
@Test
public void testBackgroundDrawable() {
Drawable backgroundDrawable = mock(Drawable.class);
locationViewSettings.setBackgroundDrawable(backgroundDrawable);
assertEquals("foreground should match", backgroundDrawable, locationViewSettings.getBackgroundDrawable());
}
@Test
public void testBackgroundOffset() {
int[] offset = new int[]{1, 2, 3, 4};
locationViewSettings.setBackgroundOffset(1, 2, 3, 4);
locationViewSettings.setBackgroundDrawable(backgroundDrawable, offset);
assertEquals("foreground should match", backgroundDrawable, locationViewSettings.getBackgroundDrawable());
assertTrue("offsets should match", Arrays.equals(offset, locationViewSettings.getBackgroundOffset()));
}
@@ -68,7 +63,7 @@ public class MyLocationViewSettingsTest {
}
@Test
public void testBackgroundTint(){
public void testBackgroundTint() {
int color = Color.RED;
locationViewSettings.setBackgroundTintColor(Color.RED);
assertEquals("color should match", color, locationViewSettings.getBackgroundTintColor());