[ios] Search simmilar button

2018-03-30 15:11:06 +03:00 · 2018-03-30 15:11:06 +03:00 · c2a9e4855d
commit c2a9e4855d
parent 30f48b1b98
20 changed files with 291 additions and 14 deletions
--- a/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.swift
+++ b/iphone/Maps/Bookmarks/Categories/Permissions/BMCPermissionsCell.swift
@ -12,9 +12,9 @@ final class BMCPermissionsCell: MWMTableViewCell {

  @IBOutlet private weak var button: UIButton! {
    didSet {
-      button.setTitleColor(.white, for: .normal)
+      button.setTitleColor(UIColor.whitePrimaryText(), for: .normal)
+      button.setTitleColor(UIColor.whitePrimaryTextHighlighted(), for: .highlighted)
      button.setBackgroundColor(.linkBlue(), for: .normal)
-      button.setBackgroundColor(.linkBlueHighlighted(), for: .highlighted)
      button.titleLabel?.font = .regular14()
      button.layer.cornerRadius = 6
      button.clipsToBounds = true
--- a/iphone/Maps/Core/Search/MWMSearch.h
+++ b/iphone/Maps/Core/Search/MWMSearch.h
@ -2,6 +2,7 @@
 #import "MWMSearchFilterViewController.h"
 #import "MWMSearchItemType.h"
 #import "MWMSearchObserver.h"
+#import "MWMTypes.h"

 namespace search
 {
@ -9,6 +10,11 @@ class Result;
 struct ProductInfo;
 }  // namespace search

+namespace search_filter
+{
+struct HotelParams;
+}
+
@interface MWMSearch : NSObject

 + (void)addObserver:(id<MWMSearchObserver>)observer;
@ -39,6 +45,8 @@ struct ProductInfo;
 + (BOOL)hasFilter;
 + (MWMSearchFilterViewController *)getFilter;
 + (void)clearFilter;
+ (void)showHotelFilterWithParams:(search_filter::HotelParams &&)params
+                 onFinishCallback:(MWMVoidBlock)callback;

 - (instancetype)init __attribute__((unavailable("unavailable")));
 - (instancetype)copy __attribute__((unavailable("unavailable")));
--- a/iphone/Maps/Core/Search/MWMSearch.mm
+++ b/iphone/Maps/Core/Search/MWMSearch.mm
@ -3,6 +3,8 @@
 #import "MWMBannerHelpers.h"
 #import "MWMFrameworkListener.h"
 #import "MWMSearchHotelsFilterViewController.h"
+#import "MWMSearchManager+Filter.h"
+#import "MWMSearchManager.h"
 #import "SwiftBridge.h"

 #include "Framework.h"
@ -12,6 +14,8 @@
 #include "map/everywhere_search_params.hpp"
 #include "map/viewport_search_params.hpp"

+#include <utility>
+
 extern NSString * const kLuggageCategory;

 namespace
@ -319,6 +323,19 @@ using Observers = NSHashTable<Observer>;
  [manager update];
 }

+ (void)showHotelFilterWithParams:(search_filter::HotelParams &&)params
+                 onFinishCallback:(MWMVoidBlock)callback
+{
+  auto filter =
+  static_cast<MWMSearchHotelsFilterViewController *>([MWMSearchHotelsFilterViewController controller]);
+  auto search = [MWMSearch manager];
+  search.filter = filter;
+  [[MWMSearchManager manager] updateFilter:[filter, callback, params = std::move(params)]() mutable
+  {
+    [filter applyParams:std::move(params) onFinishCallback:callback];
+  }];
+}
+
 - (void)updateItemsIndexWithBannerReload:(BOOL)reloadBanner
 {
  auto const resultsCount = self->m_everywhereResults.GetCount();
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@ -514,6 +514,8 @@
 		F6C16A671F9626B2000FE296 /* ReviewsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3430291B1F87BC3000D0A07C /* ReviewsViewController.xib */; };
 		F6D67CDC2062B9C00032FD38 /* BCCreateCategoryAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6D67CDB2062B9C00032FD38 /* BCCreateCategoryAlert.swift */; };
 		F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6D67CDD2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib */; };
+		F6D67CE9206929590032FD38 /* PPPSearchSimilarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6D67CE8206929590032FD38 /* PPPSearchSimilarButton.swift */; };
+		F6D67CEB2069318B0032FD38 /* PPPSearchSimilarButton.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6D67CEA2069318B0032FD38 /* PPPSearchSimilarButton.xib */; };
 		F6E2FD501E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.mm */; };
 		F6E2FD531E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC001E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.xib */; };
 		F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC021E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.mm */; };
