Skip to content

Android View Margin #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Android View Margin #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06398c7
fix(android): allow android logoViewMargins and attributionButtonMarg…
chingyawhao Apr 18, 2021
87291a1
fix(convert): compass view margin remain the same since theres the gr…
chingyawhao Apr 19, 2021
5edc696
feat(setAttributionButtonMargins): adding variable name to the consta…
chingyawhao Jun 5, 2021
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
16 changes: 12 additions & 4 deletions android/src/main/java/com/mapbox/mapboxgl/Convert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

package com.mapbox.mapboxgl;

import android.content.Context;
import android.graphics.Point;
import android.util.DisplayMetrics;

import com.mapbox.geojson.Polygon;
import com.mapbox.mapboxsdk.camera.CameraPosition;
import com.mapbox.mapboxsdk.camera.CameraUpdate;
Expand Down Expand Up @@ -235,7 +238,8 @@ private static String toString(Object o) {
return (String) o;
}

static void interpretMapboxMapOptions(Object o, MapboxMapOptionsSink sink) {
static void interpretMapboxMapOptions(Object o, MapboxMapOptionsSink sink, Context context) {
final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
final Map<?, ?> data = toMap(o);
final Object cameraTargetBounds = data.get("cameraTargetBounds");
if (cameraTargetBounds != null) {
Expand Down Expand Up @@ -292,7 +296,8 @@ static void interpretMapboxMapOptions(Object o, MapboxMapOptionsSink sink) {
final Object logoViewMargins = data.get("logoViewMargins");
if(logoViewMargins != null){
final List logoViewMarginsData = toList(logoViewMargins);
sink.setLogoViewMargins(toInt(logoViewMarginsData.get(0)), toInt(logoViewMarginsData.get(1)));
final Point point = toPoint(logoViewMarginsData, metrics.density);
sink.setLogoViewMargins(point.x, point.y);
}
final Object compassGravity = data.get("compassViewPosition");
if(compassGravity != null){
Expand All @@ -301,12 +306,15 @@ static void interpretMapboxMapOptions(Object o, MapboxMapOptionsSink sink) {
final Object compassViewMargins = data.get("compassViewMargins");
if(compassViewMargins != null){
final List compassViewMarginsData = toList(compassViewMargins);
sink.setCompassViewMargins(toInt(compassViewMarginsData.get(0)), toInt(compassViewMarginsData.get(1)));
final Point point = toPoint(compassViewMarginsData, metrics.density);
sink.setCompassViewMargins(point.x, point.y);
}
final Object attributionButtonMargins = data.get("attributionButtonMargins");
if(attributionButtonMargins != null){
final List attributionButtonMarginsData = toList(attributionButtonMargins);
sink.setAttributionButtonMargins(toInt(attributionButtonMarginsData.get(0)), toInt(attributionButtonMarginsData.get(1)));
final Point point = toPoint(attributionButtonMarginsData, metrics.density);
final int attributionButtonWidth = toPixels(21, metrics.density);
sink.setAttributionButtonMargins(metrics.widthPixels - point.x - attributionButtonWidth, point.y);
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/mapbox/mapboxgl/MapboxMapController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
mapReadyResult = result;
break;
case "map#update": {
Convert.interpretMapboxMapOptions(call.argument("options"), this);
Convert.interpretMapboxMapOptions(call.argument("options"), this, context);
result.success(Convert.toJson(getCameraPosition()));
break;
}
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/mapbox/mapboxgl/MapboxMapFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public PlatformView create(Context context, int id, Object args) {
Map<String, Object> params = (Map<String, Object>) args;
final MapboxMapBuilder builder = new MapboxMapBuilder();

Convert.interpretMapboxMapOptions(params.get("options"), builder);
Convert.interpretMapboxMapOptions(params.get("options"), builder, context);
if (params.containsKey("initialCameraPosition")) {
CameraPosition position = Convert.toCameraPosition(params.get("initialCameraPosition"));
builder.setInitialCameraPosition(position);
Expand Down