[ios] CarPlay/phone switch prototype

Signed-off-by: Oleg Montak <oleg.montak@gmail.com>
2024-05-09 00:59:42 +03:00 · 2024-05-09 00:59:42 +03:00 · ebb20b739d
commit ebb20b739d
parent 7e453e4503
10 changed files with 237 additions and 82 deletions
--- a/android/app/src/main/java/app/organicmaps/car/screens/MapPlaceholderScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/MapPlaceholderScreen.java
@ -25,15 +25,14 @@ public class MapPlaceholderScreen extends BaseScreen
  @Override
  public Template onGetTemplate()
  {
-    final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.aa_used_on_the_phone_screen));
+    final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.car_used_on_the_phone_screen));

    final Header.Builder headerBuilder = new Header.Builder();
    headerBuilder.setStartHeaderAction(Action.APP_ICON);
    headerBuilder.setTitle(getCarContext().getString(R.string.app_name));
    builder.setHeader(headerBuilder.build());
-
    builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_phone_android)).build());
-    builder.addAction(new Action.Builder().setTitle(getCarContext().getString(R.string.aa_continue_in_the_car))
+    builder.addAction(new Action.Builder().setTitle(getCarContext().getString(R.string.car_continue_in_the_car))
        .setOnClickListener(() -> DisplayManager.from(getCarContext()).changeDisplay(DisplayType.Car)).build());

    return builder.build();
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@ -34,7 +34,7 @@
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:text="@string/aa_used_on_the_car_screen"
+        android:text="@string/car_used_on_the_car_screen"
        android:textAlignment="center"
        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
  </LinearLayout>
@ -47,5 +47,5 @@
      android:layout_marginEnd="32dp"
      android:layout_marginStart="32dp"
      android:layout_marginTop="24dp"
-      android:text="@string/aa_continue_on_the_phone" />
-</LinearLayout>
+      android:text="@string/car_continue_on_the_phone" />
+</LinearLayout>
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@ -29348,9 +29348,9 @@
    zh-Hans = 我们的主要目标是构建您会喜欢的快速、注重隐私、易于使用的地图。
    zh-Hant = 我們的主要目標是構建您會喜歡的快速、注重隱私、易於使用的地圖。

-  [aa_used_on_the_phone_screen]
-    comment = Text on the Android Auto placeholder screen that maps are displayed on the phone screen
-    tags = android
+  [car_used_on_the_phone_screen]
+    comment = Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen
+    tags = android,ios
    en = You are now using Organic Maps on the phone screen
    ar = أنت الآن تستخدم الخرائط العضوية على شاشة الهاتف
    az = İndi telefon ekranında Organic Maps istifadə edirsiniz
@ -29393,9 +29393,9 @@
    zh-Hans = 您现在正在手机屏幕上使用有机地图
    zh-Hant = 您現在正在手機螢幕上使用有機地圖

-  [aa_used_on_the_car_screen]
+  [car_used_on_the_car_screen]
    comment = Text on the phone placeholder screen that maps are displayed on the car screen
-    tags = android
+    tags = android,ios
    en = You are now using Organic Maps on the car screen
    ar = أنت الآن تستخدم الخرائط العضوية على شاشة السيارة
    az = Hazırda avtomobil ekranında Organic Maps istifadə edirsiniz
@ -29483,9 +29483,9 @@
    zh-Hans = 您已连接到 Android Auto
    zh-Hant = 您已連接到 Android Auto

-  [aa_continue_on_the_phone]
+  [car_continue_on_the_phone]
    comment = Displayed on the phone screen. Button to display maps on the phone screen instead of a car
-    tags = android
+    tags = android,ios
    en = Continue on the phone
    ar = تواصل على الهاتف
    az = Telefonda davam edin
@ -29528,9 +29528,9 @@
    zh-Hans = 在手机上继续
    zh-Hant = 繼續打電話

-  [aa_continue_in_the_car]
-    comment = Displayed on the Android Auto screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols!
-    tags = android
+  [car_continue_in_the_car]
+    comment = Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols!
+    tags = android,ios
    en = To the car screen
    ar = إلى شاشة السيارة
    az = Avtomobil ekranına
--- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift
+++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
@ -58,9 +58,45 @@ final class CarPlayService: NSObject {
      updateContentStyle(configuration.contentStyle)
    }
    FrameworkHelper.updatePositionArrowOffset(false, offset: 5)
+
+    CarPlayWindowScaleAdjuster.updateAppearance(
+      fromWindow: MapsAppDelegate.theApp().window,
+      toWindow: window,
+      isCarplayActivated: true
+    )
  }

