Skip to content

Fixed search button in mobile and SDL app. SDL CarWindow menu is not scrollable #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixed search button in mobile and SDL app. SDL CarWindow menu is not scrollable #21

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6e17aa
sdl version update
Apr 20, 2022
6dc3508
in app search fix
Apr 20, 2022
0262887
sdl app search fix
Apr 20, 2022
a040ed7
sdl menu scroll fix
Apr 20, 2022
f003c96
sdl search revert
Apr 20, 2022
69eec0d
Comments review
Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions MobileNav/SDL/SDL UI/Menu/SDLMenuViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion MobileNav/ViewControllers/Map/SearchViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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