@ -1437,6 +1439,8 @@
 		F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMOsmAuthAlert.xib; sourceTree = "<group>"; };
 		F6D67CDB2062B9C00032FD38 /* BCCreateCategoryAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BCCreateCategoryAlert.swift; sourceTree = "<group>"; };
 		F6D67CDD2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMBCCreateCategoryAlert.xib; sourceTree = "<group>"; };
+		F6D67CE8206929590032FD38 /* PPPSearchSimilarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PPPSearchSimilarButton.swift; sourceTree = "<group>"; };
+		F6D67CEA2069318B0032FD38 /* PPPSearchSimilarButton.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PPPSearchSimilarButton.xib; sourceTree = "<group>"; };
 		F6DF5F321CD1136800A87154 /* LocaleTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleTranslator.h; sourceTree = "<group>"; };
 		F6E2FBFE1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderAdsTableViewCell.h; sourceTree = "<group>"; };
 		F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderAdsTableViewCell.mm; sourceTree = "<group>"; };
@ -3643,6 +3647,8 @@
 				F6E2FCDE1E097B9F0083EBEC /* _MWMPPPTitle.xib */,
 				F6E2FCDF1E097B9F0083EBEC /* MWMPPPreviewLayoutHelper.h */,
 				F6E2FCE01E097B9F0083EBEC /* MWMPPPreviewLayoutHelper.mm */,
+				F6D67CE8206929590032FD38 /* PPPSearchSimilarButton.swift */,
+				F6D67CEA2069318B0032FD38 /* PPPSearchSimilarButton.xib */,
 				34F1ADD11F6BC09E001CE79D /* PPPReview.swift */,
 				F6E2FCD91E097B9F0083EBEC /* PPPReview.xib */,
 			);
@ -4058,6 +4064,7 @@
 				6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */,
 				6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */,
 				34AB66801FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
+				F6D67CEB2069318B0032FD38 /* PPPSearchSimilarButton.xib in Resources */,
 				F61757F11FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */,
 				6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */,
 				F603E05E1FDE9703006B84D6 /* DiscoverySearchCollectionHolderCell.xib in Resources */,
@ -4340,6 +4347,7 @@
 				34F742321E0834F400AC1FD6 /* UIViewController+Navigation.mm in Sources */,
 				340475811E081B3300C92850 /* iosOGLContextFactory.mm in Sources */,
 				34AB66561FC5AA330078E451 /* TransportTransitPedestrian.swift in Sources */,