-  @objc func destroy() {
+  private var savedInterfaceController: CPInterfaceController?
+  @objc func showOnPhone() {
+    savedInterfaceController = interfaceController
+    switchScreenToPhone()
+    showPhoneModeAlert()
+  }
+
+  @objc func showOnCarplay() {
+    if let window, let savedInterfaceController {
+      setup(window: window, interfaceController: savedInterfaceController)
+    }
+  }
+
+  private func showPhoneModeAlert() {
+    let switchToCarAction = CPAlertAction(
+      title: L("car_continue_in_the_car"),
+      style: .default,
+      handler: { [weak self] _ in
+        self?.savedInterfaceController?.dismissTemplate(animated: false)
+        self?.showOnCarplay()
+      }
+    )
+    let alert = CPAlertTemplate(
+      titleVariants: [L("car_used_on_the_phone_screen")],
+      actions: [switchToCarAction]
+    )
+    savedInterfaceController?.dismissTemplate(animated: false)
+    savedInterfaceController?.presentTemplate(alert, animated: false)
+  }
+
+  private func switchScreenToPhone() {
    if let carplayVC = carplayVC {
      carplayVC.removeMapView()
    }
@ -84,6 +120,21 @@ final class CarPlayService: NSObject {
    interfaceController = nil
    ThemeManager.invalidate()
    FrameworkHelper.updatePositionArrowOffset(true, offset: 0)
+
+    if let window {
+      CarPlayWindowScaleAdjuster.updateAppearance(
+        fromWindow: window,
+        toWindow: MapsAppDelegate.theApp().window,
+        isCarplayActivated: false
+      )
+    }
+  }
+
+  @objc func destroy() {
+    if isCarplayActivated {
+      switchScreenToPhone()
+    }
+    savedInterfaceController = nil
  }

  @objc func interfaceStyle() -> UIUserInterfaceStyle {
--- a/iphone/Maps/Classes/CarPlay/CarPlayWindowScaleAdjuster.swift
+++ b/iphone/Maps/Classes/CarPlay/CarPlayWindowScaleAdjuster.swift
@ -0,0 +1,51 @@
+import Foundation
+import UIKit
+
+enum CarPlayWindowScaleAdjuster {
+
+  static func updateAppearance(
+    fromWindow sourceWindow: UIWindow,
+    toWindow destinationWindow: UIWindow,
+    isCarplayActivated: Bool
+  ) {
+
+    let sourceContentScale = sourceWindow.screen.scale;
+    let destinationContentScale = destinationWindow.screen.scale;
+
+    if abs(sourceContentScale - destinationContentScale) > 0.1 {
+      if isCarplayActivated {
+        updateVisualScale(to: destinationContentScale)
+      } else {
+        updateVisualScaleToMain()
+      }
+    }
+  }
+
+  private static func updateVisualScale(to scale: CGFloat) {
+    if isGraphicContextInitialized {
+      mapViewController?.mapView.updateVisualScale(to: scale)
+    } else {
+      DispatchQueue.main.async {
+        updateVisualScale(to: scale)
+      }
+    }
+  }
+
+  private static func updateVisualScaleToMain() {
+    if isGraphicContextInitialized {
+      mapViewController?.mapView.updateVisualScaleToMain()
+    } else {
+      DispatchQueue.main.async {
+        updateVisualScaleToMain()
+      }
+    }
+  }
+
+  private static var isGraphicContextInitialized: Bool {
+    return mapViewController?.mapView.graphicContextInitialized ?? false
+  }
+
+  private static var mapViewController: MapViewController? {
+    return MapViewController.shared()
+  }
+}
--- a/iphone/Maps/Classes/CarPlay/CarplayPlaceholderView.swift
+++ b/iphone/Maps/Classes/CarPlay/CarplayPlaceholderView.swift
@ -0,0 +1,85 @@
+import Foundation
+
+class CarplayPlaceholderView: UIView {
+  private let containerView = UIView()
+  private let imageView = UIImageView()
+  private let descriptionLabel = UILabel()
+  private let switchButton = UIButton(type: .system);
+
+  override init(frame: CGRect) {
+    super.init(frame: frame)
+    commonInit()
+  }
+
+  required init?(coder: NSCoder) {
+    super.init(coder: coder)
+    commonInit()
+  }
+
+  private func commonInit() {
+    backgroundColor = .clear
+
+    addSubview(containerView)
+
+    imageView.image = UIImage(named: "ic_carplay_activated")
+    imageView.contentMode = .scaleAspectFit
+    containerView.addSubview(imageView)
+
+    descriptionLabel.text = L("car_used_on_the_car_screen")
+    descriptionLabel.font = UIFont.bold24()
+    descriptionLabel.textColor = UIColor.blackSecondaryText()
+    descriptionLabel.textAlignment = .center
+    descriptionLabel.numberOfLines = 0
+    containerView.addSubview(descriptionLabel)
+
+    switchButton.setTitle(L("car_continue_on_the_phone"), for: .normal)
+    switchButton.addTarget(self, action: #selector(onSwitchButtonTap), for: .touchUpInside)
+    switchButton.setTitleColor(UIColor.whitePrimaryText(), for: .normal)
+    switchButton.titleLabel?.font = UIFont.medium16()
+    switchButton.titleLabel?.lineBreakMode = .byWordWrapping
+    switchButton.titleLabel?.textAlignment = .center
+    switchButton.backgroundColor = UIColor.linkBlue()
+    switchButton.layer.cornerRadius = 8
+    containerView.addSubview(switchButton)
+
+    setupConstraints()
+  }
+
+  @objc private func onSwitchButtonTap(_ sender: UIButton) {
+    CarPlayService.shared.showOnPhone()
+  }
+
+  private func setupConstraints() {
+    translatesAutoresizingMaskIntoConstraints = false
+
+    containerView.translatesAutoresizingMaskIntoConstraints = false
+    imageView.translatesAutoresizingMaskIntoConstraints = false
+    descriptionLabel.translatesAutoresizingMaskIntoConstraints = false
+    switchButton.translatesAutoresizingMaskIntoConstraints = false
+
+    let horizontalPadding: CGFloat = 24
+
+    NSLayoutConstraint.activate([
+      containerView.centerYAnchor.constraint(equalTo: centerYAnchor),
+      containerView.topAnchor.constraint(greaterThanOrEqualTo: topAnchor),
+      containerView.leadingAnchor.constraint(equalTo: leadingAnchor),
+      containerView.trailingAnchor.constraint(equalTo: trailingAnchor),
+      containerView.bottomAnchor.constraint(lessThanOrEqualTo: bottomAnchor),
+
+      imageView.topAnchor.constraint(equalTo: containerView.topAnchor),
+      imageView.centerXAnchor.constraint(equalTo: centerXAnchor),
+      imageView.widthAnchor.constraint(equalToConstant: 160),
+      imageView.heightAnchor.constraint(equalToConstant: 160),
+
+      descriptionLabel.topAnchor.constraint(equalTo: imageView.bottomAnchor, constant: 32),
+      descriptionLabel.leadingAnchor.constraint(equalTo: leadingAnchor, constant: horizontalPadding),
+      descriptionLabel.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -horizontalPadding),
+
+      switchButton.topAnchor.constraint(equalTo: descriptionLabel.bottomAnchor, constant: 24),
+      switchButton.leadingAnchor.constraint(equalTo: leadingAnchor, constant: horizontalPadding),
+      switchButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -horizontalPadding),
+      switchButton.heightAnchor.constraint(equalToConstant: 48),
+      switchButton.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
+    ])
+  }
+}
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@ -84,7 +84,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
@property(strong, nonatomic) IBOutlet NSLayoutConstraint *placePageAreaKeyboard;
@property(strong, nonatomic) IBOutlet NSLayoutConstraint *sideButtonsAreaBottom;
@property(strong, nonatomic) IBOutlet NSLayoutConstraint *sideButtonsAreaKeyboard;
-@property(strong, nonatomic) IBOutlet UIImageView *carplayPlaceholderLogo;
+@property(strong, nonatomic) IBOutlet UIView *carplayPlaceholderView;
@property(strong, nonatomic) BookmarksCoordinator * bookmarksCoordinator;

@property(strong, nonatomic) NSHashTable<id<MWMLocationModeListener>> *listeners;
@ -343,7 +343,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
  // After all users migrate to OAuth2 we can remove next code
  [self migrateOAuthCredentials];

-
  /// @todo: Uncomment update dialog when will be ready to handle big traffic bursts.
  /*
  if (!DeepLinkHandler.shared.isLaunchedByDeeplink)
@ -664,7 +663,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
 #pragma mark - CarPlay map append/remove

 - (void)disableCarPlayRepresentation {
-  self.carplayPlaceholderLogo.hidden = YES;
+  self.carplayPlaceholderView.hidden = YES;
  self.mapView.frame = self.view.bounds;
  [self.view insertSubview:self.mapView atIndex:0];
  [[self.mapView.topAnchor constraintEqualToAnchor:self.view.topAnchor] setActive:YES];
@ -686,7 +685,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
  if (!self.controlsView.isHidden) {
    self.controlsView.hidden = YES;
  }
-  self.carplayPlaceholderLogo.hidden = NO;
+  self.carplayPlaceholderView.hidden = NO;
 }

 #pragma mark - MWMBookmarksObserver
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@ -79,10 +79,6 @@ using namespace osm_auth_ios;
  return self.mapViewController.mapView.drapeEngineCreated;
 }

- (BOOL)isGraphicContextInitialized {
-  return self.mapViewController.mapView.graphicContextInitialized;
-}
-
 - (void)searchText:(NSString *)searchString {
  if (!self.isDrapeEngineCreated) {
    dispatch_async(dispatch_get_main_queue(), ^{
@ -417,48 +413,12 @@ using namespace osm_auth_ios;
  didConnectCarInterfaceController:(CPInterfaceController *)interfaceController
           toWindow:(CPWindow *)window API_AVAILABLE(ios(12.0)) {
  [self.carplayService setupWithWindow:window interfaceController:interfaceController];
-  [self updateAppearanceFromWindow:self.window toWindow:window isCarplayActivated:YES];
 }

 - (void)application:(UIApplication *)application
  didDisconnectCarInterfaceController:(CPInterfaceController *)interfaceController
                           fromWindow:(CPWindow *)window API_AVAILABLE(ios(12.0)) {
  [self.carplayService destroy];
-  [self updateAppearanceFromWindow:window toWindow:self.window isCarplayActivated:NO];
-}
-
- (void)updateAppearanceFromWindow:(UIWindow *)sourceWindow
-                          toWindow:(UIWindow *)destinationWindow
-                isCarplayActivated:(BOOL)isCarplayActivated {
-  CGFloat sourceContentScale = sourceWindow.screen.scale;
-  CGFloat destinationContentScale = destinationWindow.screen.scale;
-  if (ABS(sourceContentScale - destinationContentScale) > 0.1) {
-    if (isCarplayActivated) {
-      [self updateVisualScale:destinationContentScale];
-    } else {
-      [self updateVisualScaleToMain];
-    }
-  }
-}
-
- (void)updateVisualScale:(CGFloat)scale {
-  if ([self isGraphicContextInitialized]) {
-    [self.mapViewController.mapView updateVisualScaleTo:scale];
-  } else {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self updateVisualScale:scale];
-    });
-  }
-}
-
- (void)updateVisualScaleToMain {
-  if ([self isGraphicContextInitialized]) {
-    [self.mapViewController.mapView updateVisualScaleToMain];
-  } else {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self updateVisualScaleToMain];
-    });
-  }
 }

@end
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@ -325,6 +325,8 @@
 		6B15907226623AE500944BBA /* 00_NotoSansThai-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */; };
 		6B679E89266BFD0A0074AE2A /* 00_NotoNaskhArabic-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B679E88266BFD090074AE2A /* 00_NotoNaskhArabic-Regular.ttf */; };
 		6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; };
