AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] [refactoring] Add banner to PP, add PP states, polish UI

Browse source
This commit is contained in:
Aleksey Belouosv 2019-12-11 04:26:38 +03:00 • committed by Alexander Boriskov
parent f0e56bd3a2
commit 8dd1e8805a
30 changed files with 1071 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
View file

@ -17,6 +17,9 @@
471AB98D23AB925D00F56D49 /* MWMMapSearchResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 471AB98B23AB925D00F56D49 /* MWMMapSearchResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
471AB98E23AB925D00F56D49 /* MWMMapSearchResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = 471AB98C23AB925D00F56D49 /* MWMMapSearchResult.mm */; };
471AB99123AB931000F56D49 /* MWMMapSearchResult+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 471AB98F23AB931000F56D49 /* MWMMapSearchResult+Core.h */; };
4738A8E0239FACE7007C0F43 /* CoreBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 4738A8DE239FACE7007C0F43 /* CoreBanner.h */; settings = {ATTRIBUTES = (Public, ); }; };
4738A8E1239FACE7007C0F43 /* CoreBanner.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4738A8DF239FACE7007C0F43 /* CoreBanner.mm */; };
4738A8E4239FB46E007C0F43 /* CoreBanner+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 4738A8E2239FB46E007C0F43 /* CoreBanner+Core.h */; };
475784C22344B422008291A4 /* Framework.h in Headers */ = {isa = PBXBuildFile; fileRef = 475784C02344B421008291A4 /* Framework.h */; settings = {ATTRIBUTES = (Public, ); }; };
475784C32344B422008291A4 /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 475784C12344B422008291A4 /* Framework.cpp */; };
47938905239A932D006ECACC /* UgcSummaryRatingType.h in Headers */ = {isa = PBXBuildFile; fileRef = 47938904239A92F8006ECACC /* UgcSummaryRatingType.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -133,6 +136,9 @@
471AB98B23AB925D00F56D49 /* MWMMapSearchResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMMapSearchResult.h; sourceTree = "<group>"; };
471AB98C23AB925D00F56D49 /* MWMMapSearchResult.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapSearchResult.mm; sourceTree = "<group>"; };
471AB98F23AB931000F56D49 /* MWMMapSearchResult+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMMapSearchResult+Core.h"; sourceTree = "<group>"; };
4738A8DE239FACE7007C0F43 /* CoreBanner.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreBanner.h; sourceTree = "<group>"; };
4738A8DF239FACE7007C0F43 /* CoreBanner.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CoreBanner.mm; sourceTree = "<group>"; };
4738A8E2239FB46E007C0F43 /* CoreBanner+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CoreBanner+Core.h"; sourceTree = "<group>"; };
475784C02344B421008291A4 /* Framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Framework.h; sourceTree = "<group>"; };
475784C12344B422008291A4 /* Framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Framework.cpp; sourceTree = "<group>"; };
47938904239A92F8006ECACC /* UgcSummaryRatingType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UgcSummaryRatingType.h; sourceTree = "<group>"; };
@ -320,6 +326,16 @@
path = NetworkPolicy;
sourceTree = "<group>";
};
4738A8DD239FAC77007C0F43 /* Ad */ = {
isa = PBXGroup;
children = (
4738A8DE239FACE7007C0F43 /* CoreBanner.h */,
4738A8E2239FB46E007C0F43 /* CoreBanner+Core.h */,
4738A8DF239FACE7007C0F43 /* CoreBanner.mm */,
);
path = Ad;
sourceTree = "<group>";
};
477C775523435B69001C5B4E /* Framework */ = {
isa = PBXGroup;
children = (
@ -391,6 +407,7 @@
children = (
47942D51237CC3B500DEFAE3 /* PlacePageData.h */,
47942D52237CC3B500DEFAE3 /* PlacePageData.mm */,
4738A8DD239FAC77007C0F43 /* Ad */,
47942D89237D629D00DEFAE3 /* Catalog */,
47942D5B237CC3B500DEFAE3 /* Common */,
47942D65237CC3B500DEFAE3 /* Booking */,
@ -586,6 +603,7 @@
47942D74237CC41A00DEFAE3 /* HotelBookingData.h in Headers */,
479F705F234FBB8F00011E2E /* MWMCategory.h in Headers */,
471AB99123AB931000F56D49 /* MWMMapSearchResult+Core.h in Headers */,
4738A8E0239FACE7007C0F43 /* CoreBanner.h in Headers */,
47942D6D237CC3E300DEFAE3 /* PlacePagePreviewData.h in Headers */,
47A65CAF235008E100DCD85F /* CoreApi-swift.h in Headers */,
9957FACE237AB01400855F48 /* DeepLinkParser.h in Headers */,
@ -615,6 +633,7 @@
999D3A64237B097C00C5F7A8 /* DeepLinkSubscriptionData.h in Headers */,
47942D7E237CC43000DEFAE3 /* UgcData+Core.h in Headers */,
47942D6E237CC3E800DEFAE3 /* PlacePagePreviewData+Core.h in Headers */,
4738A8E4239FB46E007C0F43 /* CoreBanner+Core.h in Headers */,
47942D7B237CC41A00DEFAE3 /* HotelRoom+Core.h in Headers */,
47942D94237D673E00DEFAE3 /* CatalogPromoItem.h in Headers */,
470016102342579200EBF03D /* MWMTagGroup.h in Headers */,
@ -729,6 +748,7 @@
47942D7F237CC43300DEFAE3 /* UgcData.mm in Sources */,
47C637D12354A6FB00E12DE0 /* MWMEye.mm in Sources */,
47942D9D237D927800DEFAE3 /* PlacePageBookmarkData.mm in Sources */,
4738A8E1239FACE7007C0F43 /* CoreBanner.mm in Sources */,
47942D86237CC55500DEFAE3 /* MWMOpeningHoursCommon.mm in Sources */,
47942D82237CC52A00DEFAE3 /* MWMOpeningHours.mm in Sources */,
47942D73237CC41400DEFAE3 /* OpeningHours.mm in Sources */,

1
iphone/CoreApi/CoreApi/CoreApi-swift.h
View file

@ -33,6 +33,7 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[];
#pragma mark - Place Page
#import <CoreApi/CoreBanner.h>
#import <CoreApi/PlacePageData.h>
#import <CoreApi/CatalogPromoData.h>
#import <CoreApi/CatalogPromoItem.h>

13
iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner+Core.h Normal file
View file

@ -0,0 +1,13 @@
#import "CoreBanner.h"
#include <CoreApi/Framework.h>
NS_ASSUME_NONNULL_BEGIN
@interface CoreBanner (Core)
- (instancetype)initWithAdBanner:(ads::Banner const &)banner;
@end
NS_ASSUME_NONNULL_END

29
iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.h Normal file
View file

@ -0,0 +1,29 @@
#import <Foundation/Foundation.h>
typedef NS_ENUM(NSInteger, MWMBannerType) {
MWMBannerTypeNone,
MWMBannerTypeFacebook,
MWMBannerTypeRb,
MWMBannerTypeMopub
};
NS_ASSUME_NONNULL_BEGIN
@protocol MWMBanner <NSObject>
@property(nonatomic, readonly) enum MWMBannerType mwmType;
@property(nonatomic, readonly) NSString *bannerID;
@end
@interface CoreBanner : NSObject <MWMBanner>
@property(nonatomic, readonly) MWMBannerType mwmType;
@property(nonatomic, readonly) NSString *bannerID;
@property(nonatomic, readonly) NSString *query;
- (instancetype)initWithMwmType:(MWMBannerType)type bannerID:(NSString *)bannerID query:(NSString *)query;
@end
NS_ASSUME_NONNULL_END

50
iphone/CoreApi/CoreApi/PlacePageData/Ad/CoreBanner.mm Normal file
View file

@ -0,0 +1,50 @@
#import "CoreBanner+Core.h"
static MWMBannerType ConvertBannerType(ads::Banner::Type coreType) {
switch (coreType) {
case ads::Banner::Type::None:
return MWMBannerTypeNone;
case ads::Banner::Type::Facebook:
return MWMBannerTypeFacebook;
case ads::Banner::Type::RB:
return MWMBannerTypeRb;
case ads::Banner::Type::Mopub:
return MWMBannerTypeMopub;
}
}
@interface CoreBanner ()
@property(nonatomic, readwrite) MWMBannerType mwmType;
@property(nonatomic, copy) NSString *bannerID;
@property(nonatomic, copy) NSString *query;
@end
@implementation CoreBanner
- (instancetype)initWithMwmType:(MWMBannerType)type bannerID:(NSString *)bannerID query:(NSString *)query {
self = [super init];
if (self) {
_mwmType = type;
_bannerID = bannerID;
_query = query;
}
return self;
}
@end
@implementation CoreBanner (Core)
- (instancetype)initWithAdBanner:(ads::Banner const &)banner {
self = [super init];
if (self) {
_mwmType = ConvertBannerType(banner.m_type);
_bannerID = @(banner.m_bannerId.c_str());
_query = @"";
}
return self;
}
@end

3
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h
View file

@ -2,6 +2,7 @@
@class PlacePageScheduleData;
@class UgcSummaryRating;
@class CoreBanner;
typedef NS_ENUM(NSInteger, PlacePageDataHotelType) {
PlacePageDataHotelTypeHotel,
@ -36,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) BOOL isPopular;
@property(nonatomic, readonly) BOOL isBookingPlace;
@property(nonatomic, readonly) BOOL showUgc;
//@property(nonatomic, readonly, nullable) UgcSummaryRating *ugcSummaryRating;
@property(nonatomic, readonly, nullable) NSArray<CoreBanner *> *banners;
@end

9
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.mm
View file

@ -1,6 +1,7 @@
#import "PlacePagePreviewData+Core.h"
#import "UgcSummaryRating.h"
#import "CoreBanner+Core.h"
#include "3party/opening_hours/opening_hours.hpp"
@ -73,6 +74,14 @@ static PlacePageDataHotelType convertHotelType(boost::optional<ftypes::IsHotelCh
_schedule = convertOpeningHours(rawData.GetOpeningHours());
_hotelType = convertHotelType(rawData.GetHotelType());
_showUgc = rawData.ShouldShowUGC();
if (_hasBanner) {
NSMutableArray *bannersArray = [NSMutableArray array];
for (auto const &b : rawData.GetBanners()) {
CoreBanner *banner = [[CoreBanner alloc] initWithAdBanner:b];
[bannersArray addObject:banner];
}
_banners = [bannersArray copy];
}
}
return self;
}

1
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.h
View file

@ -53,6 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) BOOL isPartner;
@property(nonatomic, readonly) BOOL shouldShowUgc;
@property(nonatomic, readonly) BOOL isMyPosition;
@property(nonatomic, readonly) BOOL isPreviewPlus;
@property(nonatomic, readonly) NSInteger partnerIndex;
@property(nonatomic, readonly, nullable) NSString *partnerName;
@property(nonatomic, readonly) CLLocationCoordinate2D locationCoordinate;

1
iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
View file

@ -80,6 +80,7 @@ static PlacePageTaxiProvider convertTaxiProvider(taxi::Provider::Type providerTy
_isPromoCatalog = _isLargeToponim || _isSightseeing;
_shouldShowUgc = rawData().ShouldShowUGC();
_isMyPosition = rawData().IsMyPosition();
_isPreviewPlus = rawData().GetOpeningMode() == place_page::OpeningMode::PreviewPlus;
_isPartner = rawData().GetSponsoredType() == place_page::SponsoredType::Partner;
_partnerIndex = _isPartner ? rawData().GetPartnerIndex() : -1;
_partnerName = _isPartner ? @(rawData().GetPartnerName().c_str()) : nil;

1
iphone/Maps/Bridging-Header.h
View file

@ -30,7 +30,6 @@
#import "MWMActivityViewController.h"
#import "MWMAlertViewController.h"
#import "MWMAvailableAreaAffectDirection.h"
#import "MWMBanner.h"
#import "MWMBottomMenuViewController.h"
#import "MWMCircularProgress.h"
#import "MWMCollectionViewController.h"

2
iphone/Maps/Classes/MapViewController.h
View file

@ -47,6 +47,8 @@
- (void)enableCarPlayRepresentation;
- (void)disableCarPlayRepresentation;
- (void)dismissPlacePage;
@property(nonatomic, readonly) MWMMapViewControlsManager * controlsManager;
@property(nonatomic) MWMWelcomePageController * welcomePageController;
@property(nonatomic, readonly) MWMMapDownloadDialog * downloadDialog;

23
iphone/Maps/Core/Ads/CoreBanner.swift
View file

@ -1,23 +0,0 @@
@objc(MWMCoreBanner)
final class CoreBanner: NSObject, MWMBanner {
let mwmType: MWMBannerType
let bannerID: String
let query: String
@objc init(mwmType: MWMBannerType, bannerID: String, query: String) {
self.mwmType = mwmType
self.bannerID = bannerID
self.query = query
}
override var debugDescription: String {
let type: String
switch mwmType {
case .none: type = "none"
case .facebook: type = "facebook"
case .rb: type = "rb"
case .mopub: type = "mopub"
}
return "Type: <\(type)> | id: <\(bannerID)> | query: <\(query)>"
}
}

11
iphone/Maps/Core/Ads/MWMBanner.h
View file

@ -1,11 +0,0 @@
typedef NS_ENUM(NSInteger, MWMBannerType) {
MWMBannerTypeNone,
MWMBannerTypeFacebook,
MWMBannerTypeRb,
MWMBannerTypeMopub
};
@protocol MWMBanner <NSObject>
@property(nonatomic, readonly) enum MWMBannerType mwmType;
@property(copy, nonatomic, readonly) NSString * bannerID;
@end

15
iphone/Maps/Core/Ads/MWMBannerHelpers.h
View file

@ -1,5 +1,4 @@
#import "MWMBanner.h"
#import "SwiftBridge.h"
#import <CoreApi/CoreBanner.h>
#include "partners_api/banner.hpp"
@ -18,16 +17,16 @@ static inline MWMBannerType MatchBannerType(ads::Banner::Type coreType)
}
}
static inline MWMCoreBanner * MatchBanner(ads::Banner const & banner, NSString * query)
static inline CoreBanner * MatchBanner(ads::Banner const & banner, NSString * query)
{
return [[MWMCoreBanner alloc] initWithMwmType:MatchBannerType(banner.m_type)
bannerID:@(banner.m_bannerId.c_str())
query:query];
return [[CoreBanner alloc] initWithMwmType:MatchBannerType(banner.m_type)
bannerID:@(banner.m_bannerId.c_str())
query:query];
}
static inline NSArray<MWMCoreBanner *> * MatchPriorityBanners(std::vector<ads::Banner> const & banners, NSString * query = @"")
static inline NSArray<CoreBanner *> * MatchPriorityBanners(std::vector<ads::Banner> const & banners, NSString * query = @"")
{
NSMutableArray<MWMCoreBanner *> * mBanners = [@[] mutableCopy];
NSMutableArray<CoreBanner *> * mBanners = [@[] mutableCopy];
for (auto const & banner : banners)
[mBanners addObject:MatchBanner(banner, query)];
return [mBanners copy];

1
iphone/Maps/Core/Search/MWMSearch.h
View file

@ -1,6 +1,5 @@
#import <CoreApi/MWMTypes.h>
#import "MWMBanner.h"
#import "MWMHotelParams.h"
#import "MWMSearchItemType.h"
#import "MWMSearchObserver.h"

26
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -309,7 +309,6 @@
34F4072C1E9E1AFF00E57AC0 /* Banner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F4071D1E9E1AFF00E57AC0 /* Banner.swift */; };
34F4072F1E9E1AFF00E57AC0 /* BannersCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F4071E1E9E1AFF00E57AC0 /* BannersCache.swift */; };
34F407321E9E1AFF00E57AC0 /* BannerType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F4071F1E9E1AFF00E57AC0 /* BannerType.swift */; };
34F407351E9E1AFF00E57AC0 /* CoreBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F407201E9E1AFF00E57AC0 /* CoreBanner.swift */; };
34F407381E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F407221E9E1AFF00E57AC0 /* FacebookBanner.swift */; };
34F4073B1E9E1AFF00E57AC0 /* MopubBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F407241E9E1AFF00E57AC0 /* MopubBanner.swift */; };
34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.m */; };
@ -383,6 +382,8 @@
472E3F4C2147D5700020E412 /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472E3F4B2147D5700020E412 /* Subscription.swift */; };
473464A7218B0BC000D6AF5B /* MWMPurchaseValidation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 473464A6218B0BC000D6AF5B /* MWMPurchaseValidation.mm */; };
4735008A23A83CF700661A95 /* DownloadedMapsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4735008923A83CF700661A95 /* DownloadedMapsDataSource.swift */; };
4738A8E7239FC513007C0F43 /* AdBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4738A8E6239FC513007C0F43 /* AdBannerView.swift */; };
4738A8E9239FC526007C0F43 /* AdBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4738A8E8239FC526007C0F43 /* AdBannerView.xib */; };
473CBF9B2164DD470059BD54 /* SettingsTableViewSelectableProgressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473CBF9A2164DD470059BD54 /* SettingsTableViewSelectableProgressCell.swift */; };
474AC76C2139E4F2002F9BF9 /* RemoveAdsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 474AC76A2139E4F2002F9BF9 /* RemoveAdsViewController.swift */; };
474AC76D2139E4F2002F9BF9 /* RemoveAdsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 474AC76B2139E4F2002F9BF9 /* RemoveAdsViewController.xib */; };
@ -808,7 +809,7 @@
F6E2FE8B1E097BA00083EBEC /* MWMPlacePageInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC41E097B9F0083EBEC /* MWMPlacePageInfoCell.xib */; };
F6E2FE8E1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC51E097B9F0083EBEC /* MWMPlacePageLinkCell.xib */; };
F6E2FE941E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC91E097B9F0083EBEC /* PlacePageTaxiCell.xib */; };
F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCCB1E097B9F0083EBEC /* ContextViews.mm */; };
F6E2FE971E097BA00083EBEC /* CopyLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCCB1E097B9F0083EBEC /* CopyLabel.m */; };
F6E2FE9A1E097BA00083EBEC /* MWMiPadPlacePageLayoutImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCCD1E097B9F0083EBEC /* MWMiPadPlacePageLayoutImpl.mm */; };
F6E2FE9D1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCCF1E097B9F0083EBEC /* MWMiPhonePlacePageLayoutImpl.mm */; };
F6E2FEA01E097BA00083EBEC /* MWMPlacePageLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCD11E097B9F0083EBEC /* MWMPlacePageLayout.mm */; };
@ -1331,12 +1332,10 @@
34F4071D1E9E1AFF00E57AC0 /* Banner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Banner.swift; sourceTree = "<group>"; };
34F4071E1E9E1AFF00E57AC0 /* BannersCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannersCache.swift; sourceTree = "<group>"; };
34F4071F1E9E1AFF00E57AC0 /* BannerType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannerType.swift; sourceTree = "<group>"; };
34F407201E9E1AFF00E57AC0 /* CoreBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreBanner.swift; sourceTree = "<group>"; };
34F407221E9E1AFF00E57AC0 /* FacebookBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacebookBanner.swift; sourceTree = "<group>"; };
34F407241E9E1AFF00E57AC0 /* MopubBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MopubBanner.swift; sourceTree = "<group>"; };
34F407251E9E1AFF00E57AC0 /* MPNativeAd+MWM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPNativeAd+MWM.h"; sourceTree = "<group>"; };
34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPNativeAd+MWM.m"; sourceTree = "<group>"; };
34F407271E9E1AFF00E57AC0 /* MWMBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBanner.h; sourceTree = "<group>"; };
34F407281E9E1AFF00E57AC0 /* MWMBannerHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBannerHelpers.h; sourceTree = "<group>"; };
34F4072A1E9E1AFF00E57AC0 /* RBBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RBBanner.swift; sourceTree = "<group>"; };
34F407581E9E1D7A00E57AC0 /* Mopub.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Mopub.xcodeproj; path = MoPubSDK/Mopub.xcodeproj; sourceTree = "<group>"; };
@ -1485,6 +1484,8 @@
4735008923A83CF700661A95 /* DownloadedMapsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadedMapsDataSource.swift; sourceTree = "<group>"; };
473500C023A8F81800661A95 /* MWMFrameworkObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkObserver.h; sourceTree = "<group>"; };
473500C123A8F85A00661A95 /* MWMFrameworkStorageObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkStorageObserver.h; sourceTree = "<group>"; };
4738A8E6239FC513007C0F43 /* AdBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdBannerView.swift; sourceTree = "<group>"; };
4738A8E8239FC526007C0F43 /* AdBannerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AdBannerView.xib; sourceTree = "<group>"; };
473CBF9A2164DD470059BD54 /* SettingsTableViewSelectableProgressCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSelectableProgressCell.swift; sourceTree = "<group>"; };
474902D8224A54EC008D71E0 /* MWMRoutingOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRoutingOptions.h; sourceTree = "<group>"; };
474902D9224A54EC008D71E0 /* MWMRoutingOptions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutingOptions.mm; sourceTree = "<group>"; };
@ -2052,8 +2053,8 @@
F6E2FCC41E097B9F0083EBEC /* MWMPlacePageInfoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageInfoCell.xib; sourceTree = "<group>"; };
F6E2FCC51E097B9F0083EBEC /* MWMPlacePageLinkCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageLinkCell.xib; sourceTree = "<group>"; };
F6E2FCC91E097B9F0083EBEC /* PlacePageTaxiCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacePageTaxiCell.xib; sourceTree = "<group>"; };
F6E2FCCA1E097B9F0083EBEC /* ContextViews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextViews.h; sourceTree = "<group>"; };
F6E2FCCB1E097B9F0083EBEC /* ContextViews.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextViews.mm; sourceTree = "<group>"; };
F6E2FCCA1E097B9F0083EBEC /* CopyLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CopyLabel.h; sourceTree = "<group>"; };
F6E2FCCB1E097B9F0083EBEC /* CopyLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CopyLabel.m; sourceTree = "<group>"; };
F6E2FCCC1E097B9F0083EBEC /* MWMiPadPlacePageLayoutImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMiPadPlacePageLayoutImpl.h; sourceTree = "<group>"; };
F6E2FCCD1E097B9F0083EBEC /* MWMiPadPlacePageLayoutImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMiPadPlacePageLayoutImpl.mm; sourceTree = "<group>"; };
F6E2FCCE1E097B9F0083EBEC /* MWMiPhonePlacePageLayoutImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMiPhonePlacePageLayoutImpl.h; sourceTree = "<group>"; };
@ -2714,6 +2715,8 @@
3488B0111E9D0AEC0068AFD8 /* AdBanner.xib */,
474AC76A2139E4F2002F9BF9 /* RemoveAdsViewController.swift */,
474AC76B2139E4F2002F9BF9 /* RemoveAdsViewController.xib */,
4738A8E6239FC513007C0F43 /* AdBannerView.swift */,
4738A8E8239FC526007C0F43 /* AdBannerView.xib */,
);
path = Ads;
sourceTree = "<group>";
@ -3383,10 +3386,8 @@
34F4071D1E9E1AFF00E57AC0 /* Banner.swift */,
34F4071E1E9E1AFF00E57AC0 /* BannersCache.swift */,
34F4071F1E9E1AFF00E57AC0 /* BannerType.swift */,
34F407201E9E1AFF00E57AC0 /* CoreBanner.swift */,
34F407211E9E1AFF00E57AC0 /* Facebook */,
34F407231E9E1AFF00E57AC0 /* Mopub */,
34F407271E9E1AFF00E57AC0 /* MWMBanner.h */,
34F407281E9E1AFF00E57AC0 /* MWMBannerHelpers.h */,
34F407291E9E1AFF00E57AC0 /* RB */,
);
@ -4509,8 +4510,8 @@
children = (
F6E2FC9D1E097B9F0083EBEC /* ActionBar */,
F6E2FCA81E097B9F0083EBEC /* Content */,
F6E2FCCA1E097B9F0083EBEC /* ContextViews.h */,
F6E2FCCB1E097B9F0083EBEC /* ContextViews.mm */,
F6E2FCCA1E097B9F0083EBEC /* CopyLabel.h */,
F6E2FCCB1E097B9F0083EBEC /* CopyLabel.m */,
F6E2FCCC1E097B9F0083EBEC /* MWMiPadPlacePageLayoutImpl.h */,
F6E2FCCD1E097B9F0083EBEC /* MWMiPadPlacePageLayoutImpl.mm */,
F6E2FCCE1E097B9F0083EBEC /* MWMiPhonePlacePageLayoutImpl.h */,
@ -5212,6 +5213,7 @@
33010DB321B7E14700925411 /* MWMPlaceDescriptionCell.xib in Resources */,
4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */,
F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */,
4738A8E9239FC526007C0F43 /* AdBannerView.xib in Resources */,
344532511F714FD70059FBCC /* UGCAddReviewController.xib in Resources */,
3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
346DB82B1E5C4F6700E3123E /* GalleryCell.xib in Resources */,
@ -5449,6 +5451,7 @@
6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */,
3404F48B202894EA0090E401 /* BMCViewController.swift in Sources */,
472848FB238573EE00176158 /* RatingSummaryViewController.swift in Sources */,
4738A8E7239FC513007C0F43 /* AdBannerView.swift in Sources */,
349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */,
993F5511237C622700545511 /* DeepLinkCatalogueStrategy.swift in Sources */,
34E50DF81F6FCC96008EED49 /* UGCReviewCell.swift in Sources */,
@ -5547,7 +5550,6 @@
47868A7B22145A2C000AFC86 /* GuideNameViewController.swift in Sources */,
34AB66501FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */,
F6E2FE251E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */,
34F407351E9E1AFF00E57AC0 /* CoreBanner.swift in Sources */,
34C9BD031C6DB693000DC38D /* MWMTableViewController.m in Sources */,
F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */,
34D3B0361E389D05004100F9 /* MWMEditorSelectTableViewCell.m in Sources */,
@ -5823,7 +5825,7 @@
34D3B0481E389D05004100F9 /* MWMNoteCell.m in Sources */,
CD9AD967228067F500EC174A /* MapInfo.swift in Sources */,
47F6E51221F61908004580CA /* CoreNotificationWrapper.mm in Sources */,
F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */,
F6E2FE971E097BA00083EBEC /* CopyLabel.m in Sources */,
344532561F7155540059FBCC /* UGCReviewModel.swift in Sources */,
6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */,
346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */,

29
iphone/Maps/UI/Ads/AdBanner.swift
View file

@ -1,34 +1,5 @@
import FBAudienceNetwork
@objc(MWMAdBannerState)
enum AdBannerState: Int {
case unset
case compact
case detailed
case search
func config() -> (priority: UILayoutPriority, numberOfTitleLines: Int, numberOfBodyLines: Int) {
switch self {
case .unset:
assert(false)
return (priority: UILayoutPriority(rawValue: 0), numberOfTitleLines: 0, numberOfBodyLines: 0)
case .compact:
return alternative(iPhone: (priority: UILayoutPriority.defaultLow, numberOfTitleLines: 1, numberOfBodyLines: 2),
iPad: (priority: UILayoutPriority.defaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0))
case .search:
return (priority: UILayoutPriority.defaultLow, numberOfTitleLines: 2, numberOfBodyLines: 0)
case .detailed:
return (priority: UILayoutPriority.defaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0)
}
}
}
@objc(MWMAdBannerContainerType)
enum AdBannerContainerType: Int {
case placePage
case search
}
private func attributedTitle(title: String, indent: CGFloat) -> NSAttributedString {
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.firstLineHeadIndent = indent

263
iphone/Maps/UI/Ads/AdBannerView.swift Normal file
View file

@ -0,0 +1,263 @@
import FBAudienceNetwork
@objc(MWMAdBannerState)
enum AdBannerState: Int {
case unset
case compact
case detailed
case search
func config() -> (priority: UILayoutPriority, numberOfTitleLines: Int, numberOfBodyLines: Int) {
switch self {
case .unset:
assert(false)
return (priority: UILayoutPriority(rawValue: 0), numberOfTitleLines: 0, numberOfBodyLines: 0)
case .compact:
return alternative(iPhone: (priority: UILayoutPriority.defaultLow, numberOfTitleLines: 1, numberOfBodyLines: 2),
iPad: (priority: UILayoutPriority.defaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0))
case .search:
return (priority: UILayoutPriority.defaultLow, numberOfTitleLines: 2, numberOfBodyLines: 0)
case .detailed:
return (priority: UILayoutPriority.defaultHigh, numberOfTitleLines: 0, numberOfBodyLines: 0)
}
}
}
@objc(MWMAdBannerContainerType)
enum AdBannerContainerType: Int {
case placePage
case search
}
private func attributedTitle(title: String, indent: CGFloat) -> NSAttributedString {
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.firstLineHeadIndent = indent
paragraphStyle.lineBreakMode = .byTruncatingTail
return NSAttributedString(string: title,
attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle,
NSAttributedString.Key.font: UIFont.bold12(),
NSAttributedString.Key.foregroundColor: UIColor.blackSecondaryText()
])
}
class AdBannerView: UIView {
@IBOutlet private var detailedModeConstraints: [NSLayoutConstraint]!
@IBOutlet private weak var adCallToActionButtonCompactLeading: NSLayoutConstraint!
@IBOutlet private weak var adIconImageView: UIImageView!
@IBOutlet private weak var adTitleLabel: UILabel!
@IBOutlet private weak var adBodyLabel: UILabel!
@IBOutlet private weak var DAAImage: UIImageView!
@IBOutlet private weak var DAAImageWidth: NSLayoutConstraint!
@IBOutlet private weak var adPrivacyImage: UIImageView!
@IBOutlet private weak var adCallToActionButtonCompact: UIButton!
@IBOutlet private weak var adCallToActionButtonDetailed: UIButton!
@IBOutlet private weak var adCallToActionButtonCustom: UIButton!
@IBOutlet private weak var removeAdsSmallButton: UIButton!
@IBOutlet private weak var removeAdsLargeButton: UIButton!
@IBOutlet private weak var removeAdsImage: UIImageView!
@IBOutlet private weak var fallbackAdView: UIView!
@IBOutlet private var nativeAdViewBottom: NSLayoutConstraint!
@IBOutlet private var fallbackAdViewBottom: NSLayoutConstraint!
@IBOutlet private var fallbackAdViewHeight: NSLayoutConstraint!
@IBOutlet private var ctaButtonLeftConstraint: NSLayoutConstraint!
@IBOutlet private weak var nativeAdView: UIView! {
didSet {
nativeAdView.layer.borderColor = UIColor.blackDividers().cgColor
}
}
@objc var onRemoveAds: MWMVoidBlock?
@objc static let detailedBannerExcessHeight: Float = 52
enum AdType {
case native
case fallback
}
var adType = AdType.native {
didSet {
let isNative = adType == .native
nativeAdView.isHidden = !isNative
fallbackAdView.isHidden = isNative
nativeAdViewBottom.isActive = isNative
fallbackAdViewBottom.isActive = !isNative
fallbackAdViewHeight.isActive = !isNative
}
}
@objc var state = AdBannerState.unset {
didSet {
guard state != .unset else {
adCallToActionButtonCustom.isHidden = true
mpNativeAd = nil
nativeAd = nil
return
}
guard state != oldValue else { return }
let config = state.config()
animateConstraints(animations: {
self.adTitleLabel.numberOfLines = config.numberOfTitleLines
self.adBodyLabel.numberOfLines = config.numberOfBodyLines
self.detailedModeConstraints.forEach { $0.priority = config.priority }
self.refreshBannerIfNeeded()
})
}
}
@objc weak var mpNativeAd: MPNativeAd?
func cancelImageLoading() {
adIconImageView.wi_cancelImageRequest()
adIconImageView.image = nil;
}
private var nativeAd: Banner? {
willSet {
nativeAd?.unregister()
}
}
@IBAction
private func privacyAction() {
let url: URL?
if let ad = nativeAd as? FacebookBanner {
url = ad.nativeAd.adChoicesLinkURL
} else if let ad = nativeAd as? MopubBanner, let u = ad.privacyInfoURL {
url = u
} else {
return
}
UIViewController.topViewController().open(url)
}
@IBAction
private func removeAction(_ sender: UIButton) {
Statistics.logEvent(kStatInappBannerClose, withParameters: [
kStatBanner : state == .detailed ? 1 : 0,
kStatButton : sender == removeAdsLargeButton ? 1 : 0])
onRemoveAds?()
}
func reset() {
state = .unset
}
@objc func config(ad: MWMBanner, containerType: AdBannerContainerType, canRemoveAds: Bool, onRemoveAds: (() -> Void)?) {
reset()
switch containerType {
case .placePage:
state = alternative(iPhone: .compact, iPad: .detailed)
case .search:
state = .search
}
nativeAd = ad as? Banner
switch ad {
case let ad as FacebookBanner: configFBBanner(ad: ad.nativeAd)
case let ad as RBBanner: configRBBanner(ad: ad)
case let ad as MopubBanner: configMopubBanner(ad: ad)
default: assert(false)
}
self.onRemoveAds = onRemoveAds
removeAdsSmallButton.isHidden = !canRemoveAds
removeAdsLargeButton.isHidden = !canRemoveAds
removeAdsImage.isHidden = !canRemoveAds
ctaButtonLeftConstraint.priority = canRemoveAds ? .defaultLow : .defaultHigh
}
func setHighlighted(_ highlighted: Bool) {
adCallToActionButtonCompact.isHighlighted = highlighted;
adCallToActionButtonDetailed.isHighlighted = highlighted;
}
private func configFBBanner(ad: FBNativeAd) {
adType = .native
DAAImageWidth.constant = adPrivacyImage.width;
DAAImage.isHidden = false;
let adCallToActionButtons: [UIView]
if state == .search {
adCallToActionButtons = [self, adCallToActionButtonCompact]
} else {
adCallToActionButtons = [adCallToActionButtonCompact, adCallToActionButtonDetailed]
}
ad.registerView(forInteraction: self, with: nil, withClickableViews: adCallToActionButtons)
ad.icon?.loadAsync { [weak self] image in
self?.adIconImageView.image = image
}
adTitleLabel.attributedText = attributedTitle(title: ad.title ?? "",
indent: adPrivacyImage.width + DAAImageWidth.constant)
adBodyLabel.text = ad.body ?? ""
let config = state.config()
adTitleLabel.numberOfLines = config.numberOfTitleLines
adBodyLabel.numberOfLines = config.numberOfBodyLines
[adCallToActionButtonCompact, adCallToActionButtonDetailed].forEach { $0.setTitle(ad.callToAction, for: .normal) }
}
private func configRBBanner(ad: MTRGNativeAd) {
guard let banner = ad.banner else { return }
adType = .native
DAAImageWidth.constant = 0;
DAAImage.isHidden = true;
MTRGNativeAd.loadImage(banner.icon, to: adIconImageView)
adTitleLabel.attributedText = attributedTitle(title: banner.title,
indent: adPrivacyImage.width + DAAImageWidth.constant)
adBodyLabel.text = banner.descriptionText ?? ""
let config = state.config()
adTitleLabel.numberOfLines = config.numberOfTitleLines
adBodyLabel.numberOfLines = config.numberOfBodyLines
[adCallToActionButtonCompact, adCallToActionButtonDetailed].forEach { $0.setTitle(banner.ctaText, for: .normal) }
refreshBannerIfNeeded()
}
private func configMopubBanner(ad: MopubBanner) {
mpNativeAd = ad.nativeAd
adType = .native
DAAImageWidth.constant = adPrivacyImage.width;
DAAImage.isHidden = false;
let adCallToActionButtons: [UIButton]
if state == .search {
adCallToActionButtonCustom.isHidden = false
adCallToActionButtons = [adCallToActionButtonCustom, adCallToActionButtonCompact]
} else {
adCallToActionButtons = [adCallToActionButtonCompact, adCallToActionButtonDetailed]
adCallToActionButtons.forEach { $0.setTitle(ad.ctaText, for: .normal) }
}
mpNativeAd?.setAdView(self, actionButtons: adCallToActionButtons)
adTitleLabel.attributedText = attributedTitle(title: ad.title,
indent: adPrivacyImage.width + DAAImageWidth.constant)
adBodyLabel.text = ad.text
if let url = URL(string: ad.iconURL) {
adIconImageView.wi_setImage(with: url)
}
}
private func refreshBannerIfNeeded() {
if let ad = nativeAd as? MTRGNativeAd {
let clickableView: UIView
switch state {
case .unset:
assert(false)
clickableView = adCallToActionButtonCompact
case .compact: clickableView = adCallToActionButtonCompact
case .detailed: clickableView = adCallToActionButtonDetailed
case .search: clickableView = self
}
ad.register(clickableView, with: UIViewController.topViewController())
}
}
override func willMove(toSuperview newSuperview: UIView?) {
super.willMove(toSuperview: newSuperview)
mpNativeAd?.nativeViewWillMove(toSuperview: newSuperview)
}
}

300
iphone/Maps/UI/Ads/AdBannerView.xib Normal file
View file

@ -0,0 +1,300 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
<capability name="Safe area layout guides" minToolsVersion="9.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"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AdBannerView" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="414" height="110"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gYF-KR-F2p">
<rect key="frame" x="0.0" y="0.0" width="414" height="110"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" priority="999" constant="109" id="c1T-Qd-ORX"/>
</constraints>
</view>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AfO-KW-tyB">
<rect key="frame" x="0.0" y="0.0" width="414" height="110"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="h4t-4z-OMT">
<rect key="frame" x="-40" y="8" width="40" height="40"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="Tse-HX-upt"/>
<constraint firstAttribute="height" constant="40" id="eGj-tP-y29"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
<color key="value" white="0.0" alpha="0.12" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6hQ-rg-viN" userLabel="Privacy images">
<rect key="frame" x="8" y="10" width="40" height="12"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_ads_fb" translatesAutoresizingMaskIntoConstraints="NO" id="tQY-db-Vng">
<rect key="frame" x="0.0" y="0.0" width="20" height="12"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="Wsd-jg-DFB"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_ad_light" translatesAutoresizingMaskIntoConstraints="NO" id="8tz-ng-GBn">
<rect key="frame" x="20" y="0.0" width="20" height="12"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="s4f-Vq-gd4"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="mwm_name" value="img_ad"/>
</userDefinedRuntimeAttributes>
</imageView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="8tz-ng-GBn" firstAttribute="top" secondItem="6hQ-rg-viN" secondAttribute="top" id="7Oa-Ec-v1h"/>
<constraint firstAttribute="height" constant="12" id="DDE-co-xbH"/>
<constraint firstItem="8tz-ng-GBn" firstAttribute="leading" secondItem="tQY-db-Vng" secondAttribute="trailing" id="Lwt-6L-spK"/>
<constraint firstAttribute="bottom" secondItem="tQY-db-Vng" secondAttribute="bottom" id="USP-Cu-jru"/>
<constraint firstItem="tQY-db-Vng" firstAttribute="leading" secondItem="6hQ-rg-viN" secondAttribute="leading" id="deq-N4-wBh"/>
<constraint firstAttribute="trailing" secondItem="8tz-ng-GBn" secondAttribute="trailing" id="j5z-cB-4yp"/>
<constraint firstItem="tQY-db-Vng" firstAttribute="top" secondItem="6hQ-rg-viN" secondAttribute="top" id="qAC-x5-yh0"/>
<constraint firstAttribute="bottom" secondItem="8tz-ng-GBn" secondAttribute="bottom" id="zWj-cW-sxT"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="300" text="Delivery Club" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GhG-Kh-VRe">
<rect key="frame" x="12" y="8" width="313" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold12"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="451" verticalHuggingPriority="249" horizontalCompressionResistancePriority="249" text="Как " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D5E-LW-54x">
<rect key="frame" x="8" y="26.5" width="317" height="75.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="551" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S7j-gp-e0z">
<rect key="frame" x="329" y="24" width="69" height="24"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="gVK-6r-S73"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="64" id="uiG-cQ-epi"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
<state key="normal" title="Заказать">
<color key="titleColor" red="0.59999999999999998" green="0.58823529409999997" blue="0.56862745100000001" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium12"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="10"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/>
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gqm-uV-OY1">
<rect key="frame" x="12" y="110" width="189" height="36"/>
<color key="backgroundColor" red="0.95294117649999999" green="0.92156862750000001" blue="0.85490196080000003" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="aDD-9o-FLS"/>
</constraints>
<state key="normal" title="Remove Ads">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="remove_ads"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="removeAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="TR7-gf-UPR"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E1H-8C-XdJ">
<rect key="frame" x="213" y="110" width="189" height="36"/>
<color key="backgroundColor" red="0.95294117649999999" green="0.92156862750000001" blue="0.85490196080000003" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="C9O-Uj-NAr"/>
</constraints>
<state key="normal" title="Заказать">
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nqu-Vs-pn3">
<rect key="frame" x="0.0" y="0.0" width="414" height="110"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rqd-t1-0u9">
<rect key="frame" x="6" y="8" width="42" height="16"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<action selector="privacyAction" destination="iN0-l3-epB" eventType="touchUpInside" id="eP1-re-kOd"/>
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_ad_close" translatesAutoresizingMaskIntoConstraints="NO" id="At2-ZV-PEw">
<rect key="frame" x="399" y="2" width="13" height="13"/>
<color key="backgroundColor" red="0.89683702259999998" green="0.22233072919999999" blue="0.20819769969999999" alpha="1" colorSpace="calibratedRGB"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="13" id="IrJ-B4-vcQ"/>
<constraint firstAttribute="height" constant="13" id="r3G-f2-265"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f7S-px-Yhe">
<rect key="frame" x="374" y="0.0" width="40" height="29"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="Ftz-ts-SCa"/>
</constraints>
<connections>
<action selector="removeAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="zTk-YH-dXX"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="rqd-t1-0u9" firstAttribute="leading" secondItem="6hQ-rg-viN" secondAttribute="leading" constant="-2" id="0zG-AU-DMF"/>
<constraint firstItem="At2-ZV-PEw" firstAttribute="top" secondItem="f7S-px-Yhe" secondAttribute="top" constant="2" id="4dd-C8-BlE"/>
<constraint firstItem="f7S-px-Yhe" firstAttribute="top" secondItem="AfO-KW-tyB" secondAttribute="top" id="5eG-wH-wKo"/>
<constraint firstAttribute="bottom" secondItem="D5E-LW-54x" secondAttribute="bottom" priority="500" constant="8" id="5wk-Oz-IvB"/>
<constraint firstItem="GhG-Kh-VRe" firstAttribute="top" secondItem="AfO-KW-tyB" secondAttribute="top" constant="8" id="6ks-GK-XYM"/>
<constraint firstItem="rqd-t1-0u9" firstAttribute="top" secondItem="6hQ-rg-viN" secondAttribute="top" constant="-2" id="7WJ-g0-7F0"/>
<constraint firstItem="E1H-8C-XdJ" firstAttribute="top" relation="greaterThanOrEqual" secondItem="h4t-4z-OMT" secondAttribute="bottom" constant="8" id="8sa-sJ-coM"/>
<constraint firstItem="rqd-t1-0u9" firstAttribute="bottom" secondItem="6hQ-rg-viN" secondAttribute="bottom" constant="2" id="9Lx-xa-Gvj"/>
<constraint firstItem="S7j-gp-e0z" firstAttribute="top" secondItem="AfO-KW-tyB" secondAttribute="top" constant="24" id="ADd-Pa-9iy"/>
<constraint firstAttribute="trailing" secondItem="Nqu-Vs-pn3" secondAttribute="trailing" id="AWi-Mn-XTZ"/>
<constraint firstItem="gqm-uV-OY1" firstAttribute="top" secondItem="D5E-LW-54x" secondAttribute="bottom" constant="8" id="C4X-58-vYe"/>
<constraint firstItem="h4t-4z-OMT" firstAttribute="top" secondItem="AfO-KW-tyB" secondAttribute="top" constant="8" id="DUh-tO-f6C"/>
<constraint firstItem="E1H-8C-XdJ" firstAttribute="leading" secondItem="AfO-KW-tyB" secondAttribute="leading" priority="250" constant="12" id="Exj-rS-B8B"/>
<constraint firstItem="h4t-4z-OMT" firstAttribute="trailing" secondItem="AfO-KW-tyB" secondAttribute="leading" priority="500" id="GO8-Qj-eak"/>
<constraint firstItem="h4t-4z-OMT" firstAttribute="leading" secondItem="AfO-KW-tyB" secondAttribute="leading" priority="250" constant="16" id="Nu6-G0-5U1"/>
<constraint firstItem="Nqu-Vs-pn3" firstAttribute="top" secondItem="AfO-KW-tyB" secondAttribute="top" id="ODd-Iq-Ofv"/>
<constraint firstItem="E1H-8C-XdJ" firstAttribute="leading" secondItem="gqm-uV-OY1" secondAttribute="trailing" priority="500" constant="12" id="Q82-e0-UWw"/>
<constraint firstItem="gqm-uV-OY1" firstAttribute="width" secondItem="E1H-8C-XdJ" secondAttribute="width" id="QdF-UD-zv6"/>
<constraint firstItem="D5E-LW-54x" firstAttribute="top" secondItem="GhG-Kh-VRe" secondAttribute="bottom" priority="700" constant="4" id="XKd-Rk-e6D"/>
<constraint firstItem="GhG-Kh-VRe" firstAttribute="leading" secondItem="6hQ-rg-viN" secondAttribute="leading" constant="4" id="XiB-UN-5Bl"/>
<constraint firstItem="S7j-gp-e0z" firstAttribute="top" secondItem="f7S-px-Yhe" secondAttribute="bottom" constant="-5" id="YKe-2R-a76"/>
<constraint firstItem="At2-ZV-PEw" firstAttribute="trailing" secondItem="f7S-px-Yhe" secondAttribute="trailing" constant="-2" id="aOq-ZM-Z4F"/>
<constraint firstItem="6hQ-rg-viN" firstAttribute="leading" secondItem="AfO-KW-tyB" secondAttribute="leading" priority="600" constant="8" id="bJ3-IZ-JyD"/>
<constraint firstAttribute="trailing" secondItem="f7S-px-Yhe" secondAttribute="trailing" id="fFT-Zq-2Ad"/>
<constraint firstItem="gqm-uV-OY1" firstAttribute="leading" secondItem="AfO-KW-tyB" secondAttribute="leading" constant="12" id="fLI-Wi-N2z"/>
<constraint firstItem="E1H-8C-XdJ" firstAttribute="top" secondItem="D5E-LW-54x" secondAttribute="bottom" constant="8" id="g35-y3-zlb"/>
<constraint firstItem="gqm-uV-OY1" firstAttribute="bottom" secondItem="E1H-8C-XdJ" secondAttribute="bottom" id="h4v-NI-jgM"/>
<constraint firstAttribute="trailing" secondItem="S7j-gp-e0z" secondAttribute="trailing" priority="500" constant="16" id="hCj-RJ-pGK"/>
<constraint firstItem="S7j-gp-e0z" firstAttribute="leading" secondItem="D5E-LW-54x" secondAttribute="trailing" priority="500" constant="4" id="igM-ts-8z0"/>
<constraint firstItem="rqd-t1-0u9" firstAttribute="trailing" secondItem="6hQ-rg-viN" secondAttribute="trailing" id="jWY-zj-DKt"/>
<constraint firstItem="D5E-LW-54x" firstAttribute="trailing" secondItem="GhG-Kh-VRe" secondAttribute="trailing" id="mP7-dw-u4R"/>
<constraint firstAttribute="trailing" secondItem="E1H-8C-XdJ" secondAttribute="trailing" constant="12" id="mhz-15-E0D"/>
<constraint firstAttribute="trailing" secondItem="GhG-Kh-VRe" secondAttribute="trailing" priority="250" constant="16" id="pGf-Xx-22j"/>
<constraint firstAttribute="trailing" secondItem="S7j-gp-e0z" secondAttribute="leading" priority="250" id="pfq-qS-fIY"/>
<constraint firstItem="D5E-LW-54x" firstAttribute="leading" secondItem="6hQ-rg-viN" secondAttribute="leading" id="prP-cj-UL1"/>
<constraint firstItem="6hQ-rg-viN" firstAttribute="top" secondItem="GhG-Kh-VRe" secondAttribute="top" constant="2" id="pwm-qI-sRP"/>
<constraint firstItem="Nqu-Vs-pn3" firstAttribute="leading" secondItem="AfO-KW-tyB" secondAttribute="leading" id="qFd-S8-Ne5"/>
<constraint firstAttribute="bottom" secondItem="E1H-8C-XdJ" secondAttribute="bottom" priority="250" constant="12" id="t7P-M4-f4j"/>
<constraint firstAttribute="bottom" secondItem="Nqu-Vs-pn3" secondAttribute="bottom" id="vLY-ex-HA8"/>
<constraint firstItem="D5E-LW-54x" firstAttribute="top" secondItem="GhG-Kh-VRe" secondAttribute="bottom" priority="250" constant="8" id="vPg-hg-U9c"/>
<constraint firstItem="6hQ-rg-viN" firstAttribute="leading" secondItem="h4t-4z-OMT" secondAttribute="trailing" priority="250" constant="8" id="xru-9W-5gV"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
<color key="value" white="0.0" alpha="0.12" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerBackground"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="gYF-KR-F2p" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="03l-Tw-NJR"/>
<constraint firstItem="AfO-KW-tyB" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="6MD-r5-mXG"/>
<constraint firstAttribute="trailing" secondItem="AfO-KW-tyB" secondAttribute="trailing" id="77h-Pe-ltA"/>
<constraint firstAttribute="trailing" secondItem="gYF-KR-F2p" secondAttribute="trailing" id="bh9-gW-GRn"/>
<constraint firstItem="gYF-KR-F2p" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="fXP-gL-JvE"/>
<constraint firstAttribute="bottom" secondItem="gYF-KR-F2p" secondAttribute="bottom" id="tFU-Pd-f4K"/>
<constraint firstAttribute="bottom" secondItem="AfO-KW-tyB" secondAttribute="bottom" id="tfr-QC-Y8I"/>
<constraint firstItem="AfO-KW-tyB" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="vtj-B2-xAw"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<connections>
<outlet property="DAAImage" destination="tQY-db-Vng" id="atH-fh-ho2"/>
<outlet property="DAAImageWidth" destination="Wsd-jg-DFB" id="H6c-p1-1zx"/>
<outlet property="adBodyLabel" destination="D5E-LW-54x" id="Wwc-1N-j3V"/>
<outlet property="adCallToActionButtonCompact" destination="S7j-gp-e0z" id="wmH-C7-Ec9"/>
<outlet property="adCallToActionButtonCompactLeading" destination="pfq-qS-fIY" id="42Z-Za-842"/>
<outlet property="adCallToActionButtonCustom" destination="Nqu-Vs-pn3" id="gco-5d-wRb"/>
<outlet property="adCallToActionButtonDetailed" destination="E1H-8C-XdJ" id="HOc-Uj-r19"/>
<outlet property="adIconImageView" destination="h4t-4z-OMT" id="Z2Z-dU-hkQ"/>
<outlet property="adPrivacyImage" destination="8tz-ng-GBn" id="wHF-60-gGj"/>
<outlet property="adTitleLabel" destination="GhG-Kh-VRe" id="EDB-Rd-o7F"/>
<outlet property="ctaButtonLeftConstraint" destination="Exj-rS-B8B" id="nZ2-sS-bL7"/>
<outlet property="fallbackAdView" destination="gYF-KR-F2p" id="hW8-Im-dKK"/>
<outlet property="fallbackAdViewBottom" destination="tFU-Pd-f4K" id="0J4-Sl-SGo"/>
<outlet property="fallbackAdViewHeight" destination="c1T-Qd-ORX" id="omW-c3-p6d"/>
<outlet property="nativeAdView" destination="AfO-KW-tyB" id="XFQ-uP-ENg"/>
<outlet property="nativeAdViewBottom" destination="tfr-QC-Y8I" id="Vju-9b-5xl"/>
<outlet property="removeAdsImage" destination="At2-ZV-PEw" id="UEQ-rS-A8F"/>
<outlet property="removeAdsLargeButton" destination="gqm-uV-OY1" id="u3t-CC-dEk"/>
<outlet property="removeAdsSmallButton" destination="f7S-px-Yhe" id="EXJ-PN-S9b"/>
<outletCollection property="detailedModeConstraints" destination="xru-9W-5gV" collectionClass="NSMutableArray" id="Rjd-h4-qRE"/>
<outletCollection property="detailedModeConstraints" destination="pGf-Xx-22j" collectionClass="NSMutableArray" id="xdB-yz-q31"/>
<outletCollection property="detailedModeConstraints" destination="Nu6-G0-5U1" collectionClass="NSMutableArray" id="wsV-Xb-O49"/>
<outletCollection property="detailedModeConstraints" destination="t7P-M4-f4j" collectionClass="NSMutableArray" id="FGC-wM-H9Q"/>
<outletCollection property="detailedModeConstraints" destination="pfq-qS-fIY" collectionClass="NSMutableArray" id="XYi-ye-c03"/>
<outletCollection property="detailedModeConstraints" destination="vPg-hg-U9c" collectionClass="NSMutableArray" id="MuA-dg-KJm"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="-137.94642857142856"/>
</view>
</objects>
<resources>
<image name="ic_ad_close" width="8" height="8"/>
<image name="ic_ads_fb" width="20" height="12"/>
<image name="img_ad_light" width="20" height="12"/>
</resources>
</document>

1
iphone/Maps/UI/PlacePage/MWMPlacePageData.mm
View file

@ -3,6 +3,7 @@
#import "MWMDiscoveryGuideViewModel.h"
#import "MWMBannerHelpers.h"
#import "MWMUGCViewModel.h"
#import "SwiftBridge.h"
#import <CoreApi/CoreApi.h>

4
iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
View file

@ -1109,6 +1109,10 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type)
}];
}
- (void)showRemoveAds {
[[MapViewController sharedController] showRemoveAds];
}
#pragma mark - AvailableArea / PlacePageArea
- (void)updateAvailableArea:(CGRect)frame