+				F6D67CE9206929590032FD38 /* PPPSearchSimilarButton.swift in Sources */,
 				6741A9B11BF340DE002C974C /* MWMAPIBarView.mm in Sources */,
 				3467CEB2202C6EEE00D3C670 /* BMCNotificationsHeader.swift in Sources */,
 				34F4072F1E9E1AFF00E57AC0 /* BannersCache.swift in Sources */,
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
@ -21,6 +21,7 @@ typedef UIView * _Nullable (^MWMPlacePageButtonsDismissBlock)(NSInteger);
        (nonnull MWMPlacePageButtonsDismissBlock)referenceViewWhenDismissingHandler;
 - (void)showGallery;
 - (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromPreview:(BOOL)fromPreview;
+- (void)searchSimilar;

 - (void)openLocalAdsURL;

--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h
@ -10,6 +10,8 @@

 #include <vector>

+#include <boost/optional.hpp>
+
@class MWMPlacePageData;
@class MWMUGCReviewVM;

@ -59,6 +61,7 @@ enum class PreviewRows
  Subtitle,
  Schedule,
  Review,
+  SearchSimilar,
  Address,
  Space,
  Banner
@ -185,6 +188,9 @@ using NewSectionsAreReady = void (^)(NSRange const & range, MWMPlacePageData * d
 - (NSURL *)URLToAllReviews;
 - (NSArray<MWMGalleryItemModel *> *)photos;

+- (boost::optional<int>)hotelRawApproximatePricing;
+- (boost::optional<ftypes::IsHotelChecker::Type>)hotelType;
+
 // Partners
 - (NSString *)partnerName;
 - (int)partnerIndex;
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
@ -177,9 +177,15 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
  if (self.schedule != OpeningHours::Unknown) m_previewRows.push_back(PreviewRows::Schedule);
  if (self.isBooking)
    m_previewRows.push_back(PreviewRows::Review);
-  if (self.address.length) m_previewRows.push_back(PreviewRows::Address);
-  m_previewRows.push_back(PreviewRows::Space);

+  if (self.address.length) m_previewRows.push_back(PreviewRows::Address);
+  if (self.hotelType)
+  {
+    m_previewRows.push_back(PreviewRows::Space);
+    m_previewRows.push_back(PreviewRows::SearchSimilar);
+  }
+
+  m_previewRows.push_back(PreviewRows::Space);
  NSAssert(!m_previewRows.empty(), @"Preview row's can't be empty!");

  if (network_policy::CanUseNetwork() && ![MWMSettings adForbidden] && m_info.HasBanner() &&
@ -632,6 +638,16 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
  return _photos;
 }

+- (boost::optional<int>)hotelRawApproximatePricing
+{
+  return m_info.GetRawApproximatePricing();
+}
+
+- (boost::optional<ftypes::IsHotelChecker::Type>)hotelType
+{
+  return m_info.GetHotelType();
+}
+
 #pragma mark - Partners

 - (NSString *)partnerName
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@ -12,6 +12,8 @@
 #import "MWMPlacePageLayout.h"
 #import "MWMRoutePoint+CPP.h"
 #import "MWMRouter.h"
+#import "MWMSearch.h"
+#import "MWMSearchHotelsFilterViewController.h"
 #import "MWMStorage.h"
 #import "MWMUGCViewModel.h"
 #import "MapViewController.h"
@ -24,6 +26,12 @@

 #include "geometry/distance_on_sphere.hpp"

+#include "base/assert.hpp"
+#include "base/logging.hpp"
+#include "base/stl_helpers.hpp"
+
+#include <utility>
+
 namespace
 {
 void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
@ -597,6 +605,33 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
  [[MapViewController controller].navigationController pushViewController:ugcVC animated:YES];
 }

+- (void)searchSimilar
+{
+  [Statistics logEvent:@"Placepage_Hotel_search_similar"
+        withParameters:@{kStatProvider : self.data.isBooking ? kStatBooking : kStatOSM}];
+
+  auto data = self.data;
+  if (!data)
+    return;
+
+  search_filter::HotelParams params;
+  CHECK(data.hotelType, ("Incorrect hotel type at coordinate:", data.latLon.lat, data.latLon.lon));
+  params.m_type = *data.hotelType;
+
+  if (auto const price = data.hotelRawApproximatePricing)
+  {
+    CHECK_LESS_OR_EQUAL(*price, my::Key(search_filter::Price::Three), ());
+    params.m_price = static_cast<search_filter::Price>(*price);
+  }
+
+  params.m_rating = place_page::rating::GetFilterRating(data.ratingRawValue);
+  [MWMSearch showHotelFilterWithParams:std::move(params)
+                      onFinishCallback:^{
+    [MWMMapViewControlsManager.manager searchTextOnMap:[L(@"booking_hotel") stringByAppendingString:@" "]
+                                        forInputLocale:[NSLocale currentLocale].localeIdentifier];
+  }];
+}
+
 - (void)showAllFacilities
 {
  auto data = self.data;
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.h
@ -4,5 +4,6 @@

 + (void)updateAvailableArea:(CGRect)frame;
 + (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromPreview:(BOOL)fromPreview;
+ (void)searchSimilar;

@end
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm
@ -12,6 +12,7 @@

 - (void)updateAvailableArea:(CGRect)frame;
 - (void)showUGCAddReview:(MWMRatingSummaryViewValueType)value fromPreview:(BOOL)fromPreview;
+- (void)searchSimilar;

@end

@ -28,4 +29,9 @@
                                                             fromPreview:fromPreview];
 }

+ (void)searchSimilar
+{
+  [[MWMMapViewControlsManager manager].placePageManager searchSimilar];
+}
+
@end
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
@ -9,7 +9,7 @@
 #import "Statistics.h"
 #import "SwiftBridge.h"

-#include "std/array.hpp"
+#include <array>

 #pragma mark - Base
 // Base class for avoiding copy-paste in inheriting cells.
@ -103,11 +103,12 @@

 namespace
 {
-array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class],
+std::array<Class, 9> const kPreviewCells = {{[_MWMPPPTitle class],
                                        [_MWMPPPExternalTitle class],
                                        [_MWMPPPSubtitle class],
                                        [_MWMPPPSchedule class],
                                        [MWMPPPReview class],
+                                        [MWMPPPSearchSimilarButton class],
                                        [_MWMPPPAddress class],
                                        [_MWMPPPSpace class],
                                        [MWMAdBanner class]}};
@ -175,7 +176,7 @@ array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class],
  using namespace place_page;
  auto tableView = self.tableView;
  auto const row = data.previewRows[indexPath.row];
-  Class cls = kPreviewCells[static_cast<size_t>(row)];
+  Class cls = kPreviewCells[my::Key(row)];

  auto * c = [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath];
  switch(row)
@ -249,6 +250,14 @@ array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class],
    }
    return reviewCell;
  }
