[ios] Changed to the new logo

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

iphone/Maps/Classes/Share/MWMShareActivityItem.mm

@@ -109,7 +109,7 @@ NSString * httpGe0Url(NSString * shortUrl)
   LPLinkMetadata * metadata = [[LPLinkMetadata alloc] init];
   metadata.originalURL = [NSURL URLWithString:httpGe0Url([self url:NO])];
   metadata.title = self.isMyPosition ? L(@"core_my_position") : self.data.previewData.title;
-  metadata.iconProvider = [[NSItemProvider alloc] initWithObject:[UIImage imageNamed:@"imgLogo"]];
+  metadata.iconProvider = [[NSItemProvider alloc] initWithObject:[UIImage imageNamed:@"Logo"]];
   return metadata;
 }
 

iphone/Maps/Images.xcassets/AppIconDebug.appiconset/Contents.json

@@ -1,14 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "debug_icon.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

iphone/Maps/Images.xcassets/Debug Icon.appiconset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "images" : [
+    {
+      "filename" : "Light-Debug.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "Dark-Debug.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "Tinted-Debug.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iphone/Maps/Images.xcassets/Icon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon.png",
+      "filename" : "Light.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
@@ -13,7 +13,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "dark_icon.png",
+      "filename" : "Dark.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
@@ -25,7 +25,7 @@
           "value" : "tinted"
         }
       ],
-      "filename" : "tinted_icon.png",
+      "filename" : "Tinted.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

iphone/Maps/Images.xcassets/Interface/Logo.imageset/Contents.json

@@ -1,12 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "logo.svg",
+      "filename" : "Logo.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }

iphone/Maps/Images.xcassets/Interface/Logo.imageset/Logo.svg

@@ -0,0 +1 @@
+<svg height="1024" viewBox="0 0 1024 1024" width="1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h1024v1024h-1024z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><use fill="#588157" xlink:href="#a"/><g transform="translate(101.9992 102)"><path d="m614.992052 739.531345c3.435118 4.523637 4.743157 10.311409 3.589539 15.870577-1.155132 5.560682-4.659891 10.349257-9.610457 13.130355-58.948074 32.776686-126.793542 51.467723-198.970377 51.467723-226.284786 0-410.000757-183.714457-410.000757-410.000757 0-226.284786 183.715971-409.999243 410.000757-409.999243 65.544287 0 127.517203 15.4133688 182.48817 42.8095304 5.209449 2.617593 8.983688 7.4167659 10.300811 13.0955348 1.317124 5.6787689.040877 11.6497272-3.485077 16.2929648-12.506614 16.5109714-30.598134 40.332733-41.615036 54.840769-5.541001 7.295651-15.387632 9.790616-23.733954 6.016377-37.846852-17.006029-79.805551-26.456009-123.954914-26.456009-167.451771 0-303.400076 135.949819-303.400076 303.400076 0 167.451771 135.948305 303.400076 303.400076 303.400076 50.094584 0 97.368708-12.165979 139.027648-33.703214 8.478034-4.420689 18.90753-2.084688 24.689246 5.52889 11.174352 14.67154 29.047865 38.205655 41.274401 54.30635z" fill="#fefdf6"/><path d="m685.947142 138.64008c3.536551-4.658376 8.965521-7.497004 14.809308-7.745289 5.842274-.248286 11.492278 2.121022 15.411855 6.462987 64.561744 72.499303 103.833209 168.02101 103.833209 272.641465 0 97.874362-34.369345 187.783914-91.685397 258.309046-3.807546 4.629612-9.524163 7.262344-15.51783 7.150906-5.993668-.120194-11.60431-2.972447-15.230183-7.747396-12.942627-16.977264-31.353587-41.221413-42.235749-55.550805-5.273035-6.942904-5.33662-16.530653-.157449-23.543198 36.619051-50.109723 58.225927-111.86009 58.225927-178.618553 0-72.85205-25.733862-139.742225-68.597894-192.068349-5.816537-7.015573-6.033029-17.113517-.520793-24.37132 10.971484-14.50198 29.09631-38.367646 41.664996-54.919494zm-429.969606 309.635475c-8.118888-1.223018-14.620486-7.366962-16.30005-15.404057-1.680805-8.035469 1.816931-16.270385 8.765684-20.640504 70.515208-44.355408 206.63148-129.974029 277.022816-174.251558 6.940533-4.3661 15.863874-3.960111 22.380346 1.018476 6.514846 4.977346 9.252218 13.480148 6.86411 21.324303-24.216735 79.554946-71.043685 233.390652-95.302999 313.085586-2.389825 7.853143-9.41569 13.392566-17.610396 13.883139-8.195949.4922-15.831257-4.16446-19.145461-11.676329-20.480877-46.42493-48.310524-109.515704-48.310524-109.515704s-68.189135-10.267622-118.363526-17.823352z" fill="#ccdfca"/></g></g></svg>

