[MAPSME-6549] [ios] Added Booking support to Discovery Manager.

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -240,6 +240,9 @@
 		34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */; };
 		34B1104C1FC8474D0010F76F /* CoreActionSheetPicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34B1104A1FC843420010F76F /* CoreActionSheetPicker.framework */; };
 		34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */; };
+		34B6FD5F2015E6BF00C18E97 /* DiscoveryBookingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B6FD5D2015E6BE00C18E97 /* DiscoveryBookingCell.swift */; };
+		34B6FD602015E6BF00C18E97 /* DiscoveryBookingCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B6FD5E2015E6BF00C18E97 /* DiscoveryBookingCell.xib */; };
+		34B6FD622015F71A00C18E97 /* DiscoveryBookingCollectionHolderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B6FD612015F71900C18E97 /* DiscoveryBookingCollectionHolderCell.xib */; };
 		34B924431DC8A29C0008D971 /* MWMMailViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.mm */; };
 		34BBD6471F82649D0070CA50 /* GoogleSignIn.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */; };
 		34BBD64C1F826DB10070CA50 /* AuthorizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BBD64A1F826DB10070CA50 /* AuthorizationViewController.swift */; };
@@ -1066,6 +1069,9 @@
 		34B127E71FBDD410008713D9 /* MWMRouterTransitStepInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterTransitStepInfo.h; sourceTree = "<group>"; };
 		34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRouterTransitStepInfo.mm; sourceTree = "<group>"; };
 		34B3806B1F1E46E20087D65B /* MWMSearchManagerState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerState.h; sourceTree = "<group>"; };
+		34B6FD5D2015E6BE00C18E97 /* DiscoveryBookingCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiscoveryBookingCell.swift; sourceTree = "<group>"; };
+		34B6FD5E2015E6BF00C18E97 /* DiscoveryBookingCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DiscoveryBookingCell.xib; sourceTree = "<group>"; };
+		34B6FD612015F71900C18E97 /* DiscoveryBookingCollectionHolderCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DiscoveryBookingCollectionHolderCell.xib; sourceTree = "<group>"; };
 		34B924401DC8A29C0008D971 /* MWMMailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMailViewController.h; sourceTree = "<group>"; };
 		34B924411DC8A29C0008D971 /* MWMMailViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMailViewController.mm; sourceTree = "<group>"; };
 		34BBD6451F8264980070CA50 /* GoogleSignIn.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GoogleSignIn.bundle; path = 3party/GoogleSignIn/GoogleSignIn.bundle; sourceTree = "<group>"; };
@@ -3714,6 +3720,9 @@
 		F6E407CC1FC45ED4001F7821 /* Discovery */ = {
 			isa = PBXGroup;
 			children = (
+				34B6FD5D2015E6BE00C18E97 /* DiscoveryBookingCell.swift */,
+				34B6FD5E2015E6BF00C18E97 /* DiscoveryBookingCell.xib */,
+				34B6FD612015F71900C18E97 /* DiscoveryBookingCollectionHolderCell.xib */,
 				F5BD2A86D9DA2F9769D30B54 /* DiscoveryCollectionHolderCell.swift */,
 				F69739B41FD198E300FDA07D /* DiscoveryControllerViewModel.hpp */,
 				F69739DA1FD6ECCE00FDA07D /* DiscoveryLocalExpertCell.swift */,
@@ -4046,6 +4055,7 @@
 				34D3B04B1E389D05004100F9 /* MWMNoteCell.xib in Resources */,
 				F6E2FDEF1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */,
 				34E50DE31F6FCBA1008EED49 /* UGCAddReviewCell.xib in Resources */,
+				34B6FD602015E6BF00C18E97 /* DiscoveryBookingCell.xib in Resources */,
 				F6E2FDF51E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */,
 				F603E05A1FDE9410006B84D6 /* DiscoveryLocalExpertCollectionHolderCell.xib in Resources */,
 				F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
@@ -4107,6 +4117,7 @@
 				671182E51C7F0DDB00CB8177 /* packed_polygons_obsolete.bin in Resources */,
 				676507601C10559800830BB3 /* patterns.txt in Resources */,
 				6741A94A1BF340DE002C974C /* resources-6plus_clear in Resources */,
+				34B6FD622015F71A00C18E97 /* DiscoveryBookingCollectionHolderCell.xib in Resources */,
 				6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */,
 				677A2DE21C0DD50900635A00 /* resources-default in Resources */,
 				F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */,
@@ -4239,6 +4250,7 @@
 				34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */,
 				F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */,
 				34D4FA671E265749003F53EF /* WhatsNewController.swift in Sources */,
+				34B6FD5F2015E6BF00C18E97 /* DiscoveryBookingCell.swift in Sources */,
 				34D3B01B1E389D05004100F9 /* MWMButtonCell.mm in Sources */,
 				3486B5161E27AD3B0069C126 /* Framework.cpp in Sources */,
 				34ABA6291C2D567B00FE1BEC /* MWMInputLoginValidator.mm in Sources */,

iphone/Maps/UI/Discovery/DiscoveryBookingCell.swift

@@ -0,0 +1,99 @@
+@objc(MWMDiscoveryBookingCell)
+final class DiscoveryBookingCell: UICollectionViewCell {
+  @IBOutlet private weak var avatar: UIImageView!
+  @IBOutlet private weak var name: UILabel! {
+    didSet {
+      name.font = UIFont.medium14()
+      name.textColor = UIColor.blackPrimaryText()
+    }
+  }
+
+  @IBOutlet private weak var stars: UILabel! {
+    didSet {
+      stars.font = UIFont.regular12()
+      stars.textColor = UIColor.blackSecondaryText()
+    }
+  }
+
+  @IBOutlet private weak var price: UILabel! {
+    didSet {
+      price.font = UIFont.medium14()
+      price.textColor = UIColor.blackSecondaryText()
+    }
+  }
+
+  @IBOutlet private weak var rating: RatingSummaryView! {
+    didSet {
+      rating.defaultConfig()
+      rating.textFont = UIFont.bold12()
+      rating.textSize = 12
+    }
+  }
+
+  @IBOutlet private weak var distance: UILabel! {
+    didSet {
+      distance.font = UIFont.medium14()
+      distance.textColor = UIColor.linkBlue()
+    }
+  }
+
+  @IBOutlet private weak var buildRoute: UIButton! {
+    didSet {
+      buildRoute.setTitleColor(UIColor.linkBlue(), for: .normal)
+      buildRoute.setTitle(L("p2p_to_here"), for: .normal)
+    }
+  }
+
+  typealias OnBuildRoute = () -> Void
+  private var onBuildRoute: OnBuildRoute!
+
+  override var isHighlighted: Bool {
+    didSet {
+      UIView.animate(withDuration: kDefaultAnimationDuration,
+                     delay: 0,
+                     options: [.allowUserInteraction, .beginFromCurrentState],
+                     animations: { self.alpha = self.isHighlighted ? 0.3 : 1 },
+                     completion: nil)
+    }
+  }
+
+  private func setAvatar(_ avatarURL: String?) {
+    guard let avatarURL = avatarURL else { return }
+    if !avatarURL.isEmpty, let url = URL(string: avatarURL) {
+      avatar.af_setImage(withURL: url, placeholderImage: #imageLiteral(resourceName: "img_localsdefault"), imageTransition: .crossDissolve(kDefaultAnimationDuration))
+    } else {
+      avatar.image = #imageLiteral(resourceName: "img_localsdefault")
+    }
+  }
+
+  private func setRating(_ ratingValue: String, _ ratingType: MWMRatingSummaryViewValueType) {
+    rating.value = ratingValue
+    rating.type = ratingType
+  }
+
+  @objc func config(avatarURL: String?,
+                    title: String,
+                    subtitle: String,
+                    price: String,
+                    ratingValue: String,
+                    ratingType: MWMRatingSummaryViewValueType,
+                    distance: String,
+                    onBuildRoute: @escaping OnBuildRoute) {
+    setAvatar(avatarURL)
+    self.name.text = title
+    self.stars.text = subtitle
+    self.price.text = price.isEmpty ? "" : "\(price) • "
+    setRating(ratingValue, ratingType)
+    self.distance.text = distance
+    self.onBuildRoute = onBuildRoute
+  }
+
+  @IBAction private func buildRouteAction() {
+    onBuildRoute()
+  }
+
+  override func awakeFromNib() {
+    super.awakeFromNib()
+    layer.borderColor = UIColor.blackDividers().cgColor
+  }
+}

iphone/Maps/UI/Discovery/DiscoveryBookingCell.xib

@@ -0,0 +1,161 @@
+<?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" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="DiscoveryBookingCell" id="bjC-eX-cME" customClass="MWMDiscoveryBookingCell">
+            <rect key="frame" x="0.0" y="0.0" width="160" height="138"/>
+            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
+                <rect key="frame" x="0.0" y="0.0" width="160" height="138"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WIp-9D-zCf">
+                        <rect key="frame" x="0.0" y="0.0" width="160" height="0.0"/>
+                        <constraints>
+                            <constraint firstAttribute="height" id="SzI-04-VFX"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WvH-Ak-fYM">
+                        <rect key="frame" x="12" y="14" width="136" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" id="D3X-Qh-8pr"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
+                        </userDefinedRuntimeAttributes>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iw8-ju-uOt">
+                        <rect key="frame" x="12" y="36" width="136" height="16"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="16" id="QKU-5K-Yca"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mlf-pU-xTQ" userLabel="Price">
+                        <rect key="frame" x="12" y="54" width="42" height="20"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="KmA-vt-YxO" customClass="RatingSummaryView" customModule="maps_me" customModuleProvider="target">
+                        <rect key="frame" x="54" y="54" width="48" height="20"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="48" id="6WJ-qD-apL"/>
+                            <constraint firstAttribute="height" constant="20" id="jcd-OG-vjG"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="image" keyPath="excellentImage" value="ic_24px_rating_excellent"/>
+                            <userDefinedRuntimeAttribute type="image" keyPath="goodImage" value="ic_24px_rating_excellent"/>
+                            <userDefinedRuntimeAttribute type="image" keyPath="normalImage" value="ic_24px_rating_normal"/>
+                            <userDefinedRuntimeAttribute type="image" keyPath="badImage" value="ic_24px_rating_bad"/>
+                            <userDefinedRuntimeAttribute type="image" keyPath="horribleImage" value="ic_24px_rating_horrible"/>
+                            <userDefinedRuntimeAttribute type="number" keyPath="topOffset">
+                                <real key="value" value="2"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="number" keyPath="bottomOffset">
+                                <real key="value" value="2"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="number" keyPath="leadingImageOffset">
+                                <real key="value" value="6"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="number" keyPath="margin">
+                                <real key="value" value="4"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="number" keyPath="trailingTextOffset">
+                                <real key="value" value="6"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="image" keyPath="noValueImage" value="ic_12px_rating_normal"/>
+                        </userDefinedRuntimeAttributes>
+                    </view>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5vR-oH-2gt">
+                        <rect key="frame" x="0.0" y="98" width="160" height="40"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.040000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="160" id="NFU-3P-bPD"/>
+                            <constraint firstAttribute="height" constant="40" id="Yyw-mG-8Io"/>
+                        </constraints>
+                        <state key="normal" title="Button"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
+                        </userDefinedRuntimeAttributes>
+                        <connections>
+                            <action selector="buildRouteAction" destination="bjC-eX-cME" eventType="touchUpInside" id="8vR-L4-RUL"/>
+                        </connections>
+                    </button>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O6r-ws-8ia" userLabel="Distance">
+                        <rect key="frame" x="12" y="74" width="42" height="16"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="WvH-Ak-fYM" secondAttribute="trailing" constant="12" id="0PD-UO-vAF"/>
+                <constraint firstAttribute="trailing" secondItem="WIp-9D-zCf" secondAttribute="trailing" id="0a4-1Q-ZUH"/>
+                <constraint firstItem="iw8-ju-uOt" firstAttribute="trailing" secondItem="WvH-Ak-fYM" secondAttribute="trailing" id="4ap-cL-lqj"/>
+                <constraint firstItem="Mlf-pU-xTQ" firstAttribute="top" secondItem="iw8-ju-uOt" secondAttribute="bottom" constant="2" id="5Xo-om-Qdv"/>
+                <constraint firstAttribute="bottom" secondItem="5vR-oH-2gt" secondAttribute="bottom" id="721-79-YyD"/>
+                <constraint firstAttribute="trailing" secondItem="5vR-oH-2gt" secondAttribute="trailing" id="8L0-cn-C8u"/>
+                <constraint firstItem="O6r-ws-8ia" firstAttribute="leading" secondItem="WvH-Ak-fYM" secondAttribute="leading" id="AgR-Ct-Boz"/>
+                <constraint firstItem="WIp-9D-zCf" firstAttribute="top" secondItem="bjC-eX-cME" secondAttribute="top" id="Hdr-qF-Wyu"/>
+                <constraint firstItem="KmA-vt-YxO" firstAttribute="top" secondItem="Mlf-pU-xTQ" secondAttribute="top" id="J1Q-UG-YBb"/>
+                <constraint firstItem="WvH-Ak-fYM" firstAttribute="leading" secondItem="bjC-eX-cME" secondAttribute="leading" constant="12" id="Pik-ol-qoY"/>
+                <constraint firstItem="Mlf-pU-xTQ" firstAttribute="leading" secondItem="WvH-Ak-fYM" secondAttribute="leading" id="UYf-Wa-dMQ"/>
+                <constraint firstItem="iw8-ju-uOt" firstAttribute="top" secondItem="WvH-Ak-fYM" secondAttribute="bottom" constant="2" id="ZJQ-CY-0yY"/>
+                <constraint firstItem="KmA-vt-YxO" firstAttribute="bottom" secondItem="Mlf-pU-xTQ" secondAttribute="bottom" id="gfH-El-V3L"/>
+                <constraint firstItem="O6r-ws-8ia" firstAttribute="top" secondItem="Mlf-pU-xTQ" secondAttribute="bottom" id="h5f-tY-ozA"/>
+                <constraint firstItem="WIp-9D-zCf" firstAttribute="leading" secondItem="bjC-eX-cME" secondAttribute="leading" id="hKg-pe-KgJ"/>
+                <constraint firstItem="5vR-oH-2gt" firstAttribute="leading" secondItem="bjC-eX-cME" secondAttribute="leading" id="rix-U3-uBU"/>
+                <constraint firstItem="KmA-vt-YxO" firstAttribute="leading" secondItem="Mlf-pU-xTQ" secondAttribute="trailing" id="sYM-kR-44c"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="KmA-vt-YxO" secondAttribute="trailing" constant="12" id="tHI-AN-77R"/>
+                <constraint firstItem="WvH-Ak-fYM" firstAttribute="top" secondItem="WIp-9D-zCf" secondAttribute="bottom" constant="14" id="uvh-8Y-Ed6"/>
+                <constraint firstItem="iw8-ju-uOt" firstAttribute="leading" secondItem="WvH-Ak-fYM" secondAttribute="leading" id="x5G-YL-8Hr"/>
+                <constraint firstItem="5vR-oH-2gt" firstAttribute="top" secondItem="O6r-ws-8ia" secondAttribute="bottom" constant="8" id="zwz-dU-6UF"/>
+            </constraints>
+            <size key="customSize" width="160" height="218"/>
+            <userDefinedRuntimeAttributes>
+                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                    <integer key="value" value="6"/>
+                </userDefinedRuntimeAttribute>
+                <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
+                    <integer key="value" value="1"/>
+                </userDefinedRuntimeAttribute>
+                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
+            </userDefinedRuntimeAttributes>
+            <connections>
+                <outlet property="avatar" destination="WIp-9D-zCf" id="tTe-VB-e8W"/>
+                <outlet property="buildRoute" destination="5vR-oH-2gt" id="IaG-cz-rt7"/>
+                <outlet property="distance" destination="O6r-ws-8ia" id="Wd4-VM-Au0"/>
+                <outlet property="name" destination="WvH-Ak-fYM" id="Q0X-Dh-fn7"/>
+                <outlet property="price" destination="Mlf-pU-xTQ" id="cZq-6W-zla"/>
+                <outlet property="rating" destination="KmA-vt-YxO" id="pJX-d4-VkZ"/>
+                <outlet property="stars" destination="iw8-ju-uOt" id="Z5A-eO-nAN"/>
+            </connections>
+            <point key="canvasLocation" x="-165" y="-17"/>
+        </collectionViewCell>
+    </objects>
+    <resources>
+        <image name="ic_12px_rating_normal" width="12" height="12"/>
+        <image name="ic_24px_rating_bad" width="24" height="24"/>
+        <image name="ic_24px_rating_excellent" width="24" height="24"/>
+        <image name="ic_24px_rating_horrible" width="24" height="24"/>
+        <image name="ic_24px_rating_normal" width="24" height="24"/>
+    </resources>
+</document>

iphone/Maps/UI/Discovery/DiscoveryBookingCollectionHolderCell.xib

@@ -0,0 +1,71 @@
+<?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>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoveryBookingCollectionHolderCell" rowHeight="245" id="kOb-uR-NfL" customClass="MWMDiscoveryBookingCollectionHolderCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="190"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="kOb-uR-NfL" id="HJe-Ad-Mjp">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="189.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVI-Rn-1Ht">
+                        <rect key="frame" x="16" y="12" width="327" height="26.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
+                        </userDefinedRuntimeAttributes>
+                    </label>
+                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="hb0-w1-X0p" customClass="MWMDiscoveryCollectionView">
+                        <rect key="frame" x="0.0" y="50.5" width="375" height="139"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="139" id="EJY-mn-vpT"/>
+                        </constraints>
+                        <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="8" minimumInteritemSpacing="0.0" id="XgH-zm-NQn">
+                            <size key="itemSize" width="160" height="138"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                    </collectionView>
+                </subviews>
+                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                <constraints>
+                    <constraint firstItem="hb0-w1-X0p" firstAttribute="top" secondItem="mVI-Rn-1Ht" secondAttribute="bottom" constant="12" id="2HX-P3-y34"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="mVI-Rn-1Ht" secondAttribute="trailing" constant="16" id="Krm-7b-e90"/>
+                    <constraint firstItem="mVI-Rn-1Ht" firstAttribute="leading" secondItem="HJe-Ad-Mjp" secondAttribute="leading" constant="16" id="O0N-tB-zHS"/>
+                    <constraint firstItem="mVI-Rn-1Ht" firstAttribute="top" secondItem="HJe-Ad-Mjp" secondAttribute="top" constant="12" id="Pjh-uR-2fV"/>
+                    <constraint firstAttribute="trailing" secondItem="hb0-w1-X0p" secondAttribute="trailing" id="TZ9-cR-8ob"/>
+                    <constraint firstAttribute="bottom" secondItem="hb0-w1-X0p" secondAttribute="bottom" id="ekR-z5-imZ"/>
+                    <constraint firstItem="hb0-w1-X0p" firstAttribute="leading" secondItem="HJe-Ad-Mjp" secondAttribute="leading" id="uPC-mg-zsI"/>
+                </constraints>
+                <userDefinedRuntimeAttributes>
+                    <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
+                </userDefinedRuntimeAttributes>
+            </tableViewCellContentView>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <userDefinedRuntimeAttributes>
+                <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
+            </userDefinedRuntimeAttributes>
+            <connections>
+                <outlet property="collectionView" destination="hb0-w1-X0p" id="CRZ-o9-rpF"/>
+                <outlet property="header" destination="mVI-Rn-1Ht" id="0SB-Lz-CRU"/>
+            </connections>
+            <point key="canvasLocation" x="-179.5" y="58"/>
+        </tableViewCell>
+    </objects>
+</document>

iphone/Maps/UI/Discovery/DiscoveryCollectionHolderCell.swift

@@ -10,7 +10,7 @@ class DiscoveryCollectionHolder: UITableViewCell {
 
 @objc(MWMDiscoveryViatorCollectionHolderCell)
 final class DiscoveryViatorCollectionHolderCell: DiscoveryCollectionHolder {
-  typealias Tap = () -> ()
+  typealias Tap = () -> Void
   private var tap: Tap?
 
   @objc func config(tap: @escaping Tap) {
@@ -46,3 +46,11 @@ final class DiscoverySearchCollectionHolderCell: DiscoveryCollectionHolder {
     super.config(header: header, cellClass: DiscoverySearchCell.self)
   }
 }
+
+@objc(MWMDiscoveryBookingCollectionHolderCell)
+final class DiscoveryBookingCollectionHolderCell: DiscoveryCollectionHolder {
+  @objc func config() {
+    super.config(header: L("discovery_button_subtitle_booking").uppercased(),
+                 cellClass: DiscoveryBookingCell.self)
+  }
+}

iphone/Maps/UI/Discovery/DiscoveryControllerViewModel.hpp

@@ -21,9 +21,22 @@ public:
   void SetSearchResults(search::Results const & res, m2::PointD const & viewportCenter,
                         ItemType const type)
   {
-    auto & results = type == ItemType::Attractions ? m_attractions : m_cafes;
-    results.m_viewportCenter = viewportCenter;
-    results.m_results = res;
+    switch (type)
+    {
+    case ItemType::Attractions:
+      m_attractions.m_viewportCenter = viewportCenter;
+      m_attractions.m_results = res;
+      break;
+    case ItemType::Cafes:
+      m_cafes.m_viewportCenter = viewportCenter;
+      m_cafes.m_results = res;
+      break;
+    case ItemType::Hotels:
+      m_hotels.m_viewportCenter = viewportCenter;
+      m_hotels.m_results = res;
+      break;
+    default: break;
+    }
   }
 
   void SetViator(std::vector<viator::Product> const & viator) { m_viator = viator; }
@@ -36,8 +49,8 @@ public:
     case ItemType::Viator: return m_viator.size();
     case ItemType::Attractions: return m_attractions.m_results.GetCount();
     case ItemType::Cafes: return m_cafes.m_results.GetCount();
+    case ItemType::Hotels: return m_hotels.m_results.GetCount();
     case ItemType::LocalExperts: return m_experts.size();
-    case ItemType::Hotels: CHECK(false, ("Discovering hotels hasn't supported yet.")); return 0;
     }
   }
 
@@ -69,6 +82,14 @@ public:
     return m_experts[index];
   }
 
+  search::Result const & GetHotelAt(size_t const index) const
+  {
+    CHECK_LESS(index, m_hotels.m_results.GetCount(), ("Incorrect hotels index:", index));
+    return m_hotels.m_results[index];
+  }
+
+  m2::PointD const & GetHotelReferencePoint() const { return m_hotels.m_viewportCenter; }
+
 private:
   struct UISearchResults
   {
@@ -78,6 +99,7 @@ private:
 
   UISearchResults m_attractions;
   UISearchResults m_cafes;
+  UISearchResults m_hotels;
   std::vector<viator::Product> m_viator;
   std::vector<locals::LocalExpert> m_experts;
 };

iphone/Maps/UI/Discovery/MWMDiscoveryController.mm

@@ -118,8 +118,9 @@ struct Callback
 
   auto getTypes = [](MWMDiscoveryMode m) -> vector<ItemType> {
     if (m == MWMDiscoveryModeOnline)
-      return {ItemType::Viator, ItemType::Attractions, ItemType::Cafes, ItemType::LocalExperts};
-    return {ItemType::Attractions, ItemType::Cafes};
+      return {ItemType::Hotels, ItemType::Viator, ItemType::Attractions, ItemType::Cafes,
+              ItemType::LocalExperts};
+    return {ItemType::Hotels, ItemType::Attractions, ItemType::Cafes};
   };
 
   vector<ItemType> types = getTypes(self.mode);
@@ -134,37 +135,38 @@ struct Callback
 
 #pragma mark - MWMDiscoveryTapDelegate
 
+- (void)showSearchResult:(const search::Result &)item
+{
+  GetFramework().ShowSearchResult(item);
+  [self.navigationController popViewControllerAnimated:YES];
+}
+
 - (void)tapOnItem:(ItemType const)type atIndex:(size_t const)index
 {
   NSString * dest = @"";
   switch (type)
   {
   case ItemType::Viator:
-  case ItemType::LocalExperts:
-  {
-    auto const & url = type == ItemType::Viator ? m_model.GetViatorAt(index).m_pageUrl
-                                                : m_model.GetExpertAt(index).m_pageUrl;
-    [self openUrl:[NSURL URLWithString:@(url.c_str())]];
+    [self openUrl:[NSURL URLWithString:@(m_model.GetViatorAt(index).m_pageUrl.c_str())]];
+    dest = kStatExternal;
+    break;
+  case ItemType::LocalExperts:
+    [self openUrl:[NSURL URLWithString:@(m_model.GetExpertAt(index).m_pageUrl.c_str())]];
     dest = kStatExternal;
     break;
-  }
   case ItemType::Attractions:
+    [self showSearchResult:m_model.GetAttractionAt(index)];
+    dest = kStatPlacePage;
+    break;
   case ItemType::Cafes:
-  {
-    auto const & item =
-        type == ItemType::Attractions ? m_model.GetAttractionAt(index) : m_model.GetCafeAt(index);
-    GetFramework().ShowSearchResult(item);
-    [self.navigationController popViewControllerAnimated:YES];
+    [self showSearchResult:m_model.GetCafeAt(index)];
+    dest = kStatPlacePage;
+    break;
+  case ItemType::Hotels:
+    [self showSearchResult:m_model.GetHotelAt(index)];
     dest = kStatPlacePage;
     break;
   }
-  case ItemType::Hotels:
-  {
-    NSAssert(false, @"Discovering hotels hasn't implemented yet.");
-    break;
-  }
-  }
-
   NSAssert(dest.length > 0, @"");
   [Statistics logEvent:kStatPlacepageSponsoredItemSelected
         withParameters:@{
@@ -177,7 +179,7 @@ struct Callback
 
 - (void)routeToItem:(ItemType const)type atIndex:(size_t const)index
 {
-  CHECK(type == ItemType::Attractions || type == ItemType::Cafes,
+  CHECK(type == ItemType::Attractions || type == ItemType::Cafes || type == ItemType::Hotels,
         ("Attempt to route to item with type:", static_cast<int>(type)));
   auto const & item =
       type == ItemType::Attractions ? m_model.GetAttractionAt(index) : m_model.GetCafeAt(index);

iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm

@@ -37,7 +37,7 @@ NSString * StatProvider(ItemType const type)
   case ItemType::LocalExperts: return kStatLocalsProvider;
   case ItemType::Attractions: return kStatSearchAttractions;
   case ItemType::Cafes: return kStatSearchRestaurants;
-  case ItemType::Hotels: ASSERT(false, ()); return @"";
+  case ItemType::Hotels: return kStatBooking;
   }
 }
 }  // namespace discovery
@@ -179,6 +179,7 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
   [tv registerWithCellClass:[MWMDiscoverySearchCollectionHolderCell class]];
   [tv registerWithCellClass:[MWMDiscoveryViatorCollectionHolderCell class]];
   [tv registerWithCellClass:[MWMDiscoveryLocalExpertCollectionHolderCell class]];
+  [tv registerWithCellClass:[MWMDiscoveryBookingCollectionHolderCell class]];
   [tv registerWithCellClass:[MWMDiscoveryNoResultsCell class]];
 }
 
@@ -240,6 +241,19 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
   return cell;
 }
 
+- (MWMDiscoveryBookingCollectionHolderCell *)bookingCollectionHolderCell:(NSIndexPath *)indexPath
+{
+  Class cls = [MWMDiscoveryBookingCollectionHolderCell class];
+  auto cell = static_cast<MWMDiscoveryBookingCollectionHolderCell *>(
+      [self.tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
+  auto collection = static_cast<MWMDiscoveryCollectionView *>(cell.collectionView);
+  [cell config];
+  collection.delegate = self;
+  collection.dataSource = self;
+  collection.itemType = ItemType::Hotels;
+  return cell;
+}
+
 #pragma mark - UITableViewDataSource
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
@@ -297,11 +311,7 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
     }
     return [self searchCollectionHolderCell:indexPath];
   }
-  case ItemType::Hotels:
-  {
-    CHECK(false, ("Discovering hotels hasn't implemented yet."));
-    return nil;
-  }
+  case ItemType::Hotels: return [self bookingCollectionHolderCell:indexPath];
   }
 }
 