1
iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.h
View file

@ -38,5 +38,6 @@
+ (void)avoidDirty;
+ (void)avoidFerry;
+ (void)avoidToll;
+ (void)showRemoveAds;
@end

5
iphone/Maps/UI/PlacePage/MWMPlacePageManagerHelper.mm
View file

@ -41,6 +41,7 @@
- (void)avoidDirty;
- (void)avoidFerry;
- (void)avoidToll;
- (void)showRemoveAds;
@end
@ -174,4 +175,8 @@
[[MWMMapViewControlsManager manager].placePageManager avoidToll];
}
+ (void)showRemoveAds {
[[MWMMapViewControlsManager manager].placePageManager showRemoveAds];
}
@end

126
iphone/Maps/UI/PlacePage/PlacePage.storyboard
View file

@ -14,7 +14,7 @@
<scene sceneID="6YW-kA-w2N">
<objects>
<viewController id="bX8-ZQ-XDA" customClass="PlacePageViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="WOB-EV-vjA">
<view key="view" contentMode="scaleToFill" id="WOB-EV-vjA" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@ -38,6 +38,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
@ -47,6 +48,9 @@
<constraint firstItem="Gxs-11-xMJ" firstAttribute="centerX" secondItem="VbW-Ts-aP4" secondAttribute="centerX" id="iGe-wX-XGI"/>
<constraint firstAttribute="height" constant="10" id="yn2-uS-XdO"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
@ -61,6 +65,9 @@
</constraints>
<viewLayoutGuide key="contentLayoutGuide" id="VD0-9k-Kda"/>
<viewLayoutGuide key="frameLayoutGuide" id="fDP-bR-gGe"/>
<connections>
<outlet property="delegate" destination="bX8-ZQ-XDA" id="ASo-bI-N1l"/>
</connections>
</scrollView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RZh-69-00e">
<rect key="frame" x="0.0" y="812" width="414" height="1"/>
@ -75,6 +82,9 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="inM-UW-vpv">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -169,6 +179,9 @@
<constraint firstItem="5bu-1v-9Tb" firstAttribute="leading" secondItem="Jgo-Sd-tyF" secondAttribute="leading" id="jQE-W1-wfl"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="5bu-1v-9Tb" secondAttribute="bottom" id="p52-P8-ncK"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="5bD-ca-761" customClass="DirectionView" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="343" y="0.0" width="79" height="50"/>
@ -200,6 +213,9 @@
<constraint firstItem="X89-MY-YjP" firstAttribute="top" secondItem="5bD-ca-761" secondAttribute="top" id="ntO-Yt-0Zo"/>
<constraint firstAttribute="trailing" secondItem="X89-MY-YjP" secondAttribute="trailing" id="ubi-E0-leh"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="button" destination="X89-MY-YjP" id="krj-ci-aFE"/>
</connections>
@ -222,7 +238,7 @@
<view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="S03-Xg-4VC" customClass="DirectionView" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="79" height="25"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pvc-Si-SIT">
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pvc-Si-SIT">
<rect key="frame" x="0.0" y="0.0" width="79" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="8GI-Nz-8nk"/>
@ -249,6 +265,9 @@
<constraint firstItem="Pvc-Si-SIT" firstAttribute="top" secondItem="S03-Xg-4VC" secondAttribute="top" id="esA-cK-Ol6"/>
<constraint firstAttribute="trailing" secondItem="Pvc-Si-SIT" secondAttribute="trailing" id="jtq-Aa-sb8"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="button" destination="Pvc-Si-SIT" id="7IJ-yU-TXj"/>
</connections>
@ -308,6 +327,9 @@
<constraint firstItem="8ow-cP-eiZ" firstAttribute="leading" secondItem="nJh-6w-A6M" secondAttribute="leading" id="mYe-mI-4o5"/>
<constraint firstItem="8ow-cP-eiZ" firstAttribute="top" secondItem="nJh-6w-A6M" secondAttribute="top" id="z76-Zv-hjf"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="button" destination="8ow-cP-eiZ" id="o8h-5Z-WgJ"/>
</connections>
@ -428,8 +450,7 @@
<state key="normal" title="Button"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="whitePrimaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="whitePrimaryTextHighlighted"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="6"/>
@ -465,6 +486,9 @@
<constraint firstItem="fVG-je-keF" firstAttribute="bottom" secondItem="1x8-x0-W3C" secondAttribute="bottom" id="fel-8X-6tZ"/>
</constraints>
<viewLayoutGuide key="safeArea" id="sNg-Nr-PA2"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="220"/>
<connections>
@ -480,6 +504,7 @@
<outlet property="reviewsLabel" destination="kol-v4-MSp" id="Uas-eN-4pX"/>
<outlet property="scheduleLabel" destination="caI-ec-meo" id="dqL-Ov-367"/>
<outlet property="searchSimilarButton" destination="s4M-6d-Z3r" id="s8P-Xo-rog"/>
<outlet property="stackView" destination="Gmb-Zm-Z10" id="M2z-ue-zMa"/>
<outlet property="subtitleContainerView" destination="YyN-l5-4le" id="k1n-hA-QbV"/>
<outlet property="subtitleDirectionView" destination="S03-Xg-4VC" id="9sB-bq-fYT"/>
<outlet property="subtitleLabel" destination="Gzt-ot-sRg" id="YUq-E1-Dlo"/>
@ -551,6 +576,9 @@
<constraint firstAttribute="trailing" secondItem="soI-1J-JL6" secondAttribute="trailing" constant="16" id="tu6-L8-fUt"/>
</constraints>
<viewLayoutGuide key="safeArea" id="pcV-Cv-rW6"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="180"/>
<connections>
@ -608,6 +636,9 @@
<constraint firstItem="u8Q-Ia-dJM" firstAttribute="leading" secondItem="uyH-Qn-86F" secondAttribute="leading" id="t7d-2e-cqm"/>
</constraints>
<viewLayoutGuide key="safeArea" id="g60-e9-U8G"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<size key="freeformSize" width="375" height="100"/>
@ -703,6 +734,9 @@
<constraint firstItem="SBs-yh-ReN" firstAttribute="top" secondItem="r2i-s1-dSm" secondAttribute="top" constant="12" id="vEK-gP-SsY"/>
</constraints>
<viewLayoutGuide key="safeArea" id="cBR-ke-2iM"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="64"/>
<connections>
@ -913,6 +947,9 @@
<constraint firstItem="O35-ra-wkW" firstAttribute="top" secondItem="bjZ-TM-sWx" secondAttribute="bottom" id="t2x-u4-cTI"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Qqm-hA-RiC"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="168"/>
<connections>
@ -954,6 +991,9 @@
<constraint firstItem="NiY-No-EBo" firstAttribute="trailing" secondItem="6hx-NK-Og5" secondAttribute="trailing" id="fuv-Uw-eLp"/>
</constraints>
<viewLayoutGuide key="safeArea" id="NiY-No-EBo"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="414" height="44"/>
<connections>
@ -1349,6 +1389,9 @@
<constraint firstAttribute="bottom" secondItem="LjS-v9-1od" secondAttribute="bottom" constant="16" id="hrQ-cr-0wD"/>
</constraints>
<viewLayoutGuide key="safeArea" id="snf-qT-eY3"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="130"/>
<connections>
@ -1409,6 +1452,9 @@
<constraint firstAttribute="bottom" secondItem="SYO-2V-qwm" secondAttribute="bottom" id="xIk-g4-al8"/>
</constraints>
<viewLayoutGuide key="safeArea" id="58R-Xd-hzj"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="200"/>
<connections>
@ -1533,6 +1579,9 @@
<constraint firstAttribute="trailing" secondItem="021-FW-tZO" secondAttribute="trailing" constant="16" id="Ox1-Cd-PWE"/>
</constraints>
<viewLayoutGuide key="safeArea" id="wND-VP-FnI"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="256"/>
<connections>
@ -1655,6 +1704,9 @@
<constraint firstAttribute="trailing" secondItem="fMV-Nc-MV1" secondAttribute="trailing" id="zgm-QP-JXX"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Ap2-6G-LHF"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="110"/>
<connections>
@ -1686,6 +1738,9 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wbd-0C-g1k" customClass="ExpandableLabel" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="16" y="17" width="343" height="41"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CJa-YV-HLO">
<rect key="frame" x="16" y="74" width="359" height="1"/>
@ -1743,6 +1798,9 @@
<constraint firstItem="CJa-YV-HLO" firstAttribute="top" secondItem="wbd-0C-g1k" secondAttribute="bottom" constant="16" id="yzc-2D-cEs"/>
</constraints>
<viewLayoutGuide key="safeArea" id="uD5-4L-NZG"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="120"/>
<connections>
@ -1800,6 +1858,9 @@
<constraint firstItem="WKM-LM-QWh" firstAttribute="leading" secondItem="V8t-VG-V8Z" secondAttribute="leading" id="pmx-U3-m06"/>
</constraints>
<viewLayoutGuide key="safeArea" id="2ZO-rV-hbS"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="150"/>
<connections>
@ -1976,6 +2037,9 @@
<constraint firstItem="8zD-Hi-bKz" firstAttribute="top" secondItem="Z6m-fj-o9a" secondAttribute="top" constant="16" id="xJV-Gi-doA"/>
</constraints>
<viewLayoutGuide key="safeArea" id="jYQ-pI-7Cc"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="240"/>
<connections>
@ -2006,6 +2070,7 @@
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_operator" translatesAutoresizingMaskIntoConstraints="NO" id="l7d-ck-nSv">
<rect key="frame" x="0.0" y="0.0" width="56" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="dbx-It-HsN"/>
<constraint firstAttribute="width" constant="56" id="uhV-yT-jBd"/>
@ -2014,8 +2079,9 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8eU-Fj-XRv">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8eU-Fj-XRv" customClass="CopyLabel">
<rect key="frame" x="56" y="0.0" width="287" height="44"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -2026,6 +2092,7 @@
</label>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_placepage_change" translatesAutoresizingMaskIntoConstraints="NO" id="onF-JL-5dZ">
<rect key="frame" x="343" y="10" width="24" height="24"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="4f7-wJ-RNQ"/>
<constraint firstAttribute="height" constant="24" id="JCX-T3-d68"/>
@ -2062,8 +2129,12 @@
<constraint firstItem="8eU-Fj-XRv" firstAttribute="top" secondItem="oz0-2o-icQ" secondAttribute="top" id="wix-sM-o7T"/>
</constraints>
<viewLayoutGuide key="safeArea" id="xdh-hy-Bxo"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outletCollection property="gestureRecognizers" destination="pe0-Qk-VTv" appends="YES" id="8fl-TA-rH2"/>
<outletCollection property="gestureRecognizers" destination="dX8-SV-o1f" appends="YES" id="qtt-Cp-gk8"/>
</connections>
</view>
<size key="freeformSize" width="375" height="44"/>
@ -2081,6 +2152,11 @@
<action selector="onTap:" destination="cJQ-4x-NFc" id="mFE-bW-scr"/>
</connections>
</tapGestureRecognizer>
<pongPressGestureRecognizer allowableMovement="10" minimumPressDuration="0.5" id="dX8-SV-o1f">
<connections>
<action selector="onLongPress:" destination="cJQ-4x-NFc" id="WUr-7i-Zpb"/>
</connections>
</pongPressGestureRecognizer>
</objects>
<point key="canvasLocation" x="1567" y="-315"/>
</scene>
@ -2160,6 +2236,9 @@
<constraint firstItem="4AM-Q5-lT6" firstAttribute="top" secondItem="tqV-tM-Pas" secondAttribute="bottom" constant="4" id="ryK-aq-xlO"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Iyj-Gf-ueC"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="150"/>
<connections>
@ -2216,6 +2295,9 @@
<constraint firstAttribute="trailing" secondItem="tq8-Dl-Au7" secondAttribute="trailing" id="pMd-i0-NR8"/>
</constraints>
<viewLayoutGuide key="safeArea" id="ccL-7H-eDR"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outletCollection property="gestureRecognizers" destination="7T3-wt-fdM" appends="YES" id="bYc-ym-Vbu"/>
</connections>
@ -2223,7 +2305,6 @@
<size key="freeformSize" width="375" height="44"/>
<connections>
<outlet property="facilityLabel" destination="Wmx-0o-eHe" id="5bM-fi-RAz"/>
<outlet property="tapGestureRecognizer" destination="pe0-Qk-VTv" id="f6U-Su-nya"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="c4x-ip-QTW" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@ -2303,6 +2384,9 @@
<constraint firstItem="wbf-rz-A00" firstAttribute="top" secondItem="wgy-sp-eyT" secondAttribute="bottom" constant="8" id="mBu-Av-xke"/>
<constraint firstItem="wbf-rz-A00" firstAttribute="leading" secondItem="Q6d-dl-Wdi" secondAttribute="leading" constant="16" id="vjo-wO-MnD"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
</stackView>
@ -2331,6 +2415,9 @@
<constraint firstItem="5sj-B0-IDB" firstAttribute="top" secondItem="PLL-9L-9hM" secondAttribute="top" id="xpT-Kj-2Zk"/>
</constraints>
<viewLayoutGuide key="safeArea" id="RBE-y0-lIX"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="200"/>
<connections>
@ -2400,6 +2487,9 @@
<constraint firstItem="jTB-Th-Ekk" firstAttribute="leading" secondItem="eEA-gd-LFX" secondAttribute="leading" id="hb1-uu-8hU"/>
<constraint firstItem="Fjp-1p-sTK" firstAttribute="leading" secondItem="RHE-3s-tdT" secondAttribute="trailing" constant="8" id="mTA-ju-1t1"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fnC-V9-k6q">
<rect key="frame" x="0.0" y="0.0" width="343" height="24"/>
@ -2432,6 +2522,9 @@
<constraint firstAttribute="trailing" secondItem="dnY-CM-aTS" secondAttribute="trailing" id="blp-cc-4RK"/>
<constraint firstItem="dnY-CM-aTS" firstAttribute="leading" secondItem="iPS-3u-nrl" secondAttribute="trailing" constant="16" id="evo-QW-2sL"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r4G-nh-NQ3">
<rect key="frame" x="0.0" y="0.0" width="343" height="24"/>
@ -2464,6 +2557,9 @@
<constraint firstAttribute="trailing" secondItem="dDN-cw-9yi" secondAttribute="trailing" id="ynW-pR-BPw"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="RNP-4u-PZQ" secondAttribute="bottom" id="zRz-ef-PFN"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
</stackView>
@ -2489,6 +2585,9 @@
<constraint firstItem="UDa-4t-ehI" firstAttribute="top" secondItem="1o2-rw-52c" secondAttribute="top" constant="20" id="lXb-Cz-8ed"/>
</constraints>
<viewLayoutGuide key="safeArea" id="zpD-N2-YqV"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="200"/>
<connections>
@ -2735,6 +2834,9 @@
<constraint firstItem="4co-gt-uj9" firstAttribute="top" secondItem="QBA-ja-OWM" secondAttribute="bottom" constant="0.5" id="v39-Y2-nVD"/>
</constraints>
<viewLayoutGuide key="safeArea" id="uTn-Se-AtA"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="454"/>
<connections>
@ -2975,6 +3077,9 @@
<constraint firstItem="ucb-4d-ebI" firstAttribute="leading" secondItem="VPS-rm-qWf" secondAttribute="leading" id="zEO-hz-S9w"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Bvx-lu-0o3"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="247"/>
<connections>
@ -3010,6 +3115,9 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5nz-eA-gNS" customClass="ExpandableLabel" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="343" height="155"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wB7-XJ-Nck">
<rect key="frame" x="0.0" y="155" width="343" height="44"/>
@ -3045,6 +3153,9 @@
<constraint firstItem="XR5-Np-W07" firstAttribute="top" secondItem="wB7-XJ-Nck" secondAttribute="top" id="Wll-QX-ljL"/>
<constraint firstItem="OUV-mg-G9u" firstAttribute="centerX" secondItem="wB7-XJ-Nck" secondAttribute="centerX" id="wyh-oj-4AU"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
</stackView>
@ -3073,6 +3184,9 @@
<constraint firstItem="G5y-H6-EfE" firstAttribute="leading" secondItem="bRD-Uv-Uak" secondAttribute="leading" id="wnk-cA-Ujq"/>
</constraints>
<viewLayoutGuide key="safeArea" id="mWF-en-dQX"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<size key="freeformSize" width="375" height="200"/>
<connections>