+  case PreviewRows::SearchSimilar:
+  {
+    auto searchCell = static_cast<MWMPPPSearchSimilarButton *>(c);
+    [searchCell configWithTap:^{
+      [MWMPlacePageManagerHelper searchSimilar];
+    }];
+    return searchCell;
+  }
  case PreviewRows::Address:
    static_cast<_MWMPPPAddress *>(c).address.text = data.address;
    break;
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPReview.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPReview.swift
@ -69,4 +69,10 @@ final class PPPReview: MWMTableViewCell {
  @IBAction private func addReview() {
    onAddReview()
  }
+
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    let inset = width / 2
+    separatorInset = UIEdgeInsetsMake(0, inset, 0, inset)
+  }
 }
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPSearchSimilarButton.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPSearchSimilarButton.swift
@ -0,0 +1,20 @@
+@objc(MWMPPPSearchSimilarButton)
+final class PPPSearchSimilarButton: MWMTableViewCell {
+  typealias TapCallback = () -> Void
+
+  private var callback: TapCallback?
+
+  @objc func config(tap: @escaping TapCallback) {
+    callback = tap
+  }
+
+  @IBAction private func tap() {
+    callback?()
+  }
+
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    let inset = width / 2
+    separatorInset = UIEdgeInsetsMake(0, inset, 0, inset)
+  }
+}
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPSearchSimilarButton.xib
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/PPPSearchSimilarButton.xib
@ -0,0 +1,55 @@
+<?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="Safe area layout guides" minToolsVersion="9.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" rowHeight="37" id="LrV-a8-QE3" customClass="MWMPPPSearchSimilarButton">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="37"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="LrV-a8-QE3" id="RxM-lf-fTY">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="36.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nav-sJ-aRi">
+                        <rect key="frame" x="16" y="0.0" width="343" height="36"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="36" id="RJY-zu-7if"/>
+                        </constraints>
+                        <state key="normal" title="Button"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="6"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="clipsToBounds" value="YES"/>
+                            <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="place_page_search_similar_hotel"/>
+                        </userDefinedRuntimeAttributes>
+                        <connections>
+                            <action selector="tap" destination="LrV-a8-QE3" eventType="touchUpInside" id="Sbe-cQ-vld"/>
+                        </connections>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="Nav-sJ-aRi" secondAttribute="trailing" constant="16" id="8VG-y9-wXL"/>
+                    <constraint firstItem="Nav-sJ-aRi" firstAttribute="top" secondItem="RxM-lf-fTY" secondAttribute="top" id="cmp-yG-aww"/>
+                    <constraint firstAttribute="bottom" secondItem="Nav-sJ-aRi" secondAttribute="bottom" priority="750" constant="0.5" id="iGM-6r-cPl"/>
+                    <constraint firstItem="Nav-sJ-aRi" firstAttribute="leading" secondItem="RxM-lf-fTY" secondAttribute="leading" constant="16" id="qXQ-bw-3vY"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="cXx-oy-vIl"/>
+            <point key="canvasLocation" x="-132.5" y="-90.5"/>
+        </tableViewCell>
+    </objects>
+</document>
--- a/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift
+++ b/iphone/Maps/UI/Search/Filters/FilterCollectionHolderCell.swift
@ -1,6 +1,6 @@
@objc(MWMFilterCollectionHolderCell)
 final class FilterCollectionHolderCell: MWMTableViewCell {
-  @IBOutlet weak var collectionView: UICollectionView!
+  @IBOutlet private(set) weak var collectionView: UICollectionView!
  @IBOutlet private weak var collectionViewHeight: NSLayoutConstraint!
  private weak var tableView: UITableView?
  override var frame: CGRect {
--- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.h
+++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.h
@ -1,5 +1,30 @@
 #import "MWMSearchFilterViewController.h"
+#import "MWMTypes.h"
+
+#include "map/place_page_info.hpp"
+
+#include "indexer/ftypes_matcher.hpp"
+
+namespace search_filter
+{
+enum class Price
+{
+  Any = 0,
+  One = 1,
+  Two = 2,
+  Three = 3
+};
+
+struct HotelParams
+{
+  ftypes::IsHotelChecker::Type m_type = ftypes::IsHotelChecker::Type::Count;
+  place_page::rating::FilterRating m_rating = place_page::rating::FilterRating::Any;
+  Price m_price = Price::Any;
+};
+}  // namespace search_filter

@interface MWMSearchHotelsFilterViewController : MWMSearchFilterViewController

+- (void)applyParams:(search_filter::HotelParams &&)params onFinishCallback:(MWMVoidBlock)callback;
+
@end
--- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
+++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm
@ -7,6 +7,8 @@

 #include "search/hotels_filter.hpp"

+#include "base/stl_helpers.hpp"
+
 namespace
 {
 static NSTimeInterval kDayInterval = 24 * 60 * 60;
@ -118,6 +120,8 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
@property(nonatomic) NSDate * checkInDate;
@property(nonatomic) NSDate * checkOutDate;

+@property(nonatomic, copy) MWMVoidBlock onFinishCallback;
+
@end

@implementation MWMSearchHotelsFilterViewController
@ -129,6 +133,60 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
      [self controllerWithIdentifier:identifier]);
 }

+- (void)applyParams:(search_filter::HotelParams &&)params onFinishCallback:(MWMVoidBlock)callback
+{
+  using namespace search_filter;
+  using namespace place_page::rating;
+
+  CHECK(params.m_type != ftypes::IsHotelChecker::Type::Count, ());
+
+  self.onFinishCallback = callback;
+  [self.type.collectionView
+                     selectItemAtIndexPath:[NSIndexPath indexPathForItem:my::Key(params.m_type)
+                                 inSection:0]
+                                  animated:NO
+                            scrollPosition:UICollectionViewScrollPositionNone];
+
+  auto ratingCell = self.rating;
+
+  ratingCell.any.selected = NO;
+
+  switch (params.m_rating)
+  {
+  case FilterRating::Any:
+    ratingCell.any.selected = YES;
+    break;
+  case FilterRating::Good:
+    ratingCell.good.selected = YES;
+    break;
+  case FilterRating::VeryGood:
+    ratingCell.veryGood.selected = YES;
+    break;
+  case FilterRating::Excellent:
+    ratingCell.excellent.selected = YES;
+    break;
+  }
+
+  auto priceCell = self.price;
+  switch (params.m_price)
+  {
+  case Price::Any:
+    break;
+  case Price::One:
+    priceCell.one.selected = YES;
+    break;
+  case Price::Two:
+    priceCell.two.selected = YES;
+    priceCell.one.selected = YES;
+    break;
+  case Price::Three:
+    priceCell.three.selected = YES;
+    priceCell.two.selected = YES;
+    priceCell.one.selected = YES;
+    break;
+  }
+}
+
 - (void)viewWillAppear:(BOOL)animated
 {
  [super viewWillAppear:animated];
@ -179,7 +237,7 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar
 {
  [Statistics logEvent:kStatSearchFilterApply withParameters:@{kStatCategory: kStatHotel}];
  [MWMSearch update];
-  [self dismissViewControllerAnimated:YES completion:nil];
+  [self dismissViewControllerAnimated:YES completion:self.onFinishCallback];
 }

 - (void)initialCheckConfig
--- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.h
+++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.h
@ -1,7 +1,9 @@
 #import "MWMSearchManager.h"
+#import "MWMTypes.h"

@interface MWMSearchManager (Filter)

+- (void)updateFilter:(MWMVoidBlock)completion;
 - (void)clearFilter;

@end
--- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm
@ -15,11 +15,11 @@

@implementation MWMSearchManager (Filter)

- (IBAction)updateFilter
+- (void)updateFilter:(MWMVoidBlock)completion
 {
  MWMSearchFilterViewController * filter = [MWMSearch getFilter];
  UINavigationController * navController =
-      [[UINavigationController alloc] initWithRootViewController:filter];
+  [[UINavigationController alloc] initWithRootViewController:filter];
  UIViewController * ownerController = self.ownerController;

  if (IPAD)
@ -35,7 +35,12 @@
  [self configNavigationBar:navController.navigationBar];
  [self configNavigationItem:navController.topViewController.navigationItem];

-  [ownerController presentViewController:navController animated:YES completion:nil];
+  [ownerController presentViewController:navController animated:YES completion:completion];
+}
+
+- (IBAction)updateTap
+{
+  [self updateFilter:nil /* completion */];
 }

 - (IBAction)clearFilter { [MWMSearch clearFilter]; }
--- a/iphone/Maps/UI/Search/MWMSearchManager.mm
+++ b/iphone/Maps/UI/Search/MWMSearchManager.mm
@ -458,8 +458,7 @@ using Observers = NSHashTable<Observer>;
 {
  if (_state == state)
    return;
-  if (_state == MWMSearchManagerStateHidden)
-    [self endSearch];
+
  _state = state;
  [self updateTopController];
  switch (state)