Skip to content

Commit 3d9b390

Browse files
MaximAlienMaximAlien
committed
Update.
1 parent d8fad34 commit 3d9b390

File tree

4 files changed

+48
-30
lines changed

4 files changed

+48
-30
lines changed

‎Navigation-Examples.xcodeproj/project.pbxproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
2B521D522409242A00984CF8 /* CustomBottomBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2B521D512409242A00984CF8 /* CustomBottomBannerView.xib */; };
1515
2B5470632816C74A0068DA3F /* Custom-RoutingProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B5470622816C74A0068DA3F /* Custom-RoutingProvider.swift */; };
1616
6CD94175657B369FB9C6B8B5 /* Pods_DocsCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9107365E41DB56AF5F37BEE2 /* Pods_DocsCode.framework */; };
17+
8A0A0171289882D800E4D8CA /* Navigation-View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0A0170289882D800E4D8CA /* Navigation-View.swift */; };
1718
8A0B182326553482005107DE /* CustomSegue.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8A0B182226553482005107DE /* CustomSegue.storyboard */; };
1819
8A2DFA57261650A60034A87E /* CustomCameraStateTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A2DFA55261650A60034A87E /* CustomCameraStateTransition.swift */; };
1920
8A2DFA58261650A60034A87E /* CustomViewportDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A2DFA56261650A60034A87E /* CustomViewportDataSource.swift */; };
@@ -64,6 +65,7 @@
6465
2B521D512409242A00984CF8 /* CustomBottomBannerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CustomBottomBannerView.xib; sourceTree = "<group>"; };
6566
2B5470622816C74A0068DA3F /* Custom-RoutingProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Custom-RoutingProvider.swift"; sourceTree = "<group>"; };
6667
751C9DE4E717073D370EB4EF /* Pods-DocsCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DocsCode.release.xcconfig"; path = "Target Support Files/Pods-DocsCode/Pods-DocsCode.release.xcconfig"; sourceTree = "<group>"; };
68+
8A0A0170289882D800E4D8CA /* Navigation-View.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Navigation-View.swift"; sourceTree = "<group>"; };
6769
8A0B182226553482005107DE /* CustomSegue.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CustomSegue.storyboard; sourceTree = "<group>"; };
6870
8A2DFA55261650A60034A87E /* CustomCameraStateTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomCameraStateTransition.swift; sourceTree = "<group>"; };
6971
8A2DFA56261650A60034A87E /* CustomViewportDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomViewportDataSource.swift; sourceTree = "<group>"; };
@@ -212,7 +214,6 @@
212214
E4F99A65CCB2B9CB623270EE /* Pods-Navigation-Examples.debug.xcconfig */,
213215
0544DEF056F7B94F491CBD53 /* Pods-Navigation-Examples.release.xcconfig */,
214216
);
215-
name = Pods;
216217
path = Pods;
217218
sourceTree = "<group>";
218219
};
@@ -278,6 +279,7 @@
278279
11DC36F126161DAF0042CD4A /* Location-Snapping.swift */,
279280
11B6E81626176F3600872E4D /* Upcoming-Intersection.swift */,
280281
B4F805ED26791AD900D5F1C8 /* Custom-User-Location.swift */,
282+
8A0A0170289882D800E4D8CA /* Navigation-View.swift */,
281283
8AFBF217265E851700468551 /* CustomSegue */,
282284
8A2DFA52261650600034A87E /* NavigationCamera */,
283285
8AC9129E2494118400B6941E /* TestData */,
@@ -628,6 +630,7 @@
628630
C5C0D63820589422003A3B1D /* Custom-Server.swift in Sources */,
629631
C3893F1C25F96BDC0058A987 /* Custom-Waypoints.swift in Sources */,
630632
8A31388726402DF400763714 /* Navigation-From-Segue.swift in Sources */,
633+
8A0A0171289882D800E4D8CA /* Navigation-View.swift in Sources */,
631634
B4F805EE26791AD900D5F1C8 /* Custom-User-Location.swift in Sources */,
632635
C346744E263C57610068A65E /* Beta-Query-Parameters.swift in Sources */,
633636
2B521D4E24090A3A00984CF8 /* CustomBarsViewController.swift in Sources */,

