[ios] Fixed UI.

iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h

@@ -1,10 +1,9 @@
 #import "MWMAlert.h"
-#import "MWMViewController.h"
 
 #include "routing/router.hpp"
 #include "storage/storage.hpp"
 
-@interface MWMAlertViewController : MWMViewController
+@interface MWMAlertViewController : UIViewController
 
 @property (weak, nonatomic, readonly) UIViewController * _Null_unspecified ownerViewController;
 

iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm

@@ -150,7 +150,7 @@ static inline CGFloat angleWithProgress(CGFloat progress)
     self.spinner.hidden = NO;
     self.backgroundLayer.hidden = self.progressLayer.hidden = YES;
   }
-  NSUInteger const animationImagesCount = 12;
+  NSUInteger const animationImagesCount = 18;
   NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
   NSString * postfix = ([UIColor isNightMode] && !self.isInvertColor) || (![UIColor isNightMode] && self.isInvertColor) ? @"dark" : @"light";
   for (NSUInteger i = 0; i < animationImagesCount; ++i)

iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h

@@ -1,5 +1,4 @@
 #import "MWMBottomMenuView.h"
-#import "MWMViewController.h"
 
 #include "platform/location.hpp"
 
@@ -14,7 +13,7 @@
 
 @end
 
-@interface MWMBottomMenuViewController : MWMViewController
+@interface MWMBottomMenuViewController : UIViewController
 
 @property(nonatomic) MWMBottomMenuState state;
 @property(weak, nonatomic) IBOutlet MWMButton * p2pButton;
@@ -27,7 +26,7 @@
 - (void)setInactive;
 - (void)setPlanning;
 - (void)setGo;
-
+- (void)mwm_refreshUI;
 - (void)refreshLayout;
 
 - (void)processMyPositionStateModeEvent:(location::EMyPositionMode)mode;

iphone/Maps/Classes/PlacePageView.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="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMPlacePage">
@@ -15,16 +15,19 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clipsSubviews="YES" contentMode="scaleToFill" id="KWK-Ky-ZkL" customClass="MWMExtendedPlacePageView">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="486"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="490"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="a4c-bA-qa5">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="18"/>
+                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="a4c-bA-qa5">
+                    <rect key="frame" x="0.0" y="0.0" width="320" height="22"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="vHZ-qz-A4f" appends="YES" id="g0Q-lA-bEs"/>
+                    </connections>
                 </imageView>
                 <view contentMode="scaleToFill" id="1m8-Jf-cgf">
-                    <rect key="frame" x="0.0" y="18" width="320" height="465"/>
+                    <rect key="frame" x="0.0" y="22" width="320" height="469"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <userDefinedRuntimeAttributes>
@@ -32,7 +35,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view contentMode="scaleToFill" id="8RI-YR-2UD" customClass="MWMBasePlacePageView">
-                    <rect key="frame" x="0.0" y="18" width="320" height="462"/>
+                    <rect key="frame" x="0.0" y="22" width="320" height="466"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <view contentMode="scaleToFill" id="Eil-hi-tf9" userLabel="PPPreview">
@@ -117,7 +120,7 @@
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" allowsSelection="NO" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="15" sectionFooterHeight="1" id="hZM-Gs-BbS">
                             <rect key="frame" x="0.0" y="84" width="320" height="384"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                            <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                             <inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
                             <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <userDefinedRuntimeAttributes>
@@ -160,6 +163,11 @@
                 <action selector="didTap:" destination="-1" id="a4e-XS-TaP"/>
             </connections>
         </tapGestureRecognizer>
+        <tapGestureRecognizer id="vHZ-qz-A4f">
+            <connections>
+                <action selector="didTap:" destination="-1" id="iKz-Le-xYy"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="img_direction_light" width="32" height="32"/>

iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_2_light.imageset/Contents.json

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

iphone/Maps/Images.xcassets/NavigationDashboard/Spinner/Spinner_3_light.imageset/Contents.json

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