iphone/Maps/Images.xcassets/Settings/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

iphone/Maps/Images.xcassets/Settings/imgLogo.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "imgLogo.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "imgLogo@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "imgLogo@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -5142,7 +5142,7 @@
 		6741AA571BF340DE002C974C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
+				ASSETCATALOG_COMPILER_APPICON_NAME = "Debug Icon";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
 				CODE_SIGN_ENTITLEMENTS = "CoMaps-Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -5177,7 +5177,7 @@
 		6741AA5A1BF340DE002C974C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Icon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color";
 				CODE_SIGN_ENTITLEMENTS = "CoMaps-Release.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";

iphone/Maps/UI/Autoupdate/MWMAutoupdateController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -24,9 +24,9 @@
                             <rect key="frame" x="16" y="100" width="382" height="650"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vVR-Wh-jf5" userLabel="CenteredView">
-                                    <rect key="frame" x="0.0" y="198.5" width="382" height="253"/>
+                                    <rect key="frame" x="0.0" y="198.5" width="382" height="253.5"/>
                                     <subviews>
-                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="imgLogo" translatesAutoresizingMaskIntoConstraints="NO" id="ym1-j4-Fn7">
+                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="Logo" translatesAutoresizingMaskIntoConstraints="NO" id="ym1-j4-Fn7">
                                             <rect key="frame" x="111" y="0.0" width="160" height="160"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="240" id="0ZT-MS-DwR"/>
@@ -45,7 +45,7 @@
                                             </userDefinedRuntimeAttributes>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Updated maps supports information about objects in the current state" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WLZ-Z2-pj2" userLabel="Text">
-                                            <rect key="frame" x="0.0" y="220" width="382" height="33"/>
+                                            <rect key="frame" x="0.0" y="220" width="382" height="33.5"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -198,6 +198,6 @@
         </view>
     </objects>
     <resources>
-        <image name="imgLogo" width="120" height="120"/>
+        <image name="Logo" width="1024" height="1024"/>
     </resources>
 </document>

iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarViewController.xib

@@ -39,7 +39,7 @@
                             </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <inset key="imageEdgeInsets" minX="9" minY="9" maxX="9" maxY="9"/>
-                            <state key="normal" image="logo"/>
+                            <state key="normal" image="Logo"/>
                             <connections>
                                 <action selector="onLeftButtonPressed:" destination="-1" eventType="touchUpInside" id="1gx-P2-sRJ"/>
                             </connections>
@@ -157,9 +157,9 @@
         </view>
     </objects>
     <resources>
+        <image name="Logo" width="1024" height="1024"/>
         <image name="ic_menu" width="48" height="48"/>
         <image name="ic_menu_bookmark_list" width="48" height="48"/>
         <image name="ic_menu_search" width="48" height="48"/>
-        <image name="logo" width="462" height="512"/>
     </resources>
 </document>

iphone/Maps/UI/Help/AboutController/AboutController.swift

@@ -105,7 +105,9 @@ private extension AboutController {
 
     func setupLogo() {
       logoImageView.contentMode = .scaleAspectFit
-      logoImageView.image = UIImage(named: "logo")
+      logoImageView.image = UIImage(named: "Logo")
+      logoImageView.layer.cornerRadius = 12
+      logoImageView.layer.masksToBounds = true
     }
 
     func setupHeaderTitle() {