39
iphone/Maps/UI/PlacePage/PlacePageInfoViewController.swift
View file

@ -25,11 +25,20 @@ class InfoItemViewController: UIViewController {
}
}
}
var canShowMenu = false
@IBAction func onTap(_ sender: UITapGestureRecognizer) {
tapHandler?()
}
@IBAction func onLongPress(_ sender: UILongPressGestureRecognizer) {
guard sender.state == .began, canShowMenu else { return }
let menuController = UIMenuController.shared
menuController.setTargetRect(infoLabel.frame, in: self.view)
infoLabel.becomeFirstResponder()
menuController.setMenuVisible(true, animated: true)
}
override func viewDidLoad() {
super.viewDidLoad()
@ -48,6 +57,9 @@ protocol PlacePageInfoViewControllerDelegate: AnyObject {
}
class PlacePageInfoViewController: UIViewController {
private struct Const {
static let coordinatesKey = "PlacePageInfoViewController_coordinatesKey"
}
private typealias TapHandler = InfoItemViewController.TapHandler
private typealias Style = InfoItemViewController.Style
@ -66,6 +78,14 @@ class PlacePageInfoViewController: UIViewController {
var placePageInfoData: PlacePageInfoData!
weak var delegate: PlacePageInfoViewControllerDelegate?
var showRawCoordinates: Bool {
get {
UserDefaults.standard.bool(forKey: Const.coordinatesKey)
}
set {
UserDefaults.standard.set(newValue, forKey: Const.coordinatesKey)
}
}
override func viewDidLoad() {
super.viewDidLoad()
@ -116,14 +136,25 @@ class PlacePageInfoViewController: UIViewController {
addressView = createInfoItem(address, icon: UIImage(named: "ic_placepage_adress"))
}
if let coordinates = placePageInfoData.formattedCoordinates {
if let formattedCoordinates = placePageInfoData.formattedCoordinates,
let rawCoordinates = placePageInfoData.rawCoordinates {
let coordinates = showRawCoordinates ? rawCoordinates : formattedCoordinates
coordinatesView = createInfoItem(coordinates, icon: UIImage(named: "ic_placepage_coordinate")) {
[unowned self] in
self.showRawCoordinates = !self.showRawCoordinates
let coordinates = self.showRawCoordinates ? rawCoordinates : formattedCoordinates
self.coordinatesView?.infoLabel.text = coordinates
}
coordinatesView?.accessoryImage.image = UIImage(named: "ic_placepage_change")
coordinatesView?.accessoryImage.isHidden = false
} else if let formattedCoordinates = placePageInfoData.formattedCoordinates {
coordinatesView = createInfoItem(formattedCoordinates, icon: UIImage(named: "ic_placepage_coordinate"))
} else if let rawCoordinates = placePageInfoData.rawCoordinates {
coordinatesView = createInfoItem(rawCoordinates, icon: UIImage(named: "ic_placepage_coordinate"))
}
coordinatesView?.accessoryImage.image = UIImage(named: "ic_placepage_change")
coordinatesView?.accessoryImage.isHidden = false
coordinatesView?.canShowMenu = true
switch placePageInfoData.localAdsStatus {
case .candidate:
localAdsButton = createLocalAdsButton(L("create_campaign_button"))

29
iphone/Maps/UI/PlacePage/PlacePageLayout/ContextViews.mm
View file

@ -1,29 +0,0 @@
#import "ContextViews.h"
@implementation CopyLabel
- (instancetype)initWithFrame:(CGRect)frame
{
self = [super initWithFrame:frame];
self.userInteractionEnabled = YES;
return self;
}
- (BOOL)canBecomeFirstResponder
{
return YES;
}
- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
{
return action == @selector(copy:);
}
- (void)copy:(id)sender
{
[UIPasteboard generalPasteboard].string = self.text;
}
@end

0
iphone/Maps/UI/PlacePage/PlacePageLayout/ContextViews.h → iphone/Maps/UI/PlacePage/PlacePageLayout/CopyLabel.h
View file

25
iphone/Maps/UI/PlacePage/PlacePageLayout/CopyLabel.m Executable file
View file

@ -0,0 +1,25 @@
#import "CopyLabel.h"
@implementation CopyLabel
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
self.userInteractionEnabled = YES;
}
return self;
}
- (BOOL)canBecomeFirstResponder {
return YES;
}
- (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
return action == @selector(copy:);
}
- (void)copy:(id)sender {
[UIPasteboard generalPasteboard].string = self.text;
}
@end

17
iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift
View file

@ -5,9 +5,11 @@ class DirectionView: UIView {
protocol PlacePagePreviewViewControllerDelegate: AnyObject {
func previewDidPressAddReview()
func previewDidPressSimilarHotels()
func previewDidPressRemoveAds()
}
class PlacePagePreviewViewController: UIViewController {
@IBOutlet var stackView: UIStackView!
@IBOutlet var titleLabel: UILabel!
@IBOutlet var titleContainerView: UIStackView!
@IBOutlet var popularView: UIView!
@ -34,6 +36,11 @@ class PlacePagePreviewViewController: UIViewController {
@IBOutlet var addressDirectionView: DirectionView!
var directionView: DirectionView?
lazy var adView: AdBannerView = {
let view = Bundle.main.load(viewClass: AdBannerView.self)?.first as! AdBannerView
view.isHidden = true
return view
}()
var placePagePreviewData: PlacePagePreviewData!
weak var delegate: PlacePagePreviewViewControllerDelegate?
@ -72,7 +79,15 @@ class PlacePagePreviewViewController: UIViewController {
ugcContainerView.isHidden = !placePagePreviewData.isBookingPlace
directionView?.isHidden = false
// directionView?.button.imageView?.transform = CGAffineTransform(rotationAngle: 0.2)
stackView.addArrangedSubview(adView)
}
func updateBanner(_ banner: MWMBanner) {
adView.isHidden = false
adView.config(ad: banner, containerType: .placePage, canRemoveAds: true) { [weak self] in
self?.delegate?.previewDidPressRemoveAds()
}
}
func updateUgc(_ ugcData: UgcData) {

162
iphone/Maps/UI/PlacePage/PlacePageViewController.swift
View file

@ -4,6 +4,37 @@ class PlacePageScrollView: UIScrollView {
}
}
class TouchTransparentView: UIView {
var targetView: UIView?
override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
guard let targetView = targetView else {
return super.point(inside: point, with: event)
}
let targetPoint = convert(point, to: targetView)
return targetView.point(inside: targetPoint, with: event)
}
}
enum PlacePageState {
case closed(CGFloat)
case preview(CGFloat)
case previewPlus(CGFloat)
case expanded(CGFloat)
var offset: CGFloat {
switch self {
case .closed(let value):
return value
case .preview(let value):
return value
case .previewPlus(let value):
return value
case .expanded(let value):
return value
}
}
}
@objc class PlacePageViewController: UIViewController {
@IBOutlet var scrollView: UIScrollView!
@IBOutlet var stackView: UIStackView!
@ -11,6 +42,8 @@ class PlacePageScrollView: UIScrollView {
@objc var placePageData: PlacePageData!
var beginDragging = false
var scrollSteps: [PlacePageState] = []
var rootViewController: MapViewController {
MapViewController.shared()
}
@ -128,6 +161,10 @@ class PlacePageScrollView: UIScrollView {
override func viewDidLoad() {
super.viewDidLoad()
if let touchTransparentView = view as? TouchTransparentView {
touchTransparentView.targetView = scrollView
}
addToStack(previewViewController)
if placePageData.isPromoCatalog {
@ -198,15 +235,21 @@ class PlacePageScrollView: UIScrollView {
self.reviewsViewController.ugcData = ugcData
self.reviewsViewController.view.isHidden = false
}
self.view.layoutIfNeeded()
let previewFrame = self.scrollView.convert(self.previewViewController.view.bounds, from: self.previewViewController.view)
UIView.animate(withDuration: kDefaultAnimationDuration) {
self.scrollView.contentOffset = CGPoint(x: 0, y: previewFrame.maxY - self.scrollView.height)
}
self.updatePreviewOffset()
}
}
}
if placePageData.previewData.hasBanner,
let banners = placePageData.previewData.banners {
BannersCache.cache.get(coreBanners: banners,
cacheOnly: false,
loadNew: true) { [weak self] (banner, _) in
self?.previewViewController.updateBanner(banner)
self?.updatePreviewOffset()
}
}
if placePageData.buttonsData != nil {
addToStack(buttonsViewController)
}
@ -268,13 +311,31 @@ class PlacePageScrollView: UIScrollView {
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
let previewFrame = self.scrollView.convert(self.previewViewController.view.bounds, from: self.previewViewController.view)
UIView.animate(withDuration: kDefaultAnimationDuration) {
self.scrollView.contentOffset = CGPoint(x: 0, y: previewFrame.maxY - self.scrollView.height)
}
updatePreviewOffset()
}
// MARK: private
// MARK: Private
private func calculateSteps() -> [PlacePageState] {
var steps: [PlacePageState] = []
steps.append(.closed(-self.scrollView.height))
let previewFrame = scrollView.convert(previewViewController.view.bounds, from: previewViewController.view)
steps.append(.preview(previewFrame.maxY - self.scrollView.height))
if placePageData.isPreviewPlus {
steps.append(.previewPlus(-self.scrollView.height * 0.55))
}
steps.append(.expanded(-self.scrollView.height * 0.3))
return steps
}
private func updatePreviewOffset() {
self.view.layoutIfNeeded()
scrollSteps = calculateSteps()
let state = placePageData.isPreviewPlus ? scrollSteps[2] : scrollSteps[1]
UIView.animate(withDuration: kDefaultAnimationDuration) {
self.scrollView.contentOffset = CGPoint(x: 0, y: state.offset)
}
}
private func addToStack(_ viewController: UIViewController) {
addChild(viewController)
@ -284,6 +345,10 @@ class PlacePageScrollView: UIScrollView {
}
extension PlacePageViewController: PlacePagePreviewViewControllerDelegate {
func previewDidPressRemoveAds() {
MWMPlacePageManagerHelper.showRemoveAds()
}
func previewDidPressAddReview() {
MWMPlacePageManagerHelper.showUGCAddReview(placePageData, rating: .none, from: .placePagePreview)
}
@ -448,6 +513,83 @@ extension PlacePageViewController: ActionBarViewControllerDelegate {
}
}
extension PlacePageViewController: UIScrollViewDelegate {
func scrollViewDidScroll(_ scrollView: UIScrollView) {
if scrollView.contentOffset.y < -scrollView.height + 1 && beginDragging {
rootViewController.dismissPlacePage()
}
}
func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
beginDragging = true
}
func scrollViewWillEndDragging(_ scrollView: UIScrollView,
withVelocity velocity: CGPoint,
targetContentOffset: UnsafeMutablePointer<CGPoint>) {
print("scrollView willEndDragging: \(velocity)")
guard let maxOffset = scrollSteps.last else { return }
if targetContentOffset.pointee.y > maxOffset.offset {
previewViewController.adView.state = .detailed
return
}
let targetState = findNextStop(scrollView.contentOffset.y, velocity: velocity.y)
if targetState.offset > scrollView.contentSize.height - scrollView.contentInset.top {
previewViewController.adView.state = .detailed
return
}
switch targetState {
case .closed(_):
fallthrough
case .preview(_):
previewViewController.adView.state = .compact
case .previewPlus(_):
fallthrough
case .expanded(_):
previewViewController.adView.state = .detailed
}
targetContentOffset.pointee = CGPoint(x: 0, y: targetState.offset)
}
private func findNearestStop(_ offset: CGFloat) -> PlacePageState{
var result = scrollSteps[0]
scrollSteps.suffix(from: 1).forEach {
if abs(result.offset - offset) > abs($0.offset - offset) {
result = $0
}
}
return result
}
private func findNextStop(_ offset: CGFloat, velocity: CGFloat) -> PlacePageState {
if velocity == 0 {
return findNearestStop(offset)
}
var result: PlacePageState
if velocity < 0 {
guard let first = scrollSteps.first else { return .closed(-scrollView.height) }
result = first
scrollSteps.suffix(from: 1).forEach {
if offset > $0.offset {
result = $0
}
}
} else {
guard let last = scrollSteps.last else { return .closed(-scrollView.height) }
result = last
scrollSteps.reversed().suffix(from: 1).forEach {
if offset < $0.offset {
result = $0
}
}
}
return result
}
}
extension PlacePageViewController: MWMLocationObserver {
func onHeadingUpdate(_ heading: CLHeading) {
if heading.trueHeading < 0 {