[android] Update attribution wordmark (#8774)

* Update wordmark on android

* Moved attribution i icon to the right of mapbox word (in mapview preview image)

* update padding and margin

platform/android/CHANGELOG.md

@@ -3,7 +3,7 @@
 Mapbox welcomes participation and contributions from everyone. If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started.
 
 ## 5.1.0 - TBA
-
+* Update attribution with new Mapbox wordmark [#8774](https://github.com/mapbox/mapbox-gl-native/pull/8774)
 
 ## 5.1.0-beta.1 - May 2, 2017
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java

@@ -35,10 +35,8 @@
  */
 public class MapboxMapOptions implements Parcelable {
 
- private static final float DIMENSION_SEVEN_DP = 7f;
- private static final float DIMENSION_TEN_DP = 10f;
- private static final float DIMENSION_SIXTEEN_DP = 16f;
- private static final float DIMENSION_SEVENTY_SIX_DP = 76f;
+ private static final float FOUR_DP = 4f;
+ private static final float EIGHTY_NINE_DP = 92f;
 
  private CameraPosition cameraPosition;
 
@@ -206,13 +204,13 @@ public static MapboxMapOptions createFromAttributes(@NonNull Context context, @N
  Gravity.TOP | Gravity.END));
  mapboxMapOptions.compassMargins(new int[] {
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginLeft,
- DIMENSION_TEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginTop,
- DIMENSION_TEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginRight,
- DIMENSION_TEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginBottom,
- DIMENSION_TEN_DP * pxlRatio))});
+ FOUR_DP * pxlRatio))});
  mapboxMapOptions.compassFadesWhenFacingNorth(typedArray.getBoolean(
  R.styleable.mapbox_MapView_mapbox_uiCompassFadeFacingNorth, true));
  Drawable compassDrawable = typedArray.getDrawable(
@@ -227,13 +225,13 @@ public static MapboxMapOptions createFromAttributes(@NonNull Context context, @N
  Gravity.BOTTOM | Gravity.START));
  mapboxMapOptions.logoMargins(new int[] {
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginLeft,
- DIMENSION_SIXTEEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginTop,
- DIMENSION_SIXTEEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginRight,
- DIMENSION_SIXTEEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginBottom,
- DIMENSION_SIXTEEN_DP * pxlRatio))});
+ FOUR_DP * pxlRatio))});
 
  mapboxMapOptions.attributionTintColor(typedArray.getColor(
  R.styleable.mapbox_MapView_mapbox_uiAttributionTintColor, -1));
