[iOS] add UI for booking hot offers

2018-06-27 17:56:50 +03:00 · 2018-06-27 17:56:50 +03:00 · 71db6f02e5
commit 71db6f02e5
parent 2d1d5be066
9 changed files with 82 additions and 40 deletions
--- a/iphone/Maps/Core/Search/MWMSearch.h
+++ b/iphone/Maps/Core/Search/MWMSearch.h
@ -31,6 +31,7 @@ struct HotelParams;
 + (search::ProductInfo const &)productInfoWithContainerIndex:(NSUInteger)index;
 + (id<MWMBanner>)adWithContainerIndex:(NSUInteger)index;
 + (BOOL)isBookingAvailableWithContainerIndex:(NSUInteger)index;
+ (BOOL)isDealAvailableWithContainerIndex:(NSUInteger)index;

 + (void)update;
 + (void)clear;
--- a/iphone/Maps/Core/Search/MWMSearch.mm
+++ b/iphone/Maps/Core/Search/MWMSearch.mm
@ -54,7 +54,7 @@ using Observers = NSHashTable<Observer>;
  search::ViewportSearchParams m_viewportParams;
  search::Results m_everywhereResults;
  search::Results m_viewportResults;
-  std::vector<FeatureID> m_bookingAvailableFeatureIDs;
+  std::unordered_map<booking::filter::Type, std::vector<FeatureID>> m_filterResults;
  std::vector<search::ProductInfo> m_productInfo;
 }

@ -81,6 +81,31 @@ using Observers = NSHashTable<Observer>;
  return self;
 }

+- (void)enableCallbackFor:(booking::filter::Type const)filterType {
+  auto & tasks = self->m_everywhereParams.m_bookingFilterTasks;
+  auto availabilityTaskIt = tasks.Find(filterType);
+  if (availabilityTaskIt != tasks.end())
+  {
+    availabilityTaskIt->m_filterParams.m_callback =
+    [self, filterType](shared_ptr<booking::ParamsBase> const & apiParams,
+                        std::vector<FeatureID> const & sortedFeatures)
+    {
+      auto & t = self->m_everywhereParams.m_bookingFilterTasks;
+      auto const it = t.Find(filterType);
+
+      if (it == t.end())
+        return;
+
+      auto const & p = it->m_filterParams.m_apiParams;
+      if (p->IsEmpty() || !p->Equals(*apiParams))
+        return;
+
+      self->m_filterResults[filterType] = sortedFeatures;
+      [self onSearchResultsUpdated];
+    };
+  }
+}
+
 - (void)searchEverywhere
 {
  self.lastSearchTimestamp += 1;
@ -102,29 +127,8 @@ using Observers = NSHashTable<Observer>;
      self.searchCount -= 1;
  };

-  auto & tasks = self->m_everywhereParams.m_bookingFilterTasks;
-  auto availabilityTaskIt = tasks.Find(booking::filter::Type::Availability);
-  if (availabilityTaskIt != tasks.end())
-  {
-    // TODO: implement callback for booking::filter::Type::Deals.
-    availabilityTaskIt->m_filterParams.m_callback =
-      [self](shared_ptr<booking::ParamsBase> const & apiParams,
-             std::vector<FeatureID> const & sortedFeatures)
-      {
-        auto & t = self->m_everywhereParams.m_bookingFilterTasks;
-        auto const it = t.Find(booking::filter::Type::Availability);
-        
-        if (it == t.end())
-          return;
-        
-        auto const & p = it->m_filterParams.m_apiParams;
-        if (p->IsEmpty() || !p->Equals(*apiParams))
-          return;
-        
-        self->m_bookingAvailableFeatureIDs = sortedFeatures;
-        [self onSearchResultsUpdated];
-      };
-  }
+  [self enableCallbackFor:booking::filter::Type::Availability];
+  [self enableCallbackFor:booking::filter::Type::Deals];

  GetFramework().SearchEverywhere(m_everywhereParams);
  self.searchCount += 1;
@ -266,15 +270,23 @@ using Observers = NSHashTable<Observer>;
  return [[MWMSearch manager].banners bannerAtIndex:index];
 }

-+ (BOOL)isBookingAvailableWithContainerIndex:(NSUInteger)index
+ (BOOL)isFeatureAt:(NSUInteger)index in:(std::vector<FeatureID> const &)array
 {
  auto const & result = [self resultWithContainerIndex:index];
  if (result.GetResultType() != search::Result::Type::Feature)
    return NO;
  auto const & resultFeatureID = result.GetFeatureID();
-  auto const & bookingAvailableIDs = [MWMSearch manager]->m_bookingAvailableFeatureIDs;
-  return std::binary_search(bookingAvailableIDs.begin(), bookingAvailableIDs.end(),
-                            resultFeatureID);
+  return std::binary_search(array.begin(), array.end(), resultFeatureID);
+}
+
+ (BOOL)isBookingAvailableWithContainerIndex:(NSUInteger)index
+{
+  return [self isFeatureAt:index in:[MWMSearch manager]->m_filterResults[booking::filter::Type::Availability]];
+}
+
+ (BOOL)isDealAvailableWithContainerIndex:(NSUInteger)index
+{
+  return [self isFeatureAt:index in:[MWMSearch manager]->m_filterResults[booking::filter::Type::Deals]];
 }

 + (MWMSearchItemType)resultTypeWithRow:(NSUInteger)row
