diff --git a/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift b/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift index 2d1158e..49ece0f 100644 --- a/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift +++ b/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift @@ -36,7 +36,15 @@ class SDLMenuViewController: SDLCarWindowViewController { } } +// MARK: - SDLTouchManagerDelegate callbacks extension SDLMenuViewController: SDLTouchManagerDelegate { + /// Detect the user pan/scroll movement on the HMI screen in order to update the `SDLCarWindowViewController`'s view + /// so it can update the screen position of the HMI menu + func touchManager(_ manager: SDLTouchManager, didReceivePanningFrom fromPoint: CGPoint, to toPoint: CGPoint) { + let displacementPoint = fromPoint.displacement(toPoint: toPoint) + self.view.frame.origin.y += displacementPoint.y + } + func touchManager(_ manager: SDLTouchManager, didReceiveSingleTapFor view: UIView?, at point: CGPoint) { if let view = view { switch view { diff --git a/MobileNav/ViewControllers/Map/SearchViewController.swift b/MobileNav/ViewControllers/Map/SearchViewController.swift index edcb53a..deb32b6 100644 --- a/MobileNav/ViewControllers/Map/SearchViewController.swift +++ b/MobileNav/ViewControllers/Map/SearchViewController.swift @@ -45,7 +45,7 @@ extension SearchViewController: UITableViewDelegate, UITableViewDataSource { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { let place = searchResults[indexPath.row] let request = MKLocalSearch.Request() - let query: String = place.subtitle != "" ? place.subtitle : place.title + let query: String = ((place.subtitle != "") ? (place.title + ", " + place.subtitle) : place.title) request.naturalLanguageQuery = query let search = MKLocalSearch(request: request) diff --git a/Podfile b/Podfile index 2f9107b..bc1b163 100644 --- a/Podfile +++ b/Podfile @@ -6,7 +6,7 @@ target 'MobileNav' do use_frameworks! # Pods for MobileNav -# pod 'SmartDeviceLink/Swift', :git => 'https://github.com/smartdevicelink/sdl_ios.git', :branch => 'bugfix/issue-2011-fix-sdlvideostreamingrange' - pod 'SmartDeviceLink/Swift', '~> 7.3' +# pod 'SmartDeviceLink/Swift', :git => 'https://github.com/smartdevicelink/sdl_ios.git', :branch => 'develop' + pod 'SmartDeviceLink/Swift', '~> 7.4' pod 'Mapbox-iOS-SDK', '~> 5.7' end diff --git a/Podfile.lock b/Podfile.lock index 23bc25c..71f711e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -3,15 +3,15 @@ PODS: - Mapbox-iOS-SDK (5.9.0): - MapboxMobileEvents (= 0.10.2) - MapboxMobileEvents (0.10.2) - - SmartDeviceLink/Default (7.3.1): + - SmartDeviceLink/Default (7.4.0): - BiSON (~> 1.2) - - SmartDeviceLink/Swift (7.3.1): + - SmartDeviceLink/Swift (7.4.0): - BiSON (~> 1.2) - SmartDeviceLink/Default DEPENDENCIES: - Mapbox-iOS-SDK (~> 5.7) - - SmartDeviceLink/Swift (~> 7.3) + - SmartDeviceLink/Swift (~> 7.4) SPEC REPOS: trunk: @@ -24,8 +24,8 @@ SPEC CHECKSUMS: BiSON: 232dc4fdbe825301742963f27a78f10f13bca68b Mapbox-iOS-SDK: a5915700ec84bc1a7f8b3e746d474789e35b7956 MapboxMobileEvents: 2bc0ca2eedb627b73cf403258dce2b2fa98074a6 - SmartDeviceLink: a3486b871633378c65a5be08ea5e73ec8f5a8057 + SmartDeviceLink: 2e2f8690215f31a9e77ffa64975c64a579ad31e3 -PODFILE CHECKSUM: b64edc435fe0c951b39888a904334408edd15125 +PODFILE CHECKSUM: 46fa73b7412c6c78f26a22e515cd01a686750581 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3