diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-06-13 13:05:25 +0200 |
---|---|---|
committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-06-14 15:11:20 +0200 |
commit | 7942ce94558739b0171abcee1281e1aa4c60d409 (patch) | |
tree | 5aab169b239cac1c51774a7953f3b7fd8a66da9f /platform/android | |
parent | 4f622a75dba03fe3f8dfb73c470b42eee676a576 (diff) | |
download | qtlocation-mapboxgl-7942ce94558739b0171abcee1281e1aa4c60d409.tar.gz |
[android] #5279 - expose MarkerView alpha
Diffstat (limited to 'platform/android')
5 files changed, 37 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java index 2a41fad234..a5c6397b6f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java @@ -29,6 +29,7 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base protected float rotation; protected boolean visible = true; protected boolean selected; + protected float alpha = 1.0f; /** * Default constructor @@ -132,7 +133,7 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base * Set the visibility state of the MarkerView. * * @param visible the visible state - * @return the object for which the method was calleds + * @return the object for which the method was called */ public T visible(boolean visible) { this.visible = visible; @@ -140,6 +141,17 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base } /** + * Set the alpha of the MarkerView. + * + * @param alpha the alpha value + * @return the object for which the method was called + */ + public T alpha(float alpha) { + this.alpha = alpha; + return getThis(); + } + + /** * Get the geographical location of the MarkerView. * * @return the geographical location @@ -239,6 +251,15 @@ public abstract class BaseMarkerViewOptions<U extends MarkerView, T extends Base } /** + * Get the alpha of the MarkerView. + * + * @return the alpha value + */ + public float getAlpha() { + return alpha; + } + + /** * Get the instance of the object for which this method was called. * * @return the object for which the this method was called diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java index c6735a3c8d..8548f37fba 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewOptions.java @@ -30,6 +30,7 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV infoWindowAnchor(in.readFloat(), in.readFloat()); rotation(in.readFloat()); visible(in.readByte() != 0); + alpha(in.readFloat()); if (in.readByte() != 0) { // this means we have an icon String iconId = in.readString(); @@ -61,6 +62,7 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV out.writeFloat(getInfoWindowAnchorV()); out.writeFloat(getRotation()); out.writeByte((byte) (isVisible() ? 1 : 0)); + out.writeFloat(alpha); Icon icon = getIcon(); out.writeByte((byte) (icon != null ? 1 : 0)); if (icon != null) { @@ -80,6 +82,7 @@ public class MarkerViewOptions extends BaseMarkerViewOptions<MarkerView, MarkerV marker.setInfoWindowAnchor(infoWindowAnchorU, infoWindowAnchorV); marker.setRotation(rotation); marker.setVisible(visible); + marker.setAlpha(alpha); return marker; } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java index 0f08c6ae86..7899c79545 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java @@ -92,6 +92,7 @@ public class MarkerViewActivity extends AppCompatActivity { mMapboxMap.addMarker(new MarkerViewOptions() .position(LAT_LNGS[i]) .title(String.valueOf(i)) + .alpha(0.5f) .icon(usFlag) ); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java index abf5f19aca..a1df434ebc 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CountryMarkerViewOptions.java @@ -7,6 +7,7 @@ import android.os.Parcelable; import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions; import com.mapbox.mapboxsdk.annotations.Icon; import com.mapbox.mapboxsdk.annotations.IconFactory; +import com.mapbox.mapboxsdk.annotations.MarkerView; import com.mapbox.mapboxsdk.geometry.LatLng; public class CountryMarkerViewOptions extends BaseMarkerViewOptions<CountryMarkerView, CountryMarkerViewOptions> { @@ -23,8 +24,10 @@ public class CountryMarkerViewOptions extends BaseMarkerViewOptions<CountryMarke title(in.readString()); flat(in.readByte() != 0); anchor(in.readFloat(), in.readFloat()); - selected = in.readByte() != 0; + infoWindowAnchor(in.readFloat(), in.readFloat()); rotation(in.readFloat()); + visible(in.readByte() != 0); + alpha(in.readFloat()); if (in.readByte() != 0) { // this means we have an icon String iconId = in.readString(); @@ -56,8 +59,9 @@ public class CountryMarkerViewOptions extends BaseMarkerViewOptions<CountryMarke out.writeFloat(getAnchorV()); out.writeFloat(getInfoWindowAnchorU()); out.writeFloat(getInfoWindowAnchorV()); - out.writeByte((byte) (selected ? 1 : 0)); out.writeFloat(getRotation()); + out.writeByte((byte) (isVisible() ? 1 : 0)); + out.writeFloat(getAlpha()); Icon icon = getIcon(); out.writeByte((byte) (icon != null ? 1 : 0)); if (icon != null) { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java index 0b2a365e5d..a8622e9790 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/TextMarkerViewOptions.java @@ -7,6 +7,7 @@ import android.os.Parcelable; import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions; import com.mapbox.mapboxsdk.annotations.Icon; import com.mapbox.mapboxsdk.annotations.IconFactory; +import com.mapbox.mapboxsdk.annotations.MarkerView; import com.mapbox.mapboxsdk.geometry.LatLng; public class TextMarkerViewOptions extends BaseMarkerViewOptions<TextMarkerView, TextMarkerViewOptions> { @@ -24,6 +25,8 @@ public class TextMarkerViewOptions extends BaseMarkerViewOptions<TextMarkerView, anchor(in.readFloat(), in.readFloat()); infoWindowAnchor(in.readFloat(), in.readFloat()); rotation(in.readFloat()); + visible(in.readByte() != 0); + alpha(in.readFloat()); if (in.readByte() != 0) { // this means we have an icon String iconId = in.readString(); @@ -55,6 +58,8 @@ public class TextMarkerViewOptions extends BaseMarkerViewOptions<TextMarkerView, out.writeFloat(getInfoWindowAnchorU()); out.writeFloat(getInfoWindowAnchorV()); out.writeFloat(getRotation()); + out.writeByte((byte) (isVisible() ? 1 : 0)); + out.writeFloat(alpha); Icon icon = getIcon(); out.writeByte((byte) (icon != null ? 1 : 0)); if (icon != null) { |