From 33e505440183b5e9a117576185b6d8d02928ff13 Mon Sep 17 00:00:00 2001 From: Zoia Pribytkova Date: Fri, 1 Mar 2019 14:09:01 +0300 Subject: [PATCH] [iOS][CarPlay] Base 1.0 CarPlay Integration --- .../Categories/BMCView/BMCViewController.xib | 8 +- .../BookmarksSharingViewController.swift | 2 +- iphone/Maps/Bridging-Header.h | 9 + iphone/Maps/Categories/UIColor+MapsMeColor.h | 5 + iphone/Maps/Categories/UIColor+MapsMeColor.mm | 21 + iphone/Maps/Categories/UIColorRoutines.h | 1 + iphone/Maps/Classes/CarPlay/CPConstants.swift | 38 + .../Classes/CarPlay/CPViewPortState.swift | 7 + .../Maps/Classes/CarPlay/CarPlayRouter.swift | 347 +++++++++ .../Maps/Classes/CarPlay/CarPlayService.swift | 685 ++++++++++++++++++ .../CarPlay/MWMCarPlayBookmarkObject.h | 13 + .../CarPlay/MWMCarPlayBookmarkObject.mm | 31 + .../CarPlay/MWMCarPlaySearchResultObject.h | 13 + .../CarPlay/MWMCarPlaySearchResultObject.mm | 42 ++ .../Classes/CarPlay/MWMCarPlaySearchService.h | 17 + .../CarPlay/MWMCarPlaySearchService.mm | 60 ++ .../ListTemplateBuilder.swift | 129 ++++ .../MapTemplateBuilder.swift | 197 +++++ .../SearchTemplateBuilder.swift | 10 + .../SettingsTemplateBuilder.swift | 86 +++ .../CarPlay/Templates Data/BookmarkInfo.swift | 9 + .../CarPlay/Templates Data/CategoryInfo.swift | 7 + .../CarPlay/Templates Data/ListItemInfo.swift | 13 + .../CarPlay/Templates Data/MapInfo.swift | 10 + .../CarPlay/Templates Data/RouteInfo.swift | 50 ++ .../Templates Data/SearchResultInfo.swift | 7 + .../MWMMapViewControlsManager.mm | 6 +- .../MWMTrafficButtonViewController.mm | 2 +- .../MWMNavigationDashboardEntity.mm | 11 +- .../MWMNavigationDashboardManager+Entity.mm | 17 +- .../Views/RoutePreview/MWMRoutePreview.mm | 9 +- iphone/Maps/Classes/EAGLView.h | 22 +- iphone/Maps/Classes/EAGLView.mm | 60 +- iphone/Maps/Classes/MapViewController.h | 12 + iphone/Maps/Classes/MapViewController.mm | 87 ++- iphone/Maps/Classes/MapsAppDelegate.h | 2 + iphone/Maps/Classes/MapsAppDelegate.mm | 76 +- .../Classes/Widgets/MWMMapDownloadDialog.mm | 7 + iphone/Maps/Classes/Widgets/MWMMapWidgets.h | 2 + iphone/Maps/Classes/Widgets/MWMMapWidgets.mm | 47 +- .../Classes/Widgets/MWMMapWidgetsHelper.h | 2 + .../Classes/Widgets/MWMMapWidgetsHelper.mm | 10 + iphone/Maps/Common/Keyboard/MWMKeyboard.h | 7 + iphone/Maps/Common/Keyboard/MWMKeyboard.mm | 2 +- .../BackgroundFetchTaskFrameworkType.swift | 2 +- .../Maps/Core/Bookmarks/MWMBookmarksManager.h | 13 +- .../Core/Bookmarks/MWMBookmarksManager.mm | 27 +- .../EventListening/ListenerContainer.swift | 60 ++ .../Maps/Core/Framework/MWMFrameworkHelper.h | 14 + .../Maps/Core/Framework/MWMFrameworkHelper.mm | 61 +- .../Core/Framework/MWMFrameworkListener.h | 1 - .../Core/Framework/MWMFrameworkListener.mm | 12 + .../Core/Framework/MWMFrameworkObservers.h | 2 + .../Location/MWMLocationModeListener.h | 10 + .../Routing/MWMRouterResultCode.h | 19 + .../ProxyObjects/Routing/MWMRoutingManager.h | 48 ++ .../ProxyObjects/Routing/MWMRoutingManager.mm | 285 ++++++++ .../Routing/MWMSpeedCameraManagerMode.h | 5 + .../Maps/Core/Location/MWMLocationHelpers.h | 26 +- .../Maps/Core/Location/MWMLocationManager.h | 1 - .../Maps/Core/Location/MWMLocationManager.mm | 2 +- iphone/Maps/Core/Routing/MWMRoutePoint.h | 6 + iphone/Maps/Core/Routing/MWMRoutePoint.mm | 15 + iphone/Maps/Core/Routing/MWMRouter.h | 13 + iphone/Maps/Core/Routing/MWMRouter.mm | 39 +- iphone/Maps/Core/Search/MWMSearch.h | 12 +- iphone/Maps/Core/Search/MWMSearch.mm | 2 +- iphone/Maps/Core/Settings/MWMRoutingOptions.h | 1 + iphone/Maps/Core/Settings/MWMSettings.mm | 10 + .../Maps/Core/TextToSpeech/MWMTextToSpeech.h | 13 +- .../Maps/Core/TextToSpeech/MWMTextToSpeech.mm | 116 ++- iphone/Maps/Core/Traffic/MWMTrafficManager.h | 7 + iphone/Maps/Core/Traffic/MWMTrafficManager.mm | 2 +- .../Images.xcassets/CarPlay/Contents.json | 6 + .../CarPlay/Maneuvers/Contents.json | 6 + .../CarPlay/Maneuvers/Symbols/Contents.json | 6 + .../Contents.json | 12 + .../ic_cp_exit_highway_to_left_then.pdf | Bin 0 -> 9357 bytes .../Contents.json | 12 + .../ic_cp_exit_highway_to_right_then.pdf | Bin 0 -> 9333 bytes .../ic_cp_round_then.imageset/Contents.json | 12 + .../ic_cp_round_then.pdf | Bin 0 -> 4026 bytes .../Contents.json | 12 + .../ic_cp_sharp_left_then.pdf | Bin 0 -> 4193 bytes .../Contents.json | 12 + .../ic_cp_sharp_right_then.pdf | Bin 0 -> 4188 bytes .../Contents.json | 12 + .../ic_cp_simple_left_then.pdf | Bin 0 -> 4052 bytes .../Contents.json | 12 + .../ic_cp_simple_right_then.pdf | Bin 0 -> 4042 bytes .../Contents.json | 12 + .../ic_cp_slight_left_then.pdf | Bin 0 -> 4095 bytes .../Contents.json | 12 + .../ic_cp_slight_right_then.pdf | Bin 0 -> 4092 bytes .../Contents.json | 12 + .../ic_cp_straight_then.pdf | Bin 0 -> 3993 bytes .../Contents.json | 12 + .../ic_cp_uturn_left_then.pdf | Bin 0 -> 4130 bytes .../Contents.json | 21 + .../ic_cp_uturn_right_then.pdf | Bin 0 -> 4061 bytes .../Contents.json | 12 + .../ic_cp_exit_highway_to_left.pdf | Bin 0 -> 9658 bytes .../Contents.json | 12 + .../ic_cp_exit_highway_to_right.pdf | Bin 0 -> 9646 bytes .../ic_cp_finish_point.imageset/Contents.json | 12 + .../ic_cp_finish_point.pdf | Bin 0 -> 9453 bytes .../ic_cp_round.imageset/Contents.json | 12 + .../ic_cp_round.imageset/ic_cp_round.pdf | Bin 0 -> 4033 bytes .../ic_cp_sharp_left.imageset/Contents.json | 12 + .../ic_cp_sharp_left.pdf | Bin 0 -> 4195 bytes .../ic_cp_sharp_right.imageset/Contents.json | 12 + .../ic_cp_sharp_right.pdf | Bin 0 -> 4184 bytes .../ic_cp_simple_left.imageset/Contents.json | 12 + .../ic_cp_simple_left.pdf | Bin 0 -> 4061 bytes .../ic_cp_simple_right.imageset/Contents.json | 12 + .../ic_cp_simple_right.pdf | Bin 0 -> 4058 bytes .../ic_cp_slight_left.imageset/Contents.json | 12 + .../ic_cp_slight_left.pdf | Bin 0 -> 4101 bytes .../ic_cp_slight_right.imageset/Contents.json | 12 + .../ic_cp_slight_right.pdf | Bin 0 -> 4091 bytes .../ic_cp_straight.imageset/Contents.json | 12 + .../ic_cp_straight.pdf | Bin 0 -> 4014 bytes .../ic_cp_uturn_left.imageset/Contents.json | 12 + .../ic_cp_uturn_left.pdf | Bin 0 -> 4148 bytes .../ic_cp_uturn_right.imageset/Contents.json | 12 + .../ic_cp_uturn_right.pdf | Bin 0 -> 4076 bytes .../Contents.json | 12 + .../btn_carplay_pan.pdf | Bin 0 -> 9029 bytes .../Contents.json | 15 + .../ic_carplay_bookmark.pdf | Bin 0 -> 5958 bytes .../ic_carplay_camera.imageset/Contents.json | 15 + .../ic_carplay_camera.pdf | Bin 0 -> 4297 bytes .../ic_carplay_ferry.imageset/Contents.json | 12 + .../ic_carplay_ferry.pdf | Bin 0 -> 6077 bytes .../Contents.json | 12 + .../ic_carplay_ferry_active.pdf | Bin 0 -> 6100 bytes .../Contents.json | 15 + .../ic_carplay_keyboard.pdf | Bin 0 -> 4169 bytes .../ic_carplay_muted.imageset/Contents.json | 12 + .../ic_carplay_muted.pdf | Bin 0 -> 4411 bytes .../ic_carplay_recent.imageset/Contents.json | 12 + .../ic_carplay_recent.pdf | Bin 0 -> 6148 bytes .../Contents.json | 15 + .../ic_carplay_redirect_route.pdf | Bin 0 -> 6867 bytes .../Contents.json | 15 + .../ic_carplay_settings.pdf | Bin 0 -> 6867 bytes .../Contents.json | 12 + .../ic_carplay_speedcam.pdf | Bin 0 -> 4454 bytes .../Contents.json | 12 + .../ic_carplay_speedcam_active.pdf | Bin 0 -> 4477 bytes .../ic_carplay_toll.imageset/Contents.json | 12 + .../ic_carplay_toll.pdf | Bin 0 -> 7074 bytes .../Contents.json | 12 + .../ic_carplay_toll_active.pdf | Bin 0 -> 7097 bytes .../Contents.json | 12 + .../ic_carplay_trafficlight.pdf | Bin 0 -> 6086 bytes .../Contents.json | 12 + .../ic_carplay_trafficlight_active.pdf | Bin 0 -> 6110 bytes .../ic_carplay_unmuted.imageset/Contents.json | 15 + .../ic_carplay_volumn.pdf | Bin 0 -> 5491 bytes .../ic_carplay_unpaved.imageset/Contents.json | 12 + .../ic_carplay_unpaved.pdf | Bin 0 -> 5964 bytes .../Contents.json | 12 + .../ic_carplay_unpaved_active.pdf | Bin 0 -> 5987 bytes iphone/Maps/Maps.xcodeproj/project.pbxproj | 204 +++++- iphone/Maps/UI/Appearance/ThemeManager.swift | 4 +- .../Maps/UI/AvailableArea/VisibleArea.swift | 7 +- .../Maps/UI/BottomMenu/MWMBottomMenuView.mm | 5 +- .../BottomMenu/MWMBottomMenuViewController.mm | 4 +- .../UI/CarPlay/CarPlayMapViewController.swift | 150 ++++ .../Maps/UI/Editor/MWMEditorViewController.mm | 2 +- .../DirectionView/MWMDirectionView.mm | 2 +- .../Maps/UI/PlacePage/MWMPlacePageManager.mm | 22 +- .../PlacePageLayout/MWMPlacePageLayout.mm | 2 +- .../DrivingOptionsViewController.swift | 2 +- .../Storyboard/CarPlayStoryboard.storyboard | 122 ++++ iphone/Maps/UI/Storyboard/Main.storyboard | 158 ++-- iphone/Maps/UI/Storyboard/Storyboard.swift | 2 + .../UI/Welcome/WelcomePageController.swift | 2 +- iphone/Maps/maps.me dbg.entitlements | 2 + iphone/Maps/maps.me full.entitlements | 16 + iphone/Maps/maps.me rel.entitlements | 14 + map/routing_manager.cpp | 5 + map/routing_manager.hpp | 17 + platform/measurement_utils.cpp | 25 + platform/measurement_utils.hpp | 2 + .../omim.xcworkspace/contents.xcworkspacedata | 3 - 187 files changed, 4084 insertions(+), 283 deletions(-) create mode 100644 iphone/Maps/Classes/CarPlay/CPConstants.swift create mode 100644 iphone/Maps/Classes/CarPlay/CPViewPortState.swift create mode 100644 iphone/Maps/Classes/CarPlay/CarPlayRouter.swift create mode 100644 iphone/Maps/Classes/CarPlay/CarPlayService.swift create mode 100644 iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.h create mode 100644 iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.mm create mode 100644 iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.h create mode 100644 iphone/Maps/Classes/CarPlay/MWMCarPlaySearchResultObject.mm create mode 100644 iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.h create mode 100644 iphone/Maps/Classes/CarPlay/MWMCarPlaySearchService.mm create mode 100644 iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift create mode 100644 iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift create mode 100644 iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift create mode 100644 iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift create mode 100644 iphone/Maps/Classes/CarPlay/Templates Data/BookmarkInfo.swift create mode 100644 iphone/Maps/Classes/CarPlay/Templates Data/CategoryInfo.swift create mode 100644 iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift create mode 100644 iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift create mode 100644 iphone/Maps/Classes/CarPlay/Templates Data/RouteInfo.swift create mode 100644 iphone/Maps/Classes/CarPlay/Templates Data/SearchResultInfo.swift create mode 100644 iphone/Maps/Core/EventListening/ListenerContainer.swift create mode 100644 iphone/Maps/Core/Framework/ProxyObjects/Location/MWMLocationModeListener.h create mode 100644 iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRouterResultCode.h create mode 100644 iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.h create mode 100644 iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm create mode 100644 iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMSpeedCameraManagerMode.h create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_left_then.imageset/ic_cp_exit_highway_to_left_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_exit_highway_to_right_then.imageset/ic_cp_exit_highway_to_right_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_round_then.imageset/ic_cp_round_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_left_then.imageset/ic_cp_sharp_left_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_sharp_right_then.imageset/ic_cp_sharp_right_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_left_then.imageset/ic_cp_simple_left_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_simple_right_then.imageset/ic_cp_simple_right_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_left_then.imageset/ic_cp_slight_left_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_slight_right_then.imageset/ic_cp_slight_right_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_straight_then.imageset/ic_cp_straight_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_left_then.imageset/ic_cp_uturn_left_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/Symbols/ic_cp_uturn_right_then.imageset/ic_cp_uturn_right_then.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_left.imageset/ic_cp_exit_highway_to_left.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_exit_highway_to_right.imageset/ic_cp_exit_highway_to_right.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_finish_point.imageset/ic_cp_finish_point.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_round.imageset/ic_cp_round.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_left.imageset/ic_cp_sharp_left.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_sharp_right.imageset/ic_cp_sharp_right.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_left.imageset/ic_cp_simple_left.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_simple_right.imageset/ic_cp_simple_right.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_left.imageset/ic_cp_slight_left.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_slight_right.imageset/ic_cp_slight_right.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_straight.imageset/ic_cp_straight.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_left.imageset/ic_cp_uturn_left.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/Maneuvers/ic_cp_uturn_right.imageset/ic_cp_uturn_right.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/btn_carplay_pan_light.imageset/btn_carplay_pan.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_camera.imageset/ic_carplay_camera.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry.imageset/ic_carplay_ferry.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_ferry_active.imageset/ic_carplay_ferry_active.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_muted.imageset/ic_carplay_muted.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_recent.imageset/ic_carplay_recent.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_redirect_route.imageset/ic_carplay_redirect_route.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam.imageset/ic_carplay_speedcam.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_speedcam_active.imageset/ic_carplay_speedcam_active.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll.imageset/ic_carplay_toll.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_toll_active.imageset/ic_carplay_toll_active.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight.imageset/ic_carplay_trafficlight.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_trafficlight_active.imageset/ic_carplay_trafficlight_active.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unmuted.imageset/ic_carplay_volumn.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved.imageset/ic_carplay_unpaved.pdf create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_unpaved_active.imageset/ic_carplay_unpaved_active.pdf create mode 100644 iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift create mode 100644 iphone/Maps/UI/Storyboard/CarPlayStoryboard.storyboard create mode 100644 iphone/Maps/maps.me full.entitlements create mode 100644 iphone/Maps/maps.me rel.entitlements diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib index a6cf7ef4ab..5733af89d0 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -53,7 +53,7 @@