[ios] Fixed tab buttons.

iphone/Maps/Classes/Components/MWMButton.mm

@@ -80,8 +80,9 @@ namespace
   else
   {
     if (self.selected)
-      return;
-    [self setDefaultTintColor];
+      [self setSelected:YES];
+    else
+      [self setDefaultTintColor];
   }
 }
 

iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.mm

@@ -8,7 +8,7 @@ static CGFloat const kIconToLabelSpacing = 4.0;
 
 @property (nonatomic) IBOutlet UIView * rootView;
 
-@property (weak, nonatomic) IBOutlet UIImageView * icon;
+@property (weak, nonatomic) IBOutlet UIButton * icon;
 @property (weak, nonatomic) IBOutlet UILabel * label;
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint * iconLeft;
@@ -36,8 +36,11 @@ static CGFloat const kIconToLabelSpacing = 4.0;
   return self;
 }
 
-- (IBAction)buttonTap:(UITapGestureRecognizer *)sender
+- (IBAction)buttonTap
 {
+  if (self.icon.selected)
+    return;
+
   [self.delegate tabButtonPressed:self];
 }
 
@@ -80,14 +83,15 @@ static CGFloat const kIconToLabelSpacing = 4.0;
 
 - (void)setSelected:(BOOL)selected
 {
-  _selected = self.icon.highlighted = selected;
+  _selected = self.icon.selected = selected;
   self.label.textColor = selected ? UIColor.linkBlue : UIColor.blackSecondaryText;
 }
 
 - (void)setIconImage:(UIImage *)iconImage
 {
-  _iconImage = self.icon.image = iconImage;
-  [self.icon makeImageAlwaysTemplate];
+  _iconImage = iconImage;
+  [self.icon setImage:iconImage forState:UIControlStateNormal];
+  [self.icon.imageView makeImageAlwaysTemplate];
 }
 
 - (void)setLocalizedText:(NSString *)localizedText

iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabButtons/MWMSearchTabButtonsView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMSearchTabButtonsView">
@@ -11,9 +11,9 @@
                 <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="categories"/>
             </userDefinedRuntimeAttributes>
             <connections>
-                <outlet property="icon" destination="qTf-fd-D9i" id="a7L-Zw-lq7"/>
-                <outlet property="iconLeft" destination="nQe-W6-JBV" id="DYT-rh-g1b"/>
-                <outlet property="iconTop" destination="9mE-qq-eao" id="eVe-k5-FHV"/>
+                <outlet property="icon" destination="dWc-6u-iP3" id="jPr-Jj-agI"/>
+                <outlet property="iconLeft" destination="r0h-cS-OQL" id="oVG-DE-UGg"/>
+                <outlet property="iconTop" destination="hRq-8b-vbp" id="Vt6-o3-v9G"/>
                 <outlet property="label" destination="Lj2-rb-tLK" id="jnz-NA-V4x"/>
                 <outlet property="labelLeft" destination="oMw-ic-QBY" id="oiH-Gi-daA"/>
                 <outlet property="labelTop" destination="87u-mS-F8T" id="eTj-rP-YCr"/>
@@ -25,16 +25,19 @@
             <rect key="frame" x="0.0" y="0.0" width="160" height="60"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_history_tab" translatesAutoresizingMaskIntoConstraints="NO" id="qTf-fd-D9i">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dWc-6u-iP3" customClass="MWMButton">
                     <rect key="frame" x="66" y="6" width="28" height="28"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="28" id="ehM-kJ-EwT"/>
-                        <constraint firstAttribute="height" constant="28" id="pcM-3V-mou"/>
+                        <constraint firstAttribute="width" constant="28" id="oCp-7N-a4B"/>
+                        <constraint firstAttribute="height" constant="28" id="rF4-5t-7Rr"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
+                        <userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
                     </userDefinedRuntimeAttributes>
-                </imageView>
+                    <connections>
+                        <action selector="buttonTap" destination="-1" eventType="touchUpInside" id="biG-Kb-U12"/>
+                    </connections>
+                </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="History" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lj2-rb-tLK">
                     <rect key="frame" x="58" y="38" width="45" height="17"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
@@ -49,9 +52,9 @@
             <gestureRecognizers/>
             <constraints>
                 <constraint firstItem="Lj2-rb-tLK" firstAttribute="top" secondItem="B2L-gJ-zbV" secondAttribute="top" constant="38" id="87u-mS-F8T"/>
-                <constraint firstItem="qTf-fd-D9i" firstAttribute="top" secondItem="B2L-gJ-zbV" secondAttribute="top" constant="6" id="9mE-qq-eao"/>
-                <constraint firstItem="qTf-fd-D9i" firstAttribute="leading" secondItem="B2L-gJ-zbV" secondAttribute="leading" constant="66" id="nQe-W6-JBV"/>
+                <constraint firstItem="dWc-6u-iP3" firstAttribute="top" secondItem="B2L-gJ-zbV" secondAttribute="top" constant="6" id="hRq-8b-vbp"/>
                 <constraint firstItem="Lj2-rb-tLK" firstAttribute="leading" secondItem="B2L-gJ-zbV" secondAttribute="leading" constant="58" id="oMw-ic-QBY"/>
+                <constraint firstItem="dWc-6u-iP3" firstAttribute="leading" secondItem="B2L-gJ-zbV" secondAttribute="leading" constant="66" id="r0h-cS-OQL"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -64,12 +67,11 @@
         </view>
         <tapGestureRecognizer id="xUD-KM-Vlt">
             <connections>
-                <action selector="buttonTap:" destination="-1" id="NMO-AX-2G0"/>
+                <action selector="buttonTap" destination="-1" id="TDJ-qi-J5d"/>
             </connections>
         </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="ic_category_tab" width="28" height="28"/>
-        <image name="ic_history_tab" width="28" height="28"/>
     </resources>
 </document>