+		8C4FB9C72BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */; };
+		8CB13C3B2BF1276A004288F2 /* CarplayPlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */; };
 		99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */; };
 		9901284F244732DB00C72B10 /* BottomTabBarPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99012849244732DB00C72B10 /* BottomTabBarPresenter.swift */; };
 		99012851244732DB00C72B10 /* BottomTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284B244732DB00C72B10 /* BottomTabBarViewController.swift */; };
@ -1168,6 +1170,8 @@
 		6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "00_NotoSansThai-Regular.ttf"; path = "../../data/00_NotoSansThai-Regular.ttf"; sourceTree = "<group>"; };
 		6B679E88266BFD090074AE2A /* 00_NotoNaskhArabic-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "00_NotoNaskhArabic-Regular.ttf"; path = "../../data/00_NotoNaskhArabic-Regular.ttf"; sourceTree = "<group>"; };
 		6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = "<group>"; };
+		8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayWindowScaleAdjuster.swift; sourceTree = "<group>"; };
+		8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarplayPlaceholderView.swift; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* OMaps.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OMaps.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = "<group>"; };
 		97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; };
@ -2908,6 +2912,8 @@
 				CDCA273E2238087700167D87 /* MWMCarPlaySearchService.mm */,
 				CDCA2746223FD24600167D87 /* MWMCarPlaySearchResultObject.h */,
 				CDCA2747223FD24600167D87 /* MWMCarPlaySearchResultObject.mm */,
