From 6f708ac5458fe332e25ca398431928b7ff5ba404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 24 Apr 2017 13:31:22 -0400 Subject: [PATCH] [ios, macos] Update MGLMapView logo view (#8771) * [ios, macos] Updated logo view to new Mapbox logo * [default] Updated attribution logo SVG --- .../default/resources/attribution-logo.svg | 92 +++++++++++++++++- platform/ios/CHANGELOG.md | 1 + platform/ios/resources/mapbox.png | Bin 1085 -> 2347 bytes platform/ios/resources/mapbox@2x.png | Bin 2180 -> 5290 bytes platform/ios/resources/mapbox@3x.png | Bin 3293 -> 8245 bytes platform/ios/src/MGLMapView.mm | 2 +- platform/macos/CHANGELOG.md | 1 + platform/macos/sdk/mapbox.pdf | Bin 3762 -> 26280 bytes platform/macos/src/MGLMapView.mm | 2 +- 9 files changed, 95 insertions(+), 3 deletions(-) diff --git a/platform/default/resources/attribution-logo.svg b/platform/default/resources/attribution-logo.svg index f6edd35cd..d0de0c690 100644 --- a/platform/default/resources/attribution-logo.svg +++ b/platform/default/resources/attribution-logo.svg @@ -1 +1,91 @@ -image/svg+xml \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 062462c5d..cc8e910e9 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -14,6 +14,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT ### Other changes +* Updated MGLMapView’s logo view to display [the new Mapbox logo](https://www.mapbox.com/blog/new-mapbox-logo/). ([#8771](https://github.com/mapbox/mapbox-gl-native/pull/8771)) * Fixed a crash or console spew when MGLMapView is initialized with a frame smaller than 64 points wide by 64 points tall. ([#8562](https://github.com/mapbox/mapbox-gl-native/pull/8562)) * The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418)) * Fixed an issue where gesture recognizers associated with map view interactivity were not disabled when their related interactions were disabled. ([#8304](https://github.com/mapbox/mapbox-gl-native/pull/8304)) diff --git a/platform/ios/resources/mapbox.png b/platform/ios/resources/mapbox.png index 533ad9f723c4c8857dfd60c603b2bd99e971be71..00bc897a58e6213c360bdab77200003788926d85 100644 GIT binary patch literal 2347 zcmV+`3Dow9P)8Hrtu{&llOh!_rC9a-h1C)LlHs{u22-U0zf;dY480UZB?IUs zgg8DzslZTqQz?pC3m{Ptgsj}$+znc-Rz2H5o6Qz%X=(Xub#?Vk0KgO8WvZ z1E8G{GXA3qB!oZ$b}hp&MQv?ucZ0#8ixA>`R}BV(uC}(ey9~n=0Z5hS`j9FBEz7bM zU0q!_>+0%^0CxY_G9wgEKC!8(iOGGg+xiv^IXm@ZCwf)1(1O3yM1KmdS^ z5Mon|O;#An=Kx+R<_bvPCl6h4e!wSo}xn4+jC02_}TJC+Rq7cN}5fAHYJ->h1-D(3d>+fVE2 z>h5gbym>`oVc}YpN<|(%d^mCB$PqI|QS+q*f5G#7+OA!@eyLKah|lK>HZ(NcOHWT< z1^|_nl^r^rjxH)HN*);*nGi*BUQSNV&!VED7RtP4vsnYcquf)tIn8FXhN7r;=|EVH zhXA{1wqJ)iHUjH+1WXI<;s;rhG7 z7z_gxMfCyzTUl9oI-I`bd0r17A3*-fl`D$^fxweZn>LloG(ivy$}yFdm8Su)k}it_ zkneW8-G0B{C4Xh!OP4PF-Rt$bmHNB2wY5{8ySBFWvfL;0dA;5@a{BNS%%l^b<69YBj1+*cI)-}^U6MX4YKXf>-FaeARF8UtiyS$+pA+ zK)%Ujx*7^B##>z2ouOs1;<@J<$XOkIQU5B_j*vBJ$vsU7ah^MO?oXj|W$I2|7d-m+T$;nAd(%CKm4vWR&n3{qf z0D1v*0f67{{|*4OTJ6IB#^-c8eR4m;FhKz5=;&|(2oOTrWx3FIeY>E(#}`uYyZS04uu9#o&t7cn|I`b=)y?e^(iyLNpuH8u55p6AVWyL}n}_UzfS zX33HzuYYKlWME*x4FF4*E?p*()&of7I4&tVI{GblFCig8CmnDqfb|T+ELgN?QJi#e zQ?u~_Kzw{WE%$po9yI`DW@au05JgecMgWOC&!@%4#*!B=UQ7W1$8kyP)~(ZsqDav+ z{kpWYGy_1QU1Xa&mG$FDNMZ1%S1(ESBeay;5h&I%~G7RNl%eS<$zw zzhXX}QV(++S2YXmKdisfu+64Zm7c}Btp6;0Z&`n34YmH=-Q8AYTQ+t8wDSNsO(xSo zSy@?*9P7u%#*zaE4rE@uc=2zt!=I3l@RRiP^ktcunQK#0Qs{6#t#m7#3g>vHv9a-* z`~W1MQQO$qculQVzminUIDqFNwBeGHk`}Ag`gr^H?VrWO#JmdiQ$uy?(W6JZckbMo zLesQb;eS2=U>hABrE6+xu8xe1Ogww`?By(c766gu<>hE^Z?}cL{z(?8kgNsx|ZB{}^KuTlEQO`>$l8XxElhzz1y&jDsq0x0PXk4r`iZ1z5n-l((eOm zXy$*%jvdL_+1W`nO{i literal 1085 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⁡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 literal 3293 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 b3>wW(bTes_m8aA^00000NkvXXu0mjfNQZ02 diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index d02fcac89..01611e03f 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -466,7 +466,7 @@ public: // setup logo bug // - UIImage *logo = [[MGLMapView resourceImageNamed:@"mapbox.png"] imageWithAlignmentRectInsets:UIEdgeInsetsMake(1.5, 4, 3.5, 2)]; + UIImage *logo = [MGLMapView resourceImageNamed:@"mapbox.png"]; _logoView = [[UIImageView alloc] initWithImage:logo]; _logoView.accessibilityTraits = UIAccessibilityTraitStaticText; _logoView.accessibilityLabel = NSLocalizedStringWithDefaultValue(@"LOGO_A11Y_LABEL", nil, nil, @"Mapbox", @"Accessibility label"); diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index a8efea586..db8c4804f 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -10,6 +10,7 @@ ### Other changes +* Updated MGLMapView’s logo view to display [the new Mapbox logo](https://www.mapbox.com/blog/new-mapbox-logo/). ([#8771](https://github.com/mapbox/mapbox-gl-native/pull/8771)) * Fixed an issue causing attribution button text to appear blue instead of black. ([#8701](https://github.com/mapbox/mapbox-gl-native/pull/8701)) * Fixed a crash or console spew when MGLMapView is initialized with a frame smaller than 64 points wide by 64 points tall. ([#8562](https://github.com/mapbox/mapbox-gl-native/pull/8562)) * The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418)) diff --git a/platform/macos/sdk/mapbox.pdf b/platform/macos/sdk/mapbox.pdf index c08a0e31359c4a4cd4672a2523c30310dd307400..fbe86d3a4386ddde80c0e1fa5cae6f7c11b0a806 100644 GIT binary patch literal 26280 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�kjU<>H?L0gPKZHg@;JHyt01g&wwv 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 diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index c56b32bfc..cf3a5afe7 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -363,7 +363,7 @@ public: NSImage *logoImage = [[NSImage alloc] initWithContentsOfFile: [[NSBundle mgl_frameworkBundle] pathForResource:@"mapbox" ofType:@"pdf"]]; // Account for the image’s built-in padding when aligning other controls to the logo. - logoImage.alignmentRect = NSInsetRect(logoImage.alignmentRect, 3, 3); + logoImage.alignmentRect = NSInsetRect(logoImage.alignmentRect, 0, 3); _logoView.image = logoImage; _logoView.translatesAutoresizingMaskIntoConstraints = NO; _logoView.accessibilityTitle = NSLocalizedStringWithDefaultValue(@"MAP_A11Y_TITLE", nil, nil, @"Mapbox", @"Accessibility title");