‎Navigation-Examples/Examples/Navigation-View.swift

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class NavigationViewViewController: UIViewController {
99

1010
override func viewDidLoad() {
1111
super.viewDidLoad()
12-
12+
1313
navigationView = NavigationView(frame: view.bounds)
1414
navigationView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
1515

@@ -23,8 +23,9 @@ class NavigationViewViewController: UIViewController {
2323
navigationView.bottomBannerContainerView.isHidden = false
2424
navigationView.bottomBannerContainerView.heightAnchor.constraint(equalToConstant: 150.0).isActive = true
2525
navigationView.bottomBannerContainerView.backgroundColor = .white
26-
navigationView.isBottomBannerContainerViewExpandable = true
27-
navigationView.bottomBannerContainerViewOffset = 50.0
26+
// TODO: Make public.
27+
// navigationView.bottomBannerContainerView.isExpandable = true
28+
// navigationView.bottomBannerContainerView.expansionOffset = 50.0
2829

2930
navigationView.topBannerContainerView.isHidden = false
3031
navigationView.topBannerContainerView.heightAnchor.constraint(equalToConstant: 50.0).isActive = true

‎Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ install! 'cocoapods', :warn_for_unused_master_specs_repo => false
33
platform :ios, '11.0'
44
use_frameworks!
55

6-
pod 'MapboxCoreNavigation', '~> 2.6.0'
7-
pod 'MapboxNavigation', '~> 2.6.0'
6+
pod 'MapboxCoreNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :branch => 'main'
7+
pod 'MapboxNavigation', :git => 'https://github.com/mapbox/mapbox-navigation-ios.git', :branch => 'main'
88

99
target 'Navigation-Examples' do
1010
end

‎Podfile.lock

+38-24
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,80 @@
11
PODS:
2-
- MapboxCommon (22.0.0)
3-
- MapboxCoreMaps (10.6.0):
4-
- MapboxCommon (~> 22.0)
5-
- MapboxCoreNavigation (2.6.0):
2+
- MapboxCommon (22.1.0-rc.1)
3+
- MapboxCoreMaps (10.7.0-rc.1):
4+
- MapboxCommon (~> 22.1.0-rc)
5+
- MapboxCoreNavigation (2.7.0-beta.3):
66
- MapboxDirections (~> 2.6)
77
- MapboxMobileEvents (~> 1.0)
8-
- MapboxNavigationNative (~> 106.0)
8+
- MapboxNavigationNative (~> 110.0)
99
- MapboxDirections (2.6.0):
1010
- Polyline (~> 5.0)
1111
- Turf (~> 2.4)
12-
- MapboxMaps (10.6.0):
13-
- MapboxCommon (= 22.0.0)
14-
- MapboxCoreMaps (= 10.6.0)
12+
- MapboxMaps (10.7.0-rc.1):
13+
- MapboxCommon (= 22.1.0-rc.1)
14+
- MapboxCoreMaps (= 10.7.0-rc.1)
1515
- MapboxMobileEvents (= 1.0.8)
1616
- Turf (~> 2.0)
1717
- MapboxMobileEvents (1.0.8)
18-
- MapboxNavigation (2.6.0):
19-
- MapboxCoreNavigation (= 2.6.0)
20-
- MapboxMaps (~> 10.6)
18+
- MapboxNavigation (2.7.0-beta.3):
19+
- MapboxCoreNavigation (= 2.7.0-beta.3)
20+
- MapboxMaps (= 10.7.0-rc.1)
2121
- MapboxMobileEvents (~> 1.0)
2222
- MapboxSpeech (~> 2.0)
2323
- Solar-dev (~> 3.0)
24-
- MapboxNavigationNative (106.0.0):
25-
- MapboxCommon (~> 22.0)
24+
- MapboxNavigationNative (110.0.0):
25+
- MapboxCommon (~> 22.1.0-rc.1)
2626
- MapboxSpeech (2.0.1)
2727
- Polyline (5.0.2)
2828
- Solar-dev (3.0.1)
2929
- Turf (2.4.0)
3030

3131
DEPENDENCIES:
32-
- MapboxCoreNavigation (~> 2.6.0)
33-
- MapboxNavigation (~> 2.6.0)
32+
- MapboxCoreNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, branch `main`)
33+
- MapboxNavigation (from `https://github.com/mapbox/mapbox-navigation-ios.git`, branch `main`)
3434

3535
SPEC REPOS:
3636
trunk:
3737
- MapboxCommon
3838
- MapboxCoreMaps
39-
- MapboxCoreNavigation
4039
- MapboxDirections
4140
- MapboxMaps
4241
- MapboxMobileEvents
43-
- MapboxNavigation
4442
- MapboxNavigationNative
4543
- MapboxSpeech
4644
- Polyline
4745
- Solar-dev
4846
- Turf
4947

48+
EXTERNAL SOURCES:
49+
MapboxCoreNavigation:
50+
:branch: main
51+
:git: https://github.com/mapbox/mapbox-navigation-ios.git
52+
MapboxNavigation:
53+
:branch: main
54+
:git: https://github.com/mapbox/mapbox-navigation-ios.git
55+
56+
CHECKOUT OPTIONS:
57+
MapboxCoreNavigation:
58+
:commit: 7886707486121dcb458c12f51083531227a296c6
59+
:git: https://github.com/mapbox/mapbox-navigation-ios.git
60+
MapboxNavigation:
61+
:commit: 7886707486121dcb458c12f51083531227a296c6
62+
:git: https://github.com/mapbox/mapbox-navigation-ios.git
63+
5064
SPEC CHECKSUMS:
51-
MapboxCommon: 8b10731406d2e4472d52ae6ec3679e6e5c4bd55e
52-
MapboxCoreMaps: 2019935caed7e56be1417ff70d3ad0c0cbf0264e
53-
MapboxCoreNavigation: b2c6fb963d434e04c2609967b1c573d30f6f6ee0
65+
MapboxCommon: a4cf3c329d10c66d14d1b43d38af6dbd90a7d8f7
66+
MapboxCoreMaps: 03bb0539ed3a8913b9eb01211d15de0574dbf642
67+
MapboxCoreNavigation: 227f4abaea1e599c07d3185bf884a6e425343b16
5468
MapboxDirections: 4a51348c02146bd246ce67c3e3d06e809003fbba
55-
MapboxMaps: e078cc1343a0513174869a5e16ae9a18d3977252
69+
MapboxMaps: c982c6ffebd7cbd5c9f69153dbcdadd5adf3f631
5670
MapboxMobileEvents: febdd92835daa258ca1c1faad0821c0b3394ef40
57-
MapboxNavigation: 8092769e6a1450be497cca0dc79cf188884f683c
58-
MapboxNavigationNative: ea019c7a8e4c6a2776d9fe11963085095d17b14a
71+
MapboxNavigation: 0043250d453488556091e4028d135d1adaf2609c
72+
MapboxNavigationNative: dfcdc073de416677f6be529dddd184dd7157d46a
5973
MapboxSpeech: fb9129e1ca7cc2dd465397d2aea1f5f510de260e
6074
Polyline: fce41d72e1146c41c6d081f7656827226f643dff
6175
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
6276
Turf: 60b93cfdc62758526bc7bf1ef191a829aeb9694d
6377

64-
PODFILE CHECKSUM: f1c747048a6fdea1d3e8814dacc4705ec7a2a180
78+
PODFILE CHECKSUM: 83cd7c216a75a3629527137ecc695972e6c5b825
6579

6680
COCOAPODS: 1.11.3

0 commit comments

Comments
 (0)