+				8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */,
+				8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */,
 			);
 			path = CarPlay;
 			sourceTree = "<group>";
@ -4213,7 +4219,9 @@
 				F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.m in Sources */,
 				47F86CFF20C936FC00FEE291 /* TabView.swift in Sources */,
 				34AB66741FC5AA330078E451 /* BaseRoutePreviewStatus.swift in Sources */,
+				8C4FB9C72BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift in Sources */,
 				349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */,
+				8CB13C3B2BF1276A004288F2 /* CarplayPlaceholderView.swift in Sources */,
 				CDB4D4E1222D70DF00104869 /* CarPlayMapViewController.swift in Sources */,
 				471AB98923AA8A3500F56D49 /* IDownloaderDataSource.swift in Sources */,
 				EDE243E72B6D55610057369B /* InfoView.swift in Sources */,
--- a/iphone/Maps/UI/Storyboard/Main.storyboard
+++ b/iphone/Maps/UI/Storyboard/Main.storyboard
@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
    <device id="retina6_72" orientation="landscape" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@ -16,13 +17,10 @@
                        <rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_carplay_activated" translatesAutoresizingMaskIntoConstraints="NO" id="Tqh-46-Yrm">
-                                <rect key="frame" x="386" y="124.66666666666669" width="160" height="160"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="160" id="dkE-Cj-sE5"/>
-                                    <constraint firstAttribute="width" constant="160" id="pz7-lu-Ocm"/>
-                                </constraints>
-                            </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ixC-IZ-Pvs" userLabel="CarPlayPlaceholderView" customClass="CarplayPlaceholderView" customModule="Organic_Maps" customModuleProvider="target">
+                                <rect key="frame" x="59" y="0.0" width="814" height="409"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            </view>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aPn-pa-nCx" customClass="EAGLView">
                                <rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
                                <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -168,18 +166,18 @@
                        <viewLayoutGuide key="safeArea" id="utd-Jy-pE5"/>
                        <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
