forked from organicmaps/organicmaps
[iOS] add rating and popularity mark on discovery cell
This commit is contained in:
Aleksey Belouosv
Vlad Mihaylenko
parent
ec47c41a16
commit
bd8805ec03
6 changed files with 185 additions and 49 deletions
|
|
@ -26,16 +26,13 @@ public:
|
|||
switch (type)
|
||||
{
|
||||
case ItemType::Attractions:
|
||||
m_attractions.m_viewportCenter = viewportCenter;
|
||||
m_attractions.m_results = res;
|
||||
m_attractions.SetResults(res, productInfo, viewportCenter);
|
||||
break;
|
||||
case ItemType::Cafes:
|
||||
m_cafes.m_viewportCenter = viewportCenter;
|
||||
m_cafes.m_results = res;
|
||||
m_cafes.SetResults(res, productInfo, viewportCenter);
|
||||
break;
|
||||
case ItemType::Hotels:
|
||||
m_hotels.m_viewportCenter = viewportCenter;
|
||||
m_hotels.m_results = res;
|
||||
m_hotels.SetResults(res, productInfo, viewportCenter);
|
||||
break;
|
||||
default: break;
|
||||
}
|
||||
|
|
@ -64,20 +61,28 @@ public:
|
|||
|
||||
search::Result const & GetAttractionAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_attractions.m_results.GetCount(), ("Incorrect attractions index:", index));
|
||||
return m_attractions.m_results[index];
|
||||
return m_attractions.GetSearchResultAt(index);
|
||||
}
|
||||
|
||||
m2::PointD const & GetAttractionReferencePoint() const { return m_attractions.m_viewportCenter; }
|
||||
|
||||
search::ProductInfo const & GetAttractionProductInfoAt(size_t const index) const
|
||||
{
|
||||
return m_attractions.GetProductInfoAt(index);
|
||||
}
|
||||
|
||||
search::Result const & GetCafeAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_cafes.m_results.GetCount(), ("Incorrect cafes index:", index));
|
||||
return m_cafes.m_results[index];
|
||||
return m_cafes.GetSearchResultAt(index);
|
||||
}
|
||||
|
||||
m2::PointD const & GetCafeReferencePoint() const { return m_cafes.m_viewportCenter; }
|
||||
|
||||
search::ProductInfo const & GetCafeProductInfoAt(size_t const index) const
|
||||
{
|
||||
return m_cafes.GetProductInfoAt(index);
|
||||
}
|
||||
|
||||
locals::LocalExpert const & GetExpertAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_experts.size(), ("Incorrect experts index:", index));
|
||||
|
|
@ -86,8 +91,7 @@ public:
|
|||
|
||||
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];
|
||||
return m_hotels.GetSearchResultAt(index);
|
||||
}
|
||||
|
||||
m2::PointD const & GetHotelReferencePoint() const { return m_hotels.m_viewportCenter; }
|
||||
|
|
@ -97,6 +101,28 @@ private:
|
|||
{
|
||||
m2::PointD m_viewportCenter;
|
||||
search::Results m_results;
|
||||
std::vector<search::ProductInfo> m_productInfos;
|
||||
|
||||
void SetResults(search::Results const & res,
|
||||
std::vector<search::ProductInfo> const & productInfo,
|
||||
m2::PointD const & viewportCenter)
|
||||
{
|
||||
m_viewportCenter = viewportCenter;
|
||||
m_results = res;
|
||||
m_productInfos = productInfo;
|
||||
}
|
||||
|
||||
search::Result const & GetSearchResultAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_results.GetCount(), ("Incorrect index:", index));
|
||||
return m_results[index];
|
||||
}
|
||||
|
||||
search::ProductInfo const & GetProductInfoAt(size_t const index) const
|
||||
{
|
||||
CHECK_LESS(index, m_productInfos.size(), ("Incorrect index:", index));
|
||||
return m_productInfos[index];
|
||||
}
|
||||
};
|
||||
|
||||
UISearchResults m_attractions;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,38 @@
|
|||
@objc(MWMDiscoverySearchCell)
|
||||
final class DiscoverySearchCell: UICollectionViewCell {
|
||||
@IBOutlet private weak var title: UILabel!
|
||||
@IBOutlet private weak var subtitle: UILabel!
|
||||
@IBOutlet private weak var distance: UILabel!
|
||||
@IBOutlet private weak var titleLabel: UILabel!
|
||||
@IBOutlet private weak var subtitleLabel: UILabel!
|
||||
@IBOutlet private weak var distanceLabel: UILabel!
|
||||
@IBOutlet private weak var popularView: UIView! {
|
||||
didSet {
|
||||
popularView.tintColor = UIColor.linkBlue()
|
||||
}
|
||||
}
|
||||
|
||||
@IBOutlet private weak var ratingView: RatingSummaryView! {
|
||||
didSet {
|
||||
ratingView.defaultConfig()
|
||||
ratingView.textFont = UIFont.bold12()
|
||||
ratingView.textSize = 12
|
||||
}
|
||||
}
|
||||
|
||||
typealias Tap = () -> ()
|
||||
private var tap: Tap?
|
||||
|
||||
@objc func config(title: String, subtitle: String, distance: String, tap: @escaping Tap) {
|
||||
self.title.text = title
|
||||
self.subtitle.text = subtitle
|
||||
self.distance.text = distance
|
||||
@objc func config(title: String,
|
||||
subtitle: String,
|
||||
distance: String,
|
||||
popular: Bool,
|
||||
ratingValue: String,
|
||||
ratingType: MWMRatingSummaryViewValueType,
|
||||
tap: @escaping Tap) {
|
||||
titleLabel.text = title
|
||||
subtitleLabel.text = subtitle
|
||||
distanceLabel.text = distance
|
||||
popularView.isHidden = !popular
|
||||
ratingView.value = ratingValue
|
||||
ratingView.type = ratingType
|
||||
self.tap = tap
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
<?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="14113" 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>
|
||||
<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="DiscoverySearchCell" id="A42-0e-MgA" customClass="MWMDiscoverySearchCell" propertyAccessControl="all">
|
||||
<rect key="frame" x="0.0" y="0.0" width="160" height="128"/>
|
||||
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="DiscoverySearchCell" id="A42-0e-MgA" customClass="MWMDiscoverySearchCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="160" height="139"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="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="128"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="160" height="139"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c6x-nr-TLZ">
|
||||
<rect key="frame" x="0.0" y="88.5" width="160" height="40"/>
|
||||
<rect key="frame" x="0.0" y="103" 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="2EQ-Jv-uS6"/>
|
||||
|
|
@ -34,8 +34,11 @@
|
|||
<action selector="routeTo" destination="A42-0e-MgA" eventType="touchUpInside" id="yyq-fQ-hhq"/>
|
||||
</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="L2e-OA-S0b">
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L2e-OA-S0b">
|
||||
<rect key="frame" x="12" y="14" width="136" height="20.5"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="20" id="zqQ-pL-31M"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -44,18 +47,82 @@
|
|||
<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="YHT-YE-QdR">
|
||||
<rect key="frame" x="12" y="32.5" width="136" height="20"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YHT-YE-QdR">
|
||||
<rect key="frame" x="12" y="36.5" width="136" height="16"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="16" id="skf-mr-i6s"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</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="JeJ-M3-EPg">
|
||||
<rect key="frame" x="12" y="54.5" width="136" height="20"/>
|
||||
<view contentMode="scaleToFill" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="mdG-Tp-49e" customClass="RatingSummaryView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="12" y="55" width="48" height="20"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="48" id="9pH-0h-0fX"/>
|
||||
<constraint firstAttribute="height" constant="20" id="uco-5I-Hin"/>
|
||||
</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>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="euO-GA-D3Q">
|
||||
<rect key="frame" x="68" y="55" width="52.5" height="20"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Popular" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.90000000000000002" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QPJ-wc-N0V">
|
||||
<rect key="frame" x="4" y="3" width="44.5" height="14.5"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="popular_place"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold12"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.46202266219999999" green="0.83828371759999998" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="tintColor" red="0.016804177310000001" green="0.19835099580000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="QPJ-wc-N0V" firstAttribute="centerY" secondItem="euO-GA-D3Q" secondAttribute="centerY" id="0cc-VR-oOq"/>
|
||||
<constraint firstItem="QPJ-wc-N0V" firstAttribute="leading" secondItem="euO-GA-D3Q" secondAttribute="leading" constant="4" id="REO-xJ-LSq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="QPJ-wc-N0V" secondAttribute="trailing" constant="4" id="cyj-vR-7Mg"/>
|
||||
<constraint firstAttribute="height" constant="20" id="gsx-gp-hHI"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="10"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlueHighlighted"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JeJ-M3-EPg">
|
||||
<rect key="frame" x="12" y="75" width="136" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -68,20 +135,26 @@
|
|||
</view>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.040000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="JeJ-M3-EPg" firstAttribute="top" secondItem="YHT-YE-QdR" secondAttribute="bottom" constant="2" id="1wK-M9-BQN"/>
|
||||
<constraint firstItem="YHT-YE-QdR" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" constant="12" id="7Pk-rx-ZrK"/>
|
||||
<constraint firstItem="L2e-OA-S0b" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" constant="12" id="A3J-k8-plP"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="euO-GA-D3Q" secondAttribute="trailing" constant="4" id="BGd-hQ-Iwr"/>
|
||||
<constraint firstItem="JeJ-M3-EPg" firstAttribute="top" secondItem="mdG-Tp-49e" secondAttribute="bottom" id="BhV-QO-kPH"/>
|
||||
<constraint firstItem="JeJ-M3-EPg" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" constant="12" id="KuK-3e-Zvo"/>
|
||||
<constraint firstAttribute="trailing" secondItem="YHT-YE-QdR" secondAttribute="trailing" constant="12" id="MQ3-IH-msz"/>
|
||||
<constraint firstItem="euO-GA-D3Q" firstAttribute="leading" secondItem="mdG-Tp-49e" secondAttribute="trailing" constant="8" id="N76-Vn-8w7"/>
|
||||
<constraint firstAttribute="trailing" secondItem="L2e-OA-S0b" secondAttribute="trailing" constant="12" id="Sud-C0-JLq"/>
|
||||
<constraint firstItem="mdG-Tp-49e" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" constant="12" id="VaR-gU-s46"/>
|
||||
<constraint firstAttribute="trailing" secondItem="JeJ-M3-EPg" secondAttribute="trailing" constant="12" id="Vff-iT-sba"/>
|
||||
<constraint firstItem="L2e-OA-S0b" firstAttribute="top" secondItem="A42-0e-MgA" secondAttribute="top" constant="14" id="gLI-iw-JPO"/>
|
||||
<constraint firstItem="c6x-nr-TLZ" firstAttribute="leading" secondItem="A42-0e-MgA" secondAttribute="leading" id="gN3-ah-mlT"/>
|
||||
<constraint firstItem="euO-GA-D3Q" firstAttribute="centerY" secondItem="mdG-Tp-49e" secondAttribute="centerY" id="hss-JK-bZ9"/>
|
||||
<constraint firstAttribute="trailing" secondItem="c6x-nr-TLZ" secondAttribute="trailing" id="kb6-On-TGI"/>
|
||||
<constraint firstItem="c6x-nr-TLZ" firstAttribute="top" secondItem="JeJ-M3-EPg" secondAttribute="bottom" constant="14" id="rre-b7-fO7"/>
|
||||
<constraint firstItem="c6x-nr-TLZ" firstAttribute="top" secondItem="JeJ-M3-EPg" secondAttribute="bottom" constant="8" id="rre-b7-fO7"/>
|
||||
<constraint firstItem="mdG-Tp-49e" firstAttribute="top" secondItem="YHT-YE-QdR" secondAttribute="bottom" constant="2" id="vgH-De-e6X"/>
|
||||
<constraint firstAttribute="bottom" secondItem="c6x-nr-TLZ" secondAttribute="bottom" priority="750" id="xJj-et-E3x"/>
|
||||
<constraint firstItem="YHT-YE-QdR" firstAttribute="top" secondItem="L2e-OA-S0b" secondAttribute="bottom" constant="-2" id="xy7-Xp-ZXH"/>
|
||||
<constraint firstItem="YHT-YE-QdR" firstAttribute="top" secondItem="L2e-OA-S0b" secondAttribute="bottom" constant="2" id="xy7-Xp-ZXH"/>
|
||||
</constraints>
|
||||
<size key="customSize" width="160" height="161"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="6"/>
|
||||
|
|
@ -92,11 +165,20 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="distance" destination="JeJ-M3-EPg" id="ZQ0-pN-2vn"/>
|
||||
<outlet property="subtitle" destination="YHT-YE-QdR" id="Pwk-KE-aK5"/>
|
||||
<outlet property="title" destination="L2e-OA-S0b" id="OjQ-3m-dxx"/>
|
||||
<outlet property="distanceLabel" destination="JeJ-M3-EPg" id="7oY-L4-1dO"/>
|
||||
<outlet property="popularView" destination="euO-GA-D3Q" id="rN6-yp-vQz"/>
|
||||
<outlet property="ratingView" destination="mdG-Tp-49e" id="DLq-vN-YRR"/>
|
||||
<outlet property="subtitleLabel" destination="YHT-YE-QdR" id="m0j-HU-G4L"/>
|
||||
<outlet property="titleLabel" destination="L2e-OA-S0b" id="CC0-BV-Bfh"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-261" y="-53"/>
|
||||
<point key="canvasLocation" x="-261" y="-36.5"/>
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
<?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">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" 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"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
|
||||
<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="DiscoverySearchCollectionHolderCell" rowHeight="175" id="69d-dp-KY2" customClass="MWMDiscoverySearchCollectionHolderCell" propertyAccessControl="all">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="178"/>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DiscoverySearchCollectionHolderCell" rowHeight="245" id="69d-dp-KY2" customClass="MWMDiscoverySearchCollectionHolderCell">
|
||||
<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="69d-dp-KY2" id="qeQ-5M-VVb">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="177.5"/>
|
||||
<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="zLg-Ze-Eru">
|
||||
<rect key="frame" x="16" y="12" width="327" height="24.5"/>
|
||||
<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"/>
|
||||
|
|
@ -30,13 +30,13 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="5kQ-Mc-ZYQ" customClass="MWMDiscoveryCollectionView">
|
||||
<rect key="frame" x="0.0" y="48.5" width="375" height="129"/>
|
||||
<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="129" id="yin-jq-MTp"/>
|
||||
<constraint firstAttribute="height" constant="139" id="yin-jq-MTp"/>
|
||||
</constraints>
|
||||
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="8" minimumInteritemSpacing="0.0" id="jRB-QZ-TJf">
|
||||
<size key="itemSize" width="160" height="128"/>
|
||||
<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"/>
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
<outlet property="collectionView" destination="5kQ-Mc-ZYQ" id="C7T-Ve-ayU"/>
|
||||
<outlet property="header" destination="zLg-Ze-Eru" id="nYu-GN-ODe"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="-179.5" y="23"/>
|
||||
<point key="canvasLocation" x="-179.5" y="29"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -376,9 +376,15 @@ string GetDistance(m2::PointD const & from, m2::PointD const & to)
|
|||
: model.GetCafeAt(indexPath.row);
|
||||
auto const & pt = type == ItemType::Attractions ? model.GetAttractionReferencePoint()
|
||||
: model.GetCafeReferencePoint();
|
||||
auto const & pi = type == ItemType::Attractions ? model.GetAttractionProductInfoAt(indexPath.row)
|
||||
: model.GetCafeProductInfoAt(indexPath.row);
|
||||
tie(ratingValue, ratingType) = FormattedRating(pi.m_ugcRating);
|
||||
[cell configWithTitle:@(sr.GetString().c_str())
|
||||
subtitle:@(sr.GetFeatureTypeName().c_str())
|
||||
distance:@(GetDistance(pt, sr.GetFeatureCenter()).c_str())
|
||||
popular:sr.GetRankingInfo().m_popularity > 0
|
||||
ratingValue:ratingValue
|
||||
ratingType:ratingType
|
||||
tap:^{
|
||||
[self.delegate routeToItem:type atIndex:indexPath.row];
|
||||
}];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
CURRENT_PROJECT_VERSION = 8.2.9
|
||||
CURRENT_PROJECT_VERSION = 8.3.0
|
||||
|
||||
// Paths
|
||||
OMIM_ROOT = $(PROJECT_DIR)/../..
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue