diff --git a/GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj b/GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj index 89ce6804..5fd46309 100644 --- a/GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj +++ b/GoogleMaps-Swift/GoogleMapsSwiftDemos.xcodeproj/project.pbxproj @@ -8,101 +8,103 @@ /* Begin PBXBuildFile section */ 0000CCE582DF20F853E43502 /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612E451B3A594633E32B3131 /* CameraViewController.swift */; }; - 02DF0DD4C3D8B5849C510C23 /* step6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 582E8D45A41BDDC81EA48DD7 /* step6@2x.png */; }; - 04E60E4743F55E6BFC17B7B3 /* bulgaria-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 27D56F2A707892084368A7E2 /* bulgaria-large.png */; }; - 05CF5A358A5758D0A61027A5 /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D10973A4336C45EE56319A9B /* boat@2x.png */; }; - 07C43705738284E4921A680D /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = 17C7DF8FF79FD6CE7012853F /* step4.png */; }; - 0AA49E1F095C6DD67BBDC556 /* voyager@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FB44254CA7D0DECE9C14158D /* voyager@2x.png */; }; + 04AD2721C937D569090BA338 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5CFB2179FECC8DF98666E98A /* LaunchScreen.storyboard */; }; 0B806397B1092EB141DCE52C /* DoubleMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBFD03041A5EAA400168D31F /* DoubleMapViewController.swift */; }; 0F1EA55F7B0EAA26EB2060A2 /* SnapshotReadyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB76DC4B0DC1CB6692AE61E /* SnapshotReadyViewController.swift */; }; - 11BF5BA8105198E326CF4F96 /* aeroplane.png in Resources */ = {isa = PBXBuildFile; fileRef = B26D6D4D0FD65566CA60C29A /* aeroplane.png */; }; + 0FCEA246EF4C79E06C2CED0A /* spitfire@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 522113F4629950AB8239E18A /* spitfire@2x.png */; }; + 11203A6B8B88B28751C5BA93 /* step4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BE2B2F064E5D2B955799B90 /* step4@2x.png */; }; 156F720D1E526A533B03DD2B /* MarkerEventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD93738C4D90134DB506ECFE /* MarkerEventsViewController.swift */; }; + 18614BFA1E8E949451055BF5 /* australia-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2C8E6590B2109C88BF5DF3BF /* australia-large@2x.png */; }; + 186CEB356232AB601905652D /* walking_dot@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5A1683F9E8A794DD56CB304 /* walking_dot@3x.png */; }; 188F5FEB25C05500FFF796C4 /* SampleMapStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E18764F42392A93B39C775AB /* SampleMapStyle.swift */; }; - 1E769ACDBCCB6DB84D5E3E8E /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 996FCE46D4BD31A4E02C2473 /* h1.png */; }; - 20F35834239A135EC77A752C /* arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 221F6743F6F3DB331816D7D3 /* arrow@2x.png */; }; - 21AFA9E1157E41E761EDC099 /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C37B898C1EEE5364AEE5EDAA /* newark_nj_1922.jpg */; }; - 26B8792B58E56800CA3D60ED /* step2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AD1D1A994D7ECBF890F0034A /* step2@2x.png */; }; - 26D1A664AD19C1BAD7551777 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA28C25BC5FDEC28E429D90D /* libPods-GoogleMapsSwiftDemos.a */; }; - 293B8794611FD45B631FE20C /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = C5014E3BCF7EBF869B9F9BC7 /* step2.png */; }; + 1992E0A75E17B67F793BD23D /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = ED3D93ABBF24BFEF78629B0D /* step7.png */; }; + 1B39088D7EB09E978E72279D /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = EB1DB9C65356269FB0E9805F /* boat.png */; }; + 249D71CEF0C256EC8839B65F /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A5B8956E7E8B6AF430CC416 /* voyager.png */; }; + 2A69E725A8A436D1FE30D365 /* step1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DF1488DDE60393FF03CF8A87 /* step1@2x.png */; }; 2B28FB6F052E4609695C6CD5 /* PanoramaServiceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D27175E880CA9EEC63374BD4 /* PanoramaServiceController.swift */; }; 2C0E3A82E5EFE9F47DB9256F /* FrameRateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 020DE40B5B1E19C53A7E1982 /* FrameRateViewController.swift */; }; - 2D218EA1029C3FB7A528179F /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 87E37B0AEBC49DF8A0F89492 /* spitfire.png */; }; - 2E3A841E83BC75E113066610 /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = EB1DB9C65356269FB0E9805F /* boat.png */; }; + 2D3CE54E021F114114487E4A /* h1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4429DACE39F5B3E2E31B963D /* h1@2x.png */; }; + 30E07F2A223F6824F6C5B2DA /* step7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C96B86B64A6F458F79250076 /* step7@2x.png */; }; 33F23B3B99CCD40567D80076 /* MapZoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9B924A31846136307374FE /* MapZoomViewController.swift */; }; - 362C49E4DB90848A82AA5F1B /* museum-exhibits.json in Resources */ = {isa = PBXBuildFile; fileRef = AFCF3BFD151B8E93B8704001 /* museum-exhibits.json */; }; 3888570B6E197983F2249FCD /* PaddingBehaviorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6181B3AED573910BA0F2D6B /* PaddingBehaviorViewController.swift */; }; 3C0A5FE1143A58DBEA18A599 /* IndoorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E35664DD7AE7235688F9964 /* IndoorViewController.swift */; }; - 3D3F2A8EA739004B1489A792 /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = EFD1B4A1869A5ED24977724F /* step8.png */; }; - 41B7BD6313F16FFB24A404B2 /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = ED3D93ABBF24BFEF78629B0D /* step7.png */; }; - 4773BB1B2EBD65AEC32F9E7C /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E8E67F17F84C0169D05D684B /* step3.png */; }; + 3CFDA60C57476C3CE3D30B1F /* australia-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 73E9911385541153DF35EE99 /* australia-large.png */; }; + 41B68AA4334D049FEC4D3638 /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 996FCE46D4BD31A4E02C2473 /* h1.png */; }; 4788C5C048ACF0FC15C2A75A /* Samples.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE8CA03ED74DC7887D70CCA6 /* Samples.swift */; }; 47F0AC7126A1B045383D2D1E /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4886CC72C988DDBC1F268FD3 /* SceneDelegate.swift */; }; - 4A9E3BF5489DCA1C7A200A64 /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */; }; 4A9F5DDF75B725448DB6B0EF /* PanoramaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDABCFB71E0D9B75FA2091CF /* PanoramaViewController.swift */; }; - 4D932F94F684532C309EB4BF /* step7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C96B86B64A6F458F79250076 /* step7@2x.png */; }; 4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 922338CA529F228A03DE6422 /* UIKit.framework */; }; - 4F01A0839D992FC9F724CD85 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = 30CF698467FA9E7F200017B3 /* mapstyle-silver.json */; }; 5016E68430C4B4F06ACA1596 /* SampleListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83F342A6AF95FF580F924D74 /* SampleListViewController.swift */; }; - 51B06A8BE3A738B98EC2B2B3 /* botswana-large.png in Resources */ = {isa = PBXBuildFile; fileRef = F531ABFE1A21DA26444A02BC /* botswana-large.png */; }; + 525B19587DF2BA603DD472C9 /* step5.png in Resources */ = {isa = PBXBuildFile; fileRef = 24E559AA1425536C6D0ACF0D /* step5.png */; }; 550FE98EC9032009D39A6EA1 /* FixedPanoramaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1730B1B4AD1EF5754F84355B /* FixedPanoramaViewController.swift */; }; - 58C1F1AFB8E52C5A7D70FD54 /* aeroplane@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EAC16DE0E8CC752D17EB04A /* aeroplane@2x.png */; }; - 6305177FAABE60AC55BDC3E4 /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 713A9415F77D646F9547193B /* bulgaria.png */; }; + 5A2C977BA3CD8B0733AD1F2F /* bulgaria-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 27D56F2A707892084368A7E2 /* bulgaria-large.png */; }; + 5C48E4C909FCCB216EAF6243 /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 87E37B0AEBC49DF8A0F89492 /* spitfire.png */; }; 63AA012E2D9D55A712B7B766 /* MarkerLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABD5CD72476857CF2A348366 /* MarkerLayerViewController.swift */; }; 6F974DAC19BC11133EBD3B64 /* StructuredGeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1A99C0C04795272C12DD9EF /* StructuredGeocoderViewController.swift */; }; 6FE45DC6C071ABCD078807F7 /* SDKConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */; }; - 6FEFF5E13C84596B02FC5CEC /* step5.png in Resources */ = {isa = PBXBuildFile; fileRef = 24E559AA1425536C6D0ACF0D /* step5.png */; }; + 700503499290D1BA158896D5 /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = E8E67F17F84C0169D05D684B /* step3.png */; }; 7148D5BB00ABDA10E0F0C5A4 /* SampleLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B919F5AC728E794E349D4A3 /* SampleLevel.swift */; }; 71C2D64F6C0E6E8694320943 /* MarkerInfoWindowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD61BF07E9A5511F02937FE /* MarkerInfoWindowViewController.swift */; }; + 74CC8A888B60D7F523EBD5D8 /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D10973A4336C45EE56319A9B /* boat@2x.png */; }; 76B15EA60EA7D5B327D47BF3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24E0C7EAB68D8720DCB2CAC0 /* AppDelegate.swift */; }; + 76EF332509404106DF8B51C0 /* aeroplane.png in Resources */ = {isa = PBXBuildFile; fileRef = B26D6D4D0FD65566CA60C29A /* aeroplane.png */; }; 793779D4C5EF17E64E9A6B88 /* BasicMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5AB6411A9C7E6CEDB98041D /* BasicMapViewController.swift */; }; + 79AB9A99F184984ACF263341 /* x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6041A5D425D71CDF9418ABE /* x29@2x.png */; }; 7A2ADB0D632A94D7D60F67A7 /* VisibleRegionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B644212DDBA2509AD4CF5A /* VisibleRegionViewController.swift */; }; 7C4EF58C8DA531E5FC32D9DD /* GeocoderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D1BEF5B3B6C6A990EA98C5 /* GeocoderViewController.swift */; }; + 7CC8ECD0094A41ABEDFAF145 /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = A29805B04CA5A5071F63E40F /* arrow.png */; }; + 7DDD2AAE263658E8D8827F55 /* museum-exhibits.json in Resources */ = {isa = PBXBuildFile; fileRef = AFCF3BFD151B8E93B8704001 /* museum-exhibits.json */; }; + 7F5F3469817C2C30D66D6C0F /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = F17F1884FB9429A59D92A98A /* glow-marker.png */; }; + 83592B3CF56B80A690F49EAB /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C37B898C1EEE5364AEE5EDAA /* newark_nj_1922.jpg */; }; 8679E8541C17881309FB5F11 /* MapsDemoAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1DE0C90254383DA8C437CD0A /* MapsDemoAssets.xcassets */; }; - 88135F34106D3360A5820F96 /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = 2D48B3FFC6D573CF2673D451 /* popup_santa.png */; }; - 91D8C803DEDB4A701699AF8D /* glow-marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0A676DB2BE6F08848CCC5F44 /* glow-marker@2x.png */; }; - 93DF8E1D616607C73D24D731 /* step5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8DCC6728BCC97657B2285199 /* step5@2x.png */; }; + 87710C46AFF873B391259D34 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 0EDDB89D7FC679C6141D5F7F /* argentina-large.png */; }; + 89361183BB2BF64F4847DA32 /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = 822521FD132C2E44D03EE0E8 /* argentina.png */; }; + 8CAB00DE9E5AFE66057884A4 /* botswana-large.png in Resources */ = {isa = PBXBuildFile; fileRef = F531ABFE1A21DA26444A02BC /* botswana-large.png */; }; + 95CF5E70DD685CF5930FED3F /* libPods-GoogleMapsSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2711077F7697311AFA5589AB /* libPods-GoogleMapsSwiftDemos.a */; }; 97DD9977EC5047161D0F7A40 /* GroundOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 922B67562D8E4B0D00C7B4BB /* GroundOverlayViewController.swift */; }; 9B820E7BA576743B85114CB7 /* GestureControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE84B21AF0FE670AF73B8015 /* GestureControlViewController.swift */; }; 9DDFC10B53970CA1F0007AF5 /* MarkersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ED4F2473A7C9EB8BA05986B /* MarkersViewController.swift */; }; - A1F2BF43DACC00B6B26249F8 /* mapstyle-night.json in Resources */ = {isa = PBXBuildFile; fileRef = 5DE971B436125DBE256A5FA5 /* mapstyle-night.json */; }; - A412E68F580DA7D80E303215 /* track.json in Resources */ = {isa = PBXBuildFile; fileRef = 3B0F56EA0940A859776C9DD3 /* track.json */; }; - A4FC0324F71E06035CB2BE88 /* popup_santa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F8CE19F8126C25D885E758AC /* popup_santa@2x.png */; }; + 9EEBDD6E954245BECFE1A844 /* glow-marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0A676DB2BE6F08848CCC5F44 /* glow-marker@2x.png */; }; + A0AC487449D7BD7250FBA7DA /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = 17C7DF8FF79FD6CE7012853F /* step4.png */; }; A558875AEB68DDE9D1A63798 /* GradientPolylinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C6A03E42A9983A4FB4A7E3 /* GradientPolylinesViewController.swift */; }; - A586B9513453238497AB855A /* step4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8BE2B2F064E5D2B955799B90 /* step4@2x.png */; }; + A62C740EE7A8A20607A0A799 /* step6.png in Resources */ = {isa = PBXBuildFile; fileRef = 4864D7EE574742D69D0917F3 /* step6.png */; }; + A6415EC52F1637738AF76275 /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 71F546CBD85FE306F988C2F0 /* australia.png */; }; + A90D3BB2D6E8DA6D7DA2F0C4 /* step8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E604082110AE5DB05E1B7C5 /* step8@2x.png */; }; + A959F073B59395796269568F /* track.json in Resources */ = {isa = PBXBuildFile; fileRef = 3B0F56EA0940A859776C9DD3 /* track.json */; }; + AB2B4983DC5235992C391E5F /* aeroplane@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EAC16DE0E8CC752D17EB04A /* aeroplane@2x.png */; }; + AB633C7D2262239EFA76E78F /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 713A9415F77D646F9547193B /* bulgaria.png */; }; ABF592027F3E684817715EDD /* PolylinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 784B90031ED0D2E68FA9EF93 /* PolylinesViewController.swift */; }; - AC10E7A466233271826AB625 /* spitfire@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 522113F4629950AB8239E18A /* spitfire@2x.png */; }; + AC73B3A4F663CCE854336667 /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = C5014E3BCF7EBF869B9F9BC7 /* step2.png */; }; AF7238FE8B018260C51578B6 /* StyledMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA1DB5D699D162AC375E1C9 /* StyledMapViewController.swift */; }; - B3F740B819DBAA1F4E651157 /* h1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4429DACE39F5B3E2E31B963D /* h1@2x.png */; }; - B6565F6882481535DAB5C86A /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A5B8956E7E8B6AF430CC416 /* voyager.png */; }; - B69D158DC43E0889B5BF1561 /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = F17F1884FB9429A59D92A98A /* glow-marker.png */; }; - B7345D33E5BF31A00280355C /* step1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DF1488DDE60393FF03CF8A87 /* step1@2x.png */; }; - B9465AA9D8B047C4FF6EFF98 /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = 02A9E40F7B9F8AFC4EF0BB41 /* step1.png */; }; + B054386EB91A07A013AD8483 /* voyager@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FB44254CA7D0DECE9C14158D /* voyager@2x.png */; }; + B88B31E997F5CBA4A544506D /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = F838C1A5E413CE8D5CC1CA85 /* botswana.png */; }; B9A86B6A12CD89751A59B283 /* PolygonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C54F70F6C6426F576247C16F /* PolygonsViewController.swift */; }; BC338ACA3F71AD2AB5BB55E6 /* TrafficMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4091BA2074B3B691B1AAD79F /* TrafficMapViewController.swift */; }; BE232DD5D3AE0A5D14DA43F4 /* CustomMarkersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B8C82F193D6253A379BF3FD /* CustomMarkersViewController.swift */; }; - C29CA0E15834811100992B2E /* x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6041A5D425D71CDF9418ABE /* x29@2x.png */; }; - C7EBC2EA4F8DE36B09BCB5C9 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 0EDDB89D7FC679C6141D5F7F /* argentina-large.png */; }; + C402A1A737681E62B02D7353 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = 30CF698467FA9E7F200017B3 /* mapstyle-silver.json */; }; + C495CD99965510597C43280D /* step6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 582E8D45A41BDDC81EA48DD7 /* step6@2x.png */; }; + C69776CD24AC4E24111542CF /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = 02A9E40F7B9F8AFC4EF0BB41 /* step1.png */; }; + C8BABAA83956AFADC871C42A /* arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 221F6743F6F3DB331816D7D3 /* arrow@2x.png */; }; + C96C3729523E8F0C1797F368 /* step3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B055CD3729E64D455BC5B034 /* step3@2x.png */; }; C997DD044658258CF28058BB /* AnimatedCurrentLocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2566CE33406BE9F4AE26CFC0 /* AnimatedCurrentLocationViewController.swift */; }; - CA20AF965D945AFC7DA5FB88 /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 71F546CBD85FE306F988C2F0 /* australia.png */; }; - CBCC9C39BE2C3870BF2F29A8 /* australia-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2C8E6590B2109C88BF5DF3BF /* australia-large@2x.png */; }; - CC516093DCE57637E995CD6C /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = A29805B04CA5A5071F63E40F /* arrow.png */; }; CE0349DCBBE305F2A475E6ED /* MapLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEB41AE386954E4085FAA85 /* MapLayerViewController.swift */; }; - D3E1235A287B63F1C8326B39 /* step3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B055CD3729E64D455BC5B034 /* step3@2x.png */; }; - D581AE7D87DF1D47CFB93CFA /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = F838C1A5E413CE8D5CC1CA85 /* botswana.png */; }; + D572786AC2A5D2604D3A6D6A /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = 2D48B3FFC6D573CF2673D451 /* popup_santa.png */; }; DC204BFAEB6DCDA7F7610536 /* GMSMapStyle+Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A9A391184A7EAD7C072E62 /* GMSMapStyle+Bundle.swift */; }; - DEA4846A15B8330203AB1573 /* step6.png in Resources */ = {isa = PBXBuildFile; fileRef = 4864D7EE574742D69D0917F3 /* step6.png */; }; DFBE1D0F69ADD7B44416635D /* MapTypesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB2B29C49F7B36D477192D04 /* MapTypesViewController.swift */; }; E31E402B435CE656EAF45BD6 /* CustomIndoorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B08A9836FC58ADF5E6C36DC /* CustomIndoorViewController.swift */; }; E3D9CA39859BD1CDB3863347 /* FitBoundsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBE707A4130CDA88BBCC2DD4 /* FitBoundsViewController.swift */; }; + E899CA016F483DAF0998CF6B /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */; }; + E9EC783AAF928C3E9F018D40 /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = EFD1B4A1869A5ED24977724F /* step8.png */; }; + EB0B47F55DF32D621F82E2A2 /* popup_santa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F8CE19F8126C25D885E758AC /* popup_santa@2x.png */; }; EFF3F2E5F34BAB29EBE27D38 /* MyLocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A7916340031F78D38C594C4 /* MyLocationViewController.swift */; }; - F0AC2AA4D171EC887FE1532C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5CFB2179FECC8DF98666E98A /* LaunchScreen.storyboard */; }; + F01FD385320558ECB216B283 /* mapstyle-night.json in Resources */ = {isa = PBXBuildFile; fileRef = 5DE971B436125DBE256A5FA5 /* mapstyle-night.json */; }; + F130EF52E476BA055B0033E3 /* x29.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E8E2784C6B7A0900490D68D /* x29.png */; }; + F16D005A217E5D29AC2E4864 /* walking_dot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F01FCE4EF643D64454E2485B /* walking_dot@2x.png */; }; + F1760A27E3A7271AA32C7541 /* step2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AD1D1A994D7ECBF890F0034A /* step2@2x.png */; }; F1AECCBACB7BC8DDB3DB2887 /* IndoorMuseumNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E4201AB786148B34D7190E /* IndoorMuseumNavigationViewController.swift */; }; F1E12C97E57BD8D71DA70360 /* TileLayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962C5BE26208B06737B4653C /* TileLayerViewController.swift */; }; - F269AECF0CD0F37AAD2D09CD /* step8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E604082110AE5DB05E1B7C5 /* step8@2x.png */; }; - F37349A51F746D3C2D991773 /* australia-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 73E9911385541153DF35EE99 /* australia-large.png */; }; + F340872247BF1F9A6C5CF185 /* step5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8DCC6728BCC97657B2285199 /* step5@2x.png */; }; F49EEF61AEC832CE859F6B37 /* AnimatedUIViewMarkerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49E9C05F3A051F688CF7F4BF /* AnimatedUIViewMarkerViewController.swift */; }; - FE3B7D57BDD934A0FF2E3405 /* x29.png in Resources */ = {isa = PBXBuildFile; fileRef = 6E8E2784C6B7A0900490D68D /* x29.png */; }; - FF9199E04763094C5992E3BA /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = 822521FD132C2E44D03EE0E8 /* argentina.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -120,6 +122,7 @@ 24E0C7EAB68D8720DCB2CAC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 24E559AA1425536C6D0ACF0D /* step5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step5.png; sourceTree = ""; }; 2566CE33406BE9F4AE26CFC0 /* AnimatedCurrentLocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatedCurrentLocationViewController.swift; sourceTree = ""; }; + 2711077F7697311AFA5589AB /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 27D56F2A707892084368A7E2 /* bulgaria-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bulgaria-large.png"; sourceTree = ""; }; 2A5B8956E7E8B6AF430CC416 /* voyager.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voyager.png; sourceTree = ""; }; 2C8E6590B2109C88BF5DF3BF /* australia-large@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "australia-large@2x.png"; sourceTree = ""; }; @@ -163,13 +166,12 @@ 8E604082110AE5DB05E1B7C5 /* step8@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step8@2x.png"; sourceTree = ""; }; 922338CA529F228A03DE6422 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 922B67562D8E4B0D00C7B4BB /* GroundOverlayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroundOverlayViewController.swift; sourceTree = ""; }; - 9334E54EFF0349CC4CEBB633 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos.default.xcconfig"; sourceTree = ""; }; 962C5BE26208B06737B4653C /* TileLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileLayerViewController.swift; sourceTree = ""; }; 996FCE46D4BD31A4E02C2473 /* h1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = h1.png; sourceTree = ""; }; 9DEB41AE386954E4085FAA85 /* MapLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLayerViewController.swift; sourceTree = ""; }; + A14E794B17D957FCB1A20246 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsSwiftDemos/Pods-GoogleMapsSwiftDemos.default.xcconfig"; sourceTree = ""; }; A29805B04CA5A5071F63E40F /* arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow.png; sourceTree = ""; }; A6181B3AED573910BA0F2D6B /* PaddingBehaviorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaddingBehaviorViewController.swift; sourceTree = ""; }; - AA28C25BC5FDEC28E429D90D /* libPods-GoogleMapsSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ABD5CD72476857CF2A348366 /* MarkerLayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerLayerViewController.swift; sourceTree = ""; }; AD1D1A994D7ECBF890F0034A /* step2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step2@2x.png"; sourceTree = ""; }; AFCF3BFD151B8E93B8704001 /* museum-exhibits.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "museum-exhibits.json"; sourceTree = ""; }; @@ -191,11 +193,13 @@ DE91B8EA42AFFCEDA758CE06 /* SDKConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKConstants.swift; sourceTree = ""; }; DF1488DDE60393FF03CF8A87 /* step1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step1@2x.png"; sourceTree = ""; }; E18764F42392A93B39C775AB /* SampleMapStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleMapStyle.swift; sourceTree = ""; }; + E5A1683F9E8A794DD56CB304 /* walking_dot@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "walking_dot@3x.png"; sourceTree = ""; }; E5AB6411A9C7E6CEDB98041D /* BasicMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicMapViewController.swift; sourceTree = ""; }; E8E67F17F84C0169D05D684B /* step3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step3.png; sourceTree = ""; }; EB1DB9C65356269FB0E9805F /* boat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boat.png; sourceTree = ""; }; ED3D93ABBF24BFEF78629B0D /* step7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step7.png; sourceTree = ""; }; EFD1B4A1869A5ED24977724F /* step8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step8.png; sourceTree = ""; }; + F01FCE4EF643D64454E2485B /* walking_dot@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "walking_dot@2x.png"; sourceTree = ""; }; F17F1884FB9429A59D92A98A /* glow-marker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "glow-marker.png"; sourceTree = ""; }; F531ABFE1A21DA26444A02BC /* botswana-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "botswana-large.png"; sourceTree = ""; }; F838C1A5E413CE8D5CC1CA85 /* botswana.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = botswana.png; sourceTree = ""; }; @@ -212,76 +216,26 @@ buildActionMask = 2147483647; files = ( 4EA38ACBC98F34B1F0AF5BDD /* UIKit.framework in Frameworks */, - 26D1A664AD19C1BAD7551777 /* libPods-GoogleMapsSwiftDemos.a in Frameworks */, + 95CF5E70DD685CF5930FED3F /* libPods-GoogleMapsSwiftDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 276F12798307D9B2AED683F5 /* Pods */ = { + 26F592F5BB1E8A4BF41291D6 /* Pods */ = { isa = PBXGroup; children = ( - 9334E54EFF0349CC4CEBB633 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */, + A14E794B17D957FCB1A20246 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */, ); name = Pods; path = Pods; sourceTree = ""; }; - 395189041FA097C5575D97CF /* Resources */ = { - isa = PBXGroup; - children = ( - 88CAE0CB38154A5CDE0ABF87 /* Museum-Icons */, - 5CFB2179FECC8DF98666E98A /* LaunchScreen.storyboard */, - B26D6D4D0FD65566CA60C29A /* aeroplane.png */, - 1EAC16DE0E8CC752D17EB04A /* aeroplane@2x.png */, - 0EDDB89D7FC679C6141D5F7F /* argentina-large.png */, - 822521FD132C2E44D03EE0E8 /* argentina.png */, - A29805B04CA5A5071F63E40F /* arrow.png */, - 221F6743F6F3DB331816D7D3 /* arrow@2x.png */, - 73E9911385541153DF35EE99 /* australia-large.png */, - 2C8E6590B2109C88BF5DF3BF /* australia-large@2x.png */, - 71F546CBD85FE306F988C2F0 /* australia.png */, - EB1DB9C65356269FB0E9805F /* boat.png */, - D10973A4336C45EE56319A9B /* boat@2x.png */, - F531ABFE1A21DA26444A02BC /* botswana-large.png */, - F838C1A5E413CE8D5CC1CA85 /* botswana.png */, - 27D56F2A707892084368A7E2 /* bulgaria-large.png */, - 713A9415F77D646F9547193B /* bulgaria.png */, - F17F1884FB9429A59D92A98A /* glow-marker.png */, - 0A676DB2BE6F08848CCC5F44 /* glow-marker@2x.png */, - 5DE971B436125DBE256A5FA5 /* mapstyle-night.json */, - 8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */, - 30CF698467FA9E7F200017B3 /* mapstyle-silver.json */, - AFCF3BFD151B8E93B8704001 /* museum-exhibits.json */, - C37B898C1EEE5364AEE5EDAA /* newark_nj_1922.jpg */, - 2D48B3FFC6D573CF2673D451 /* popup_santa.png */, - F8CE19F8126C25D885E758AC /* popup_santa@2x.png */, - 02A9E40F7B9F8AFC4EF0BB41 /* step1.png */, - DF1488DDE60393FF03CF8A87 /* step1@2x.png */, - C5014E3BCF7EBF869B9F9BC7 /* step2.png */, - AD1D1A994D7ECBF890F0034A /* step2@2x.png */, - E8E67F17F84C0169D05D684B /* step3.png */, - B055CD3729E64D455BC5B034 /* step3@2x.png */, - 17C7DF8FF79FD6CE7012853F /* step4.png */, - 8BE2B2F064E5D2B955799B90 /* step4@2x.png */, - 24E559AA1425536C6D0ACF0D /* step5.png */, - 8DCC6728BCC97657B2285199 /* step5@2x.png */, - 4864D7EE574742D69D0917F3 /* step6.png */, - 582E8D45A41BDDC81EA48DD7 /* step6@2x.png */, - ED3D93ABBF24BFEF78629B0D /* step7.png */, - C96B86B64A6F458F79250076 /* step7@2x.png */, - EFD1B4A1869A5ED24977724F /* step8.png */, - 8E604082110AE5DB05E1B7C5 /* step8@2x.png */, - 3B0F56EA0940A859776C9DD3 /* track.json */, - ); - path = Resources; - sourceTree = ""; - }; 77BA0496CE92FC06E4C6A5D5 /* GoogleMapsSwiftDemos */ = { isa = PBXGroup; children = ( - 395189041FA097C5575D97CF /* Resources */, + E8E5C8B67F417779B6FF93C4 /* Resources */, EFA8BDBE867496134E5B35DD /* Swift */, 1DE0C90254383DA8C437CD0A /* MapsDemoAssets.xcassets */, ); @@ -353,7 +307,7 @@ isa = PBXGroup; children = ( 922338CA529F228A03DE6422 /* UIKit.framework */, - AA28C25BC5FDEC28E429D90D /* libPods-GoogleMapsSwiftDemos.a */, + 2711077F7697311AFA5589AB /* libPods-GoogleMapsSwiftDemos.a */, ); name = Frameworks; sourceTree = ""; @@ -372,7 +326,7 @@ D0ED9A279E12177F7FDFA2FF /* Source */, AC723F443153D968479E59F3 /* Frameworks */, DD0B6FB690051F4443F4132B /* Products */, - 276F12798307D9B2AED683F5 /* Pods */, + 26F592F5BB1E8A4BF41291D6 /* Pods */, ); sourceTree = ""; }; @@ -384,6 +338,58 @@ name = Products; sourceTree = ""; }; + E8E5C8B67F417779B6FF93C4 /* Resources */ = { + isa = PBXGroup; + children = ( + 88CAE0CB38154A5CDE0ABF87 /* Museum-Icons */, + 5CFB2179FECC8DF98666E98A /* LaunchScreen.storyboard */, + B26D6D4D0FD65566CA60C29A /* aeroplane.png */, + 1EAC16DE0E8CC752D17EB04A /* aeroplane@2x.png */, + 0EDDB89D7FC679C6141D5F7F /* argentina-large.png */, + 822521FD132C2E44D03EE0E8 /* argentina.png */, + A29805B04CA5A5071F63E40F /* arrow.png */, + 221F6743F6F3DB331816D7D3 /* arrow@2x.png */, + 73E9911385541153DF35EE99 /* australia-large.png */, + 2C8E6590B2109C88BF5DF3BF /* australia-large@2x.png */, + 71F546CBD85FE306F988C2F0 /* australia.png */, + EB1DB9C65356269FB0E9805F /* boat.png */, + D10973A4336C45EE56319A9B /* boat@2x.png */, + F531ABFE1A21DA26444A02BC /* botswana-large.png */, + F838C1A5E413CE8D5CC1CA85 /* botswana.png */, + 27D56F2A707892084368A7E2 /* bulgaria-large.png */, + 713A9415F77D646F9547193B /* bulgaria.png */, + F17F1884FB9429A59D92A98A /* glow-marker.png */, + 0A676DB2BE6F08848CCC5F44 /* glow-marker@2x.png */, + 5DE971B436125DBE256A5FA5 /* mapstyle-night.json */, + 8E0F7227CD83A68A40D74050 /* mapstyle-retro.json */, + 30CF698467FA9E7F200017B3 /* mapstyle-silver.json */, + AFCF3BFD151B8E93B8704001 /* museum-exhibits.json */, + C37B898C1EEE5364AEE5EDAA /* newark_nj_1922.jpg */, + 2D48B3FFC6D573CF2673D451 /* popup_santa.png */, + F8CE19F8126C25D885E758AC /* popup_santa@2x.png */, + 02A9E40F7B9F8AFC4EF0BB41 /* step1.png */, + DF1488DDE60393FF03CF8A87 /* step1@2x.png */, + C5014E3BCF7EBF869B9F9BC7 /* step2.png */, + AD1D1A994D7ECBF890F0034A /* step2@2x.png */, + E8E67F17F84C0169D05D684B /* step3.png */, + B055CD3729E64D455BC5B034 /* step3@2x.png */, + 17C7DF8FF79FD6CE7012853F /* step4.png */, + 8BE2B2F064E5D2B955799B90 /* step4@2x.png */, + 24E559AA1425536C6D0ACF0D /* step5.png */, + 8DCC6728BCC97657B2285199 /* step5@2x.png */, + 4864D7EE574742D69D0917F3 /* step6.png */, + 582E8D45A41BDDC81EA48DD7 /* step6@2x.png */, + ED3D93ABBF24BFEF78629B0D /* step7.png */, + C96B86B64A6F458F79250076 /* step7@2x.png */, + EFD1B4A1869A5ED24977724F /* step8.png */, + 8E604082110AE5DB05E1B7C5 /* step8@2x.png */, + 3B0F56EA0940A859776C9DD3 /* track.json */, + F01FCE4EF643D64454E2485B /* walking_dot@2x.png */, + E5A1683F9E8A794DD56CB304 /* walking_dot@3x.png */, + ); + path = Resources; + sourceTree = ""; + }; EFA8BDBE867496134E5B35DD /* Swift */ = { isa = PBXGroup; children = ( @@ -403,11 +409,11 @@ isa = PBXNativeTarget; buildConfigurationList = 65556A7591C40D0E8B77989F /* Build configuration list for PBXNativeTarget "GoogleMapsSwiftDemos" */; buildPhases = ( - 22432B23D4628E20F9594F88 /* [CP] Check Pods Manifest.lock */, + 18657CB41BE1D0277DAE69F0 /* [CP] Check Pods Manifest.lock */, 2ADDADBB329E244AF7ED1FB2 /* Resources */, 22EB17F407E92B9B4F3B601A /* Sources */, B4530C282FE2BDE3D1071779 /* Frameworks */, - C42A22FD9FFB7260C790CB73 /* [CP] Copy Pods Resources */, + 452C9DB61EF3CC1CE3565586 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -448,56 +454,58 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6FEFF5E13C84596B02FC5CEC /* step5.png in Resources */, - B7345D33E5BF31A00280355C /* step1@2x.png in Resources */, - 07C43705738284E4921A680D /* step4.png in Resources */, - FF9199E04763094C5992E3BA /* argentina.png in Resources */, - 2E3A841E83BC75E113066610 /* boat.png in Resources */, - 58C1F1AFB8E52C5A7D70FD54 /* aeroplane@2x.png in Resources */, - DEA4846A15B8330203AB1573 /* step6.png in Resources */, - 41B7BD6313F16FFB24A404B2 /* step7.png in Resources */, - 11BF5BA8105198E326CF4F96 /* aeroplane.png in Resources */, - 51B06A8BE3A738B98EC2B2B3 /* botswana-large.png in Resources */, - 4773BB1B2EBD65AEC32F9E7C /* step3.png in Resources */, - 293B8794611FD45B631FE20C /* step2.png in Resources */, - A4FC0324F71E06035CB2BE88 /* popup_santa@2x.png in Resources */, - B69D158DC43E0889B5BF1561 /* glow-marker.png in Resources */, - B9465AA9D8B047C4FF6EFF98 /* step1.png in Resources */, - D3E1235A287B63F1C8326B39 /* step3@2x.png in Resources */, - CA20AF965D945AFC7DA5FB88 /* australia.png in Resources */, - 4D932F94F684532C309EB4BF /* step7@2x.png in Resources */, - 20F35834239A135EC77A752C /* arrow@2x.png in Resources */, - 91D8C803DEDB4A701699AF8D /* glow-marker@2x.png in Resources */, - 93DF8E1D616607C73D24D731 /* step5@2x.png in Resources */, - CBCC9C39BE2C3870BF2F29A8 /* australia-large@2x.png in Resources */, - CC516093DCE57637E995CD6C /* arrow.png in Resources */, - 05CF5A358A5758D0A61027A5 /* boat@2x.png in Resources */, - C29CA0E15834811100992B2E /* x29@2x.png in Resources */, - 2D218EA1029C3FB7A528179F /* spitfire.png in Resources */, - B3F740B819DBAA1F4E651157 /* h1@2x.png in Resources */, - AC10E7A466233271826AB625 /* spitfire@2x.png in Resources */, - 1E769ACDBCCB6DB84D5E3E8E /* h1.png in Resources */, - B6565F6882481535DAB5C86A /* voyager.png in Resources */, - FE3B7D57BDD934A0FF2E3405 /* x29.png in Resources */, - 0AA49E1F095C6DD67BBDC556 /* voyager@2x.png in Resources */, - 6305177FAABE60AC55BDC3E4 /* bulgaria.png in Resources */, - 04E60E4743F55E6BFC17B7B3 /* bulgaria-large.png in Resources */, - C7EBC2EA4F8DE36B09BCB5C9 /* argentina-large.png in Resources */, - 26B8792B58E56800CA3D60ED /* step2@2x.png in Resources */, - 88135F34106D3360A5820F96 /* popup_santa.png in Resources */, - 02DF0DD4C3D8B5849C510C23 /* step6@2x.png in Resources */, - F269AECF0CD0F37AAD2D09CD /* step8@2x.png in Resources */, - 3D3F2A8EA739004B1489A792 /* step8.png in Resources */, - F37349A51F746D3C2D991773 /* australia-large.png in Resources */, - D581AE7D87DF1D47CFB93CFA /* botswana.png in Resources */, - A586B9513453238497AB855A /* step4@2x.png in Resources */, - 21AFA9E1157E41E761EDC099 /* newark_nj_1922.jpg in Resources */, - A1F2BF43DACC00B6B26249F8 /* mapstyle-night.json in Resources */, - 4A9E3BF5489DCA1C7A200A64 /* mapstyle-retro.json in Resources */, - 4F01A0839D992FC9F724CD85 /* mapstyle-silver.json in Resources */, - A412E68F580DA7D80E303215 /* track.json in Resources */, - 362C49E4DB90848A82AA5F1B /* museum-exhibits.json in Resources */, - F0AC2AA4D171EC887FE1532C /* LaunchScreen.storyboard in Resources */, + 525B19587DF2BA603DD472C9 /* step5.png in Resources */, + 2A69E725A8A436D1FE30D365 /* step1@2x.png in Resources */, + A0AC487449D7BD7250FBA7DA /* step4.png in Resources */, + 89361183BB2BF64F4847DA32 /* argentina.png in Resources */, + 1B39088D7EB09E978E72279D /* boat.png in Resources */, + AB2B4983DC5235992C391E5F /* aeroplane@2x.png in Resources */, + A62C740EE7A8A20607A0A799 /* step6.png in Resources */, + 1992E0A75E17B67F793BD23D /* step7.png in Resources */, + 186CEB356232AB601905652D /* walking_dot@3x.png in Resources */, + 76EF332509404106DF8B51C0 /* aeroplane.png in Resources */, + 8CAB00DE9E5AFE66057884A4 /* botswana-large.png in Resources */, + 700503499290D1BA158896D5 /* step3.png in Resources */, + F16D005A217E5D29AC2E4864 /* walking_dot@2x.png in Resources */, + AC73B3A4F663CCE854336667 /* step2.png in Resources */, + EB0B47F55DF32D621F82E2A2 /* popup_santa@2x.png in Resources */, + 7F5F3469817C2C30D66D6C0F /* glow-marker.png in Resources */, + C69776CD24AC4E24111542CF /* step1.png in Resources */, + C96C3729523E8F0C1797F368 /* step3@2x.png in Resources */, + A6415EC52F1637738AF76275 /* australia.png in Resources */, + 30E07F2A223F6824F6C5B2DA /* step7@2x.png in Resources */, + C8BABAA83956AFADC871C42A /* arrow@2x.png in Resources */, + 9EEBDD6E954245BECFE1A844 /* glow-marker@2x.png in Resources */, + F340872247BF1F9A6C5CF185 /* step5@2x.png in Resources */, + 18614BFA1E8E949451055BF5 /* australia-large@2x.png in Resources */, + 7CC8ECD0094A41ABEDFAF145 /* arrow.png in Resources */, + 74CC8A888B60D7F523EBD5D8 /* boat@2x.png in Resources */, + 79AB9A99F184984ACF263341 /* x29@2x.png in Resources */, + 5C48E4C909FCCB216EAF6243 /* spitfire.png in Resources */, + 2D3CE54E021F114114487E4A /* h1@2x.png in Resources */, + 0FCEA246EF4C79E06C2CED0A /* spitfire@2x.png in Resources */, + 41B68AA4334D049FEC4D3638 /* h1.png in Resources */, + 249D71CEF0C256EC8839B65F /* voyager.png in Resources */, + F130EF52E476BA055B0033E3 /* x29.png in Resources */, + B054386EB91A07A013AD8483 /* voyager@2x.png in Resources */, + AB633C7D2262239EFA76E78F /* bulgaria.png in Resources */, + 5A2C977BA3CD8B0733AD1F2F /* bulgaria-large.png in Resources */, + 87710C46AFF873B391259D34 /* argentina-large.png in Resources */, + F1760A27E3A7271AA32C7541 /* step2@2x.png in Resources */, + D572786AC2A5D2604D3A6D6A /* popup_santa.png in Resources */, + C495CD99965510597C43280D /* step6@2x.png in Resources */, + A90D3BB2D6E8DA6D7DA2F0C4 /* step8@2x.png in Resources */, + E9EC783AAF928C3E9F018D40 /* step8.png in Resources */, + 3CFDA60C57476C3CE3D30B1F /* australia-large.png in Resources */, + B88B31E997F5CBA4A544506D /* botswana.png in Resources */, + 11203A6B8B88B28751C5BA93 /* step4@2x.png in Resources */, + 83592B3CF56B80A690F49EAB /* newark_nj_1922.jpg in Resources */, + F01FD385320558ECB216B283 /* mapstyle-night.json in Resources */, + E899CA016F483DAF0998CF6B /* mapstyle-retro.json in Resources */, + C402A1A737681E62B02D7353 /* mapstyle-silver.json in Resources */, + A959F073B59395796269568F /* track.json in Resources */, + 7DDD2AAE263658E8D8827F55 /* museum-exhibits.json in Resources */, + 04AD2721C937D569090BA338 /* LaunchScreen.storyboard in Resources */, 8679E8541C17881309FB5F11 /* MapsDemoAssets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -505,7 +513,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 22432B23D4628E20F9594F88 /* [CP] Check Pods Manifest.lock */ = { + 18657CB41BE1D0277DAE69F0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -527,7 +535,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - C42A22FD9FFB7260C790CB73 /* [CP] Copy Pods Resources */ = { + 452C9DB61EF3CC1CE3565586 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -617,14 +625,14 @@ }; 6798450D013ACAFF39CF0187 /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9334E54EFF0349CC4CEBB633 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */; + baseConfigurationReference = A14E794B17D957FCB1A20246 /* Pods-GoogleMapsSwiftDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = ./GoogleMapsSwiftDemos/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., diff --git a/GoogleMaps-Swift/GoogleMapsSwiftDemos/Resources/walking_dot@2x.png b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Resources/walking_dot@2x.png new file mode 100755 index 00000000..95c208cb Binary files /dev/null and b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Resources/walking_dot@2x.png differ diff --git a/GoogleMaps-Swift/GoogleMapsSwiftDemos/Resources/walking_dot@3x.png b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Resources/walking_dot@3x.png new file mode 100755 index 00000000..a6245040 Binary files /dev/null and b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Resources/walking_dot@3x.png differ diff --git a/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SDKConstants.swift b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SDKConstants.swift index e63b8810..95b43cf2 100755 --- a/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SDKConstants.swift +++ b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/SDKConstants.swift @@ -24,4 +24,6 @@ extension CLLocationCoordinate2D { // Victoria, Australia static let victoria = CLLocationCoordinate2D(latitude: -37.81969, longitude: 144.966085) static let newYork = CLLocationCoordinate2D(latitude: 40.761388, longitude: -73.978133) + static let mountainSceneLocation = CLLocationCoordinate2D( + latitude: -33.732022, longitude: 150.312114) } diff --git a/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/Samples/FixedPanoramaViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/Samples/FixedPanoramaViewController.swift index 4167d248..2317dcef 100755 --- a/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/Samples/FixedPanoramaViewController.swift +++ b/GoogleMaps-Swift/GoogleMapsSwiftDemos/Swift/Samples/FixedPanoramaViewController.swift @@ -15,10 +15,9 @@ import GoogleMaps import UIKit class FixedPanoramaViewController: UIViewController { - override func loadView() { let panoramaView = GMSPanoramaView(frame: .zero) - panoramaView.moveNearCoordinate(.newYork) + panoramaView.moveNearCoordinate(.mountainSceneLocation) panoramaView.camera = GMSPanoramaCamera(heading: 180, pitch: -10, zoom: 0) panoramaView.orientationGestures = false panoramaView.navigationGestures = false diff --git a/GoogleMaps-Swift/Podfile b/GoogleMaps-Swift/Podfile index 59069f1e..8f4812b4 100755 --- a/GoogleMaps-Swift/Podfile +++ b/GoogleMaps-Swift/Podfile @@ -1,6 +1,6 @@ source 'https://github.com/CocoaPods/Specs.git' target 'GoogleMapsSwiftDemos' do - platform :ios, '13.0' - pod 'GoogleMaps', '= 7.4.0' + platform :ios, '14.0' + pod 'GoogleMaps', '= 8.0.0' end diff --git a/GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj b/GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj index 34c0be33..cabee1b9 100644 --- a/GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj +++ b/GoogleMaps/GoogleMapsDemos.xcodeproj/project.pbxproj @@ -7,98 +7,100 @@ objects = { /* Begin PBXBuildFile section */ + 0235141F46E7C18CDD801877 /* popup_santa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5E2E2B19EF6846F007A7A909 /* popup_santa@2x.png */; }; + 07ADAD462DA443858CCC3D62 /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B3B4C44092471CA56ACFD4C /* voyager.png */; }; 0B6400E7F31AE43CABFE27A8 /* DoubleMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F8DFCC9D1D1F70D492149D65 /* DoubleMapViewController.m */; }; - 0EEC555F800FEE8497BCF084 /* arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 66DE8D273E896D7FF5B86DC9 /* arrow@2x.png */; }; - 132C53B3FD3703D3BBF50E62 /* step2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F955F74654756E7F7DBD9C1 /* step2@2x.png */; }; - 138233AB6895BE7AA2387050 /* spitfire@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B15768E1EE7E314DF1B0A395 /* spitfire@2x.png */; }; - 13970FC2D7013CA5C00E5AAE /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = 6533FA4161283F8F6A5F2CC3 /* step3.png */; }; - 17C0BD6F820FEECF2CE7E1C7 /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = B7B684AAFC3CA2232721C6D0 /* step8.png */; }; + 1427ABE1715EF434D32B734B /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = A6B80BDCF78F436799462F76 /* argentina.png */; }; + 1644083E4CE060AA5A03AF50 /* mapstyle-night.json in Resources */ = {isa = PBXBuildFile; fileRef = FFEED4DDB04F69C84A1924F1 /* mapstyle-night.json */; }; 1B3176D3A4C8E9B9CB2C2847 /* StampedPolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A3171A5C5E5441DDA8BE9E40 /* StampedPolylinesViewController.m */; }; 1B47A3534FDA95B9195AF9CF /* PolygonsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2ED9C84A592EB6464725BB9C /* PolygonsViewController.m */; }; - 1BE7A8A4782B8A1826594BD3 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = B4C89E62C05816B590F45D57 /* mapstyle-silver.json */; }; - 1CEF3F4702DB008F654D8E7A /* aeroplane@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F716156C215C436D55F5696 /* aeroplane@2x.png */; }; 1E4688E75E502DB5FF5FFFFF /* FrameRateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DB963F858613E50A64CFAE6 /* FrameRateViewController.m */; }; 220C39F471CD6096CEFD2DBD /* MyLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BF0878372A9A7274B74BCBE0 /* MyLocationViewController.m */; }; 2329D94E802AF61BCF5980CF /* GeocoderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A77C64C5A8B8109E6AFC41F /* GeocoderViewController.m */; }; + 24D2F154B8D6EEF676561AC4 /* step6.png in Resources */ = {isa = PBXBuildFile; fileRef = F64D45825D2647898331A1FF /* step6.png */; }; 281CB228E4BBB37DB2158754 /* MarkerEventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9450C49DDD49AF9182779EB /* MarkerEventsViewController.m */; }; + 282AE091FD7A3D76A78E53AA /* botswana-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 440513A7769094565EA82DD2 /* botswana-large.png */; }; 29851A2D3061D70713AC839C /* UIViewController+GMSToastMessages.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DC0E7977DE53BB4C0ACE6 /* UIViewController+GMSToastMessages.m */; }; - 31291E8440EE6B0EA8727463 /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = EF01EFEF0FC77447C02FE86C /* popup_santa.png */; }; - 32CC144A6B022DB1926852B5 /* aeroplane.png in Resources */ = {isa = PBXBuildFile; fileRef = 937B2FC602E80ADC11CF364F /* aeroplane.png */; }; + 2BCF0FFFB7458D84FA26F5E8 /* h1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 16C4B08486C9905568685983 /* h1@2x.png */; }; + 2D2613E2126D7023BC1B6937 /* aeroplane.png in Resources */ = {isa = PBXBuildFile; fileRef = 937B2FC602E80ADC11CF364F /* aeroplane.png */; }; + 32D07BA441B79A04B62E84BE /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = D66EF243066A58A0D10280D4 /* step1.png */; }; + 339B17567473C291BAECC6DD /* step4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 60944672BB9D460BE315ECB8 /* step4@2x.png */; }; + 343DF24DE57790A758EE0759 /* bulgaria-large.png in Resources */ = {isa = PBXBuildFile; fileRef = DA6BF21C0287E5828A770C09 /* bulgaria-large.png */; }; 3456EEAA20A663D3B60BF0EF /* MarkerInfoWindowViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89DFB3350D98DA617A2ECE85 /* MarkerInfoWindowViewController.m */; }; 34794834CD5C7B6CAC3167CD /* CustomIndoorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5563ED82E4E77A76707DAF12 /* CustomIndoorViewController.m */; }; - 3B647C56A107E00BC4815B1D /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 304A2B780A4A9B2D32261355 /* australia.png */; }; - 3DCB19D95A2A16E3CA3C212B /* museum-exhibits.json in Resources */ = {isa = PBXBuildFile; fileRef = 346BE94E21267BA7E00E1B94 /* museum-exhibits.json */; }; + 3556B9FA094E44B7DEED37FF /* popup_santa.png in Resources */ = {isa = PBXBuildFile; fileRef = EF01EFEF0FC77447C02FE86C /* popup_santa.png */; }; + 35A7A09EBCD018105043A95D /* step7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E3C8118FBF6DF1D4996693 /* step7@2x.png */; }; + 3AFA36E93815CFB41B51CA05 /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 03E00AE555F58259DD31C383 /* boat@2x.png */; }; + 3C10FB9CD850A3AFEAE75EC8 /* glow-marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 430314741C873551A75A6748 /* glow-marker@2x.png */; }; + 40CFEBD4DA0D1D903CE27C08 /* step6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C0E7585025B57F969D8C3CCD /* step6@2x.png */; }; 4197B152B2E4390B2BBBE582 /* SampleListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D1C3943A9C5721FCF5F4D901 /* SampleListViewController.m */; }; - 41C136BCC76621603A3D6C41 /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 91BCD28A8D5451665C5B3FDE /* spitfire.png */; }; + 44E01C768CC53CAC01EC8BB2 /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 2BC67BDB51522BC85EBFED8E /* bulgaria.png */; }; 456E667D0D25E81DFAFEADBD /* AnimatedCurrentLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C37F2216D5D94A3F8B698AF2 /* AnimatedCurrentLocationViewController.m */; }; - 500FA4390A29E0ADB39E21FB /* step5.png in Resources */ = {isa = PBXBuildFile; fileRef = B1763EA929EC73C50D294134 /* step5.png */; }; + 49B4EB1729B0F1E3A9B11CE4 /* libPods-GoogleMapsDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13D1B4A6AED6D2267F23F537 /* libPods-GoogleMapsDemos.a */; }; 501E837B49B7D885F3EBE16F /* BasicMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5AD93CD72DE8F5B004A621 /* BasicMapViewController.m */; }; + 51084AAFF7EB0747886EEF52 /* step2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F955F74654756E7F7DBD9C1 /* step2@2x.png */; }; 52E9330C842BD359492ACEA5 /* PolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA4145303F340FC3675AABA5 /* PolylinesViewController.m */; }; - 5653C21AEB869C92653B83A4 /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B0B37F0669CF34418A263F9 /* step7.png */; }; - 57F58315D4A973991A3DBAD5 /* bulgaria.png in Resources */ = {isa = PBXBuildFile; fileRef = 2BC67BDB51522BC85EBFED8E /* bulgaria.png */; }; 59D9F1FE2A4075B9712E7CB2 /* MapsDemoAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B53B4C2097A6AD4A98746495 /* MapsDemoAssets.xcassets */; }; - 66448469DFC43B68E9BE3337 /* libPods-GoogleMapsDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B5ED0982C71E3CDB18BC5299 /* libPods-GoogleMapsDemos.a */; }; + 5F4D5DC61C012898A7B9453C /* step7.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B0B37F0669CF34418A263F9 /* step7.png */; }; + 602F190A3AF8B9BAFA634E45 /* spitfire.png in Resources */ = {isa = PBXBuildFile; fileRef = 91BCD28A8D5451665C5B3FDE /* spitfire.png */; }; + 647A09E15574BDDE55F5BE35 /* spitfire@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B15768E1EE7E314DF1B0A395 /* spitfire@2x.png */; }; + 66CE6DE7DC9D7879C0A53871 /* voyager@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C56541EDCEFDB922783385B5 /* voyager@2x.png */; }; 6AD348D342E913F10F6ECCA0 /* StyledMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3408578DDDF6D8B183D9B91E /* StyledMapViewController.m */; }; - 6C6DF0AAB9B807C20C81DE55 /* bulgaria-large.png in Resources */ = {isa = PBXBuildFile; fileRef = DA6BF21C0287E5828A770C09 /* bulgaria-large.png */; }; - 742226EE8345C56F9CEA4F91 /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 118A0FE8CA1D110B3C694A8D /* mapstyle-retro.json */; }; - 787F22327F1D4EC202A9EAE5 /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2B0884C720D5AE0BDCC1903D /* newark_nj_1922.jpg */; }; - 796FBC17DC9D867374704425 /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 6614BE28012C7A7508437047 /* arrow.png */; }; - 79AF7A74C389B8C21C24C3B3 /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D8E4A10394122CD9C9CD157 /* argentina-large.png */; }; - 79CD6A3123D613E24B9E5983 /* x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD1DD5592D028FDD5E527FDF /* x29@2x.png */; }; + 74C56B92CAF16C8E16B6F199 /* step5.png in Resources */ = {isa = PBXBuildFile; fileRef = B1763EA929EC73C50D294134 /* step5.png */; }; + 762F1EE6511FF41F15253003 /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = BB85B60A794D982F001E5D1D /* step2.png */; }; + 79A3711A31324A8933BC2818 /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = 57D0C4A29B66857C926387F0 /* glow-marker.png */; }; + 7C3BE1C9035C535D0E103D86 /* x29@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD1DD5592D028FDD5E527FDF /* x29@2x.png */; }; 7CCC94E11616DA5545E72B3E /* AnimatedUIViewMarkerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EB950AA302B77F16CF18088 /* AnimatedUIViewMarkerViewController.m */; }; + 7E4619E97C4B21052FA21EF8 /* walking_dot@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D7DAD6B132F3CB649B1EF091 /* walking_dot@3x.png */; }; 7EB0308A1EF8F6ADBD6DEF79 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F4C119D42CF37317FA0DFA9 /* UIKit.framework */; }; - 7EEF5B03C2175CD1DB86E5DC /* boat@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 03E00AE555F58259DD31C383 /* boat@2x.png */; }; 80B2E0765CDEFB62C191FCE7 /* DemoSceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D40C920E07F055501B87FF4B /* DemoSceneDelegate.m */; }; - 81ECE58D29B8027F342FF401 /* voyager.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B3B4C44092471CA56ACFD4C /* voyager.png */; }; 8341C52DCC4E08F94F330D32 /* MapZoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B3D673FA7036FA5D07CB287 /* MapZoomViewController.m */; }; - 84A8BFF7EC2AFE5239DB222E /* step3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A3AE3B168663EA43D3F2F259 /* step3@2x.png */; }; - 851C3F39F91242ABBBBACB3F /* track.json in Resources */ = {isa = PBXBuildFile; fileRef = AD6B1AF49A87CC079E9CA862 /* track.json */; }; - 89C85AA304C7FDE1A446A292 /* glow-marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 430314741C873551A75A6748 /* glow-marker@2x.png */; }; - 8B63BA635C061A8717C43123 /* mapstyle-night.json in Resources */ = {isa = PBXBuildFile; fileRef = FFEED4DDB04F69C84A1924F1 /* mapstyle-night.json */; }; 8E09643452E1A4859A13F4F1 /* MarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D4CFDA7D44E2CF33EB10072B /* MarkersViewController.m */; }; + 904BA5FA65C93B1BE1AD37BB /* mapstyle-retro.json in Resources */ = {isa = PBXBuildFile; fileRef = 118A0FE8CA1D110B3C694A8D /* mapstyle-retro.json */; }; 923880C43B9DEE1EFD7D230F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 21267D205F7EC280F26D97ED /* main.m */; }; 92679F9EBB1FEF1EE105E353 /* TrafficMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611E9F57BD5274878732C0BE /* TrafficMapViewController.m */; }; - 9A48AFB4E51FCDD215B5044C /* x29.png in Resources */ = {isa = PBXBuildFile; fileRef = 77E4A5AC4E17EB252D617792 /* x29.png */; }; + 94C9DA520E82634C859552E9 /* arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 66DE8D273E896D7FF5B86DC9 /* arrow@2x.png */; }; + 98E89233F3156E167E2025AF /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C186E84CB691DD6239C5E57 /* botswana.png */; }; + 9965C8A5D2A9946E09162EA4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DBB8C9AD891A00824AE32343 /* LaunchScreen.storyboard */; }; + 9D5BB62964864FF1E0F16B48 /* track.json in Resources */ = {isa = PBXBuildFile; fileRef = AD6B1AF49A87CC079E9CA862 /* track.json */; }; 9D688B947F1C938893B92EDD /* MapLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E7BBD64FA078FC4259FCBD2 /* MapLayerViewController.m */; }; - A330C5C1305B6AFDE8549C54 /* botswana-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 440513A7769094565EA82DD2 /* botswana-large.png */; }; - A4A326C09602C12DE4851136 /* step1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C6A156792608F06437E5931 /* step1@2x.png */; }; - A7729B5E46B7F73B703649AE /* h1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 16C4B08486C9905568685983 /* h1@2x.png */; }; + 9E024CE9C0BE6ECEF5269E95 /* mapstyle-silver.json in Resources */ = {isa = PBXBuildFile; fileRef = B4C89E62C05816B590F45D57 /* mapstyle-silver.json */; }; + A478CD1E25FC58893FD313F1 /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = 99C6A64731FB5249BA53255D /* step4.png */; }; A9CDA3862243CE449C79CE39 /* PanoramaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9ECA1CA359738BB8B17657F /* PanoramaViewController.m */; }; - AB52000C1C24D163BE4A67B3 /* step4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 60944672BB9D460BE315ECB8 /* step4@2x.png */; }; - ABE214D988BB427F2881A8BC /* step2.png in Resources */ = {isa = PBXBuildFile; fileRef = BB85B60A794D982F001E5D1D /* step2.png */; }; + AB67737420DB860DC7689DBD /* australia-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A1D521E4FF1F8F85E084ED60 /* australia-large@2x.png */; }; ACEDBFBF671E55BE4E10F7E6 /* Samples.m in Sources */ = {isa = PBXBuildFile; fileRef = 115963CCE082409262D179F3 /* Samples.m */; }; AD515D1D593A2141499A01BE /* MapTypesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F371BFD608DCF4DA1671DB03 /* MapTypesViewController.m */; }; + AD8FF7F0EB9A68D47BBE8BF8 /* walking_dot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 238D6E812A5DFB75302344D2 /* walking_dot@2x.png */; }; B017677EAFEB65C012D48EB6 /* GestureControlViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CE23C2A26FD3C29E6AEEA7 /* GestureControlViewController.m */; }; - B04B69D9F2DB76AC803A637A /* voyager@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C56541EDCEFDB922783385B5 /* voyager@2x.png */; }; - B10925DA2A2A723A398910C4 /* step6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C0E7585025B57F969D8C3CCD /* step6@2x.png */; }; B2B799F6704A2FEFE0D9C9A6 /* CameraViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A36E26A0818D4F0DF21051 /* CameraViewController.m */; }; B2F17E89F79ECFAB73A3199A /* DemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C7AD415580B4A6B35532456A /* DemoAppDelegate.m */; }; - B5A196301B3B0A4DC81243F2 /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B05E27C8BB92E89D2DC78AC /* h1.png */; }; - BBA68BA0DD2166869D252187 /* glow-marker.png in Resources */ = {isa = PBXBuildFile; fileRef = 57D0C4A29B66857C926387F0 /* glow-marker.png */; }; + B9C14827111C3C218296DA6B /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 6614BE28012C7A7508437047 /* arrow.png */; }; + BB8640142835DE97545A576B /* step3.png in Resources */ = {isa = PBXBuildFile; fileRef = 6533FA4161283F8F6A5F2CC3 /* step3.png */; }; BCAC1722DD65725FF71AA311 /* MarkerLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3E84ED0331DFB2A7082CA36 /* MarkerLayerViewController.m */; }; + BDABAB33F8C32842DA338A51 /* museum-exhibits.json in Resources */ = {isa = PBXBuildFile; fileRef = 346BE94E21267BA7E00E1B94 /* museum-exhibits.json */; }; + BF65EE91F23144B36FDA6A2C /* step5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB708C911CD9B99ADBB07D08 /* step5@2x.png */; }; + C1E526F7DE908C97E9F79E50 /* australia.png in Resources */ = {isa = PBXBuildFile; fileRef = 304A2B780A4A9B2D32261355 /* australia.png */; }; C369F8AAC5E93F4F5B00101A /* GroundOverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8038AEC0AF9CBD2EBB975F54 /* GroundOverlayViewController.m */; }; C4D64EB836EDD354E4B2018F /* IndoorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA013030BC14C994AEA2428 /* IndoorViewController.m */; }; - CA5A224929A41D039C8E6F09 /* botswana.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C186E84CB691DD6239C5E57 /* botswana.png */; }; + C8933936B0EA94A4BB89E877 /* newark_nj_1922.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2B0884C720D5AE0BDCC1903D /* newark_nj_1922.jpg */; }; + CBDFCA091AE034EC92514A63 /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B049CFC81E59949D0184B8B /* boat.png */; }; CC839BBBD61B9C68F486F311 /* PaddingBehaviorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3679BC5053A9702AE4FC85B3 /* PaddingBehaviorViewController.m */; }; - CD26C5EC9D66CFD72C86EAC2 /* step6.png in Resources */ = {isa = PBXBuildFile; fileRef = F64D45825D2647898331A1FF /* step6.png */; }; - D433812D70CBD35A158CD8D5 /* step5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB708C911CD9B99ADBB07D08 /* step5@2x.png */; }; - D50D986C76882A5D0DA41F35 /* boat.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B049CFC81E59949D0184B8B /* boat.png */; }; + CD0E86DBD6C012BA37B42DBE /* step3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A3AE3B168663EA43D3F2F259 /* step3@2x.png */; }; + D25754505CD88953A2E3E950 /* x29.png in Resources */ = {isa = PBXBuildFile; fileRef = 77E4A5AC4E17EB252D617792 /* x29.png */; }; + D5851615E131B1925E73D3F2 /* step1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C6A156792608F06437E5931 /* step1@2x.png */; }; D79140F5C9786132C652F82B /* FitBoundsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 721936633CF79A85B5EF0E92 /* FitBoundsViewController.m */; }; + D7EC64C2517D1C37D61D2F7A /* argentina-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D8E4A10394122CD9C9CD157 /* argentina-large.png */; }; DE1AA3D31A2214448C20F8B9 /* CustomMarkersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC77B503E93E88F6E254A170 /* CustomMarkersViewController.m */; }; - E15028A581780CEF233A75DC /* step1.png in Resources */ = {isa = PBXBuildFile; fileRef = D66EF243066A58A0D10280D4 /* step1.png */; }; + DF0919E83546504DA55BBE0A /* step8.png in Resources */ = {isa = PBXBuildFile; fileRef = B7B684AAFC3CA2232721C6D0 /* step8.png */; }; E1C8C766EEF5F4658A00AA2D /* SnapshotReadyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 15E621C7788D69B720052601 /* SnapshotReadyViewController.m */; }; - E2E45E7204B5F6D67AEF3D05 /* australia-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 9F4CB893BCACB294FBCEC850 /* australia-large.png */; }; E3EC2EE7839A2643991FBD84 /* VisibleRegionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A0518A8C9E543FFBA7F8305E /* VisibleRegionViewController.m */; }; - E4606BC764074DC9EE1A5E4E /* step7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E3C8118FBF6DF1D4996693 /* step7@2x.png */; }; - E569618FA3968C8E0D38DB22 /* australia-large@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A1D521E4FF1F8F85E084ED60 /* australia-large@2x.png */; }; E6CFCE211B63AC011C822218 /* GradientPolylinesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B4378F4DBE15BB0E32690CE /* GradientPolylinesViewController.m */; }; - E77BADB514BB35DC002C5875 /* step8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D5E5AF68BBC86BA530755A20 /* step8@2x.png */; }; + E77AEA0E6CDD40C79F9E98E0 /* aeroplane@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F716156C215C436D55F5696 /* aeroplane@2x.png */; }; EA2A60FD3CC92A4054D4E706 /* TileLayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CEA86A42848E5BAA7B523FB /* TileLayerViewController.m */; }; - ED4617FD4C66219840E42297 /* popup_santa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5E2E2B19EF6846F007A7A909 /* popup_santa@2x.png */; }; - EFFB937E7FB26F7BA147DD18 /* argentina.png in Resources */ = {isa = PBXBuildFile; fileRef = A6B80BDCF78F436799462F76 /* argentina.png */; }; - F3031AA62E3127D164A980F5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DBB8C9AD891A00824AE32343 /* LaunchScreen.storyboard */; }; + ED4F2CCD1F904F56CEC3CDBB /* step8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D5E5AF68BBC86BA530755A20 /* step8@2x.png */; }; + F3018D1BDD5F6A65FFF3E362 /* h1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B05E27C8BB92E89D2DC78AC /* h1.png */; }; F489F581F708F97B4896711C /* StructuredGeocoderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AAFE928C9FDAA1B5703AE31 /* StructuredGeocoderViewController.m */; }; - F6AD7FEFAF0440DF650DEEBE /* step4.png in Resources */ = {isa = PBXBuildFile; fileRef = 99C6A64731FB5249BA53255D /* step4.png */; }; + F8E9D5AA019A709A26F7BCD4 /* australia-large.png in Resources */ = {isa = PBXBuildFile; fileRef = 9F4CB893BCACB294FBCEC850 /* australia-large.png */; }; FC1036CCE836DC9AA06A213E /* IndoorMuseumNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1318E0A2BA2A41F2E8759CFE /* IndoorMuseumNavigationViewController.m */; }; FC3BB569234A28CAAC9F8F79 /* FixedPanoramaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C762E469D796AFF83D3516EF /* FixedPanoramaViewController.m */; }; /* End PBXBuildFile section */ @@ -112,6 +114,7 @@ 115963CCE082409262D179F3 /* Samples.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Samples.m; sourceTree = ""; }; 118A0FE8CA1D110B3C694A8D /* mapstyle-retro.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-retro.json"; sourceTree = ""; }; 1318E0A2BA2A41F2E8759CFE /* IndoorMuseumNavigationViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IndoorMuseumNavigationViewController.m; sourceTree = ""; }; + 13D1B4A6AED6D2267F23F537 /* libPods-GoogleMapsDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 141DC0E7977DE53BB4C0ACE6 /* UIViewController+GMSToastMessages.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+GMSToastMessages.m"; sourceTree = ""; }; 15E621C7788D69B720052601 /* SnapshotReadyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SnapshotReadyViewController.m; sourceTree = ""; }; 15E6F2AA55437CFAC24BCFEE /* MarkerInfoWindowViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MarkerInfoWindowViewController.h; sourceTree = ""; }; @@ -119,6 +122,7 @@ 1B4378F4DBE15BB0E32690CE /* GradientPolylinesViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GradientPolylinesViewController.m; sourceTree = ""; }; 1EAB5489D23C2A1DDF2B6E5B /* DemoSceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoSceneDelegate.h; sourceTree = ""; }; 21267D205F7EC280F26D97ED /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 238D6E812A5DFB75302344D2 /* walking_dot@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "walking_dot@2x.png"; sourceTree = ""; }; 281FB700EEAC3323C52CB587 /* AnimatedCurrentLocationViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnimatedCurrentLocationViewController.h; sourceTree = ""; }; 2A77C64C5A8B8109E6AFC41F /* GeocoderViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GeocoderViewController.m; sourceTree = ""; }; 2AAFE928C9FDAA1B5703AE31 /* StructuredGeocoderViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StructuredGeocoderViewController.m; sourceTree = ""; }; @@ -196,12 +200,11 @@ B4C89E62C05816B590F45D57 /* mapstyle-silver.json */ = {isa = PBXFileReference; lastKnownFileType = text; path = "mapstyle-silver.json"; sourceTree = ""; }; B53058D6D185A08DDEF65436 /* Samples.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Samples.h; sourceTree = ""; }; B53B4C2097A6AD4A98746495 /* MapsDemoAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = MapsDemoAssets.xcassets; sourceTree = ""; }; - B5ED0982C71E3CDB18BC5299 /* libPods-GoogleMapsDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GoogleMapsDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B7B684AAFC3CA2232721C6D0 /* step8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step8.png; sourceTree = ""; }; B9450C49DDD49AF9182779EB /* MarkerEventsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MarkerEventsViewController.m; sourceTree = ""; }; BB653990DAD6FDE28A9E4158 /* FitBoundsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FitBoundsViewController.h; sourceTree = ""; }; BB85B60A794D982F001E5D1D /* step2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step2.png; sourceTree = ""; }; - BE522BB5DA72D3CFB638FDFD /* Pods-GoogleMapsDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos.default.xcconfig"; sourceTree = ""; }; + BD7F79DEE53DBC58E2A7999F /* Pods-GoogleMapsDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsDemos.default.xcconfig"; path = "Target Support Files/Pods-GoogleMapsDemos/Pods-GoogleMapsDemos.default.xcconfig"; sourceTree = ""; }; BEDC49669DBDA8BE37BFAB29 /* GeocoderViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeocoderViewController.h; sourceTree = ""; }; BF0878372A9A7274B74BCBE0 /* MyLocationViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyLocationViewController.m; sourceTree = ""; }; C0E7585025B57F969D8C3CCD /* step6@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step6@2x.png"; sourceTree = ""; }; @@ -219,6 +222,7 @@ D5E5AF68BBC86BA530755A20 /* step8@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "step8@2x.png"; sourceTree = ""; }; D66EF243066A58A0D10280D4 /* step1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = step1.png; sourceTree = ""; }; D78B4ACC4D102CC9EC32C8A3 /* SnapshotReadyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SnapshotReadyViewController.h; sourceTree = ""; }; + D7DAD6B132F3CB649B1EF091 /* walking_dot@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "walking_dot@3x.png"; sourceTree = ""; }; DA6BF21C0287E5828A770C09 /* bulgaria-large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bulgaria-large.png"; sourceTree = ""; }; DB481265195ED47C9D3588AB /* CustomIndoorViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomIndoorViewController.h; sourceTree = ""; }; DBB8C9AD891A00824AE32343 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; @@ -249,7 +253,7 @@ buildActionMask = 2147483647; files = ( 7EB0308A1EF8F6ADBD6DEF79 /* UIKit.framework in Frameworks */, - 66448469DFC43B68E9BE3337 /* libPods-GoogleMapsDemos.a in Frameworks */, + 49B4EB1729B0F1E3A9B11CE4 /* libPods-GoogleMapsDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -262,7 +266,7 @@ 3F84FF5646DF0F79669A6A34 /* Source */, 9F91B9CA1785E3DD586E3F93 /* Frameworks */, 9C667AD7285A7D36180D29BE /* Products */, - 8377749ACA7B391A06C8EA73 /* Pods */, + CC1BE9B1F16D3A43E70ED8CE /* Pods */, ); sourceTree = ""; }; @@ -274,15 +278,6 @@ name = Source; sourceTree = ""; }; - 8377749ACA7B391A06C8EA73 /* Pods */ = { - isa = PBXGroup; - children = ( - BE522BB5DA72D3CFB638FDFD /* Pods-GoogleMapsDemos.default.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 8AEE26F54DD8496915CC250C /* Museum-Icons */ = { isa = PBXGroup; children = ( @@ -310,12 +305,12 @@ isa = PBXGroup; children = ( 6F4C119D42CF37317FA0DFA9 /* UIKit.framework */, - B5ED0982C71E3CDB18BC5299 /* libPods-GoogleMapsDemos.a */, + 13D1B4A6AED6D2267F23F537 /* libPods-GoogleMapsDemos.a */, ); name = Frameworks; sourceTree = ""; }; - E9C287B2214772B64F89F90B /* Resources */ = { + A2271DD47C8EC357B6AFA73E /* Resources */ = { isa = PBXGroup; children = ( 8AEE26F54DD8496915CC250C /* Museum-Icons */, @@ -361,10 +356,21 @@ B7B684AAFC3CA2232721C6D0 /* step8.png */, D5E5AF68BBC86BA530755A20 /* step8@2x.png */, AD6B1AF49A87CC079E9CA862 /* track.json */, + 238D6E812A5DFB75302344D2 /* walking_dot@2x.png */, + D7DAD6B132F3CB649B1EF091 /* walking_dot@3x.png */, ); path = Resources; sourceTree = ""; }; + CC1BE9B1F16D3A43E70ED8CE /* Pods */ = { + isa = PBXGroup; + children = ( + BD7F79DEE53DBC58E2A7999F /* Pods-GoogleMapsDemos.default.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; EA7DB0420CFC5F22D6F956A3 /* Samples */ = { isa = PBXGroup; children = ( @@ -447,7 +453,7 @@ FDE7AC21E7296871E2078A29 /* GoogleMapsDemos */ = { isa = PBXGroup; children = ( - E9C287B2214772B64F89F90B /* Resources */, + A2271DD47C8EC357B6AFA73E /* Resources */, EA7DB0420CFC5F22D6F956A3 /* Samples */, 02A7C56A409A0CB977458251 /* DemoAppDelegate.h */, C7AD415580B4A6B35532456A /* DemoAppDelegate.m */, @@ -471,11 +477,11 @@ isa = PBXNativeTarget; buildConfigurationList = 56D55B92E97A2AAB3D261D4A /* Build configuration list for PBXNativeTarget "GoogleMapsDemos" */; buildPhases = ( - C6C641F94E161EFC93E26C95 /* [CP] Check Pods Manifest.lock */, + 6620A9236D2FCA2DA193AA4D /* [CP] Check Pods Manifest.lock */, C434996613C0A2FED463783D /* Resources */, 06DE6F27AD1DD8E5163683B6 /* Sources */, 8B9B135C626B0FF8CC12CB4D /* Frameworks */, - FAE9D7D2C6A0A74776EBA41E /* [CP] Copy Pods Resources */, + BE539167993DC40387CAAC83 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -516,56 +522,58 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 500FA4390A29E0ADB39E21FB /* step5.png in Resources */, - A4A326C09602C12DE4851136 /* step1@2x.png in Resources */, - F6AD7FEFAF0440DF650DEEBE /* step4.png in Resources */, - EFFB937E7FB26F7BA147DD18 /* argentina.png in Resources */, - D50D986C76882A5D0DA41F35 /* boat.png in Resources */, - 1CEF3F4702DB008F654D8E7A /* aeroplane@2x.png in Resources */, - CD26C5EC9D66CFD72C86EAC2 /* step6.png in Resources */, - 5653C21AEB869C92653B83A4 /* step7.png in Resources */, - 32CC144A6B022DB1926852B5 /* aeroplane.png in Resources */, - A330C5C1305B6AFDE8549C54 /* botswana-large.png in Resources */, - 13970FC2D7013CA5C00E5AAE /* step3.png in Resources */, - ABE214D988BB427F2881A8BC /* step2.png in Resources */, - ED4617FD4C66219840E42297 /* popup_santa@2x.png in Resources */, - BBA68BA0DD2166869D252187 /* glow-marker.png in Resources */, - E15028A581780CEF233A75DC /* step1.png in Resources */, - 84A8BFF7EC2AFE5239DB222E /* step3@2x.png in Resources */, - 3B647C56A107E00BC4815B1D /* australia.png in Resources */, - E4606BC764074DC9EE1A5E4E /* step7@2x.png in Resources */, - 0EEC555F800FEE8497BCF084 /* arrow@2x.png in Resources */, - 89C85AA304C7FDE1A446A292 /* glow-marker@2x.png in Resources */, - D433812D70CBD35A158CD8D5 /* step5@2x.png in Resources */, - E569618FA3968C8E0D38DB22 /* australia-large@2x.png in Resources */, - 796FBC17DC9D867374704425 /* arrow.png in Resources */, - 7EEF5B03C2175CD1DB86E5DC /* boat@2x.png in Resources */, - 79CD6A3123D613E24B9E5983 /* x29@2x.png in Resources */, - 41C136BCC76621603A3D6C41 /* spitfire.png in Resources */, - A7729B5E46B7F73B703649AE /* h1@2x.png in Resources */, - 138233AB6895BE7AA2387050 /* spitfire@2x.png in Resources */, - B5A196301B3B0A4DC81243F2 /* h1.png in Resources */, - 81ECE58D29B8027F342FF401 /* voyager.png in Resources */, - 9A48AFB4E51FCDD215B5044C /* x29.png in Resources */, - B04B69D9F2DB76AC803A637A /* voyager@2x.png in Resources */, - 57F58315D4A973991A3DBAD5 /* bulgaria.png in Resources */, - 6C6DF0AAB9B807C20C81DE55 /* bulgaria-large.png in Resources */, - 79AF7A74C389B8C21C24C3B3 /* argentina-large.png in Resources */, - 132C53B3FD3703D3BBF50E62 /* step2@2x.png in Resources */, - 31291E8440EE6B0EA8727463 /* popup_santa.png in Resources */, - B10925DA2A2A723A398910C4 /* step6@2x.png in Resources */, - E77BADB514BB35DC002C5875 /* step8@2x.png in Resources */, - 17C0BD6F820FEECF2CE7E1C7 /* step8.png in Resources */, - E2E45E7204B5F6D67AEF3D05 /* australia-large.png in Resources */, - CA5A224929A41D039C8E6F09 /* botswana.png in Resources */, - AB52000C1C24D163BE4A67B3 /* step4@2x.png in Resources */, - 787F22327F1D4EC202A9EAE5 /* newark_nj_1922.jpg in Resources */, - 8B63BA635C061A8717C43123 /* mapstyle-night.json in Resources */, - 742226EE8345C56F9CEA4F91 /* mapstyle-retro.json in Resources */, - 1BE7A8A4782B8A1826594BD3 /* mapstyle-silver.json in Resources */, - 851C3F39F91242ABBBBACB3F /* track.json in Resources */, - 3DCB19D95A2A16E3CA3C212B /* museum-exhibits.json in Resources */, - F3031AA62E3127D164A980F5 /* LaunchScreen.storyboard in Resources */, + 74C56B92CAF16C8E16B6F199 /* step5.png in Resources */, + D5851615E131B1925E73D3F2 /* step1@2x.png in Resources */, + A478CD1E25FC58893FD313F1 /* step4.png in Resources */, + 1427ABE1715EF434D32B734B /* argentina.png in Resources */, + CBDFCA091AE034EC92514A63 /* boat.png in Resources */, + E77AEA0E6CDD40C79F9E98E0 /* aeroplane@2x.png in Resources */, + 24D2F154B8D6EEF676561AC4 /* step6.png in Resources */, + 5F4D5DC61C012898A7B9453C /* step7.png in Resources */, + 7E4619E97C4B21052FA21EF8 /* walking_dot@3x.png in Resources */, + 2D2613E2126D7023BC1B6937 /* aeroplane.png in Resources */, + 282AE091FD7A3D76A78E53AA /* botswana-large.png in Resources */, + BB8640142835DE97545A576B /* step3.png in Resources */, + AD8FF7F0EB9A68D47BBE8BF8 /* walking_dot@2x.png in Resources */, + 762F1EE6511FF41F15253003 /* step2.png in Resources */, + 0235141F46E7C18CDD801877 /* popup_santa@2x.png in Resources */, + 79A3711A31324A8933BC2818 /* glow-marker.png in Resources */, + 32D07BA441B79A04B62E84BE /* step1.png in Resources */, + CD0E86DBD6C012BA37B42DBE /* step3@2x.png in Resources */, + C1E526F7DE908C97E9F79E50 /* australia.png in Resources */, + 35A7A09EBCD018105043A95D /* step7@2x.png in Resources */, + 94C9DA520E82634C859552E9 /* arrow@2x.png in Resources */, + 3C10FB9CD850A3AFEAE75EC8 /* glow-marker@2x.png in Resources */, + BF65EE91F23144B36FDA6A2C /* step5@2x.png in Resources */, + AB67737420DB860DC7689DBD /* australia-large@2x.png in Resources */, + B9C14827111C3C218296DA6B /* arrow.png in Resources */, + 3AFA36E93815CFB41B51CA05 /* boat@2x.png in Resources */, + 7C3BE1C9035C535D0E103D86 /* x29@2x.png in Resources */, + 602F190A3AF8B9BAFA634E45 /* spitfire.png in Resources */, + 2BCF0FFFB7458D84FA26F5E8 /* h1@2x.png in Resources */, + 647A09E15574BDDE55F5BE35 /* spitfire@2x.png in Resources */, + F3018D1BDD5F6A65FFF3E362 /* h1.png in Resources */, + 07ADAD462DA443858CCC3D62 /* voyager.png in Resources */, + D25754505CD88953A2E3E950 /* x29.png in Resources */, + 66CE6DE7DC9D7879C0A53871 /* voyager@2x.png in Resources */, + 44E01C768CC53CAC01EC8BB2 /* bulgaria.png in Resources */, + 343DF24DE57790A758EE0759 /* bulgaria-large.png in Resources */, + D7EC64C2517D1C37D61D2F7A /* argentina-large.png in Resources */, + 51084AAFF7EB0747886EEF52 /* step2@2x.png in Resources */, + 3556B9FA094E44B7DEED37FF /* popup_santa.png in Resources */, + 40CFEBD4DA0D1D903CE27C08 /* step6@2x.png in Resources */, + ED4F2CCD1F904F56CEC3CDBB /* step8@2x.png in Resources */, + DF0919E83546504DA55BBE0A /* step8.png in Resources */, + F8E9D5AA019A709A26F7BCD4 /* australia-large.png in Resources */, + 98E89233F3156E167E2025AF /* botswana.png in Resources */, + 339B17567473C291BAECC6DD /* step4@2x.png in Resources */, + C8933936B0EA94A4BB89E877 /* newark_nj_1922.jpg in Resources */, + 1644083E4CE060AA5A03AF50 /* mapstyle-night.json in Resources */, + 904BA5FA65C93B1BE1AD37BB /* mapstyle-retro.json in Resources */, + 9E024CE9C0BE6ECEF5269E95 /* mapstyle-silver.json in Resources */, + 9D5BB62964864FF1E0F16B48 /* track.json in Resources */, + BDABAB33F8C32842DA338A51 /* museum-exhibits.json in Resources */, + 9965C8A5D2A9946E09162EA4 /* LaunchScreen.storyboard in Resources */, 59D9F1FE2A4075B9712E7CB2 /* MapsDemoAssets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -573,7 +581,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - C6C641F94E161EFC93E26C95 /* [CP] Check Pods Manifest.lock */ = { + 6620A9236D2FCA2DA193AA4D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -595,7 +603,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - FAE9D7D2C6A0A74776EBA41E /* [CP] Copy Pods Resources */ = { + BE539167993DC40387CAAC83 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -674,14 +682,14 @@ /* Begin XCBuildConfiguration section */ 2723CC697F2C564456B7C001 /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BE522BB5DA72D3CFB638FDFD /* Pods-GoogleMapsDemos.default.xcconfig */; + baseConfigurationReference = BD7F79DEE53DBC58E2A7999F /* Pods-GoogleMapsDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = ./GoogleMapsDemos/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LIBRARY_SEARCH_PATHS = ( ., "$(SDKROOT)/System/Library/Frameworks", diff --git a/GoogleMaps/GoogleMapsDemos/Resources/walking_dot@2x.png b/GoogleMaps/GoogleMapsDemos/Resources/walking_dot@2x.png new file mode 100755 index 00000000..95c208cb Binary files /dev/null and b/GoogleMaps/GoogleMapsDemos/Resources/walking_dot@2x.png differ diff --git a/GoogleMaps/GoogleMapsDemos/Resources/walking_dot@3x.png b/GoogleMaps/GoogleMapsDemos/Resources/walking_dot@3x.png new file mode 100755 index 00000000..a6245040 Binary files /dev/null and b/GoogleMaps/GoogleMapsDemos/Resources/walking_dot@3x.png differ diff --git a/GoogleMaps/GoogleMapsDemos/Samples/MapLayerViewController.m b/GoogleMaps/GoogleMapsDemos/Samples/MapLayerViewController.m index 3aea721f..c7e3ca4f 100755 --- a/GoogleMaps/GoogleMapsDemos/Samples/MapLayerViewController.m +++ b/GoogleMaps/GoogleMapsDemos/Samples/MapLayerViewController.m @@ -19,6 +19,7 @@ @implementation MapLayerViewController { GMSMapView *_mapView; + BOOL _rotating; } - (void)viewDidLoad { @@ -47,43 +48,39 @@ - (void)didTapMyLocation { if (!location || !CLLocationCoordinate2DIsValid(location.coordinate)) { return; } - - _mapView.layer.cameraLatitude = location.coordinate.latitude; - _mapView.layer.cameraLongitude = location.coordinate.longitude; - _mapView.layer.cameraBearing = 0.0; - - // Access the GMSMapLayer directly to modify the following properties with a specified timing - // function and duration. + GMSCameraPosition *camera = + [[GMSCameraPosition alloc] initWithTarget:location.coordinate + zoom:_mapView.camera.zoom + bearing:0.0 + viewingAngle:_mapView.camera.viewingAngle]; CAMediaTimingFunction *curve = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - CABasicAnimation *animation; - - animation = [CABasicAnimation animationWithKeyPath:kGMSLayerCameraLatitudeKey]; - animation.duration = 2.0f; - animation.timingFunction = curve; - animation.toValue = @(location.coordinate.latitude); - [_mapView.layer addAnimation:animation forKey:kGMSLayerCameraLatitudeKey]; + // Animate to the marker + [CATransaction begin]; + [CATransaction setAnimationDuration:2.0f]; // 2 second animation + [CATransaction setAnimationTimingFunction:curve]; + [CATransaction setCompletionBlock:^{ + if (_rotating) { // Animation was interrupted by orientation change. + [CATransaction + setDisableActions:true]; // Disable animation to avoid interruption from rotation. + [_mapView animateToCameraPosition:camera]; + } + }]; - animation = [CABasicAnimation animationWithKeyPath:kGMSLayerCameraLongitudeKey]; - animation.duration = 2.0f; - animation.timingFunction = curve; - animation.toValue = @(location.coordinate.longitude); - [_mapView.layer addAnimation:animation forKey:kGMSLayerCameraLongitudeKey]; - - animation = [CABasicAnimation animationWithKeyPath:kGMSLayerCameraBearingKey]; - animation.duration = 2.0f; - animation.timingFunction = curve; - animation.toValue = @0.0; - [_mapView.layer addAnimation:animation forKey:kGMSLayerCameraBearingKey]; + [_mapView animateToCameraPosition:camera]; + [CATransaction commit]; +} - // Fly out to the minimum zoom and then zoom back to the current zoom! - CGFloat zoom = _mapView.camera.zoom; - NSArray *keyValues = @[ @(zoom), @(kGMSMinZoomLevel), @(zoom) ]; - CAKeyframeAnimation *keyFrameAnimation = - [CAKeyframeAnimation animationWithKeyPath:kGMSLayerCameraZoomLevelKey]; - keyFrameAnimation.duration = 2.0f; - keyFrameAnimation.values = keyValues; - [_mapView.layer addAnimation:keyFrameAnimation forKey:kGMSLayerCameraZoomLevelKey]; +- (void)viewWillTransitionToSize:(CGSize)size + withTransitionCoordinator:(id)coordinator { + _rotating = true; + [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; + [coordinator + animateAlongsideTransition:nil + completion:^( + id _Nonnull context) { + _rotating = false; + }]; } @end diff --git a/GoogleMaps/GoogleMapsDemos/Samples/MarkerEventsViewController.m b/GoogleMaps/GoogleMapsDemos/Samples/MarkerEventsViewController.m index 58d69c29..f3f3682d 100755 --- a/GoogleMaps/GoogleMapsDemos/Samples/MarkerEventsViewController.m +++ b/GoogleMaps/GoogleMapsDemos/Samples/MarkerEventsViewController.m @@ -22,6 +22,7 @@ @implementation MarkerEventsViewController { GMSMapView *_mapView; GMSMarker *_melbourneMarker; + BOOL _rotating; } - (void)viewDidLoad { @@ -54,14 +55,21 @@ - (UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker *)marker { } - (BOOL)mapView:(GMSMapView *)mapView didTapMarker:(GMSMarker *)marker { - // Animate to the marker - [CATransaction begin]; - [CATransaction setAnimationDuration:3.f]; // 3 second animation - GMSCameraPosition *camera = [[GMSCameraPosition alloc] initWithTarget:marker.position zoom:8 bearing:50 viewingAngle:60]; + // Animate to the marker + [CATransaction begin]; + [CATransaction setAnimationDuration:3.f]; // 3 second animation + [CATransaction setCompletionBlock:^{ + if (_rotating) { // Animation was interrupted by orientation change. + [CATransaction + setDisableActions:true]; // Disable animation to avoid interruption from rotation. + [_mapView animateToCameraPosition:camera]; + } + }]; + [mapView animateToCameraPosition:camera]; [CATransaction commit]; @@ -75,4 +83,16 @@ - (BOOL)mapView:(GMSMapView *)mapView didTapMarker:(GMSMarker *)marker { return YES; } +- (void)viewWillTransitionToSize:(CGSize)size + withTransitionCoordinator:(id)coordinator { + _rotating = true; + [coordinator + animateAlongsideTransition:nil + completion:^( + id _Nonnull context) { + _rotating = false; + }]; + [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; +} + @end diff --git a/GoogleMaps/GoogleMapsDemos/Samples/StampedPolylinesViewController.m b/GoogleMaps/GoogleMapsDemos/Samples/StampedPolylinesViewController.m index be90cae0..4e39643a 100755 --- a/GoogleMaps/GoogleMapsDemos/Samples/StampedPolylinesViewController.m +++ b/GoogleMaps/GoogleMapsDemos/Samples/StampedPolylinesViewController.m @@ -23,6 +23,17 @@ static const double kSeattleLongitudeDegrees = -122.3410462; static const double kZoom = 14; static const double kStrokeWidth = 20; +/* The following encoded path was constructed by using the Directions API. + * This is the path from the Space Needle to Paramount Theatre, with the mode of transport + * set to walking. + * Please see the documentation https://developers.google.com/maps/documentation/directions + * for more detail. + */ +static NSString *const kEncodedPathForWalkingDirections = + @"ezsaHxkwiVLc@FQ?G@G@GDKBEPED?@@B@FOJSOUDIZk@?cB?w@?iA@yLAs@?IB?Ae@@_A?sACoA?EB??e@?u@A}A@{@`@" + @"EBGv@_C\\aA?M?G@WHCFB|@kCRm@DQ?EDB@FZP?E@_@CC?oA?O\\i@j@mAN[DWd@GIq@BA?CBUVcAhA_CLUBDL_@@Bf@" + @"eA`@o@|@iBCCRa@DD^aAf@{@`@}@Xc@GIVc@DDj@iANe@x@cBHUACRYNPZQHLDFDCVSB?CGKYHGr@s@r@g@v@o@" + @"GUVSBC@FDJJK"; @implementation StampedPolylinesViewController @@ -37,7 +48,17 @@ - (void)viewDidLoad { map.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; [self.view addSubview:map]; - // Make a texture stamped polyline. + [self addTextureStampedPolylineToMap:map]; + [self addGradientTextureStampedPolylineToMap:map]; + [self addSpriteWalkingDotStampedPolylineToMap:map]; +} + +/** + * Creates a texture stamped polyline and adds it to the supplied map. + * + * @param map The map to add the polyline to. + */ +- (void)addTextureStampedPolylineToMap:(GMSMapView *)map { GMSMutablePath *path = [GMSMutablePath path]; [path addLatitude:kSeattleLatitudeDegrees + 0.003 longitude:kSeattleLongitudeDegrees - 0.003]; [path addLatitude:kSeattleLatitudeDegrees - 0.005 longitude:kSeattleLongitudeDegrees - 0.005]; @@ -51,8 +72,14 @@ - (void)viewDidLoad { texturePolyline.map = map; texturePolyline.strokeWidth = kStrokeWidth; texturePolyline.spans = @[ [GMSStyleSpan spanWithStyle:solidStroke] ]; +} - // Make a gradient texture polyline. +/** + * Creates a texture stamped polyline with gradient background and adds it to the supplied map. + * + * @param map The map to add the polyline to. + */ +- (void)addGradientTextureStampedPolylineToMap:(GMSMapView *)map { GMSMutablePath *texturePath = [GMSMutablePath path]; [texturePath addLatitude:kSeattleLatitudeDegrees - 0.012 longitude:kSeattleLongitudeDegrees]; [texturePath addLatitude:kSeattleLatitudeDegrees - 0.012 @@ -71,6 +98,23 @@ - (void)viewDidLoad { gradientTexturePolyline.map = map; } +/** + * Creates a sprite stamped polyline, using walking dots as the sprite, to the supplied map. + * + * @param map The map to add the polyline to. + */ +- (void)addSpriteWalkingDotStampedPolylineToMap:(GMSMapView *)map { + GMSPath *path = [GMSPath pathFromEncodedPath:kEncodedPathForWalkingDirections]; + + UIImage *_Nonnull stamp = (UIImage *_Nonnull)[UIImage imageNamed:@"walking_dot.png"]; + GMSStrokeStyle *stroke = [GMSStrokeStyle solidColor:[UIColor redColor]]; + stroke.stampStyle = [GMSSpriteStyle spriteStyleWithImage:stamp]; + GMSPolyline *polyline = [GMSPolyline polylineWithPath:path]; + polyline.map = map; + polyline.strokeWidth = kStrokeWidth; + polyline.spans = @[ [GMSStyleSpan spanWithStyle:stroke] ]; +} + @end NS_ASSUME_NONNULL_END diff --git a/GoogleMaps/GoogleMapsDemos/Samples/TileLayerViewController.m b/GoogleMaps/GoogleMapsDemos/Samples/TileLayerViewController.m index 0eec3fdc..76975f17 100755 --- a/GoogleMaps/GoogleMapsDemos/Samples/TileLayerViewController.m +++ b/GoogleMaps/GoogleMapsDemos/Samples/TileLayerViewController.m @@ -52,6 +52,13 @@ - (void)viewDidLoad { [self didChangeSwitcher]; } +- (void)viewWillLayoutSubviews { + [super viewWillLayoutSubviews]; + // Re-show level picker. + self.navigationItem.titleView = nil; + self.navigationItem.titleView = _switcher; +} + - (void)didChangeSwitcher { NSString *title = [_switcher titleForSegmentAtIndex:_switcher.selectedSegmentIndex]; NSInteger floor = [title integerValue]; diff --git a/GoogleMaps/Podfile b/GoogleMaps/Podfile index 09251e9b..323e5b61 100755 --- a/GoogleMaps/Podfile +++ b/GoogleMaps/Podfile @@ -1,6 +1,6 @@ source 'https://github.com/CocoaPods/Specs.git' target 'GoogleMapsDemos' do - platform :ios, '13.0' - pod 'GoogleMaps', '= 7.4.0' + platform :ios, '14.0' + pod 'GoogleMaps', '= 8.0.0' end diff --git a/GooglePlaces-Swift/GooglePlacesSwiftDemos.xcodeproj/project.pbxproj b/GooglePlaces-Swift/GooglePlacesSwiftDemos.xcodeproj/project.pbxproj index 57f32036..3908c5fa 100644 --- a/GooglePlaces-Swift/GooglePlacesSwiftDemos.xcodeproj/project.pbxproj +++ b/GooglePlaces-Swift/GooglePlacesSwiftDemos.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 3B9C352B6D5D1EFC26634090 /* ConfigurationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1508D3D314E8989F6A8B1386 /* ConfigurationViewController.swift */; }; 4049499CCDEF9E212D79D732 /* PagingPhotoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C092A8A676304070F968409 /* PagingPhotoView.swift */; }; 4F5A706C3EA996535B2D1984 /* SDKDemoAPIKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B665D719F951D76696D33BC /* SDKDemoAPIKey.swift */; }; + 50795DF756B576CC8A1F6EAA /* libPods-GooglePlacesSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FED79C110E7676428782D441 /* libPods-GooglePlacesSwiftDemos.a */; }; 5CB1F895DD9C8B1ADC8DE20A /* SampleDatas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0F1EF7458BEAB01DE68663 /* SampleDatas.swift */; }; 682AFB396B2B86F4CE39BCDC /* AutocompleteBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0288ED3B967A57B6410B96F8 /* AutocompleteBaseViewController.swift */; }; 6B674CAF48552E8B4EDEE8A8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1E58F93255E608F3E70DF9E /* AppDelegate.swift */; }; @@ -25,7 +26,6 @@ BA576744D32A7DE182CE33B1 /* AutocompleteWithTextFieldController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD305E3260332F5AAB435A2 /* AutocompleteWithTextFieldController.swift */; }; D248A9237F51145B3A03A71F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 909B59B2299866076C468ED7 /* UIKit.framework */; }; D9ACCD7795CF2F5BC448175A /* AutocompletePushViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F497012428CC54B7C4F56083 /* AutocompletePushViewController.swift */; }; - DE1C2EBF3D791A9FE3657F66 /* libPods-GooglePlacesSwiftDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A99441175D69E60D59CC6F7B /* libPods-GooglePlacesSwiftDemos.a */; }; E0F36B0E72285A3AB896E53A /* PlacesDemoAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6EA6980061CFCF840AFCEDC2 /* PlacesDemoAssets.xcassets */; }; /* End PBXBuildFile section */ @@ -38,6 +38,7 @@ 0D889387B0B1BD3F73F8E146 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Localizable.strings; sourceTree = ""; }; 0E2A6EA83A2B6BE60F8631EA /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; 1508D3D314E8989F6A8B1386 /* ConfigurationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationViewController.swift; sourceTree = ""; }; + 194D1887811663BB3CD85EE1 /* Pods-GooglePlacesSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesSwiftDemos/Pods-GooglePlacesSwiftDemos.default.xcconfig"; sourceTree = ""; }; 1B25F0846D9BEA0ACB3F71D2 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Localizable.strings; sourceTree = ""; }; 1E734E67258D377F8B1D5CE5 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; 276DCC46CD2ED5E1134AB1A4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; @@ -54,7 +55,6 @@ 4B665D719F951D76696D33BC /* SDKDemoAPIKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKDemoAPIKey.swift; sourceTree = ""; }; 4C8B7C99AD9C286DB7B585B4 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; 56E48B9ECE73CA99453E7414 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 5867C603C7D51AF9C766A045 /* Pods-GooglePlacesSwiftDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesSwiftDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesSwiftDemos/Pods-GooglePlacesSwiftDemos.default.xcconfig"; sourceTree = ""; }; 5C1C6440B4CD894A2407D495 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = ""; }; 5ED1528FE1672661AAE1060D /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr_CA; path = fr_CA.lproj/Localizable.strings; sourceTree = ""; }; 60BD4C90E355BA1E2BE02C40 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; }; @@ -77,7 +77,6 @@ 952DA97814F23494FF58F3DF /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Localizable.strings; sourceTree = ""; }; 9558BF7AD24E294645E279C5 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_GB; path = en_GB.lproj/Localizable.strings; sourceTree = ""; }; 9DADFC6AEC2D2E3896A828CA /* es_419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es_419; path = es_419.lproj/Localizable.strings; sourceTree = ""; }; - A99441175D69E60D59CC6F7B /* libPods-GooglePlacesSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ABAE5F734790D532EE25185C /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = ""; }; ABF8E968A1C74354A3486DF3 /* AutocompleteModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutocompleteModalViewController.swift; sourceTree = ""; }; AFB0AAEF9F27A855E4A33128 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; @@ -93,6 +92,7 @@ F1286D2602562EFE56DF7C74 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/Localizable.strings; sourceTree = ""; }; F497012428CC54B7C4F56083 /* AutocompletePushViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutocompletePushViewController.swift; sourceTree = ""; }; F6C83E585F96D948E93AF704 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = ""; }; + FED79C110E7676428782D441 /* libPods-GooglePlacesSwiftDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesSwiftDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -101,17 +101,17 @@ buildActionMask = 2147483647; files = ( D248A9237F51145B3A03A71F /* UIKit.framework in Frameworks */, - DE1C2EBF3D791A9FE3657F66 /* libPods-GooglePlacesSwiftDemos.a in Frameworks */, + 50795DF756B576CC8A1F6EAA /* libPods-GooglePlacesSwiftDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 4B859E09722500E8D8A066EF /* Pods */ = { + 0E0C7C88486108CBAD58CB76 /* Pods */ = { isa = PBXGroup; children = ( - 5867C603C7D51AF9C766A045 /* Pods-GooglePlacesSwiftDemos.default.xcconfig */, + 194D1887811663BB3CD85EE1 /* Pods-GooglePlacesSwiftDemos.default.xcconfig */, ); name = Pods; path = Pods; @@ -136,7 +136,7 @@ isa = PBXGroup; children = ( 909B59B2299866076C468ED7 /* UIKit.framework */, - A99441175D69E60D59CC6F7B /* libPods-GooglePlacesSwiftDemos.a */, + FED79C110E7676428782D441 /* libPods-GooglePlacesSwiftDemos.a */, ); name = Frameworks; sourceTree = ""; @@ -183,7 +183,7 @@ A7DC475C5DF48F75B36886C4 /* Source */, 64686740F39E131CEB63787F /* Frameworks */, FFA58D2498A93FE9768A06C4 /* Products */, - 4B859E09722500E8D8A066EF /* Pods */, + 0E0C7C88486108CBAD58CB76 /* Pods */, ); sourceTree = ""; }; @@ -216,11 +216,11 @@ isa = PBXNativeTarget; buildConfigurationList = BBD1C4119186BF7EAD0F4BB8 /* Build configuration list for PBXNativeTarget "GooglePlacesSwiftDemos" */; buildPhases = ( - 51CA21A10A11A96D3FDF2CB2 /* [CP] Check Pods Manifest.lock */, + D61E2953DFBD107C6E3F437B /* [CP] Check Pods Manifest.lock */, 53456A6BC8EDD8F18A987C27 /* Resources */, C418CB9FC5E37E7815CC9AF5 /* Sources */, 0BF8505E4DA2E957E40C9A5E /* Frameworks */, - E7522E80C63B6AC9BD6D8FC0 /* [CP] Copy Pods Resources */, + 58DE049D3CFF5A82B299066A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -311,7 +311,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 51CA21A10A11A96D3FDF2CB2 /* [CP] Check Pods Manifest.lock */ = { + 58DE049D3CFF5A82B299066A /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -319,21 +319,22 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", + "${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftDemos/Pods-GooglePlacesSwiftDemos-resources.sh", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64_x86_64-simulator/GooglePlaces.framework/Resources/GooglePlaces.bundle", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GooglePlacesSwiftDemos-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GooglePlaces.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftDemos/Pods-GooglePlacesSwiftDemos-resources.sh\"\n"; showEnvVarsInLog = 0; }; - E7522E80C63B6AC9BD6D8FC0 /* [CP] Copy Pods Resources */ = { + D61E2953DFBD107C6E3F437B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -341,19 +342,18 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftDemos/Pods-GooglePlacesSwiftDemos-resources.sh", - "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64/GooglePlaces.framework/Resources/GooglePlaces.bundle", - "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64_x86_64-simulator/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GooglePlaces.bundle", + "$(DERIVED_FILE_DIR)/Pods-GooglePlacesSwiftDemos-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GooglePlacesSwiftDemos/Pods-GooglePlacesSwiftDemos-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -455,14 +455,14 @@ }; 8BE6213F076EE7282AFFB455 /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5867C603C7D51AF9C766A045 /* Pods-GooglePlacesSwiftDemos.default.xcconfig */; + baseConfigurationReference = 194D1887811663BB3CD85EE1 /* Pods-GooglePlacesSwiftDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = ./GooglePlacesSwiftDemos/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( ., diff --git a/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/SampleListViewController.swift b/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/SampleListViewController.swift index 07077d35..11e69d00 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/SampleListViewController.swift +++ b/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/SampleListViewController.swift @@ -27,13 +27,6 @@ class SampleListViewController: UITableViewController { .rating, .userRatingsTotal, .priceLevel, .types, .website, .viewport, .addressComponents, .photos, .utcOffsetMinutes, .businessStatus, .iconImageURL, .iconBackgroundColor, ] - #if BuildFlag_Places_EnableBooleanPlacesAttributes - fields += [ - .takeout, .delivery, .dineIn, .curbsidePickup, .reservable, .servesBreakfast, - .servesLunch, .servesDinner, .servesBeer, .servesWine, .servesBrunch, .servesVegetarianFood, - .wheelchairAccessibleEntrance, - ] - #endif // BuildFlag_Places_EnableBooleanPlacesAttributes return AutocompleteConfiguration( autocompleteFilter: GMSAutocompleteFilter(), placeFields: GMSPlaceField(rawValue: fields.reduce(0) { $0 | $1.rawValue })) diff --git a/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift b/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift index 9368a715..55233d21 100755 --- a/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift +++ b/GooglePlaces-Swift/GooglePlacesSwiftDemos/Swift/Samples/Autocomplete/AutocompleteWithTextFieldController.swift @@ -62,9 +62,11 @@ class AutocompleteWithTextFieldController: AutocompleteBaseViewController { view.addSubview(searchField) NSLayoutConstraint.activate([ searchField.topAnchor.constraint( - equalTo: self.topLayoutGuide.bottomAnchor, constant: topPadding), - searchField.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: padding), - searchField.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -padding), + equalTo: view.safeAreaLayoutGuide.topAnchor, constant: topPadding), + searchField.leadingAnchor.constraint( + equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: padding), + searchField.trailingAnchor.constraint( + equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -padding), ]) tableDataSource.delegate = self @@ -78,9 +80,9 @@ class AutocompleteWithTextFieldController: AutocompleteBaseViewController { view.addSubview(resultView) NSLayoutConstraint.activate([ resultView.topAnchor.constraint(equalTo: searchField.bottomAnchor, constant: 0), - resultView.bottomAnchor.constraint(equalTo: view.bottomAnchor), - resultView.leadingAnchor.constraint(equalTo: view.leadingAnchor), - resultView.trailingAnchor.constraint(equalTo: view.trailingAnchor), + resultView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor), + resultView.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor), + resultView.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor), ]) } diff --git a/GooglePlaces-Swift/Podfile b/GooglePlaces-Swift/Podfile index f0e5c6cd..2d88e8ee 100755 --- a/GooglePlaces-Swift/Podfile +++ b/GooglePlaces-Swift/Podfile @@ -1,6 +1,6 @@ source 'https://github.com/CocoaPods/Specs.git' target 'GooglePlacesSwiftDemos' do - platform :ios, '13.0' - pod 'GooglePlaces', '= 7.4.0' + platform :ios, '14.0' + pod 'GooglePlaces', '= 8.0.0' end diff --git a/GooglePlaces/GooglePlacesDemos.xcodeproj/project.pbxproj b/GooglePlaces/GooglePlacesDemos.xcodeproj/project.pbxproj index 5c820cfb..0061eaf3 100644 --- a/GooglePlaces/GooglePlacesDemos.xcodeproj/project.pbxproj +++ b/GooglePlaces/GooglePlacesDemos.xcodeproj/project.pbxproj @@ -9,13 +9,13 @@ /* Begin PBXBuildFile section */ 0CD66DB620B6661F1EF6665A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D0589812EE1F702A7BBA34D /* main.m */; }; 11B0770FDB10317396772FF4 /* AutocompleteWithSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F7419DDC82CA074FF0A508C /* AutocompleteWithSearchViewController.m */; }; + 168CE4A94FE266237100834E /* libPods-GooglePlacesDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 729FA140C308477C6E348DA1 /* libPods-GooglePlacesDemos.a */; }; 3836B4BAF22DC69481A763C6 /* FindPlaceLikelihoodListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 18AE29BAB2CC24B015F7754A /* FindPlaceLikelihoodListViewController.m */; }; 392FC92D8B566E346E88DCBA /* DemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B81B9326DD5B37C08B8CCAA /* DemoAppDelegate.m */; }; 3D98F2BBEF62785171F84182 /* AutocompleteBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E6E2A1285D9A0BEBDCD503 /* AutocompleteBaseViewController.m */; }; 4B998C75A942D73EB0D61DA5 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1D344C64A66F10D55590797E /* Localizable.strings */; }; 5075D7C43A46E44872F24CD6 /* AutocompleteWithTextFieldController.m in Sources */ = {isa = PBXBuildFile; fileRef = ADB9E4A950DB2EA454486E47 /* AutocompleteWithTextFieldController.m */; }; 52EEC38B8E272054E666B986 /* AutocompletePushViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BAEA89ED8C397E73E2E9730 /* AutocompletePushViewController.m */; }; - 67F42E4C138AAAC0EF2EFADD /* libPods-GooglePlacesDemos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BD62DCFDEA80FEF6545539 /* libPods-GooglePlacesDemos.a */; }; 7A46846201F9524E7D5AEA28 /* DemoSceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F016F9B050CDC347357EB3F /* DemoSceneDelegate.m */; }; 941E6ABEE44140E5082343AE /* AutocompleteWithCustomColors.m in Sources */ = {isa = PBXBuildFile; fileRef = FC03FEE150596E9432F612DF /* AutocompleteWithCustomColors.m */; }; 98F81E82D94C6D2274795F99 /* PlacesDemoAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 85EDEFE42680FF093454D1AB /* PlacesDemoAssets.xcassets */; }; @@ -52,7 +52,6 @@ 3CB3E42FBF23DD0411D5EFB5 /* PagingPhotoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PagingPhotoView.h; sourceTree = ""; }; 3F016F9B050CDC347357EB3F /* DemoSceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemoSceneDelegate.m; sourceTree = ""; }; 4268AFE07F8787F0CA36AA3B /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; - 42BD62DCFDEA80FEF6545539 /* libPods-GooglePlacesDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 42C8FE938EFBD5D6633C190F /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = ""; }; 4F2203BCCE0CFC3DC4F38B30 /* DemoData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemoData.m; sourceTree = ""; }; 50E198C48B1A11E3B03DBE30 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = ""; }; @@ -61,7 +60,7 @@ 651835542B635C74A3D0F711 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; 67BD5ABA8E74D336AE54C0B0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; 69D781288A761B789E0F63B6 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = ""; }; - 6C541F3ABF0D0A4D054EBEFA /* Pods-GooglePlacesDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesDemos/Pods-GooglePlacesDemos.default.xcconfig"; sourceTree = ""; }; + 729FA140C308477C6E348DA1 /* libPods-GooglePlacesDemos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-GooglePlacesDemos.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 77688EB771E8262C6C224CE8 /* en_IN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_IN; path = en_IN.lproj/Localizable.strings; sourceTree = ""; }; 84E89BC0ADE5F983320B9730 /* AutocompletePushViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AutocompletePushViewController.h; sourceTree = ""; }; 85EDEFE42680FF093454D1AB /* PlacesDemoAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PlacesDemoAssets.xcassets; sourceTree = ""; }; @@ -101,6 +100,7 @@ F2689EA2B2A4F7DC9912D5DE /* AutocompleteWithTextFieldController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AutocompleteWithTextFieldController.h; sourceTree = ""; }; F3A846055E79359BAF267E70 /* SDKDemoAPIKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDKDemoAPIKey.h; sourceTree = ""; }; F7EFEB4946D6A093B9475CDD /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; + F89F69C1BCABBB370D0F8585 /* Pods-GooglePlacesDemos.default.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GooglePlacesDemos.default.xcconfig"; path = "Target Support Files/Pods-GooglePlacesDemos/Pods-GooglePlacesDemos.default.xcconfig"; sourceTree = ""; }; F8ABF15D04AF351D0A21A5CD /* DemoAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoAppDelegate.h; sourceTree = ""; }; FA2B20801D4CBBF7439CF693 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; }; FB0BACDCF9A220122AFB87B5 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = ""; }; @@ -113,7 +113,7 @@ buildActionMask = 2147483647; files = ( A2EE0081C3FF6E60DA48008E /* UIKit.framework in Frameworks */, - 67F42E4C138AAAC0EF2EFADD /* libPods-GooglePlacesDemos.a in Frameworks */, + 168CE4A94FE266237100834E /* libPods-GooglePlacesDemos.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -124,7 +124,7 @@ isa = PBXGroup; children = ( 97ADBE3D50D731A88C24F3F0 /* UIKit.framework */, - 42BD62DCFDEA80FEF6545539 /* libPods-GooglePlacesDemos.a */, + 729FA140C308477C6E348DA1 /* libPods-GooglePlacesDemos.a */, ); name = Frameworks; sourceTree = ""; @@ -172,7 +172,7 @@ 6474F6E51B1B62FD7E19E38F /* Source */, 50B93CAB6D1F1E17540F6E78 /* Frameworks */, 87ED31F365F5BCA83FBDE8E8 /* Products */, - DB291F1D322B3447C8AD9B19 /* Pods */, + 8A264E12B1DA953A78FF3BDA /* Pods */, ); sourceTree = ""; }; @@ -193,6 +193,15 @@ name = Products; sourceTree = ""; }; + 8A264E12B1DA953A78FF3BDA /* Pods */ = { + isa = PBXGroup; + children = ( + F89F69C1BCABBB370D0F8585 /* Pods-GooglePlacesDemos.default.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; C909AF9881D6F23C468852B2 /* GooglePlacesDemos */ = { isa = PBXGroup; children = ( @@ -225,15 +234,6 @@ path = Samples; sourceTree = ""; }; - DB291F1D322B3447C8AD9B19 /* Pods */ = { - isa = PBXGroup; - children = ( - 6C541F3ABF0D0A4D054EBEFA /* Pods-GooglePlacesDemos.default.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -241,11 +241,11 @@ isa = PBXNativeTarget; buildConfigurationList = E489F9A9DC7E458708AB572E /* Build configuration list for PBXNativeTarget "GooglePlacesDemos" */; buildPhases = ( - FFC78E98E074D0FCD19C0755 /* [CP] Check Pods Manifest.lock */, + F9EAA584D089B69300F7EEE6 /* [CP] Check Pods Manifest.lock */, 2A017491F6C5A9DBB4F6E6F6 /* Resources */, 45EF04B6738E3486BE121AEC /* Sources */, A91F0EDBE05C0121150AEE46 /* Frameworks */, - 2BF0248CBDA100CD24AE07FB /* [CP] Copy Pods Resources */, + B7F41FA2AA139B701E52634B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -336,7 +336,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2BF0248CBDA100CD24AE07FB /* [CP] Copy Pods Resources */ = { + B7F41FA2AA139B701E52634B /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -359,7 +359,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GooglePlacesDemos/Pods-GooglePlacesDemos-resources.sh\"\n"; showEnvVarsInLog = 0; }; - FFC78E98E074D0FCD19C0755 /* [CP] Check Pods Manifest.lock */ = { + F9EAA584D089B69300F7EEE6 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -479,14 +479,14 @@ }; C88A918BB441623AA489A34D /* Default */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6C541F3ABF0D0A4D054EBEFA /* Pods-GooglePlacesDemos.default.xcconfig */; + baseConfigurationReference = F89F69C1BCABBB370D0F8585 /* Pods-GooglePlacesDemos.default.xcconfig */; buildSettings = { "ARCHS[sdk=iphonesimulator*]" = x86_64; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; INFOPLIST_FILE = ./GooglePlacesDemos/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LIBRARY_SEARCH_PATHS = ( ., "$(SDKROOT)/System/Library/Frameworks", diff --git a/GooglePlaces/GooglePlacesDemos/DemoData.m b/GooglePlaces/GooglePlacesDemos/DemoData.m index 5be18dcc..dad5f3b4 100755 --- a/GooglePlaces/GooglePlacesDemos/DemoData.m +++ b/GooglePlaces/GooglePlacesDemos/DemoData.m @@ -15,6 +15,8 @@ #import "GooglePlacesDemos/DemoData.h" +#import +#import "GooglePlacesDemos/Samples/Autocomplete/AutocompleteBaseViewController.h" #import "GooglePlacesDemos/Samples/Autocomplete/AutocompleteModalViewController.h" #import "GooglePlacesDemos/Samples/Autocomplete/AutocompletePushViewController.h" #import "GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithCustomColors.h" @@ -48,7 +50,6 @@ - (UIViewController *)createViewControllerWithAutocompleteFilter: controller.autocompleteFilter = autocompleteFilter; controller.placeFields = placeFields; } - return demoViewController; } diff --git a/GooglePlaces/GooglePlacesDemos/DemoListViewController.m b/GooglePlaces/GooglePlacesDemos/DemoListViewController.m index 5c886940..eb18c3a0 100755 --- a/GooglePlaces/GooglePlacesDemos/DemoListViewController.m +++ b/GooglePlaces/GooglePlacesDemos/DemoListViewController.m @@ -119,6 +119,7 @@ - (void)showDemo:(Demo *)demo { UIViewController *viewController = [demo createViewControllerWithAutocompleteFilter:autocompleteFilter placeFields:[self selectedPlaceFields]]; + [self.navigationController pushViewController:viewController animated:YES]; } diff --git a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteModalViewController.m b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteModalViewController.m index d7617338..0266b98e 100755 --- a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteModalViewController.m +++ b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteModalViewController.m @@ -16,6 +16,7 @@ #import "GooglePlacesDemos/Samples/Autocomplete/AutocompleteModalViewController.h" #import +#import "GooglePlacesDemos/Support/BaseDemoViewController.h" @interface AutocompleteModalViewController () @end diff --git a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompletePushViewController.m b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompletePushViewController.m index f8e36b0d..2864e90f 100755 --- a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompletePushViewController.m +++ b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompletePushViewController.m @@ -16,6 +16,7 @@ #import "GooglePlacesDemos/Samples/Autocomplete/AutocompletePushViewController.h" #import +#import "GooglePlacesDemos/Support/BaseDemoViewController.h" @interface AutocompletePushViewController () @end diff --git a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithCustomColors.m b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithCustomColors.m index 9c3dcfb5..7795d50c 100755 --- a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithCustomColors.m +++ b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithCustomColors.m @@ -16,7 +16,8 @@ #import "GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithCustomColors.h" #import - +#import "GooglePlacesDemos/Samples/Autocomplete/AutocompleteBaseViewController.h" +#import "GooglePlacesDemos/Support/BaseDemoViewController.h" /** * Simple subclass of GMSAutocompleteViewController solely for the purpose of localising appearance * proxy changes to this part of the demo app. diff --git a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithSearchViewController.m b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithSearchViewController.m index 38cfefe1..b8dbee49 100755 --- a/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithSearchViewController.m +++ b/GooglePlaces/GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithSearchViewController.m @@ -16,7 +16,7 @@ #import "GooglePlacesDemos/Samples/Autocomplete/AutocompleteWithSearchViewController.h" #import - +#import "GooglePlacesDemos/Support/BaseDemoViewController.h" NSString *const kSearchBarAccessibilityIdentifier = @"searchBarAccessibilityIdentifier"; @interface AutocompleteWithSearchViewController ()