-                            <constraint firstItem="Tqh-46-Yrm" firstAttribute="centerX" secondItem="utd-Jy-pE5" secondAttribute="centerX" id="0T0-4t-4m2"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="65S-M4-TnM" secondAttribute="bottom" priority="100" id="2E3-5i-6An"/>
                            <constraint firstAttribute="bottom" secondItem="rL1-9E-4b7" secondAttribute="bottom" id="4fw-Xu-gAG"/>
                            <constraint firstItem="rbx-Oj-jeo" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="5Sh-l6-Icd"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="QKu-4A-UgP" secondAttribute="bottom" priority="100" id="6ko-rI-S5u"/>
-                            <constraint firstItem="Tqh-46-Yrm" firstAttribute="centerY" secondItem="utd-Jy-pE5" secondAttribute="centerY" id="7pv-5d-X2W"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="ixC-IZ-Pvs" secondAttribute="bottom" id="7eh-og-Mpe"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="aVk-ab-LFJ" secondAttribute="trailing" id="85b-Do-jO7"/>
                            <constraint firstItem="at1-V1-pzl" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="bottom" priority="250" id="8JV-dP-iYZ"/>
                            <constraint firstItem="TdT-ia-GP9" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="8YH-dJ-lHZ"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="rbx-Oj-jeo" secondAttribute="trailing" id="9M9-8P-Hzb"/>
                            <constraint firstAttribute="bottom" secondItem="rbx-Oj-jeo" secondAttribute="bottom" id="9rR-QQ-c1P"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="xJx-UU-IdV" secondAttribute="top" priority="100" id="BMq-jc-qfO"/>