@ -299,7 +311,7 @@ using Observers = NSHashTable<Observer>;
  m_everywhereResults.Clear();
  m_viewportResults.Clear();

-  m_bookingAvailableFeatureIDs.clear();
+  m_filterResults.clear();
  m_viewportParams.m_bookingFilterTasks.Clear();
  m_everywhereParams.m_bookingFilterTasks.Clear();

--- a/iphone/Maps/Images.xcassets/Search/Cells/Hot
+++ b/iphone/Maps/Images.xcassets/Search/Cells/Hot
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/iphone/Maps/Images.xcassets/Search/Cells/Hot
+++ b/iphone/Maps/Images.xcassets/Search/Cells/Hot
@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_hot_offer.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Offers/ic_hot_offer.imageset/ic_hot_offer.pdf
+++ b/Offers/ic_hot_offer.imageset/ic_hot_offer.pdf
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.h
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.h
@ -8,6 +8,7 @@

 - (void)config:(search::Result const &)result
    isAvailable:(BOOL)isAvailable
+    isHotOffer:(BOOL)isHotOffer
    productInfo:(search::ProductInfo const &)productInfo;

@end
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
@ -25,6 +25,8 @@
@property(weak, nonatomic) IBOutlet UIView * availableView;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * availableTypeOffset;
@property(weak, nonatomic) IBOutlet UIView * sideAvailableMarker;
+@property(weak, nonatomic) IBOutlet UIImageView * hotOfferImageView;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * priceOffset;

@end

@ -32,6 +34,7 @@

 - (void)config:(search::Result const &)result
    isAvailable:(BOOL)isAvailable
