From b6e17aa9e8e078dd60e92e7976b151a08c2faba7 Mon Sep 17 00:00:00 2001 From: Frank Elias Date: Wed, 20 Apr 2022 11:52:12 -0400 Subject: [PATCH 1/6] sdl version update --- Podfile | 4 ++-- Podfile.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) 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 From 6dc3508357933da5a8ffd0ee38824aed5e80a8f9 Mon Sep 17 00:00:00 2001 From: Frank Elias Date: Wed, 20 Apr 2022 11:56:30 -0400 Subject: [PATCH 2/6] in app search fix --- MobileNav/ViewControllers/Map/SearchViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MobileNav/ViewControllers/Map/SearchViewController.swift b/MobileNav/ViewControllers/Map/SearchViewController.swift index edcb53a..773ba41 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) From 0262887075abf409497a6130f9fceb094e96a8a1 Mon Sep 17 00:00:00 2001 From: Frank Elias Date: Wed, 20 Apr 2022 11:57:36 -0400 Subject: [PATCH 3/6] sdl app search fix --- MobileNav/SDL/MenuManager.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MobileNav/SDL/MenuManager.swift b/MobileNav/SDL/MenuManager.swift index 0b6a1fd..7b8cefd 100644 --- a/MobileNav/SDL/MenuManager.swift +++ b/MobileNav/SDL/MenuManager.swift @@ -43,7 +43,7 @@ class MenuManager: NSObject { let restaurantsCell = SDLMenuCell(title: SDLMenuTitles.restaurantsNearMe, secondaryText: nil, tertiaryText: nil, icon: nil, secondaryArtwork: nil, voiceCommands: [SDLMenuTitles.restaurantsNearMe]) { source in switch source { case .menu: - self.searchManager.searchFor(searchTerm: DefaultSearchTerms.restaurants) { (mapItems, error) in + self.searchManager.searchFor(searchTerm: SDLMenuTitles.restaurantsNearMe) { (mapItems, error) in guard error == nil else { Alert.presentSearchErrorAlert() return @@ -66,7 +66,7 @@ class MenuManager: NSObject { let coffeeCell = SDLMenuCell(title: SDLMenuTitles.coffeeNearMe, secondaryText: nil, tertiaryText: nil, icon: nil, secondaryArtwork: nil, voiceCommands: [SDLMenuTitles.coffeeNearMe]) { source in switch source { case .menu: - self.searchManager.searchFor(searchTerm: DefaultSearchTerms.coffeeShops) { (mapItems, error) in + self.searchManager.searchFor(searchTerm: SDLMenuTitles.coffeeNearMe) { (mapItems, error) in guard error == nil else { Alert.presentSearchErrorAlert() return @@ -89,7 +89,7 @@ class MenuManager: NSObject { let gasStationsCell = SDLMenuCell(title: SDLMenuTitles.gasNearMe, secondaryText: nil, tertiaryText: nil, icon: nil, secondaryArtwork: nil, voiceCommands: [SDLMenuTitles.gasNearMe]) { source in switch source { case .menu: - self.searchManager.searchFor(searchTerm: DefaultSearchTerms.gasStations) { (mapItems, error) in + self.searchManager.searchFor(searchTerm: SDLMenuTitles.gasNearMe) { (mapItems, error) in guard error == nil else { Alert.presentSearchErrorAlert() return From a040ed7ee3f13c1af8597580548122187834411c Mon Sep 17 00:00:00 2001 From: Frank Elias Date: Wed, 20 Apr 2022 11:57:53 -0400 Subject: [PATCH 4/6] sdl menu scroll fix --- MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift b/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift index 2d1158e..77df13c 100644 --- a/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift +++ b/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift @@ -27,6 +27,7 @@ class SDLMenuViewController: SDLCarWindowViewController { func setupTouchManager() { ProxyManager.sharedManager.sdlManager.streamManager?.touchManager.touchEventDelegate = self + ProxyManager.sharedManager.sdlManager.streamManager?.touchManager.enableSyncedPanning = true } func returnToMap() { @@ -36,7 +37,13 @@ class SDLMenuViewController: SDLCarWindowViewController { } } +// MARK: SDLTouchManagerDelegate callbacks extension SDLMenuViewController: SDLTouchManagerDelegate { + 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 { From f003c96e4823c671aaeb1eef814aabd0ef27c92d Mon Sep 17 00:00:00 2001 From: Frank Elias Date: Wed, 20 Apr 2022 11:58:57 -0400 Subject: [PATCH 5/6] sdl search revert --- MobileNav/SDL/MenuManager.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MobileNav/SDL/MenuManager.swift b/MobileNav/SDL/MenuManager.swift index 7b8cefd..0b6a1fd 100644 --- a/MobileNav/SDL/MenuManager.swift +++ b/MobileNav/SDL/MenuManager.swift @@ -43,7 +43,7 @@ class MenuManager: NSObject { let restaurantsCell = SDLMenuCell(title: SDLMenuTitles.restaurantsNearMe, secondaryText: nil, tertiaryText: nil, icon: nil, secondaryArtwork: nil, voiceCommands: [SDLMenuTitles.restaurantsNearMe]) { source in switch source { case .menu: - self.searchManager.searchFor(searchTerm: SDLMenuTitles.restaurantsNearMe) { (mapItems, error) in + self.searchManager.searchFor(searchTerm: DefaultSearchTerms.restaurants) { (mapItems, error) in guard error == nil else { Alert.presentSearchErrorAlert() return @@ -66,7 +66,7 @@ class MenuManager: NSObject { let coffeeCell = SDLMenuCell(title: SDLMenuTitles.coffeeNearMe, secondaryText: nil, tertiaryText: nil, icon: nil, secondaryArtwork: nil, voiceCommands: [SDLMenuTitles.coffeeNearMe]) { source in switch source { case .menu: - self.searchManager.searchFor(searchTerm: SDLMenuTitles.coffeeNearMe) { (mapItems, error) in + self.searchManager.searchFor(searchTerm: DefaultSearchTerms.coffeeShops) { (mapItems, error) in guard error == nil else { Alert.presentSearchErrorAlert() return @@ -89,7 +89,7 @@ class MenuManager: NSObject { let gasStationsCell = SDLMenuCell(title: SDLMenuTitles.gasNearMe, secondaryText: nil, tertiaryText: nil, icon: nil, secondaryArtwork: nil, voiceCommands: [SDLMenuTitles.gasNearMe]) { source in switch source { case .menu: - self.searchManager.searchFor(searchTerm: SDLMenuTitles.gasNearMe) { (mapItems, error) in + self.searchManager.searchFor(searchTerm: DefaultSearchTerms.gasStations) { (mapItems, error) in guard error == nil else { Alert.presentSearchErrorAlert() return From 69eec0d052fc71cb0dadb27fdf81743ed482fbfc Mon Sep 17 00:00:00 2001 From: Frank Elias Date: Fri, 22 Apr 2022 10:32:03 -0400 Subject: [PATCH 6/6] Comments review --- MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift | 5 +++-- MobileNav/ViewControllers/Map/SearchViewController.swift | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift b/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift index 77df13c..49ece0f 100644 --- a/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift +++ b/MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift @@ -27,7 +27,6 @@ class SDLMenuViewController: SDLCarWindowViewController { func setupTouchManager() { ProxyManager.sharedManager.sdlManager.streamManager?.touchManager.touchEventDelegate = self - ProxyManager.sharedManager.sdlManager.streamManager?.touchManager.enableSyncedPanning = true } func returnToMap() { @@ -37,8 +36,10 @@ class SDLMenuViewController: SDLCarWindowViewController { } } -// MARK: SDLTouchManagerDelegate callbacks +// 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 diff --git a/MobileNav/ViewControllers/Map/SearchViewController.swift b/MobileNav/ViewControllers/Map/SearchViewController.swift index 773ba41..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.title + ", " + place.subtitle : place.title + let query: String = ((place.subtitle != "") ? (place.title + ", " + place.subtitle) : place.title) request.naturalLanguageQuery = query let search = MKLocalSearch(request: request)