@@ -351,7 +361,6 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
                       }];
     return cell;
   }
-
   case ItemType::Viator:
   {
     Class cls = [MWMViatorElement class];
@@ -394,7 +403,38 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
                           }];
     return cell;
   }
-  case ItemType::Hotels: NSAssert(false, @""); return nil;
+  case ItemType::Hotels:
+  {
+    Class cls = [MWMDiscoveryBookingCell class];
+    auto cell = static_cast<MWMDiscoveryBookingCell *>(
+        [collectionView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
+    auto const & sr = model.GetHotelAt(indexPath.row);
+    auto const & pt = model.GetHotelReferencePoint();
+
+    NSMutableString * subtitle = nil;
+    auto starsCount = sr.GetStarsCount();
+    if (starsCount == 0)
+    {
+      subtitle = [@(sr.GetFeatureTypeName().c_str()) mutableCopy];
+    }
+    else
+    {
+      subtitle = [@"" mutableCopy];
+      for (int i = 0; i < starsCount; ++i)
+        [subtitle appendString:@"★"];
+    }
+    [cell configWithAvatarURL:nil
+                        title:@(sr.GetString().c_str())
+                     subtitle:[subtitle copy]
+                        price:@(sr.GetHotelApproximatePricing().c_str())
+                  ratingValue:@(sr.GetHotelRating().c_str())
+                   ratingType:MWMRatingSummaryViewValueTypeGood
+                     distance:@(GetDistance(pt, sr.GetFeatureCenter()).c_str())
+                 onBuildRoute:^{
+                   [self.delegate routeToItem:type atIndex:indexPath.row];
+                 }];
+    return cell;
+  }
   }
 }
 

map/search_api.cpp

@@ -226,7 +226,7 @@ bool SearchAPI::SearchInViewport(ViewportSearchParams const & params)
   return Search(p, false /* forceSearch */);
 }
 
-bool SearchAPI::SearchForDiscovery(DiscoverySearchParams const & params)
+void SearchAPI::SearchForDiscovery(DiscoverySearchParams const & params)
 {
   CHECK(params.m_onResults, ());
   CHECK(!params.m_query.empty(), ());
@@ -258,7 +258,7 @@ bool SearchAPI::SearchForDiscovery(DiscoverySearchParams const & params)
     }
   };
 
-  return Search(p, false /* forceSearch */);
+  GetEngine().Search(p);
 }
 
 bool SearchAPI::SearchInDownloader(storage::DownloaderSearchParams const & params)

map/search_api.hpp

@@ -112,7 +112,7 @@ public:
   // Search in the viewport.
   bool SearchInViewport(search::ViewportSearchParams const & params);
 
-  bool SearchForDiscovery(search::DiscoverySearchParams const & params);
+  void SearchForDiscovery(search::DiscoverySearchParams const & params);
 
   // Search for maps by countries or cities.
   bool SearchInDownloader(storage::DownloaderSearchParams const & params);