From d90c1722c9718e2532d406c13b17edf988070e2e Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Fri, 19 May 2017 13:08:21 -0400 Subject: [PATCH] [ios] Move image resources to an asset catalog & switch to PDFs --- platform/ios/ios.xcodeproj/project.pbxproj | 60 ++---------------- platform/ios/originals/compass.sketch | Bin 0 -> 4881 bytes platform/ios/resources/Compass.png | Bin 1139 -> 0 bytes platform/ios/resources/Compass@2x.png | Bin 1892 -> 0 bytes platform/ios/resources/Compass@3x.png | Bin 3398 -> 0 bytes .../Compass.imageset/Contents.json | 12 ++++ .../Compass.imageset/compass.pdf | Bin 0 -> 4574 bytes .../resources/Images.xcassets/Contents.json | 6 ++ .../default_marker.imageset/Contents.json | 12 ++++ .../default_marker.pdf | Bin 0 -> 2601 bytes .../mapbox.imageset/Contents.json | 12 ++++ .../mapbox.imageset/mapbox.pdf | Bin 0 -> 8823 bytes platform/ios/resources/default_marker.png | Bin 1010 -> 0 bytes platform/ios/resources/default_marker@2x.png | Bin 1995 -> 0 bytes platform/ios/resources/default_marker@3x.png | Bin 2998 -> 0 bytes platform/ios/resources/mapbox.png | Bin 2347 -> 0 bytes platform/ios/resources/mapbox@2x.png | Bin 5290 -> 0 bytes platform/ios/resources/mapbox@3x.png | Bin 8245 -> 0 bytes platform/ios/src/MGLMapView.mm | 26 ++++---- 19 files changed, 61 insertions(+), 67 deletions(-) create mode 100644 platform/ios/originals/compass.sketch delete mode 100644 platform/ios/resources/Compass.png delete mode 100644 platform/ios/resources/Compass@2x.png delete mode 100644 platform/ios/resources/Compass@3x.png create mode 100644 platform/ios/resources/Images.xcassets/Compass.imageset/Contents.json create mode 100644 platform/ios/resources/Images.xcassets/Compass.imageset/compass.pdf create mode 100644 platform/ios/resources/Images.xcassets/Contents.json create mode 100644 platform/ios/resources/Images.xcassets/default_marker.imageset/Contents.json create mode 100644 platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf create mode 100644 platform/ios/resources/Images.xcassets/mapbox.imageset/Contents.json create mode 100644 platform/ios/resources/Images.xcassets/mapbox.imageset/mapbox.pdf delete mode 100644 platform/ios/resources/default_marker.png delete mode 100644 platform/ios/resources/default_marker@2x.png delete mode 100644 platform/ios/resources/default_marker@3x.png delete mode 100644 platform/ios/resources/mapbox.png delete mode 100644 platform/ios/resources/mapbox@2x.png delete mode 100644 platform/ios/resources/mapbox@3x.png diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index ef57eac14..6ff148a18 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -200,6 +200,8 @@ 7E016D861D9E890300A29A21 /* MGLPolygon+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E016D831D9E890300A29A21 /* MGLPolygon+MGLAdditions.m */; }; 7E016D871D9E890300A29A21 /* MGLPolygon+MGLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E016D831D9E890300A29A21 /* MGLPolygon+MGLAdditions.m */; }; 920A3E5D1E6F995200C16EFC /* MGLSourceQueryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 920A3E5C1E6F995200C16EFC /* MGLSourceQueryTests.m */; }; + 960D0C361ECF5AAF008E151F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 960D0C351ECF5AAF008E151F /* Images.xcassets */; }; + 960D0C371ECF5AAF008E151F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 960D0C351ECF5AAF008E151F /* Images.xcassets */; }; 9620BB381E69FE1700705A1D /* MGLSDKUpdateChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 9620BB361E69FE1700705A1D /* MGLSDKUpdateChecker.h */; }; 9620BB391E69FE1700705A1D /* MGLSDKUpdateChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 9620BB361E69FE1700705A1D /* MGLSDKUpdateChecker.h */; }; 9620BB3A1E69FE1700705A1D /* MGLSDKUpdateChecker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9620BB371E69FE1700705A1D /* MGLSDKUpdateChecker.mm */; }; @@ -333,15 +335,6 @@ DA88485C1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.h in Headers */ = {isa = PBXBuildFile; fileRef = DA88484D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.h */; }; DA88485D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA88484E1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m */; }; DA8848601CBAFC2E00AB86E3 /* Mapbox.h in Headers */ = {isa = PBXBuildFile; fileRef = DA88485E1CBAFC2E00AB86E3 /* Mapbox.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DA88486D1CBAFCC100AB86E3 /* Compass.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848631CBAFCC100AB86E3 /* Compass.png */; }; - DA88486E1CBAFCC100AB86E3 /* Compass@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848641CBAFCC100AB86E3 /* Compass@2x.png */; }; - DA88486F1CBAFCC100AB86E3 /* Compass@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848651CBAFCC100AB86E3 /* Compass@3x.png */; }; - DA8848701CBAFCC100AB86E3 /* default_marker.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848661CBAFCC100AB86E3 /* default_marker.png */; }; - DA8848711CBAFCC100AB86E3 /* default_marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848671CBAFCC100AB86E3 /* default_marker@2x.png */; }; - DA8848721CBAFCC100AB86E3 /* default_marker@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848681CBAFCC100AB86E3 /* default_marker@3x.png */; }; - DA8848731CBAFCC100AB86E3 /* mapbox.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848691CBAFCC100AB86E3 /* mapbox.png */; }; - DA8848741CBAFCC100AB86E3 /* mapbox@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA88486A1CBAFCC100AB86E3 /* mapbox@2x.png */; }; - DA8848751CBAFCC100AB86E3 /* mapbox@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA88486B1CBAFCC100AB86E3 /* mapbox@3x.png */; }; DA8848841CBB033F00AB86E3 /* FABAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848801CBB033F00AB86E3 /* FABAttributes.h */; }; DA8848851CBB033F00AB86E3 /* FABKitProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */; }; DA8848861CBB033F00AB86E3 /* Fabric+FABKits.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */; }; @@ -355,15 +348,6 @@ DA8933DB1CCD31D400E68420 /* Foundation.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA8933BA1CCD2CA100E68420 /* Foundation.strings */; }; DA8933DC1CCD31D400E68420 /* Foundation.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = DA8933BD1CCD2CAD00E68420 /* Foundation.stringsdict */; }; DA8933E01CCD31DF00E68420 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA89339F1CCC951200E68420 /* Localizable.strings */; }; - DA8933E11CCD31DF00E68420 /* Compass.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848631CBAFCC100AB86E3 /* Compass.png */; }; - DA8933E21CCD31DF00E68420 /* Compass@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848641CBAFCC100AB86E3 /* Compass@2x.png */; }; - DA8933E31CCD31DF00E68420 /* Compass@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848651CBAFCC100AB86E3 /* Compass@3x.png */; }; - DA8933E41CCD31DF00E68420 /* default_marker.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848661CBAFCC100AB86E3 /* default_marker.png */; }; - DA8933E51CCD31DF00E68420 /* default_marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848671CBAFCC100AB86E3 /* default_marker@2x.png */; }; - DA8933E61CCD31DF00E68420 /* default_marker@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848681CBAFCC100AB86E3 /* default_marker@3x.png */; }; - DA8933E71CCD31DF00E68420 /* mapbox.png in Resources */ = {isa = PBXBuildFile; fileRef = DA8848691CBAFCC100AB86E3 /* mapbox.png */; }; - DA8933E81CCD31DF00E68420 /* mapbox@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA88486A1CBAFCC100AB86E3 /* mapbox@2x.png */; }; - DA8933E91CCD31DF00E68420 /* mapbox@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA88486B1CBAFCC100AB86E3 /* mapbox@3x.png */; }; DA8933F01CCD387900E68420 /* strip-frameworks.sh in Resources */ = {isa = PBXBuildFile; fileRef = DA8933EF1CCD387900E68420 /* strip-frameworks.sh */; }; DA8963371CC549A100684375 /* glyphs in Resources */ = {isa = PBXBuildFile; fileRef = DA8963331CC549A100684375 /* glyphs */; }; DA8963381CC549A100684375 /* sprites in Resources */ = {isa = PBXBuildFile; fileRef = DA8963341CC549A100684375 /* sprites */; }; @@ -679,6 +663,7 @@ 7E016D821D9E890300A29A21 /* MGLPolygon+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MGLPolygon+MGLAdditions.h"; sourceTree = ""; }; 7E016D831D9E890300A29A21 /* MGLPolygon+MGLAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MGLPolygon+MGLAdditions.m"; sourceTree = ""; }; 920A3E5C1E6F995200C16EFC /* MGLSourceQueryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLSourceQueryTests.m; path = ../../darwin/test/MGLSourceQueryTests.m; sourceTree = ""; }; + 960D0C351ECF5AAF008E151F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 9620BB361E69FE1700705A1D /* MGLSDKUpdateChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLSDKUpdateChecker.h; sourceTree = ""; }; 9620BB371E69FE1700705A1D /* MGLSDKUpdateChecker.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = MGLSDKUpdateChecker.mm; sourceTree = ""; }; 9660916B1E5BBFD700A9A03B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; @@ -847,15 +832,6 @@ DA88484D1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLFaux3DUserLocationAnnotationView.h; sourceTree = ""; }; DA88484E1CBAFB9800AB86E3 /* MGLFaux3DUserLocationAnnotationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLFaux3DUserLocationAnnotationView.m; sourceTree = ""; }; DA88485E1CBAFC2E00AB86E3 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mapbox.h; path = src/Mapbox.h; sourceTree = SOURCE_ROOT; }; - DA8848631CBAFCC100AB86E3 /* Compass.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Compass.png; sourceTree = ""; }; - DA8848641CBAFCC100AB86E3 /* Compass@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Compass@2x.png"; sourceTree = ""; }; - DA8848651CBAFCC100AB86E3 /* Compass@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Compass@3x.png"; sourceTree = ""; }; - DA8848661CBAFCC100AB86E3 /* default_marker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = default_marker.png; sourceTree = ""; }; - DA8848671CBAFCC100AB86E3 /* default_marker@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default_marker@2x.png"; sourceTree = ""; }; - DA8848681CBAFCC100AB86E3 /* default_marker@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default_marker@3x.png"; sourceTree = ""; }; - DA8848691CBAFCC100AB86E3 /* mapbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mapbox.png; sourceTree = ""; }; - DA88486A1CBAFCC100AB86E3 /* mapbox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mapbox@2x.png"; sourceTree = ""; }; - DA88486B1CBAFCC100AB86E3 /* mapbox@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mapbox@3x.png"; sourceTree = ""; }; DA8848801CBB033F00AB86E3 /* FABAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABAttributes.h; sourceTree = ""; }; DA8848811CBB033F00AB86E3 /* FABKitProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FABKitProtocol.h; sourceTree = ""; }; DA8848821CBB033F00AB86E3 /* Fabric+FABKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Fabric+FABKits.h"; sourceTree = ""; }; @@ -1363,17 +1339,9 @@ DA8848621CBAFCC100AB86E3 /* Kit Resources */ = { isa = PBXGroup; children = ( + 960D0C351ECF5AAF008E151F /* Images.xcassets */, DA89339F1CCC951200E68420 /* Localizable.strings */, DAC49C5F1CD02BC9009E1AA3 /* Localizable.stringsdict */, - DA8848631CBAFCC100AB86E3 /* Compass.png */, - DA8848641CBAFCC100AB86E3 /* Compass@2x.png */, - DA8848651CBAFCC100AB86E3 /* Compass@3x.png */, - DA8848661CBAFCC100AB86E3 /* default_marker.png */, - DA8848671CBAFCC100AB86E3 /* default_marker@2x.png */, - DA8848681CBAFCC100AB86E3 /* default_marker@3x.png */, - DA8848691CBAFCC100AB86E3 /* mapbox.png */, - DA88486A1CBAFCC100AB86E3 /* mapbox@2x.png */, - DA88486B1CBAFCC100AB86E3 /* mapbox@3x.png */, DA8933EF1CCD387900E68420 /* strip-frameworks.sh */, 40599F001DEE1B2400182B5D /* api_mapbox_staging.der */, 40599F011DEE1B2400182B5D /* api_mapbox_com-digicert.der */, @@ -2092,18 +2060,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - DA8848731CBAFCC100AB86E3 /* mapbox.png in Resources */, DA8933BC1CCD2CA100E68420 /* Foundation.strings in Resources */, - DA8848741CBAFCC100AB86E3 /* mapbox@2x.png in Resources */, DA8933A31CCC95B000E68420 /* Localizable.strings in Resources */, - DA88486D1CBAFCC100AB86E3 /* Compass.png in Resources */, - DA8848721CBAFCC100AB86E3 /* default_marker@3x.png in Resources */, - DA88486F1CBAFCC100AB86E3 /* Compass@3x.png in Resources */, - DA88486E1CBAFCC100AB86E3 /* Compass@2x.png in Resources */, - DA8848701CBAFCC100AB86E3 /* default_marker.png in Resources */, - DA8848711CBAFCC100AB86E3 /* default_marker@2x.png in Resources */, + 960D0C361ECF5AAF008E151F /* Images.xcassets in Resources */, DA8933F01CCD387900E68420 /* strip-frameworks.sh in Resources */, - DA8848751CBAFCC100AB86E3 /* mapbox@3x.png in Resources */, DAC49C5C1CD02BC9009E1AA3 /* Localizable.stringsdict in Resources */, DA8933BF1CCD2CAD00E68420 /* Foundation.stringsdict in Resources */, 408982E91DEE208200754016 /* api_mapbox_staging.der in Resources */, @@ -2117,16 +2077,8 @@ buildActionMask = 2147483647; files = ( DA8933E01CCD31DF00E68420 /* Localizable.strings in Resources */, - DA8933E11CCD31DF00E68420 /* Compass.png in Resources */, - DA8933E21CCD31DF00E68420 /* Compass@2x.png in Resources */, - DA8933E31CCD31DF00E68420 /* Compass@3x.png in Resources */, - DA8933E41CCD31DF00E68420 /* default_marker.png in Resources */, - DA8933E51CCD31DF00E68420 /* default_marker@2x.png in Resources */, - DA8933E61CCD31DF00E68420 /* default_marker@3x.png in Resources */, - DA8933E71CCD31DF00E68420 /* mapbox.png in Resources */, - DA8933E81CCD31DF00E68420 /* mapbox@2x.png in Resources */, - DA8933E91CCD31DF00E68420 /* mapbox@3x.png in Resources */, DA8933DB1CCD31D400E68420 /* Foundation.strings in Resources */, + 960D0C371ECF5AAF008E151F /* Images.xcassets in Resources */, DA8933DC1CCD31D400E68420 /* Foundation.stringsdict in Resources */, DAC49C5D1CD02BC9009E1AA3 /* Localizable.stringsdict in Resources */, 40599F0C1DEE1B7600182B5D /* api_mapbox_staging.der in Resources */, diff --git a/platform/ios/originals/compass.sketch b/platform/ios/originals/compass.sketch new file mode 100644 index 0000000000000000000000000000000000000000..f5b848cd968b95ba8fef65f3c414cbb23c490068 GIT binary patch literal 4881 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 literal 0 HcmV?d00001 diff --git a/platform/ios/resources/default_marker.png b/platform/ios/resources/default_marker.png deleted file mode 100644 index b112096c180eecca2d6afde217a9fe54eae6f327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1010 zcmVm{G8B)KoXJFa>pBy66(wY{N1{V$IeF+19SHcT z6u!wx>Kh-Ywd`huNn7=Ohk*=HT|M7$glc?V+76YwcTrt+HGNN~8&5eL(u>;+Am2oF`sBU=Mo2*bi}Ud?l#qhEy>oiS&DPrAXu9LANYbpjS$iC z=2g_qjQ8{N)H5?fi~IJ`oYP6~Mn>poE=RRmlXReI@Ly?%6|^ zBN6h~*Kc*13179f5wY$#>x=+L|K#LFq}&)Vy%DK>Tv(vf?d^FoH4N>kHsZ`C`lHvnlCvw70rk7d}-2OGCW*D&88mdA?;f;6Xy?E;tH z<$FW1S<9of9pD3BaOhnoX71%{sJB>@r2rrJf+J6;q4oXrG?_=J6krP<_!{Ssv?x)_ z&c2C>9TRG{otiJ1BLr^7mzJWRcaS=4U<)7fNg+d&_z1OrnEqBWb?9INTg``xMM$?R zE8i+Vvkyz9-ZMH%uz{^vmmjQfIP9pZsyfKaP(lz!gPF_;!Db7XZ=!)%j7Am~#-6*~ zw-mcwVjqzuttd(^Psn6W+>tEqtrKovcjt1Say1`+ObS+3SR9mZD$x`##@|9n5*! zI5shs>|fmc@Qvnci0*J56TGa@y7niKS;nWPrZz4AzO)gNH1U>54<|%nqID{xj55k7 gql_~COZ*aG0OGQs<%kp{B>(^b07*qoM6N<$f?LhmRsaA1 diff --git a/platform/ios/resources/default_marker@2x.png b/platform/ios/resources/default_marker@2x.png deleted file mode 100644 index d05c82bfe28d9e4d87f8cce2b74a6b39b4805c1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1995 zcmV;+2Q>JJP)v@uO-+Qf8KOssBPh>J=a zQEaH95(bcmj(~&1LuWce|L<}R9Ol8jceqd&_e&1<&b{aH&42#a`3DDOh;NFD>iE*g zZ7(-Jx4MKbo!mm)+PJlTHa^~&$vO^`q^kJx3Ac~ARhe9?kK0e&T9|B~r39H6By^nH z=ki&OD~l>iim5z5pS)|<(0abAc=YTUO+J54!+aeW9itbqf7REgxivG<(6R|Kxdy)c zCbp5v3JPdjSvge}7nu^@z}Pr-jSSPs#DshVatE2@)r<);xf4Qinw0j|)+R~HEFjso z2M;vq3P6%4OcP{sKMH-L+I8!wzPg&+E*DvWNGwL}fdD;t{8&DMUN)ub>(V0!sqL(& zAeYlgRsnNuEGnXW-j)9GaXhNq@9|V!nwhzvOOVOI5WbM)HkFprN}(t(FOlQ~lWb4B z#lpAU!hL;B4Q(weqt(DaBO}z_+bcirRDEXRzF}*rs<>p;$N^XjYpNWQ2#T$(gMWLc zb`z~OuqM_92f-ytg2(5!*1WY&Mj~`S6rzq`P;0oyGc&-NSX<=+WC`iPV*T)SW{hHF zYKm^Ks~F;IDr{gQ*v&4gjITz3wL2a@gpc%t6YFA&CMvcb?ECsRDl4hf=QA|fAFSBd zhK48{jcT7?-M5dn95_H5_v|5$-%q1GJ=(i_PoGjG9;XU}^Ew<38ssrB1-9t#9U=h; z;K@hz^@g?=RS^?Hasu$MiySjGV&^ zLG4_iWVq?AD>qlWc3-}%`8lINUyM=bSkf35xP+YIcu3<@`pWC&Z@)q42b{1`$i5is zH6THSOXmW?nQ3D#gJUaz2+`Bps@orZWHgaubqUTaCfKGOTF1r=4MyNc*aCh(a)hp* zJehL4@eJ?KM}|71NrS?r%^}XbT6F$!*Dme!W;9ulAy4{7=}KS_Qs>OXVX1$=c67*( zg$|K!;oRG3HqEy>-AYLRQ7$={C7$Cn)z~#WY>FTjexJV-!WSZhbi!~YuvV{0mjZx; z!igk7X!|K7ia1!CJ)DEc<_yTBI@Ajn6B3-}9JQ#CwBY{cz`*|&HI%hmWZg!MBxf|e znwT);w5Ub*+WsT-krQvk>AWF0$SXSo>8Vu%E z{N8E939IlyT9oe^99j{#gE=v`z>#$I>a-a($_{+FisJXRo*v5yVop(5zbe+sDCKXG z2GbJ^T1F0YDTdLM@tH(5nD*X)C0mU-FxOIsk+#B`4xEmm>RN}A#CzMeEsNl#t}ZFP zPA0e0s#D$kRwG}_6c}rCYfTXpHDk@HZ}kuGp=Qc7IgG(r#cDe(BUoKs?f4fk(_8OMz0hW8Y1^+AVB?m z5Sk?lw|c!zA*U1T7V+FA++v|nXvP#lCYGxZb1j^rossf*yuUCWe>WHoQ%Rne3UWP5 zlEZIw_*F?etz~C_c|9lRe!}{GUJGrSiAHq^LTY@e;g*wX!MoYneOseZ-E_Lxoa=8!A`P?gc=40T zNvc`9HtDA_lya|hcT@PqbBa0~_rJ~0KWe}pAjybI(y5Sx7%Ge^{e`@|PoYy|Oi*s2 z3OvI*^g&+}_EaIbBw2B}p3y8i{kvS@dv5npnSrbR5%)4fMj!MwLC__*BoXwRbsZNy zo{pd^>+88t*sCRTh2r<1Q0_rX%wjtOUh>0a^PNy z>E*y!AQ0$Fl;H4krDzdig3DqfVWo`0lV@Vh7Gr>=H<>b$z=Ok+qk?9Y0hyE>$c-%- ziv>xX*z-h;Tn(To-OJ>jnM(OZY=&2NuMjcp)^MWKOrJ?aaw(h3f~~|EIK;%3|G!%) z$ohnidW2+i4QwAIg$yOkq{3vwh7B7wY}l}2!-fqTHf-3iVZ(+E8#Zj%uwlc74I4IW d=-@vA1^|>xdY&#X)Q$iE002ovPDHLkV1g93zViS8 diff --git a/platform/ios/resources/default_marker@3x.png b/platform/ios/resources/default_marker@3x.png deleted file mode 100644 index 703b172c154d584d8c46e9cec018410bd2fc7075..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2998 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 YkEChNJ2NU=6>%yZO#_Vzb=$E20b+i|v;Y7A diff --git a/platform/ios/resources/mapbox.png b/platform/ios/resources/mapbox.png deleted file mode 100644 index 00bc897a58e6213c360bdab77200003788926d85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/platform/ios/resources/mapbox@2x.png b/platform/ios/resources/mapbox@2x.png deleted file mode 100644 index 206ed5883e2240f5fe1987679b1c7a12a912a8aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5290 zcmWld1y~ea6ov;CK^ml$M!FUdq>)@Yl@3`z2}Nln6$Dpe0ZD-cC8R;RTVUyQX%zU8 zPU-qD^E|V&yK`su-ZSSr-+LCRtF1~*Ku-Wc5V0CuNgo{Zz|Mnz8@zV!`kH{lo!4*^ zHwdDBaJ}QG>9g-Z5T&`A(qlvKsZ9%CUCORsa*aL8A;z(dWlE2Sm5c-n_fDuMc)326 zg;Hq6Y2E2~p`S}mRjy3dT$y3WPA2q2SCl?Hn_`IFh9&%QTo*1e>nW13T0Z&+F$vGO zb(7HO^sL>%nWLOEI!kj4onK^Q|8^i%c0Wb-`{3#*a|A3RgiIj;vc`kNAZubMLGp_% zZV(AH1j*m+Jmya7R%&mZdj0ql*%us00ZMw*_T2M^{DaP#&a8mDkvwp^*OEU}HDll% zUY?#+X>x&=^EePSpYaX{)G}M|#e@UR)O&63UYs3`^Tg+;Awu{?-i<2>66=RVKZN+Q zRkgvDf!mEo%S9&T_CFdM8;R2gnTEPD8ynNG6BD_Z{(gR`z{_(Tz7|I)qkHLg(hDVK zJC(r`$XcbP_W2+qDN<>{#>q)aC>Ae&+!3vx*KqKY#%f95dJ`|mH%HGSM3DSzGi=*I zvgY#bgkd_L_oNvhwQn=-vKGxt%;?UkndJ$-$CHHa<}WivA~)SXdesjZbb zJUB>`2sl5^XlZFtx}B>*rr=Mz$Z_{PRP~;iv$xy!T%(J@_hKRDhi4*3;axX!A1qFn z;+)pUCMIIzva+(6-^p9IrkeJ2+pyjx#^n|X7rzNT@>nx$fkXLE3w(~Y=L5}kb$7Pk zzkeTy#bQyzj+NcC8E8olo*)TPge@!vX_@5P**6VAAt51rM~8=KyFw(^u`;)!qT=HG zWPeiJWv=j9m(l|YjAou8k7=!Ic1lxjP<8cDVQHxlHa9mn1+oq%`|@>A&d$~zRm0FH zA?1y}BN9wwQexkRN+#C{qcIVouzPVc$le>xur4B$i5_@M(z0)>j0cIr1}hP>Qz5Xe zA(lWUw~~h%0>9VVg)W}LAmi3>-G$N<*q-*gd3##5bSI%s`kUK$P)2{ZrxxuZ$rPst z>$4n?WWMxLYK|^0f4M0?rA9|b6Ir~BQ@4xP&nu(||M@c}Cg$Gk?Chq;NiLKBzu_+t z5fKEpSF|Brkv2Mht%O@O_$-_pd~8cQ<9)QRCvaN)LUhR!T_VURR%@7O$u!5*N9-_+$&Dfzi$1;P}BX(tOZV%sKF%(OPT$1rU z^nUc{kufddP%s{84m$_O94yEG@#Dvz)6?ha{F{n{gM)vfWqhTpT;?xjAY<3a9DEij zMd)CEKc(6h6N`i(`p9KD${l_To|=k}xVZS)o5fC<^^J|O<)tN2z0brjg%vTUe->(y zD$La3n=>;rIg=9;5xCyyXZ4<&ro>c5zgh1o)=?mp&Z&5xYI?kWodiLz&ki>Sz|b%v zD-9K~OhpZ636GtE4%&Hy2_cNXM4q{HXJ;o#*?oF)GLN5|+rfw@{t2bE5j{(6beYQA z>6jQpI3-&Q+#G7L⁡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 iLpNVg!Mlp@`NNJ)2>bf=P%4&B``bSe$+@L20I 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 diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 9a27cf24c..ed989459f 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -467,7 +467,7 @@ public: // setup logo bug // - UIImage *logo = [MGLMapView resourceImageNamed:@"mapbox.png"]; + UIImage *logo = [MGLMapView resourceImageNamed:@"mapbox"]; _logoView = [[UIImageView alloc] initWithImage:logo]; _logoView.accessibilityTraits = UIAccessibilityTraitStaticText; _logoView.accessibilityLabel = NSLocalizedStringWithDefaultValue(@"LOGO_A11Y_LABEL", nil, nil, @"Mapbox", @"Accessibility label"); @@ -616,11 +616,11 @@ public: - (UIImage *)compassImage { - UIImage *scaleImage = [MGLMapView resourceImageNamed:@"Compass.png"]; + UIImage *scaleImage = [MGLMapView resourceImageNamed:@"Compass"]; UIGraphicsBeginImageContextWithOptions(scaleImage.size, NO, [UIScreen mainScreen].scale); [scaleImage drawInRect:{ CGPointZero, scaleImage.size }]; - CGFloat northSize = 9; + CGFloat northSize = 11; UIFont *northFont; if ([UIFont respondsToSelector:@selector(systemFontOfSize:weight:)]) { @@ -635,7 +635,7 @@ public: NSForegroundColorAttributeName: [UIColor whiteColor], }]; CGRect stringRect = CGRectMake((scaleImage.size.width - north.size.width) / 2, - scaleImage.size.height * 0.45, + scaleImage.size.height * 0.435, north.size.width, north.size.height); [north drawInRect:stringRect]; @@ -874,8 +874,8 @@ public: // logo bug self.logoView.frame = { - self.contentInset.left+5, - CGRectGetHeight(self.bounds)-5-self.contentInset.bottom-CGRectGetHeight(self.logoView.bounds), + self.contentInset.left+8, + CGRectGetHeight(self.bounds)-8-self.contentInset.bottom-CGRectGetHeight(self.logoView.bounds), CGRectGetWidth(self.logoView.bounds), CGRectGetHeight(self.logoView.bounds) }; @@ -5290,17 +5290,17 @@ public: + (UIImage *)resourceImageNamed:(NSString *)imageName { - NSString *extension = imageName.pathExtension.length ? imageName.pathExtension : @"png"; - NSBundle *bundle = [NSBundle mgl_frameworkBundle]; - NSString *path = [bundle pathForResource:imageName.stringByDeletingPathExtension - ofType:extension]; - if ( ! path) + UIImage *image = [UIImage imageNamed:imageName + inBundle:[NSBundle mgl_frameworkBundle] + compatibleWithTraitCollection:nil]; + + if ( ! image) { - [NSException raise:@"Resource not found" format: + [NSException raise:@"MGLResourceNotFoundException" format: @"The resource named “%@” could not be found in the Mapbox framework bundle.", imageName]; } - return [UIImage imageWithContentsOfFile:path]; + return image; } - (BOOL)isFullyLoaded