From 4b150f980a6d0cba2281b54bfaf71cdcf2afb11a Mon Sep 17 00:00:00 2001
From: Aleksey Belouosv <aleksey@maps.me>
Date: Thu, 5 Sep 2019 12:39:03 +0300
Subject: [PATCH] [iOS] workaround for iOS 13.1 beta UIButton bug

https://jira.mail.ru/browse/MAPSME-11719
---
 .../Views/MWMNavigationInfoView.xib            | 18 +++++++-----------
 .../ic_search_toast.imageset/Contents.json     |  3 +++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib
index 26e5f9fff2..489e71cbea 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.xib
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,7 +14,7 @@
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMNavigationInfoView" propertyAccessControl="all">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MWMNavigationInfoView">
             <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -32,7 +28,7 @@
                                 <constraint firstAttribute="height" constant="100" id="6em-0e-zym"/>
                             </constraints>
                         </view>
-                        <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="240" verticalHuggingPriority="240" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="OJ3-VB-hqA">
+                        <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="240" verticalHuggingPriority="240" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="OJ3-VB-hqA">
                             <rect key="frame" x="0.0" y="0.0" width="971" height="48"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="48" id="oPW-KZ-iX3"/>
@@ -424,10 +420,10 @@
                 <outlet property="searchButtonsViewHeight" destination="ClV-rj-I5W" id="egz-NO-EAn"/>
                 <outlet property="searchButtonsViewWidth" destination="mOu-Vw-eLb" id="SsK-HE-lHC"/>
                 <outlet property="searchEatButton" destination="GcK-FI-VXw" id="G0h-uf-9uS"/>
+                <outlet property="searchFoodButton" destination="Ggf-tc-U3R" id="RJJ-mh-rwy"/>
                 <outlet property="searchGasButton" destination="2Bv-7H-IZt" id="hUg-CH-kWQ"/>
                 <outlet property="searchMainButton" destination="Xna-Q1-7zW" id="v48-fa-MQE"/>
                 <outlet property="searchParkingButton" destination="RP3-01-Pj7" id="sdL-mN-sLE"/>
-                <outlet property="searchFoodButton" destination="Ggf-tc-U3R" id="RJJ-mh-rwy"/>
                 <outlet property="secondTurnImageView" destination="CKi-sy-dNO" id="A29-2z-4oh"/>
                 <outlet property="secondTurnView" destination="8Zu-Ff-6p2" id="yEK-rY-S50"/>
                 <outlet property="streetNameLabel" destination="ShI-bz-5g8" id="eZd-Es-g0l"/>
@@ -464,10 +460,10 @@
         <image name="ic_get_position" width="20" height="20"/>
         <image name="ic_routing_atm_on" width="24" height="24"/>
         <image name="ic_routing_eat_on" width="24" height="24"/>
+        <image name="ic_routing_food_on" width="24" height="24"/>
         <image name="ic_routing_fuel_on" width="24" height="24"/>
         <image name="ic_routing_parking_on" width="24" height="24"/>
         <image name="ic_routing_search_light" width="56" height="56"/>
-        <image name="ic_routing_food_on" width="24" height="24"/>
         <image name="ic_search_toast" width="24" height="24"/>
     </resources>
 </document>
diff --git a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_search_toast.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_search_toast.imageset/Contents.json
index b19aef3b0c..506c723fdd 100644
--- a/iphone/Maps/Images.xcassets/NavigationDashboard/ic_search_toast.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_search_toast.imageset/Contents.json
@@ -19,5 +19,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file