+                            <constraint firstItem="ixC-IZ-Pvs" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" id="DSJ-0D-hwO"/>
                            <constraint firstItem="rL1-9E-4b7" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="E89-WV-ZTh"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="QKu-4A-UgP" secondAttribute="trailing" id="Fjy-Cy-dHS"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="at1-V1-pzl" secondAttribute="trailing" id="GKG-4Y-2Pq"/>
@ -187,6 +185,7 @@
                            <constraint firstItem="awj-9E-eBS" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="Hfm-gb-37H"/>
                            <constraint firstItem="rbx-Oj-jeo" firstAttribute="top" secondItem="utd-Jy-pE5" secondAttribute="top" id="J0B-xe-sNj"/>
                            <constraint firstItem="jio-3T-E6G" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="K9r-P1-yFI"/>
+                            <constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="ixC-IZ-Pvs" secondAttribute="trailing" id="O7f-qU-UN2"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="at1-V1-pzl" secondAttribute="bottom" priority="750" constant="48" id="O8L-nd-nOa"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="FFY-Dy-Wou" secondAttribute="bottom" priority="100" id="OE7-Qb-J0v"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="awj-9E-eBS" secondAttribute="bottom" id="PFs-sL-oVA"/>
@ -213,6 +212,7 @@
                            <constraint firstItem="65S-M4-TnM" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="kan-ei-cIg"/>
                            <constraint firstAttribute="bottom" secondItem="jio-3T-E6G" secondAttribute="bottom" id="l6r-eW-Dbi"/>
                            <constraint firstItem="NI8-tV-i2B" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="lwX-Xm-J8A"/>
+                            <constraint firstItem="ixC-IZ-Pvs" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="m7B-SH-DDh"/>
                            <constraint firstItem="FFY-Dy-Wou" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" id="pc3-CW-vyV"/>
                            <constraint firstItem="aPn-pa-nCx" firstAttribute="top" secondItem="USG-6L-Uhw" secondAttribute="top" id="pwE-hX-IML"/>
                            <constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="TdT-ia-GP9" secondAttribute="bottom" priority="100" id="pwZ-Fm-mHR"/>
@ -284,7 +284,7 @@
                    </view>
                    <navigationItem key="navigationItem" id="8E8-0f-UV9"/>
                    <connections>
