From ea4efcce49166612c911f607f03f18cd1f6755b4 Mon Sep 17 00:00:00 2001 From: Alexander Boriskov Date: Wed, 12 Feb 2020 12:49:42 +0300 Subject: [PATCH] [iOS] Fixed build for rebase release-96-to-master --- iphone/Maps/Bridging-Header.h | 4 -- iphone/Maps/Core/Routing/MWMRouter.mm | 2 +- iphone/Maps/UI/Ads/AdBannerView.swift | 13 ++-- iphone/Maps/UI/Ads/AdBannerView.xib | 61 ++++--------------- .../AuthorizationViewController.xib | 29 ++++----- .../CatalogGalleryViewController.swift | 2 +- .../UI/PlacePage/MyReviewViewController.swift | 2 +- .../PlacePagePreviewViewController.swift | 2 - .../RatingSummaryViewController.swift | 14 +---- .../Cells/SettingsTableViewLinkCell.swift | 7 --- 10 files changed, 37 insertions(+), 99 deletions(-) diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index bc809e705e..9294c68875 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -14,8 +14,6 @@ #import "3party/Alohalytics/src/alohalytics_objc.h" #import "MPNativeAd+MWM.h" -//#import "MPNativeAd.h" -//#import "MoPub-Bridging-Header.h" #import "UIKitCategories.h" #import "private.h" @@ -23,8 +21,6 @@ #import #import "BookmarksVC.h" -//#import "FacebookNativeAdAdapter.h" -#import "CatalogPromoItem.h" #import "CoreNotificationWrapper.h" #import "MapViewController.h" #import "MWMActionBarButton.h" diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index 33c7e8bca1..d633b6f9b0 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -463,7 +463,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType) { rm.FollowRoute(); [[MWMMapViewControlsManager manager] onRouteStart]; - [MWMThemeManager setAutoUpdates:YES];} + [MWMThemeManager setAutoUpdates:YES]; } else { diff --git a/iphone/Maps/UI/Ads/AdBannerView.swift b/iphone/Maps/UI/Ads/AdBannerView.swift index 18c0e8d5cb..a7cab6c4f6 100644 --- a/iphone/Maps/UI/Ads/AdBannerView.swift +++ b/iphone/Maps/UI/Ads/AdBannerView.swift @@ -184,14 +184,15 @@ class AdBannerView: UIView { } else { adCallToActionButtons = [adCallToActionButtonCompact, adCallToActionButtonDetailed] } - ad.registerView(forInteraction: self, with: nil, withClickableViews: adCallToActionButtons) + ad.registerView(forInteraction: self, + mediaView: FBMediaView(), + iconImageView: adIconImageView, + viewController: UIViewController.topViewController(), + clickableViews: adCallToActionButtons) - ad.icon?.loadAsync { [weak self] image in - self?.adIconImageView.image = image - } - adTitleLabel.attributedText = attributedTitle(title: ad.title ?? "", + adTitleLabel.attributedText = attributedTitle(title: ad.headline ?? "", indent: adPrivacyImage.width + DAAImageWidth.constant) - adBodyLabel.text = ad.body ?? "" + adBodyLabel.text = ad.bodyText ?? "" let config = state.config() adTitleLabel.numberOfLines = config.numberOfTitleLines adBodyLabel.numberOfLines = config.numberOfBodyLines diff --git a/iphone/Maps/UI/Ads/AdBannerView.xib b/iphone/Maps/UI/Ads/AdBannerView.xib index 781e26432d..e1d1335bb4 100644 --- a/iphone/Maps/UI/Ads/AdBannerView.xib +++ b/iphone/Maps/UI/Ads/AdBannerView.xib @@ -1,9 +1,9 @@ - + - + @@ -31,16 +31,7 @@ - - - - - - - - - - + @@ -74,10 +65,7 @@ - - - - + - - - - - diff --git a/iphone/Maps/UI/PlacePage/CatalogGalleryViewController.swift b/iphone/Maps/UI/PlacePage/CatalogGalleryViewController.swift index 23fbc768f8..9996dddbb4 100644 --- a/iphone/Maps/UI/PlacePage/CatalogGalleryViewController.swift +++ b/iphone/Maps/UI/PlacePage/CatalogGalleryViewController.swift @@ -31,7 +31,7 @@ class CatalogPromoItemCell: UICollectionViewCell { if promoItem.hexColor.count == 6 { proContainerView.backgroundColor = UIColor(fromHexString: promoItem.hexColor) } else { - proContainerView.backgroundColor = UIColor.ratingRed() + proContainerView.backgroundColor = UIColor.red } proContainerView.isHidden = false } diff --git a/iphone/Maps/UI/PlacePage/MyReviewViewController.swift b/iphone/Maps/UI/PlacePage/MyReviewViewController.swift index dcc33038a4..0377d51c9b 100644 --- a/iphone/Maps/UI/PlacePage/MyReviewViewController.swift +++ b/iphone/Maps/UI/PlacePage/MyReviewViewController.swift @@ -15,7 +15,7 @@ class MyReviewViewController: UIViewController { @IBOutlet var starViews: [StarRatingView]! { didSet { starViews.forEach { - $0.activeColor = UIColor.ratingYellow() + $0.activeColor = UIColor.yellow $0.inactiveColor = UIColor.blackDividers() } } diff --git a/iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift index 7ca12a42df..7dafce72c6 100644 --- a/iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift +++ b/iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift @@ -94,7 +94,6 @@ class PlacePagePreviewViewController: UIViewController { func updateUgc(_ ugcData: UgcData) { ugcContainerView.isHidden = false if let summaryRating = ugcData.summaryRating { - ratingSummaryView.defaultConfig() ratingSummaryView.value = summaryRating.ratingString ratingSummaryView.type = summaryRating.ratingType reviewsLabel.text = String(format:L("placepage_summary_rating_description"), ugcData.ratingsCount) @@ -116,7 +115,6 @@ class PlacePagePreviewViewController: UIViewController { func updateBooking(_ bookingData: HotelBookingData, rooms: HotelRooms?) { ugcContainerView.isHidden = false - ratingSummaryView.defaultConfig() ratingSummaryView.value = NSNumber(value: bookingData.score).stringValue let rawRating = Int(bookingData.score / 2) + 1 ratingSummaryView.type = UgcSummaryRatingType(rawValue: rawRating) ?? .none diff --git a/iphone/Maps/UI/PlacePage/RatingSummaryViewController.swift b/iphone/Maps/UI/PlacePage/RatingSummaryViewController.swift index e204c1b57b..23af32a1d5 100644 --- a/iphone/Maps/UI/PlacePage/RatingSummaryViewController.swift +++ b/iphone/Maps/UI/PlacePage/RatingSummaryViewController.swift @@ -1,23 +1,13 @@ class RatingSummaryViewController: UIViewController { @IBOutlet var titleLabel: UILabel! @IBOutlet var countLabel: UILabel! - @IBOutlet var ratingSummaryView: RatingSummaryView! { - didSet { - ratingSummaryView.horribleColor = UIColor.ratingRed() - ratingSummaryView.badColor = UIColor.ratingOrange() - ratingSummaryView.normalColor = UIColor.ratingYellow() - ratingSummaryView.goodColor = UIColor.ratingLightGreen() - ratingSummaryView.excellentColor = UIColor.ratingGreen() - ratingSummaryView.textFont = UIFont.bold28() - ratingSummaryView.textSize = 28 - } - } + @IBOutlet var ratingSummaryView: RatingSummaryView! @IBOutlet var ratingViews: [UIView]! @IBOutlet var ratingLabels: [UILabel]! @IBOutlet var starViews: [StarRatingView]! { didSet { starViews.forEach { - $0.activeColor = UIColor.ratingYellow() + $0.activeColor = UIColor.yellow $0.inactiveColor = UIColor.blackDividers() } } diff --git a/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift b/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift index c5f4359f99..dbad461aad 100644 --- a/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift +++ b/iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift @@ -10,13 +10,6 @@ final class SettingsTableViewLinkCell: MWMTableViewCell { self.info?.styleName = "regular17:blackSecondaryText" } - override func awakeFromNib() { - super.awakeFromNib() - self.styleName = "Background" - self.title.styleName = "regular17:blackPrimaryText" - self.info.styleName = "regular17:blackSecondaryText" - } - @objc func config(title: String, info: String?) { self.title.text = title