@@ -243,13 +241,13 @@ public static MapboxMapOptions createFromAttributes(@NonNull Context context, @N
  R.styleable.mapbox_MapView_mapbox_uiAttributionGravity, Gravity.BOTTOM));
  mapboxMapOptions.attributionMargins(new int[] {
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginLeft,
- DIMENSION_SEVENTY_SIX_DP) * pxlRatio),
+ EIGHTY_NINE_DP * pxlRatio)),
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginTop,
- DIMENSION_SEVEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginRight,
- DIMENSION_SEVEN_DP * pxlRatio)),
+ FOUR_DP * pxlRatio)),
  (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginBottom,
- DIMENSION_SEVEN_DP * pxlRatio))});
+ FOUR_DP * pxlRatio))});
 
  mapboxMapOptions.locationEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_myLocation, false));
  mapboxMapOptions.myLocationForegroundTintColor(

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java

@@ -146,7 +146,7 @@ private void initialiseCompass(MapboxMapOptions options, Resources resources) {
  if (compassMargins != null) {
  setCompassMargins(compassMargins[0], compassMargins[1], compassMargins[2], compassMargins[3]);
  } else {
- int tenDp = (int) resources.getDimension(R.dimen.mapbox_ten_dp);
+ int tenDp = (int) resources.getDimension(R.dimen.mapbox_four_dp);
  setCompassMargins(tenDp, tenDp, tenDp, tenDp);
  }
  setCompassFadeFacingNorth(options.getCompassFadeFacingNorth());
@@ -171,9 +171,7 @@ private void saveCompass(Bundle outState) {
  private byte[] convert(Bitmap resource) {
  ByteArrayOutputStream stream = new ByteArrayOutputStream();
  resource.compress(Bitmap.CompressFormat.PNG, 100, stream);
- byte[] byteArray = stream.toByteArray();
-
- return byteArray;
+ return stream.toByteArray();
  }
 
  private void restoreCompass(Bundle savedInstanceState) {
@@ -189,10 +187,7 @@ private void restoreCompass(Bundle savedInstanceState) {
 
  private Drawable decode(byte[] bitmap) {
  Bitmap compass = BitmapFactory.decodeByteArray(bitmap, 0, bitmap.length);
-
- Drawable compassImage = new BitmapDrawable(compassView.getResources(), compass);
-
- return compassImage;
+ return new BitmapDrawable(compassView.getResources(), compass);
  }
 
  private void initialiseLogo(MapboxMapOptions options, Resources resources) {
@@ -202,8 +197,8 @@ private void initialiseLogo(MapboxMapOptions options, Resources resources) {
  if (logoMargins != null) {
  setLogoMargins(logoMargins[0], logoMargins[1], logoMargins[2], logoMargins[3]);
  } else {
- int sixteenDp = (int) resources.getDimension(R.dimen.mapbox_sixteen_dp);
- setLogoMargins(sixteenDp, sixteenDp, sixteenDp, sixteenDp);
+ int twoDp = (int) resources.getDimension(R.dimen.mapbox_two_dp);
+ setLogoMargins(twoDp, twoDp, twoDp, twoDp);
  }
  }
 
@@ -226,16 +221,12 @@ private void restoreLogo(Bundle savedInstanceState) {
  }
 
  private void initialiseAttribution(Context context, MapboxMapOptions options) {
- Resources resources = context.getResources();
  setAttributionEnabled(options.getAttributionEnabled());
  setAttributionGravity(options.getAttributionGravity());
  int[] attributionMargins = options.getAttributionMargins();
  if (attributionMargins != null) {
- setAttributionMargins(attributionMargins[0], attributionMargins[1], attributionMargins[2], attributionMargins[3]);
- } else {
- int sevenDp = (int) resources.getDimension(R.dimen.mapbox_seven_dp);
- int seventySixDp = (int) resources.getDimension(R.dimen.mapbox_seventy_six_dp);
- setAttributionMargins(seventySixDp, sevenDp, sevenDp, sevenDp);
+ setAttributionMargins(attributionMargins[0], attributionMargins[1],
+ attributionMargins[2], attributionMargins[3]);
  }
 
  int attributionTintColor = options.getAttributionTintColor();

platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml

@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:width="21dp"
+ android:height="21dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
  <path
  android:fillColor="#FF1E8CAB"
  android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z"/>

platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
+  android:width="21dp"
+  android:height="21dp"
+  android:viewportHeight="24.0"
+  android:viewportWidth="24.0">
  <path
  android:fillColor="#551E8CAB"
- android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z" />
+ android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z"/>
 </vector>

platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml

@@ -39,10 +39,9 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:adjustViewBounds="true"
- android:background="@drawable/mapbox_default_bg_selector"
  android:clickable="true"
+ android:focusable="true"
  android:contentDescription="@string/mapbox_attributionsIconContentDescription"
- android:padding="7dp"
  android:src="@drawable/mapbox_info_bg_selector"/>
 
 </merge>

platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml

@@ -1,41 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
 
  <ImageView
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:scaleType="centerCrop"
- android:src="@drawable/mapbox_mapview_preview" />
+ android:contentDescription="@null"
+ android:src="@drawable/mapbox_mapview_preview"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"/>
 
  <ImageView
+ android:id="@id/logoView"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_alignParentBottom="true"
  android:layout_alignParentLeft="true"
- android:layout_marginBottom="@dimen/mapbox_eight_dp"
- android:layout_marginLeft="@dimen/mapbox_eight_dp"
+ android:layout_alignParentStart="true"
+ android:layout_marginBottom="@dimen/mapbox_four_dp"
+ android:layout_marginLeft="@dimen/mapbox_four_dp"
+ android:layout_marginStart="@dimen/mapbox_four_dp"
  android:contentDescription="@null"
  android:src="@drawable/mapbox_logo_icon"/>
 
  <ImageView
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_alignParentBottom="true"
- android:layout_marginBottom="@dimen/mapbox_seven_dp"
- android:layout_marginLeft="@dimen/mapbox_seventy_six_dp"
+ android:layout_toEndOf="@+id/logoView"
+ android:contentDescription="@null"
+ android:layout_marginBottom="@dimen/mapbox_four_dp"
  android:background="@drawable/mapbox_default_bg_selector"
- android:clickable="true"
- android:contentDescription="@string/mapbox_attributionsIconContentDescription"
- android:src="@drawable/mapbox_info_bg_selector" />
+ android:src="@drawable/mapbox_info_bg_selector"
+ android:layout_marginLeft="@dimen/mapbox_four_dp"
+ android:layout_marginStart="@dimen/mapbox_four_dp"
+ android:layout_toRightOf="@+id/logoView"/>
 
  <ImageView
  android:layout_width="48dp"
  android:layout_height="48dp"
+ android:layout_alignParentEnd="true"
  android:layout_alignParentRight="true"
  android:layout_margin="10dp"
- android:src="@drawable/mapbox_compass_icon" />
+ android:contentDescription="@null"
+ android:src="@drawable/mapbox_compass_icon"/>
 
 </RelativeLayout>

platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml

@@ -4,10 +4,15 @@
  <dimen name="mapbox_infowindow_margin">8dp</dimen>
  <dimen name="mapbox_infowindow_offset">-2dp</dimen>
  <dimen name="mapbox_infowindow_line_width">1.5dp</dimen>
- <dimen name="mapbox_seven_dp">7dp</dimen>
+ <dimen name="mapbox_attribution_icon_left_padding">@dimen/mapbox_two_dp</dimen>
+ <dimen name="mapbox_attribution_icon_top_padding">@dimen/mapbox_two_dp</dimen>
+ <dimen name="mapbox_attribution_icon_right_padding">@dimen/mapbox_two_dp</dimen>
+ <dimen name="mapbox_attribution_icon_bottom_padding">@dimen/mapbox_two_dp</dimen>
+ <dimen name="mapbox_two_dp">2dp</dimen>
+ <dimen name="mapbox_four_dp">4dp</dimen>
  <dimen name="mapbox_eight_dp">8dp</dimen>
  <dimen name="mapbox_ten_dp">10dp</dimen>
  <dimen name="mapbox_sixteen_dp">16dp</dimen>
- <dimen name="mapbox_seventy_six_dp">76dp</dimen>
+ <dimen name="mapbox_ninety_five_dp">95dp</dimen>
  <dimen name="mapbox_my_locationview_outer_circle">18dp</dimen>
 </resources>