-                        <outlet property="carplayPlaceholderLogo" destination="Tqh-46-Yrm" id="S7m-Df-UPv"/>
+                        <outlet property="carplayPlaceholderView" destination="ixC-IZ-Pvs" id="3rZ-Kn-VBS"/>
                        <outlet property="controlsView" destination="rL1-9E-4b7" id="sfV-7X-WlR"/>
                        <outlet property="mapView" destination="aPn-pa-nCx" id="tCi-LW-1ll"/>
                        <outlet property="placePageAreaKeyboard" destination="PFs-sL-oVA" id="O3P-ia-ZlX"/>
@ -876,7 +876,7 @@
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="CwW-x8-G3j">
-                                <rect key="frame" x="0.0" y="0.0" width="932" height="409"/>
+                                <rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
                                <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <gestureRecognizers/>
                                <userDefinedRuntimeAttributes>
@ -888,13 +888,13 @@
                                </connections>
                            </tableView>
                            <containerView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kXO-Oh-2vO" userLabel="No Maps Container View">
-                                <rect key="frame" x="59" y="0.0" width="814" height="409"/>
+                                <rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
                                <connections>
                                    <segue destination="b8o-rZ-x0k" kind="embed" identifier="MapDownloaderNoResultsEmbedViewControllerSegue" id="ish-dC-mkH"/>
                                </connections>
                            </containerView>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CDj-ol-HRP">
-                                <rect key="frame" x="59" y="345" width="814" height="64"/>
+                                <rect key="frame" x="0.0" y="345" width="932" height="85"/>
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <userDefinedRuntimeAttributes>
                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/>
@ -937,17 +937,17 @@
            <objects>
                <viewController storyboardIdentifier="MWMNoMapsViewController" id="3el-Zi-2E4" customClass="MWMNoMapsViewController" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" id="4WP-vj-Alg">
-                        <rect key="frame" x="0.0" y="0.0" width="1366" height="980"/>
+                        <rect key="frame" x="0.0" y="0.0" width="932" height="430"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gmw-e3-n53" userLabel="Container" customClass="MWMNoMapsView">
-                                <rect key="frame" x="475.33333333333326" y="0.0" width="415.66666666666674" height="959"/>
+                                <rect key="frame" x="258.33333333333326" y="0.0" width="415.66666666666674" height="409"/>
                                <subviews>
                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dCZ-PN-2Ob" userLabel="BoundsView">
-                                        <rect key="frame" x="16" y="0.0" width="383.66666666666669" height="855"/>
+                                        <rect key="frame" x="16" y="0.0" width="383.66666666666669" height="409"/>
                                        <subviews>
                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87G-jh-N8H" userLabel="CenteredView">
-                                                <rect key="frame" x="0.0" y="372.66666666666669" width="383.66666666666669" height="109.66666666666669"/>
+                                                <rect key="frame" x="0.0" y="149.66666666666666" width="383.66666666666669" height="109.66666666666666"/>
                                                <subviews>
                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="У вас нет загруженных карт" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="abh-G0-Alr" userLabel="Title">
                                                        <rect key="frame" x="0.0" y="40" width="383.66666666666669" height="24"/>
@ -1018,7 +1018,7 @@
                                </connections>
                            </view>
                            <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Moj-UK-oyl" userLabel="DownloadMaps" customClass="MWMButton">
-                                <rect key="frame" x="287" y="304" width="240" height="44"/>
+                                <rect key="frame" x="346" y="325" width="240" height="44"/>
                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                <constraints>
                                    <constraint firstAttribute="width" constant="240" id="49x-bx-JJj"/>
@ -1145,7 +1145,9 @@
        <image name="ic_add_button" width="28" height="28"/>
        <image name="ic_arrow_gray_down" width="28" height="28"/>
        <image name="ic_arrow_gray_right" width="28" height="28"/>
-        <image name="ic_carplay_activated" width="160" height="160"/>
        <image name="separator_image" width="1" height="1"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
    </resources>
 </document>