Merge pull request #5883 from igrechuhin/MAPSME-4308beta-776

[MAPSME-4308] [ios] Added local ads buttons.

10 files changed, 170 insertions, 9 deletions

diff --git a/iphone/Maps/Classes/Components/BorderedButton.swift b/iphone/Maps/Classes/Components/BorderedButton.swift
new file mode 100644
index 0000000000..6ea3cf842f
--- /dev/null
+++ b/iphone/Maps/Classes/Components/BorderedButton.swift
@@ -0,0 +1,37 @@
+@objc(MWMBorderedButton)
+final class BorderedButton: UIButton {
+
+  private var borderColor: UIColor?
+  private var borderHighlightedColor: UIColor?
+  private var borderDisabledColor: UIColor?
+
+  func setBorderColor(_ color: UIColor) {
+    borderColor = color
+  }
+
+  func setBorderHighlightedColor(_ color: UIColor) {
+    borderHighlightedColor = color
+  }
+
+  func setBorderDisabledColor(_ color: UIColor) {
+    borderDisabledColor = color
+  }
+
+  private func updateBorder() {
+    if !isEnabled {
+      layer.borderColor = borderDisabledColor?.cgColor
+    } else if isHighlighted {
+      layer.borderColor = borderHighlightedColor?.cgColor
+    } else {
+      layer.borderColor = borderColor?.cgColor
+    }
+  }
+
+  override var isEnabled: Bool {
+    didSet { updateBorder() }
+  }
+
+  override var isHighlighted: Bool {
+    didSet { updateBorder() }
+  }
+}
diff --git a/iphone/Maps/Classes/MWMTableViewCell.h b/iphone/Maps/Classes/MWMTableViewCell.h
index 2ead65803c..139a57b300 100644
--- a/iphone/Maps/Classes/MWMTableViewCell.h
+++ b/iphone/Maps/Classes/MWMTableViewCell.h
@@ -1,5 +1,7 @@
 @interface MWMTableViewCell : UITableViewCell
 
+@property(nonatomic) BOOL isSeparatorHidden;
+
 - (void)awakeFromNib NS_REQUIRES_SUPER;
 - (void)configure;
 
diff --git a/iphone/Maps/Classes/MWMTableViewCell.mm b/iphone/Maps/Classes/MWMTableViewCell.mm
index 60a27cb11e..3227842e23 100644
--- a/iphone/Maps/Classes/MWMTableViewCell.mm
+++ b/iphone/Maps/Classes/MWMTableViewCell.mm
@@ -1,4 +1,5 @@
 #import "MWMTableViewCell.h"
+#import "UIKitCategories.h"
 
 @implementation MWMTableViewCell
 
@@ -25,6 +26,26 @@
   self.selectedBackgroundView.backgroundColor = [UIColor pressBackground];
 }
 
+- (void)addSubview:(UIView *)view
+{
+  [super addSubview:view];
+  if (self.isSeparatorHidden)
+    [self hideSeparators];
+}
+
+- (void)setIsSeparatorHidden:(BOOL)isSeparatorHidden
+{
+  _isSeparatorHidden = isSeparatorHidden;
+  if (isSeparatorHidden)
+    [self hideSeparators];
+}
+
+- (void)hideSeparators
+{
+  for (UIView * view in self.subviews)
+    view.hidden = [[[view class] className] isEqualToString:@"_UITableViewCellSeparatorView"];
+}
+
 @end
 
 @implementation MWMTableViewSubtitleCell
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 125275dca7..263bde4acf 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -258,6 +258,9 @@
 		346DB83D1E5C4F6700E3123E /* GalleryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8261E5C4F6700E3123E /* GalleryModel.swift */; };
 		346DB83E1E5C4F6700E3123E /* GalleryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8261E5C4F6700E3123E /* GalleryModel.swift */; };
 		346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; };
+		3470402F1EA6470700038379 /* BorderedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3470402E1EA6470700038379 /* BorderedButton.swift */; };
+		347040301EA6470700038379 /* BorderedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3470402E1EA6470700038379 /* BorderedButton.swift */; };
+		347040311EA6470700038379 /* BorderedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3470402E1EA6470700038379 /* BorderedButton.swift */; };
 		3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; };
 		3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; };
 		3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; };
@@ -1713,6 +1716,7 @@
 		346DB8261E5C4F6700E3123E /* GalleryModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryModel.swift; sourceTree = "<group>"; };
 		346EDAD91B9F0E35004F8DB5 /* MWMMultilineLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMultilineLabel.h; sourceTree = "<group>"; };
 		346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMultilineLabel.mm; sourceTree = "<group>"; };
+		3470402E1EA6470700038379 /* BorderedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BorderedButton.swift; sourceTree = "<group>"; };
 		347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../../xcode/common-debug.xcconfig"; sourceTree = "<group>"; };
 		347526FB1DC0B00F00918CF5 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../../xcode/common-release.xcconfig"; sourceTree = "<group>"; };
 		3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "tts-how-to-set-up-voice.html"; path = "../../data/tts-how-to-set-up-voice.html"; sourceTree = "<group>"; };
@@ -3070,6 +3074,7 @@
 				34B924411DC8A29C0008D971 /* MWMMailViewController.mm */,
 				343E75951E5B1EE20041226A /* MWMCollectionViewController.h */,
 				343E75961E5B1EE20041226A /* MWMCollectionViewController.mm */,
+				3470402E1EA6470700038379 /* BorderedButton.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -5302,6 +5307,7 @@
 				F6E2FD881E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */,
 				34BC72241B0DECAE0012A34B /* MWMMapViewControlsManager.mm in Sources */,
 				F6E2FF4A1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */,
+				3470402F1EA6470700038379 /* BorderedButton.swift in Sources */,
 				F6E2FE781E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */,
 				F6BD1D201CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */,
 				F6B97B261CD0CA990009B612 /* MWMBookmarkNameCell.mm in Sources */,
@@ -5594,6 +5600,7 @@
 				F6E2FED91E097BA00083EBEC /* MWMSearchContentView.mm in Sources */,
 				F6E2FD891E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */,
 				F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */,
+				347040301EA6470700038379 /* BorderedButton.swift in Sources */,
 				F6E2FF4B1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */,
 				F6E2FE791E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */,
 				F6B97B271CD0CA990009B612 /* MWMBookmarkNameCell.mm in Sources */,
@@ -5886,6 +5893,7 @@
 				F6E2FEDA1E097BA00083EBEC /* MWMSearchContentView.mm in Sources */,
 				F6E2FD8A1E097BA00083EBEC /* MWMMapDownloaderViewController.mm in Sources */,
 				F6E2FF4C1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */,
+				347040311EA6470700038379 /* BorderedButton.swift in Sources */,
 				F6E2FE7A1E097BA00083EBEC /* MWMOpeningHoursLayoutHelper.mm in Sources */,
 				849CF7251DE842290024A8A5 /* MWMMapViewControlsManager.mm in Sources */,
 				849CF7281DE842290024A8A5 /* MWMOsmAuthAlert.mm in Sources */,
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h b/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
index 5894fc5606..93c55d54d4 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageButtonsProtocol.h
@@ -15,4 +15,6 @@ typedef UIView * (^MWMPlacePageButtonsDismissBlock)(NSInteger);
            referenceViewWhenDismissingHandler:(MWMPlacePageButtonsDismissBlock)referenceViewWhenDismissingHandler;
 - (void)showGalery;
 
+- (void)openLocalAdsURL;
+
 @end
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h
index c3e0c507a9..996d442b5c 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h
@@ -82,6 +82,8 @@ enum class ButtonsRows
   BookingShowMoreFacilities,
   BookingShowMoreOnSite,
   BookingShowMoreReviews,
+  LocalAdsCandidate,
+  LocalAdsCustomer
 };
 
 enum class OpeningHours
@@ -152,6 +154,9 @@ using BannerIsReady = void (^)();
 - (NSString *)bookmarkCategory;
 - (BookmarkAndCategory)bac;
 
+// Local Ads
+- (NSString *)localAdsURL;
+
 // Table view's data
 - (vector<place_page::Sections> const &)sections;
 - (vector<place_page::PreviewRows> const &)previewRows;
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
index 0e3ee8a141..a0111c162f 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
@@ -174,6 +174,17 @@ using namespace place_page;
 
   if (m_info.ShouldShowAddBusiness())
     m_buttonsRows.push_back(ButtonsRows::AddBusiness);
+
+  switch (m_info.GetLocalAdsStatus())
+  {
+  case place_page::LocalAdsStatus::NotAvailable: break;
+  case place_page::LocalAdsStatus::Candidate:
+    m_buttonsRows.push_back(ButtonsRows::LocalAdsCandidate);
+    break;
+  case place_page::LocalAdsStatus::Customer:
+    m_buttonsRows.push_back(ButtonsRows::LocalAdsCustomer);
+    break;
+  }
 }
 
 - (void)fillOnlineBookingSections
@@ -480,6 +491,8 @@ using namespace place_page;
   return m_info.IsBookmark() ? m_info.m_bac : BookmarkAndCategory();
 }
 
+#pragma mark - Local Ads
+- (NSString *)localAdsURL { return @(m_info.GetLocalAdsUrl().c_str()); }
 #pragma mark - Getters
 
 - (NSString *)address { return @(m_info.GetAddress().c_str()); }
diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
index 143d9f4d4f..4edf4f75c9 100644
--- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
@@ -427,6 +427,16 @@ void logSponsoredEvent(MWMPlacePageData * data, NSString * eventName)
   [self.ownerViewController openHotelFacilities];
 }
 
+- (void)openLocalAdsURL
+{
+  auto data = self.data;
+  if (!data)
+    return;
+  auto url = [NSURL URLWithString:data.localAdsURL];
+  if (url)
+    [self.ownerViewController openUrl:url];
+}
+
 - (void)viewWillTransitionToSize:(CGSize)size
        withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
 {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm
index 7625522a48..f535b6e8a6 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.mm
@@ -1,13 +1,23 @@
 #import "MWMPlacePageButtonCell.h"
 #import "MWMCommon.h"
 #import "MWMPlacePageProtocol.h"
+#import "SwiftBridge.h"
 
 @interface MWMPlacePageButtonCell ()
 
-@property(weak, nonatomic) IBOutlet UIButton * titleButton;
+@property(weak, nonatomic) IBOutlet MWMBorderedButton * titleButton;
 
 @property(weak, nonatomic) id<MWMPlacePageButtonsProtocol> delegate;
 @property(nonatomic) place_page::ButtonsRows rowType;
+
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * buttonTop;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * buttonTrailing;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * buttonBottom;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * buttonLeading;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint * buttonHeight;
+
+@property(nonatomic) BOOL isInsetButton;
+
 @end
 
 @implementation MWMPlacePageButtonCell
@@ -29,16 +39,20 @@
   self.delegate = delegate;
   self.rowType = row;
   NSString * title = nil;
+  BOOL isInsetButton = NO;
   switch (row)
   {
   case ButtonsRows::AddPlace:
     title = L(@"placepage_add_place_button");
+    isInsetButton = YES;
     break;
   case ButtonsRows::EditPlace:
     title = L(@"edit_place");
+    isInsetButton = YES;
     break;
   case ButtonsRows::AddBusiness:
     title = L(@"placepage_add_business_button");
+    isInsetButton = YES;
     break;
   case ButtonsRows::HotelDescription:
     title = L(@"details_on_bookingcom");
@@ -52,10 +66,18 @@
   case ButtonsRows::BookingShowMoreOnSite:
     title = L(@"more_on_bookingcom");
     break;
+  case ButtonsRows::LocalAdsCandidate:
+    title = L(@"create_campaign_button");
+    isInsetButton = YES;
+    break;
+  case ButtonsRows::LocalAdsCustomer:
+    title = L(@"view_campaign_button");
+    isInsetButton = YES;
+    break;
   }
 
+  self.isInsetButton = isInsetButton;
   [self.titleButton setTitle:title forState:UIControlStateNormal];
-  [self.titleButton setTitle:title forState:UIControlStateDisabled];
 }
 
 - (IBAction)buttonTap
@@ -72,6 +94,45 @@
   case ButtonsRows::HotelDescription: [d book:YES]; break;
   case ButtonsRows::BookingShowMoreFacilities: [d showAllFacilities]; break;
   case ButtonsRows::BookingShowMoreReviews: [d showAllReviews]; break;
+  case ButtonsRows::LocalAdsCandidate:
+  case ButtonsRows::LocalAdsCustomer: [d openLocalAdsURL]; break;
+  }
+}
+
+#pragma mark - Properties
+
+- (void)setIsInsetButton:(BOOL)isInsetButton
+{
+  _isInsetButton = isInsetButton;
+  auto titleButton = self.titleButton;
+  auto btnLayer = titleButton.layer;
+  if (isInsetButton)
+  {
+    self.backgroundColor = [UIColor clearColor];
+    self.buttonTop.constant = 8;
+    self.buttonTrailing.constant = 16;
+    self.buttonBottom.constant = 8;
+    self.buttonLeading.constant = 16;
+    self.buttonHeight.constant = 36;
+
+    [titleButton setBorderColor:[UIColor linkBlue]];
+    [titleButton setBorderHighlightedColor:[UIColor linkBlueHighlighted]];
+    btnLayer.borderWidth = 1;
+    btnLayer.borderColor = [UIColor linkBlue].CGColor;
+    btnLayer.cornerRadius = 4;
+
+    self.isSeparatorHidden = YES;
+  }
+  else
+  {
+    self.backgroundColor = [UIColor white];
+    self.buttonTop.constant = 0;
+    self.buttonTrailing.constant = 0;
+    self.buttonBottom.constant = 0;
+    self.buttonLeading.constant = 0;
+    self.buttonHeight.constant = 44;
+
+    btnLayer.borderWidth = 0;
   }
 }
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.xib
index d7bdb99bb1..8a0980f189 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.xib
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/ButtonCell/MWMPlacePageButtonCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" 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="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,10 +15,10 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jmU-dJ-aRH">
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jmU-dJ-aRH" customClass="MWMBorderedButton">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                         <constraints>
                             <constraint firstAttribute="height" priority="999" constant="44" id="gfO-mi-8yS"/>
@@ -41,15 +41,17 @@
                     <constraint firstAttribute="bottom" secondItem="jmU-dJ-aRH" secondAttribute="bottom" id="sc3-KG-vSR"/>
                     <constraint firstItem="jmU-dJ-aRH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="yES-81-JAM"/>
                 </constraints>
-                <userDefinedRuntimeAttributes>
-                    <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
-                </userDefinedRuntimeAttributes>
             </tableViewCellContentView>
             <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
             <userDefinedRuntimeAttributes>
                 <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
             </userDefinedRuntimeAttributes>
             <connections>
+                <outlet property="buttonBottom" destination="sc3-KG-vSR" id="jFy-8o-BFc"/>
+                <outlet property="buttonHeight" destination="gfO-mi-8yS" id="DSe-Nx-JNh"/>
+                <outlet property="buttonLeading" destination="yES-81-JAM" id="0fE-sF-ByK"/>
+                <outlet property="buttonTop" destination="NxH-y9-BLI" id="IrC-52-6q5"/>
+                <outlet property="buttonTrailing" destination="bcE-yn-K3v" id="sC9-CJ-8Zz"/>
                 <outlet property="titleButton" destination="jmU-dJ-aRH" id="IXC-pf-YHH"/>
             </connections>
         </tableViewCell>