From f51444ab461e3d6191b9ad9a65e871fb80c42617 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 30 May 2017 18:11:56 +0300 Subject: [PATCH] =?UTF-8?q?[cherry]=20[MAPSME-4593]=20[ios]=20Added=20?= =?UTF-8?q?=C2=ABinstall=C2=BB=20button=20in=20search=20ad.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iphone/Maps/UI/Ads/AdBanner.swift | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/UI/Ads/AdBanner.swift b/iphone/Maps/UI/Ads/AdBanner.swift index 4f730da2be..48da058531 100644 --- a/iphone/Maps/UI/Ads/AdBanner.swift +++ b/iphone/Maps/UI/Ads/AdBanner.swift @@ -57,9 +57,6 @@ final class AdBanner: UITableViewCell { adTitleLabel.numberOfLines = config.numberOfTitleLines adBodyLabel.numberOfLines = config.numberOfBodyLines detailedModeConstraints.forEach { $0.priority = config.priority } - if state == .search { - adCallToActionButtonCompactLeading.priority = UILayoutPriorityDefaultHigh - } setNeedsLayout() UIView.animate(withDuration: kDefaultAnimationDuration) { self.layoutIfNeeded() } refreshBannerIfNeeded() @@ -103,7 +100,7 @@ final class AdBanner: UITableViewCell { case .none: assert(false) case .facebook: - configFBBanner(ad: ad as! FBNativeAd) + configFBBanner(ad: (ad as! FacebookBanner).nativeAd) case .rb: configRBBanner(ad: ad as! MTRGNativeAd) case .mopub: @@ -136,7 +133,7 @@ final class AdBanner: UITableViewCell { private func configFBBanner(ad: FBNativeAd) { let adCallToActionButtons: [UIView] if (state == .search) { - adCallToActionButtons = [self] + adCallToActionButtons = [self, adCallToActionButtonCompact] } else { adCallToActionButtons = [adCallToActionButtonCompact, adCallToActionButtonDetailed] } @@ -189,7 +186,7 @@ final class AdBanner: UITableViewCell { let adCallToActionButtons: [UIButton] if state == .search { adCallToActionButtonCustom.isHidden = false - adCallToActionButtons = [adCallToActionButtonCustom] + adCallToActionButtons = [adCallToActionButtonCustom, adCallToActionButtonCompact] } else { adCallToActionButtons = [adCallToActionButtonCompact, adCallToActionButtonDetailed] adCallToActionButtons.forEach { $0.setTitle(ad.ctaText, for: .normal) }