From 1459a2d5ee548d724d8f544f2ecb8973987f63fb Mon Sep 17 00:00:00 2001
From: Alexander Boriskov <a.boriskov@corp.mail.ru>
Date: Tue, 6 Oct 2020 11:44:45 +0300
Subject: [PATCH] [iOS] Fixed theme in carplay

---
 iphone/Maps/Classes/MapsAppDelegate.mm         | 3 +++
 iphone/Maps/Core/Theme/Core/ThemeManager.swift | 3 +++
 iphone/Maps/MAPSME.plist                       | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index d2761c8924..f8e759bfc8 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -733,6 +733,9 @@ using namespace osm_auth_ios;
   didConnectCarInterfaceController:(CPInterfaceController *)interfaceController
                           toWindow:(CPWindow *)window API_AVAILABLE(ios(12.0)) {
   [self.carplayService setupWithWindow:window interfaceController:interfaceController];
+  if (@available(iOS 13.0, *)) {
+    window.overrideUserInterfaceStyle = UIUserInterfaceStyleUnspecified;
+  }
   [self updateAppearanceFromWindow:self.window toWindow:window isCarplayActivated:YES];
 
   [Statistics logEvent:kStatCarplayActivated];
diff --git a/iphone/Maps/Core/Theme/Core/ThemeManager.swift b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
index ddb213b309..dea85946b8 100644
--- a/iphone/Maps/Core/Theme/Core/ThemeManager.swift
+++ b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
@@ -9,6 +9,9 @@ final class ThemeManager: NSObject {
 
   private override init() {
     super.init()
+    if #available(iOS 13.0, *) {
+      MapsAppDelegate.theApp().window.overrideUserInterfaceStyle = .light
+    }
   }
 
   @objc static func setDarkModeEnabled(_ val: Bool) {
diff --git a/iphone/Maps/MAPSME.plist b/iphone/Maps/MAPSME.plist
index c0ab11fbc4..efb863c3c7 100644
--- a/iphone/Maps/MAPSME.plist
+++ b/iphone/Maps/MAPSME.plist
@@ -230,8 +230,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIUserInterfaceStyle</key>
-	<string>Light</string>
 	<key>UTImportedTypeDeclarations</key>
 	<array>
 		<dict>