+    isHotOffer:(BOOL)isHotOffer
    productInfo:(search::ProductInfo const &)productInfo
 {
  [super config:result];
@ -58,6 +61,8 @@
  self.availableTypeOffset.priority = UILayoutPriorityDefaultHigh;
  self.availableView.hidden = !isAvailable;
  self.sideAvailableMarker.hidden = !isAvailable;
+  self.hotOfferImageView.hidden = !isHotOffer;
+  self.priceOffset.priority = isHotOffer ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh;

  NSUInteger const starsCount = result.GetStarsCount();
  NSString * cuisine = @(result.GetCuisine().c_str());
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib
@ -1,22 +1,17 @@
 <?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">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" 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"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
-    <customFonts key="customFonts">
-        <array key="HelveticaNeue.ttc">
-            <string>HelveticaNeue</string>
-        </array>
-    </customFonts>
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMSearchCommonCell" id="KGk-i7-Jjw" customClass="MWMSearchCommonCell" propertyAccessControl="all">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMSearchCommonCell" id="KGk-i7-Jjw" customClass="MWMSearchCommonCell">
            <rect key="frame" x="0.0" y="0.0" width="320" height="109"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
            <tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@ -285,6 +280,9 @@
                            <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="ratingGreen"/>
                        </userDefinedRuntimeAttributes>
                    </view>
+                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="ic_hot_offer" translatesAutoresizingMaskIntoConstraints="NO" id="eHM-Vf-w4R">
+                        <rect key="frame" x="307" y="56" width="20" height="18"/>
+                    </imageView>
                </subviews>
                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                <constraints>
@ -293,13 +291,15 @@
                    <constraint firstItem="5UO-MD-Hgx" firstAttribute="top" secondItem="4FD-RE-ffF" secondAttribute="bottom" constant="4" id="5dn-ca-dCn"/>
                    <constraint firstItem="AXe-5n-maZ" firstAttribute="leading" secondItem="5UO-MD-Hgx" secondAttribute="trailing" id="61j-Xn-Fhq"/>
                    <constraint firstAttribute="bottom" secondItem="ygy-0c-QWk" secondAttribute="bottom" id="8Js-dA-NXL"/>
-                    <constraint firstAttribute="trailing" secondItem="WOF-of-CqB" secondAttribute="trailing" constant="16" id="AUe-ro-9nc"/>
+                    <constraint firstAttribute="trailing" secondItem="WOF-of-CqB" secondAttribute="trailing" priority="750" constant="16" id="AUe-ro-9nc"/>
                    <constraint firstItem="70N-Lq-mj9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="G9m-Dr-gz2"/>
                    <constraint firstItem="ygy-0c-QWk" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="MPB-mh-INv"/>
                    <constraint firstItem="AXe-5n-maZ" firstAttribute="height" secondItem="5UO-MD-Hgx" secondAttribute="height" id="Q8G-UX-dmf"/>
                    <constraint firstItem="4FD-RE-ffF" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="Qld-dY-CQN"/>
+                    <constraint firstItem="eHM-Vf-w4R" firstAttribute="leading" secondItem="WOF-of-CqB" secondAttribute="trailing" constant="3" id="SGl-j3-WsI"/>
                    <constraint firstAttribute="trailing" secondItem="4FD-RE-ffF" secondAttribute="trailing" constant="84" id="Ugu-lP-b9G"/>
                    <constraint firstAttribute="trailing" secondItem="P8X-Xp-AaE" secondAttribute="trailing" constant="16" id="VJE-wo-TBb"/>
+                    <constraint firstItem="eHM-Vf-w4R" firstAttribute="centerY" secondItem="WOF-of-CqB" secondAttribute="centerY" id="aAt-L4-I1r"/>
                    <constraint firstItem="6pc-4s-GyP" firstAttribute="top" secondItem="70N-Lq-mj9" secondAttribute="bottom" constant="4" id="aFG-lW-QGv"/>
                    <constraint firstItem="WOF-of-CqB" firstAttribute="centerY" secondItem="70N-Lq-mj9" secondAttribute="centerY" id="drZ-ks-Xr4"/>
                    <constraint firstItem="Pt3-c2-zwP" firstAttribute="leading" secondItem="5UO-MD-Hgx" secondAttribute="trailing" priority="250" id="epG-jY-kzY"/>
@ -315,6 +315,7 @@
                    <constraint firstItem="6pc-4s-GyP" firstAttribute="bottom" secondItem="P8X-Xp-AaE" secondAttribute="bottom" id="q7E-Jg-MYT"/>
                    <constraint firstItem="P8X-Xp-AaE" firstAttribute="top" relation="greaterThanOrEqual" secondItem="WOF-of-CqB" secondAttribute="bottom" constant="4" id="rfU-L8-Nem"/>
                    <constraint firstItem="HGm-lZ-JNr" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="sq9-C3-M3R"/>
+                    <constraint firstAttribute="trailing" secondItem="eHM-Vf-w4R" secondAttribute="trailing" priority="500" constant="16" id="uxh-eP-Usk"/>
                    <constraint firstAttribute="bottom" secondItem="HGm-lZ-JNr" secondAttribute="bottom" id="vJc-aE-MsA"/>
                    <constraint firstItem="Pt3-c2-zwP" firstAttribute="top" secondItem="AXe-5n-maZ" secondAttribute="top" id="wiM-xV-kJd"/>
                    <constraint firstItem="V8w-dT-7B1" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="16" id="x1p-sf-n4c"/>
@ -330,11 +331,13 @@
                <outlet property="availableView" destination="Pt3-c2-zwP" id="XIQ-kb-EZd"/>
                <outlet property="closedView" destination="V8w-dT-7B1" id="5by-Nb-6Ch"/>
                <outlet property="distanceLabel" destination="P8X-Xp-AaE" id="Kaw-aR-8uJ"/>
+                <outlet property="hotOfferImageView" destination="eHM-Vf-w4R" id="0KO-yf-uMh"/>
                <outlet property="infoLabel" destination="vjT-oU-iIA" id="K5N-O7-B0x"/>
                <outlet property="infoRatingView" destination="aNp-Yw-io2" id="8Qa-uM-ARg"/>
                <outlet property="infoView" destination="AXe-5n-maZ" id="obW-dd-NLt"/>
                <outlet property="locationLabel" destination="6pc-4s-GyP" id="Te0-y3-sVQ"/>
                <outlet property="priceLabel" destination="WOF-of-CqB" id="Qbd-jK-n6t"/>
+                <outlet property="priceOffset" destination="AUe-ro-9nc" id="2eT-Ow-VWX"/>
                <outlet property="ratingLabel" destination="70N-Lq-mj9" id="Ubw-Oy-p1k"/>
                <outlet property="sideAvailableMarker" destination="ygy-0c-QWk" id="6XC-pj-HE0"/>
                <outlet property="titleLabel" destination="4FD-RE-ffF" id="OQm-o8-LUd"/>
@ -345,10 +348,11 @@
                <outletCollection property="infoRatingStars" destination="RuV-jO-kmE" id="jua-fu-h8l"/>
                <outletCollection property="infoRatingStars" destination="A5b-Hv-xec" id="b2k-85-CCP"/>
            </connections>
-            <point key="canvasLocation" x="317" y="307"/>
+            <point key="canvasLocation" x="317" y="306.5"/>
        </tableViewCell>
    </objects>
    <resources>
        <image name="hotel_star" width="12" height="12"/>
+        <image name="ic_hot_offer" width="20" height="18"/>
    </resources>
 </document>
--- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
@ -88,8 +88,9 @@
                               indexPath:indexPath]);
    auto const & result = [MWMSearch resultWithContainerIndex:containerIndex];
    auto const isBookingAvailable = [MWMSearch isBookingAvailableWithContainerIndex:containerIndex];
+    auto const isDealAvailable = [MWMSearch isDealAvailableWithContainerIndex:containerIndex];
    auto const & productInfo = [MWMSearch productInfoWithContainerIndex:containerIndex];
-    [cell config:result isAvailable:isBookingAvailable productInfo:productInfo];
+    [cell config:result isAvailable:isBookingAvailable isHotOffer:isDealAvailable productInfo:productInfo];
    return cell;
  }
  case MWMSearchItemTypeMopub: