diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index b4dd085a98..d348fb9b75 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -467,16 +467,6 @@ final class CatalogWebViewController: WebViewController { } private func logToPushWoosh(_ categoryInfo: CatalogCategoryInfo) { - let pushManager = PushNotificationManager.push() - - if categoryInfo.productId == nil { - pushManager!.setTags(["Bookmarks_Guides_free_title": categoryInfo.name]) - pushManager!.setTags(["Bookmarks_Guides_free_date": MWMPushNotifications.formattedTimestamp()]) - } else { - pushManager!.setTags(["Bookmarks_Guides_paid_tier": categoryInfo.productId!]) - pushManager!.setTags(["Bookmarks_Guides_paid_title": categoryInfo.name]) - pushManager!.setTags(["Bookmarks_Guides_paid_date": MWMPushNotifications.formattedTimestamp()]) - } } extension CatalogWebViewController: PaidRouteViewControllerDelegate { diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index 3a3cebbe9a..6a8833aeeb 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -9,12 +9,9 @@ #import "FBAudienceNetwork/FBAudienceNetwork.h" #import "FBSDKLoginKit/FBSDKLoginKit.h" #import "GoogleSignIn/GIDSignIn.h" -#import "MyTargetSDK/MyTargetSDK.h" -#import "Pushwoosh/PushNotificationManager.h" #import "UIKit/UIKit.h" #import "3party/Alohalytics/src/alohalytics_objc.h" -#import "MPNativeAd+MWM.h" #import "UIKitCategories.h" #import "private.h" diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index c56502a1ca..2ee146ffda 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -72,7 +72,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; MWMStorageObserver, MWMWelcomePageControllerProtocol, MWMKeyboardObserver, - RemoveAdsViewControllerDelegate, MWMBookmarksObserver> @property(nonatomic, readwrite) MWMMapViewControlsManager *controlsManager; @@ -670,9 +669,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; } - (void)showRemoveAds { - auto removeAds = [[RemoveAdsViewController alloc] init]; - removeAds.delegate = self; - [self.navigationController presentViewController:removeAds animated:YES completion:nil]; } - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode { @@ -724,16 +720,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; #pragma mark - MWMRemoveAdsViewControllerDelegate -- (void)didCompleteSubscribtion:(RemoveAdsViewController *)viewController { - [self.navigationController dismissViewControllerAnimated:YES completion:nil]; - GetFramework().DeactivateMapSelection(true); - [self.controlsManager hideSearch]; -} - -- (void)didCancelSubscribtion:(RemoveAdsViewController *)viewController { - [self.navigationController dismissViewControllerAnimated:YES completion:nil]; -} - #pragma mark - MWMFrameworkDrapeObserver - (void)processViewportCountryEvent:(CountryId const &)countryId { diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h index 6cb81e674c..02599605d1 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.h +++ b/iphone/Maps/Classes/MapsAppDelegate.h @@ -1,5 +1,4 @@ #import "DownloadIndicatorProtocol.h" -#import "MWMMyTarget.h" #import "MWMNavigationController.h" @class MapViewController; @@ -19,8 +18,6 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic, readonly) MapViewController * mapViewController; @property(nonatomic, readonly) BOOL isDrapeEngineCreated; -@property(nonatomic) MWMMyTarget * myTarget; - + (MapsAppDelegate *)theApp; - (void)enableStandby; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index e6fa170c57..c1bf2a2345 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -22,6 +22,7 @@ #import #import +#import #import #import @@ -176,7 +177,6 @@ using namespace osm_auth_ios; self.standbyCounter = 0; NSTimeInterval const minimumBackgroundFetchIntervalInSeconds = 6 * 60 * 60; [UIApplication.sharedApplication setMinimumBackgroundFetchInterval:minimumBackgroundFetchIntervalInSeconds]; - [MWMMyTarget startAdServerForbiddenCheckTimer]; [self updateApplicationIconBadgeNumber]; } @@ -186,8 +186,6 @@ using namespace osm_auth_ios; InitCrashTrackers(); - [self initMarketingTrackers]; - // Initialize all 3party engines. [self initStatistics:application didFinishLaunchingWithOptions:launchOptions]; @@ -244,17 +242,6 @@ using namespace osm_auth_ios; }]; } - MPMoPubConfiguration *sdkConfig = - [[MPMoPubConfiguration alloc] initWithAdUnitIdForAppInitialization:@(ads::Mopub::InitializationBannerId().c_str())]; - NSDictionary *facebookConfig = @{@"native_banner": @true}; - NSMutableDictionary *config = [@{@"FacebookAdapterConfiguration": facebookConfig} mutableCopy]; - sdkConfig.mediatedNetworkConfigurations = config; - sdkConfig.loggingLevel = MPBLogLevelDebug; - [[MoPub sharedInstance] initializeSdkWithConfiguration:sdkConfig completion:nil]; - - if ([MoPubKit shouldShowConsentDialog]) - [MoPubKit grantConsent]; - [[DeepLinkHandler shared] applicationDidFinishLaunching:launchOptions]; if (@available(iOS 13, *)) { [MWMUser verifyAppleId]; @@ -389,9 +376,7 @@ using namespace osm_auth_ios; - (void)applicationDidBecomeActive:(UIApplication *)application { LOG(LINFO, ("applicationDidBecomeActive - begin")); - [self trackMarketingAppLaunch]; - - auto &f = GetFramework(); + auto & f = GetFramework(); f.EnterForeground(); [self.mapViewController onGetFocus:YES]; [[Statistics instance] applicationDidBecomeActive]; @@ -428,23 +413,6 @@ using namespace osm_auth_ios; return NO; } -- (void)initMarketingTrackers { - NSString *appsFlyerDevKey = @(APPSFLYER_KEY); - NSString *appsFlyerAppIdKey = @(APPSFLYER_APP_ID_IOS); - if (appsFlyerDevKey.length != 0 && appsFlyerAppIdKey.length != 0) { - [AppsFlyerTracker sharedTracker].appsFlyerDevKey = appsFlyerDevKey; - [AppsFlyerTracker sharedTracker].appleAppID = appsFlyerAppIdKey; - [AppsFlyerTracker sharedTracker].delegate = self; -#if DEBUG - [AppsFlyerTracker sharedTracker].isDebug = YES; -#endif - } -} - -- (void)trackMarketingAppLaunch { - [[AppsFlyerTracker sharedTracker] trackAppLaunch]; -} - - (BOOL)initStatistics:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { Statistics *statistics = [Statistics instance]; BOOL returnValue = [statistics application:application didFinishLaunchingWithOptions:launchOptions]; @@ -690,15 +658,6 @@ using namespace osm_auth_ios; #pragma mark - Showcase -- (MWMMyTarget *)myTarget { - if (![ASIdentifierManager sharedManager].advertisingTrackingEnabled) - return nil; - - if (!_myTarget) - _myTarget = [[MWMMyTarget alloc] init]; - return _myTarget; -} - #pragma mark - NotificationManagerDelegate - (void)didOpenNotification:(Notification *)notification { diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index a3acf22149..7579ff0012 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -1,7 +1,6 @@ #import "MWMMapDownloadDialog.h" #import #import "CLLocation+Mercator.h" -#import "MWMBannerHelpers.h" #import "MWMCircularProgress.h" #import "MWMStorage+UI.h" #import "MapViewController.h" @@ -10,9 +9,6 @@ #include -#include "partners_api/ads/ads_engine.hpp" -#include "partners_api/ads/banner.hpp" - #include "storage/country_info_getter.hpp" #include "platform/downloader_defines.hpp" @@ -39,6 +35,7 @@ BOOL canAutoDownload(storage::CountryId const &countryId) { return YES; } +/* ads::Banner getPromoBanner(std::string const &mwmId) { auto const pos = GetFramework().GetCurrentPosition(); auto const banners = @@ -49,6 +46,7 @@ ads::Banner getPromoBanner(std::string const &mwmId) { return banners[0]; } +*/ } // namespace using namespace storage; @@ -69,7 +67,6 @@ using namespace storage; @property(nonatomic) MWMCircularProgress *progress; @property(nonatomic) NSMutableArray *skipDownloadTimes; @property(nonatomic) BOOL isAutoDownloadCancelled; -@property(strong, nonatomic) UIViewController *bannerViewController; @end @@ -125,7 +122,6 @@ using namespace storage; switch (nodeAttrs.m_status) { case NodeStatus::NotDownloaded: case NodeStatus::Partly: { - [self removePreviousBunnerIfNeeded]; MapViewController *controller = self.controller; BOOL const isMapVisible = [controller.navigationController.topViewController isEqual:controller]; if (isMapVisible && !self.isAutoDownloadCancelled && canAutoDownload(m_countryId)) { @@ -154,7 +150,6 @@ using namespace storage; if (nodeAttrs.m_downloadingProgress.m_bytesTotal != 0) [self showDownloading:(CGFloat)nodeAttrs.m_downloadingProgress.m_bytesDownloaded / nodeAttrs.m_downloadingProgress.m_bytesTotal]; - [self showBannerIfNeeded]; break; case NodeStatus::Applying: case NodeStatus::InQueue: @@ -163,7 +158,6 @@ using namespace storage; case NodeStatus::Undefined: case NodeStatus::Error: if (p.IsAutoRetryDownloadFailed()) { - [self removePreviousBunnerIfNeeded]; [self showError:nodeAttrs.m_error]; } else { [self showInQueue]; @@ -240,7 +234,6 @@ using namespace storage; } - (void)showDownloadRequest { - [self hideBanner]; self.downloadButton.hidden = NO; self.progressWrapper.hidden = YES; [self addToSuperview]; @@ -257,7 +250,6 @@ using namespace storage; } - (void)showInQueue { - [self showBannerIfNeeded]; self.nodeSize.textColor = [UIColor blackSecondaryText]; self.nodeSize.text = L(@"downloader_queued"); self.downloadButton.hidden = YES; @@ -274,6 +266,7 @@ using namespace storage; [self configDialog]; } +/* - (NSString *)getStatProvider:(MWMBannerType)bannerType { switch (bannerType) { case MWMBannerTypeTinkoffAllAirlines: return kStatTinkoffAirlines; @@ -399,6 +392,7 @@ using namespace storage; self.bannerView.hidden = YES; [self layoutIfNeeded]; } +*/ #pragma mark - MWMStorageObserver diff --git a/iphone/Maps/Common/Statistics/Statistics.mm b/iphone/Maps/Common/Statistics/Statistics.mm index d4ebcf91fd..a0fadb2d6b 100644 --- a/iphone/Maps/Common/Statistics/Statistics.mm +++ b/iphone/Maps/Common/Statistics/Statistics.mm @@ -4,7 +4,6 @@ #import "3party/Alohalytics/src/alohalytics.h" #import "3party/Alohalytics/src/alohalytics_objc.h" -#import "Flurry.h" #import #import #import @@ -16,11 +15,6 @@ namespace { -void checkFlurryLogStatus(FlurryEventRecordStatus status) { - NSCAssert(status == FlurryEventRecorded || status == FlurryEventLoggingDelayed, - @"Flurry log event failed."); -} - NSInteger convertToAlohalyticsChannel(StatisticsChannel cnannel) { switch (cnannel) { case StatisticsChannelDefault: return (NSInteger)alohalytics::ChannelMask(0); @@ -41,13 +35,6 @@ NSInteger convertToAlohalyticsChannel(StatisticsChannel cnannel) { - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // _enabled should be already correctly set up in init method. if ([MWMSettings statisticsEnabled]) { - if ([ASIdentifierManager sharedManager].advertisingTrackingEnabled) { - auto sessionBuilder = [[[FlurrySessionBuilder alloc] init] - withAppVersion:[AppInfo sharedInfo].bundleVersion]; - [sessionBuilder withDataSaleOptOut:true]; - [Flurry startSession:@(FLURRY_KEY) withSessionBuilder:sessionBuilder]; - } - [Alohalytics setup:@[@(ALOHALYTICS_URL), [NSString stringWithFormat:@"%@/%@", @(ALOHALYTICS_URL), @"realtime"]] withLaunchOptions:launchOptions]; } @@ -61,9 +48,6 @@ NSInteger convertToAlohalyticsChannel(StatisticsChannel cnannel) { return; NSMutableDictionary * params = [self addDefaultAttributesToParameters:parameters]; [Alohalytics logEvent:eventName withDictionary:params withChannel:convertToAlohalyticsChannel(channel)]; - dispatch_async(dispatch_get_main_queue(), ^{ - checkFlurryLogStatus([Flurry logEvent:eventName withParameters:params]); - }); } - (void)logEvent:(NSString *)eventName withParameters:(NSDictionary *)parameters atLocation:(CLLocation *)location @@ -75,9 +59,6 @@ NSInteger convertToAlohalyticsChannel(StatisticsChannel cnannel) { withChannel:convertToAlohalyticsChannel(channel)]; auto const & coordinate = location ? location.coordinate : kCLLocationCoordinate2DInvalid; params[kStatLocation] = makeLocationEventValue(coordinate.latitude, coordinate.longitude); - dispatch_async(dispatch_get_main_queue(), ^{ - checkFlurryLogStatus([Flurry logEvent:eventName withParameters:params]); - }); } - (NSMutableDictionary *)addDefaultAttributesToParameters:(NSDictionary *)parameters { diff --git a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm index e07ac3521f..0fe00d7a3d 100644 --- a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm +++ b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm @@ -1,6 +1,4 @@ #import "MWMPushNotifications.h" -#import -#import #import "Statistics.h" #include "platform/marketing_service.hpp" @@ -20,29 +18,16 @@ NSString * const kPushDeviceTokenLogEvent = @"iOSPushDeviceToken"; + (void)setup { - PushNotificationManager * pushManager = [PushNotificationManager pushManager]; - - // make sure we count app open in Pushwoosh stats - [pushManager sendAppOpen]; - - // register for push notifications! - [pushManager registerForPushNotifications]; } + (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken { - PushNotificationManager * pushManager = [PushNotificationManager pushManager]; - [pushManager handlePushRegistration:deviceToken]; - NSLog(@"Pushwoosh token: %@", [pushManager getPushToken]); - [Alohalytics logEvent:kPushDeviceTokenLogEvent withValue:pushManager.getHWID]; } + (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error { - [[PushNotificationManager pushManager] handlePushRegistrationFailure:error]; - [[FIRCrashlytics crashlytics] recordError:error]; } + (void)application:(UIApplication *)application @@ -72,18 +57,12 @@ NSString * const kPushDeviceTokenLogEvent = @"iOSPushDeviceToken"; willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler { - [[PushNotificationManager pushManager].notificationCenterDelegate userNotificationCenter:center - willPresentNotification:notification - withCompletionHandler:completionHandler]; } + (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler { - [[PushNotificationManager pushManager].notificationCenterDelegate userNotificationCenter:center - didReceiveNotificationResponse:response - withCompletionHandler:completionHandler]; } + (NSString * _Nonnull)formattedTimestamp { diff --git a/iphone/Maps/Core/Search/MWMSearch.h b/iphone/Maps/Core/Search/MWMSearch.h index dd86c0f700..0425d481e1 100644 --- a/iphone/Maps/Core/Search/MWMSearch.h +++ b/iphone/Maps/Core/Search/MWMSearch.h @@ -24,7 +24,6 @@ struct ProductInfo; + (NSUInteger)containerIndexWithRow:(NSUInteger)row; + (search::Result const &)resultWithContainerIndex:(NSUInteger)index; + (search::ProductInfo const &)productInfoWithContainerIndex:(NSUInteger)index; -+ (id)adWithContainerIndex:(NSUInteger)index; + (BOOL)isBookingAvailableWithContainerIndex:(NSUInteger)index; + (BOOL)isDealAvailableWithContainerIndex:(NSUInteger)index; diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 292c39e3f3..0b0338ab92 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -1,12 +1,10 @@ #import "MWMSearch.h" -#import "MWMBannerHelpers.h" #import "MWMFrameworkListener.h" #import "MWMFrameworkObservers.h" #import "SwiftBridge.h" #include -#include "partners_api/ads/ads_engine.hpp" #include "platform/network_policy.hpp" namespace { @@ -55,8 +53,6 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params &&availabi @property(nonatomic) MWMSearchIndex *itemsIndex; -@property(nonatomic) MWMSearchBanners *banners; - @property(nonatomic) NSInteger searchCount; @property(copy, nonatomic) NSString *lastQuery; @@ -220,13 +216,6 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params &&availabi manager->m_everywhereParams.m_query = text; manager->m_viewportParams.m_query = text; manager.textChanged = YES; - auto const &adsEngine = GetFramework().GetAdsEngine(); - auto const banners = adsEngine.GetSearchBanners(); - - if (!banners.empty()) { - auto coreBanners = banner_helpers::MatchPriorityBanners(banners, manager.lastQuery); - [[MWMBannersCache cache] refreshWithCoreBanners:coreBanners]; - } [manager update]; } @@ -241,10 +230,6 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params &&availabi return [MWMSearch manager]->m_productInfo[index]; } -+ (id)adWithContainerIndex:(NSUInteger)index { - return [[MWMSearch manager].banners bannerAtIndex:index]; -} - + (BOOL)isFeatureAt:(NSUInteger)index in:(std::vector const &)array { auto const &result = [self resultWithContainerIndex:index]; if (result.GetResultType() != search::Result::Type::Feature) @@ -379,27 +364,6 @@ booking::filter::Tasks MakeBookingFilterTasks(booking::filter::Params &&availabi auto const resultsCount = self->m_everywhereResults.GetCount(); auto const itemsIndex = [[MWMSearchIndex alloc] initWithSuggestionsCount:self.suggestionsCount resultsCount:resultsCount]; - if (resultsCount > 0) { - auto const &adsEngine = GetFramework().GetAdsEngine(); - auto const banners = adsEngine.GetSearchBanners(); - - if (!banners.empty()) { - self.banners = [[MWMSearchBanners alloc] initWithSearchIndex:itemsIndex]; - __weak auto weakSelf = self; - [[MWMBannersCache cache] getWithCoreBanners:banner_helpers::MatchPriorityBanners(banners, self.lastQuery) - cacheOnly:YES - loadNew:reloadBanner - completion:^(id ad, BOOL isAsync) { - __strong auto self = weakSelf; - if (!self) - return; - NSAssert(isAsync == NO, @"Banner is not from cache!"); - [self.banners add:ad]; - }]; - } - } else { - self.banners = nil; - } [itemsIndex build]; self.itemsIndex = itemsIndex; } diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index df4c6aa38d..0a7c74a7e8 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -2,7 +2,8 @@ #import "MWMCoreUnits.h" #import "MWMMapViewControlsManager.h" #import "SwiftBridge.h" -#import "Flurry.h" + +#import "3party/Alohalytics/src/alohalytics_objc.h" #include @@ -99,13 +100,11 @@ NSString * const kCrashReportingDisabled = @"CrashReportingDisabled"; if (statisticsEnabled) { [Alohalytics enable]; - [Flurry trackPreciseLocation:YES]; } else { [Alohalytics logEvent:@"statisticsDisabled"]; [Alohalytics disable]; - [Flurry trackPreciseLocation:NO]; } settings::Set(kStatisticsEnabledSettingsKey, static_cast(statisticsEnabled)); } diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index bec017a655..a051a7232e 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -37,7 +37,6 @@ 340416581E7C0D4100E2B6D6 /* PhotosOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340416561E7C0D4100E2B6D6 /* PhotosOverlayView.swift */; }; 3404165C1E7C29AE00E2B6D6 /* PhotosInteractionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404165A1E7C29AE00E2B6D6 /* PhotosInteractionAnimator.swift */; }; 340474F41E08199D00C92850 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474DD1E08199D00C92850 /* Fabric.framework */; }; - 340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340474EB1E08199D00C92850 /* MWMMyTarget.mm */; }; 3404754D1E081A4600C92850 /* MWMKeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 340475191E081A4600C92850 /* MWMKeyboard.m */; }; 340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475201E081A4600C92850 /* fabric_logging_ios.mm */; }; 340475531E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475221E081A4600C92850 /* MWMCustomFacebookEvents.mm */; }; @@ -143,7 +142,6 @@ 3486B5081E27A4B50069C126 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5061E27A4B50069C126 /* LocalNotificationManager.mm */; }; 3486B50D1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B50B1E27A6DA0069C126 /* MWMPushNotifications.mm */; }; 3486B5191E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */; }; - 3488B0131E9D0AEC0068AFD8 /* AdBannerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3488B0101E9D0AEC0068AFD8 /* AdBannerCell.swift */; }; 3488B01A1E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */; }; 3488B03B1E9D13EF0068AFD8 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3488B03A1E9D13EF0068AFD8 /* UserNotifications.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 348A8DF51F66775A00D83026 /* RatingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348A8DF11F66775A00D83026 /* RatingView.swift */; }; @@ -153,7 +151,6 @@ 3490D2DF1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DA1CE9DD2500D0B838 /* MWMSideButtons.mm */; }; 3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */; }; 3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */; }; - 34926BE71EA4C2A700DCF14C /* SearchBanners.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34926BE51EA4C2A700DCF14C /* SearchBanners.swift */; }; 34943BBB1E2626B200B14F84 /* WelcomePageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34943BB91E2626B200B14F84 /* WelcomePageController.swift */; }; 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.m */; }; 349A13851DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A13811DEC138C00C7DB60 /* MWMMobileInternetAlert.xib */; }; @@ -265,13 +262,6 @@ 34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E7761D1F14DB48003040B3 /* PlacePageArea.swift */; }; 34E776331F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34E776311F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm */; }; 34EF94291C05A6F30050B714 /* MWMSegue.m in Sources */ = {isa = PBXBuildFile; fileRef = F607C18D1C047FDC00B53A87 /* MWMSegue.m */; }; - 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 */; }; - 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 */; }; - 34F407411E9E1AFF00E57AC0 /* RBBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F4072A1E9E1AFF00E57AC0 /* RBBanner.swift */; }; 34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F5E0D21E3F254800B1C415 /* UIView+Hierarchy.swift */; }; 34F73F9C1E082FF800AC1FD6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F73F5F1E082FF700AC1FD6 /* InfoPlist.strings */; }; 34F73F9F1E082FF800AC1FD6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34F73F611E082FF800AC1FD6 /* Localizable.strings */; }; @@ -283,7 +273,6 @@ 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D15ACED2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm */; }; 3D1958EB213804B6009A83EC /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D1958EA213804B6009A83EC /* libmetrics.a */; }; 3DB1C57122D5DDA60097EC4C /* PromoAfterBookingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */; }; - 3DBD7B9F242363E500ED9FE8 /* PartnerBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */; }; 3DBD7BE42425015C00ED9FE8 /* ParntersStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DBD7BE32425015C00ED9FE8 /* ParntersStyleSheet.swift */; }; 3DE1762422D614B8000214FF /* PromoAfterBookingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DE1762322D614B8000214FF /* PromoAfterBookingViewController.swift */; }; 3DEE1AEB21F72CD300054A91 /* MWMPowerManagmentViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3DEE1AEA21F72CD300054A91 /* MWMPowerManagmentViewController.mm */; }; @@ -344,15 +333,10 @@ 472E3F4A2146C4CD0020E412 /* MWMPurchaseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 472E3F492146C4CD0020E412 /* MWMPurchaseManager.mm */; }; 472E3F4C2147D5700020E412 /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472E3F4B2147D5700020E412 /* Subscription.swift */; }; 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 */; }; 4740184323F5BDE800A93C81 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4740184123F5BDD300A93C81 /* minizip.framework */; }; 4740184423F5BDE900A93C81 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4740184123F5BDD300A93C81 /* minizip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 4747045424622EF0006E51E9 /* GuidesGalleryStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4747045324622EF0006E51E9 /* GuidesGalleryStyleSheet.swift */; }; - 474AC76C2139E4F2002F9BF9 /* RemoveAdsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 474AC76A2139E4F2002F9BF9 /* RemoveAdsViewController.swift */; }; - 474AC76D2139E4F2002F9BF9 /* RemoveAdsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 474AC76B2139E4F2002F9BF9 /* RemoveAdsViewController.xib */; }; - 474C9F5A213FF75800369009 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 474C9F59213FF75800369009 /* StoreKit.framework */; }; 4757D6212535BB6E0062364F /* BookmarksListInterfaces.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4757D6202535BB6E0062364F /* BookmarksListInterfaces.swift */; }; 475EC36D244EDE66003BC295 /* GuidesGalleryPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EC36C244EDE66003BC295 /* GuidesGalleryPresenter.swift */; }; 475EC36F244EF7A9003BC295 /* GuidesGalleryBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EC36E244EF7A9003BC295 /* GuidesGalleryBuilder.swift */; }; @@ -378,8 +362,6 @@ 478F6FA823C5067C00054A53 /* MyReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA723C5067C00054A53 /* MyReviewView.swift */; }; 479603732446F17C00F3BDD0 /* User+AppleId.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479603722446F17C00F3BDD0 /* User+AppleId.swift */; }; 4796037524482E3900F3BDD0 /* KeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4796037424482E3800F3BDD0 /* KeychainStorage.swift */; }; - 479D305722C627CB00D18278 /* PartnerBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 479D305522C627CB00D18278 /* PartnerBannerViewController.xib */; }; - 479D305B22C62F4000D18278 /* BookmarksBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 479D305922C62F4000D18278 /* BookmarksBannerViewController.xib */; }; 479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */; }; 47A13CA424BE872600027D4F /* DatePicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A13CA324BE872600027D4F /* DatePicker.framework */; }; 47A13CA524BE872600027D4F /* DatePicker.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 47A13CA324BE872600027D4F /* DatePicker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -643,7 +625,6 @@ 9941DFB724E6A52700CDE458 /* ABTestBookingBackButtonColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9941DFB624E6A52700CDE458 /* ABTestBookingBackButtonColor.swift */; }; 99425AF4236855BB00D005C0 /* PromoDiscoveryRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99425AF3236855BB00D005C0 /* PromoDiscoveryRouter.swift */; }; 99425AFC23685F1E00D005C0 /* PromoDiscoveryPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99425AFB23685F1E00D005C0 /* PromoDiscoveryPresenter.swift */; }; - 9948ADB424E14517003A826A /* PartnerBannerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9948ADB324E14517003A826A /* PartnerBannerBuilder.swift */; }; 994AEC3423AB7B410079B81F /* DiscoveryStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 994AEC3323AB7B410079B81F /* DiscoveryStyleSheet.swift */; }; 994F790723E85C5900660E75 /* DifficultyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 994F790623E85C5900660E75 /* DifficultyView.swift */; }; 99514BB823E82B450085D3A7 /* ElevationProfilePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99514BB223E82B450085D3A7 /* ElevationProfilePresenter.swift */; }; @@ -659,12 +640,7 @@ 9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9959C75B24599CCC008FD4FD /* DirectionView.swift */; }; 995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */; }; 995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */; }; - 996D108124E14AEB002DD0E2 /* MultiPartnerBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 996D107F24E14AEB002DD0E2 /* MultiPartnerBannerViewController.swift */; }; - 996D108224E14AEB002DD0E2 /* MultiPartnerBannerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 996D108024E14AEB002DD0E2 /* MultiPartnerBannerViewController.xib */; }; - 996D108624E15FBE002DD0E2 /* DownloadBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 996D108524E15FBE002DD0E2 /* DownloadBannerViewController.swift */; }; - 996D108824E16E6F002DD0E2 /* BookmarksBannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 996D108724E16E6F002DD0E2 /* BookmarksBannerViewController.swift */; }; 996D108A24E3DBF2002DD0E2 /* BookmarksCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */; }; - 996F8C9F24E1420800498993 /* PartnerBannerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 996F8C9E24E1420800498993 /* PartnerBannerViewModel.swift */; }; 9977E69C247BFB510073780C /* SearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E69B247BFB510073780C /* SearchTextField.swift */; }; 9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */; }; 9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */; }; @@ -829,7 +805,6 @@ F6664BFA1E6459CB00E703C2 /* FacilityCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6664BF71E6459CB00E703C2 /* FacilityCell.swift */; }; F6664BFD1E6459CB00E703C2 /* FacilityCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6664BF81E6459CB00E703C2 /* FacilityCell.xib */; }; F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */ = {isa = PBXBuildFile; fileRef = F6791B121C43DEA7007A8A6E /* MWMStartButton.m */; }; - F68BDF061EEA9A830009BB81 /* MyTargetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F68BDF041EEA9A830009BB81 /* MyTargetSDK.framework */; }; F69018BD1E9F7CB600B3C10B /* MWMAutoupdateController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F69018BB1E9F7CB600B3C10B /* MWMAutoupdateController.xib */; }; F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69018B71E9E601400B3C10B /* MWMAutoupdateController.mm */; }; F69739B21FD197DB00FDA07D /* MWMDiscoveryTableManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69739B01FD197DB00FDA07D /* MWMDiscoveryTableManager.mm */; }; @@ -992,9 +967,6 @@ 340416561E7C0D4100E2B6D6 /* PhotosOverlayView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosOverlayView.swift; sourceTree = ""; }; 3404165A1E7C29AE00E2B6D6 /* PhotosInteractionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosInteractionAnimator.swift; sourceTree = ""; }; 340474DD1E08199D00C92850 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = ""; }; - 340474EA1E08199D00C92850 /* MWMMyTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMyTarget.h; sourceTree = ""; }; - 340474EB1E08199D00C92850 /* MWMMyTarget.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMyTarget.mm; sourceTree = ""; }; - 340474EC1E08199D00C92850 /* MWMMyTargetDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMyTargetDelegate.h; sourceTree = ""; }; 340475181E081A4600C92850 /* MWMKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMKeyboard.h; sourceTree = ""; }; 340475191E081A4600C92850 /* MWMKeyboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMKeyboard.m; sourceTree = ""; }; 3404751A1E081A4600C92850 /* MWMKeyboardObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMKeyboardObserver.h; sourceTree = ""; }; @@ -1163,7 +1135,6 @@ 3486B5121E27AD3B0069C126 /* MWMFrameworkListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkListener.h; sourceTree = ""; }; 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFrameworkListener.mm; sourceTree = ""; }; 3486B5141E27AD3B0069C126 /* MWMFrameworkObservers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkObservers.h; sourceTree = ""; }; - 3488B0101E9D0AEC0068AFD8 /* AdBannerCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdBannerCell.swift; sourceTree = ""; }; 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Modifications.swift"; sourceTree = ""; }; 3488B03A1E9D13EF0068AFD8 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; 348A8DF11F66775A00D83026 /* RatingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RatingView.swift; sourceTree = ""; }; @@ -1175,7 +1146,6 @@ 3490D2DB1CE9DD2500D0B838 /* MWMSideButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideButtonsView.h; sourceTree = ""; }; 3490D2DC1CE9DD2500D0B838 /* MWMSideButtonsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideButtonsView.mm; sourceTree = ""; }; 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSideButtonsView.xib; sourceTree = ""; }; - 34926BE51EA4C2A700DCF14C /* SearchBanners.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBanners.swift; sourceTree = ""; }; 34943BB91E2626B200B14F84 /* WelcomePageController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomePageController.swift; sourceTree = ""; }; 3495433C1EB22D9600F08F73 /* MPAdBrowserController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MPAdBrowserController.xib; path = 3party/MoPubSDK/Internal/Common/MPAdBrowserController.xib; sourceTree = ""; }; 349A137F1DEC138C00C7DB60 /* MWMMobileInternetAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMobileInternetAlert.h; sourceTree = ""; }; @@ -1338,15 +1308,6 @@ 34E7761D1F14DB48003040B3 /* PlacePageArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlacePageArea.swift; sourceTree = ""; }; 34E776301F15FAC2003040B3 /* MWMPlacePageManagerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageManagerHelper.h; sourceTree = ""; }; 34E776311F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageManagerHelper.mm; sourceTree = ""; }; - 34F4071D1E9E1AFF00E57AC0 /* Banner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Banner.swift; sourceTree = ""; }; - 34F4071E1E9E1AFF00E57AC0 /* BannersCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannersCache.swift; sourceTree = ""; }; - 34F4071F1E9E1AFF00E57AC0 /* BannerType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannerType.swift; sourceTree = ""; }; - 34F407221E9E1AFF00E57AC0 /* FacebookBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacebookBanner.swift; sourceTree = ""; }; - 34F407241E9E1AFF00E57AC0 /* MopubBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MopubBanner.swift; sourceTree = ""; }; - 34F407251E9E1AFF00E57AC0 /* MPNativeAd+MWM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPNativeAd+MWM.h"; sourceTree = ""; }; - 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPNativeAd+MWM.m"; sourceTree = ""; }; - 34F407281E9E1AFF00E57AC0 /* MWMBannerHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBannerHelpers.h; sourceTree = ""; }; - 34F4072A1E9E1AFF00E57AC0 /* RBBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RBBanner.swift; sourceTree = ""; }; 34F5E0D21E3F254800B1C415 /* UIView+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Hierarchy.swift"; sourceTree = ""; }; 34F5E0DA1E3F3ED300B1C415 /* MWMRoutePoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRoutePoint.h; sourceTree = ""; }; 34F5E0DC1E3F51AF00B1C415 /* MWMCoreRouterType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCoreRouterType.h; sourceTree = ""; }; @@ -1421,7 +1382,6 @@ 3D15ACEF2155118800F725D5 /* MWMObjectsCategorySelectorDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMObjectsCategorySelectorDataSource.h; sourceTree = ""; }; 3D1958EA213804B6009A83EC /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3DB1C57022D5DDA60097EC4C /* PromoAfterBookingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PromoAfterBookingViewController.xib; sourceTree = ""; }; - 3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartnerBannerViewController.swift; sourceTree = ""; }; 3DBD7BE32425015C00ED9FE8 /* ParntersStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParntersStyleSheet.swift; sourceTree = ""; }; 3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpartners_api.a; path = "../../../omim-xcode-build/Debug-iphonesimulator/libpartners_api.a"; sourceTree = ""; }; 3DE1762322D614B8000214FF /* PromoAfterBookingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoAfterBookingViewController.swift; sourceTree = ""; }; @@ -1496,16 +1456,11 @@ 4735008923A83CF700661A95 /* DownloadedMapsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadedMapsDataSource.swift; sourceTree = ""; }; 473500C023A8F81800661A95 /* MWMFrameworkObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkObserver.h; sourceTree = ""; }; 47375E562420ECA800FFCC49 /* Chart.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Chart.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4738A8E6239FC513007C0F43 /* AdBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdBannerView.swift; sourceTree = ""; }; - 4738A8E8239FC526007C0F43 /* AdBannerView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AdBannerView.xib; sourceTree = ""; }; 473CBF9A2164DD470059BD54 /* SettingsTableViewSelectableProgressCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSelectableProgressCell.swift; sourceTree = ""; }; 4740184123F5BDD300A93C81 /* minizip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = minizip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4747045324622EF0006E51E9 /* GuidesGalleryStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryStyleSheet.swift; sourceTree = ""; }; 474902D8224A54EC008D71E0 /* MWMRoutingOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRoutingOptions.h; sourceTree = ""; }; 474902D9224A54EC008D71E0 /* MWMRoutingOptions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutingOptions.mm; sourceTree = ""; }; - 474AC76A2139E4F2002F9BF9 /* RemoveAdsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveAdsViewController.swift; sourceTree = ""; }; - 474AC76B2139E4F2002F9BF9 /* RemoveAdsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RemoveAdsViewController.xib; sourceTree = ""; }; - 474C9F59213FF75800369009 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; 4757D6202535BB6E0062364F /* BookmarksListInterfaces.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListInterfaces.swift; sourceTree = ""; }; 475EC36C244EDE66003BC295 /* GuidesGalleryPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryPresenter.swift; sourceTree = ""; }; 475EC36E244EF7A9003BC295 /* GuidesGalleryBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryBuilder.swift; sourceTree = ""; }; @@ -1532,8 +1487,6 @@ 478F6FA723C5067C00054A53 /* MyReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyReviewView.swift; sourceTree = ""; }; 479603722446F17C00F3BDD0 /* User+AppleId.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "User+AppleId.swift"; sourceTree = ""; }; 4796037424482E3800F3BDD0 /* KeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorage.swift; sourceTree = ""; }; - 479D305522C627CB00D18278 /* PartnerBannerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PartnerBannerViewController.xib; sourceTree = ""; }; - 479D305922C62F4000D18278 /* BookmarksBannerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksBannerViewController.xib; sourceTree = ""; }; 479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ActivityIndicator.swift; path = CustomViews/ActivityIndicator.swift; sourceTree = ""; }; 47A13CA324BE872600027D4F /* DatePicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DatePicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 47A13CA624BE874D00027D4F /* DatePicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DatePicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1651,7 +1604,6 @@ 6741AAAF1BF356B9002C974C /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = "../../../omim-xcode-build/Debug/libjansson.a"; sourceTree = ""; }; 6741AAB11BF356B9002C974C /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmap.a; path = "../../../omim-xcode-build/Debug/libmap.a"; sourceTree = ""; }; 6741AAB31BF356B9002C974C /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = ""; }; - 6741AAB41BF356B9002C974C /* libosrm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosrm.a; path = "../../../omim-xcode-build/Debug/libosrm.a"; sourceTree = ""; }; 6741AAB51BF356B9002C974C /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = ""; }; 6741AAB61BF356BA002C974C /* libprotobuf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprotobuf.a; path = "../../../omim-xcode-build/Debug/libprotobuf.a"; sourceTree = ""; }; 6741AAB81BF356BA002C974C /* librouting.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librouting.a; path = "../../../omim-xcode-build/Debug/librouting.a"; sourceTree = ""; }; @@ -1761,7 +1713,6 @@ 9941DFB624E6A52700CDE458 /* ABTestBookingBackButtonColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ABTestBookingBackButtonColor.swift; sourceTree = ""; }; 99425AF3236855BB00D005C0 /* PromoDiscoveryRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoDiscoveryRouter.swift; sourceTree = ""; }; 99425AFB23685F1E00D005C0 /* PromoDiscoveryPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromoDiscoveryPresenter.swift; sourceTree = ""; }; - 9948ADB324E14517003A826A /* PartnerBannerBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartnerBannerBuilder.swift; sourceTree = ""; }; 994AEC3323AB7B410079B81F /* DiscoveryStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscoveryStyleSheet.swift; sourceTree = ""; }; 994F790623E85C5900660E75 /* DifficultyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DifficultyView.swift; sourceTree = ""; }; 99514BB223E82B450085D3A7 /* ElevationProfilePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElevationProfilePresenter.swift; sourceTree = ""; }; @@ -1779,12 +1730,7 @@ 995F1610244F07F90060631D /* MWMBottomMenuState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuState.h; sourceTree = ""; }; 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = ""; }; 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuLayersCell.xib; sourceTree = ""; }; - 996D107F24E14AEB002DD0E2 /* MultiPartnerBannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiPartnerBannerViewController.swift; sourceTree = ""; }; - 996D108024E14AEB002DD0E2 /* MultiPartnerBannerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MultiPartnerBannerViewController.xib; sourceTree = ""; }; - 996D108524E15FBE002DD0E2 /* DownloadBannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadBannerViewController.swift; sourceTree = ""; }; - 996D108724E16E6F002DD0E2 /* BookmarksBannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksBannerViewController.swift; sourceTree = ""; }; 996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksCoordinator.swift; sourceTree = ""; }; - 996F8C9E24E1420800498993 /* PartnerBannerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartnerBannerViewModel.swift; sourceTree = ""; }; 9977E69B247BFB510073780C /* SearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTextField.swift; sourceTree = ""; }; 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = ""; }; 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButtonRenderer.swift; sourceTree = ""; }; @@ -1899,6 +1845,10 @@ A630D204207CAA3400976DEA /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = vi; path = vi.lproj/Localizable.stringsdict; sourceTree = ""; }; A630D205207CAA3A00976DEA /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.stringsdict"; sourceTree = ""; }; A630D206207CAA5800976DEA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = ""; }; + AC79F11E1E534D0B00B7D954 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + AC79F1201E534D4000B7D954 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; + AC79F1221E534DFA00B7D954 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + AC79F1241E534E1700B7D954 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; B32FE73E20D2844600EF7446 /* DownloadedBookmarksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadedBookmarksViewController.swift; sourceTree = ""; }; B32FE73F20D2844600EF7446 /* DownloadedBookmarksViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DownloadedBookmarksViewController.xib; sourceTree = ""; }; B32FE74220D2B09600EF7446 /* CatalogWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogWebViewController.swift; sourceTree = ""; }; @@ -2038,7 +1988,6 @@ F6664BF81E6459CB00E703C2 /* FacilityCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FacilityCell.xib; sourceTree = ""; }; F6791B111C43DEA7007A8A6E /* MWMStartButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStartButton.h; sourceTree = ""; }; F6791B121C43DEA7007A8A6E /* MWMStartButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMStartButton.m; sourceTree = ""; }; - F68BDF041EEA9A830009BB81 /* MyTargetSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MyTargetSDK.framework; sourceTree = ""; }; F69018B61E9E601400B3C10B /* MWMAutoupdateController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAutoupdateController.h; sourceTree = ""; }; F69018B71E9E601400B3C10B /* MWMAutoupdateController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAutoupdateController.mm; sourceTree = ""; }; F69018BB1E9F7CB600B3C10B /* MWMAutoupdateController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMAutoupdateController.xib; sourceTree = ""; }; @@ -2254,7 +2203,6 @@ 45FFD65D1E965EBE00DB854E /* liblocal_ads.a in Frameworks */, 34D1B6F11E95096B0057E9C7 /* libicu.a in Frameworks */, 671E78D31E6A423300B2859B /* librouting_common.a in Frameworks */, - 474C9F5A213FF75800369009 /* StoreKit.framework in Frameworks */, 67B78B551E42333C0018E590 /* AdSupport.framework in Frameworks */, 67B78B471E422E0A0018E590 /* MobileCoreServices.framework in Frameworks */, 67B78B451E422C970018E590 /* iAd.framework in Frameworks */, @@ -2272,7 +2220,6 @@ 6741AABD1BF356BA002C974C /* libagg.a in Frameworks */, 6741AABE1BF356BA002C974C /* libalohalitics.a in Frameworks */, 6741AAC11BF356BA002C974C /* libbase.a in Frameworks */, - F68BDF061EEA9A830009BB81 /* MyTargetSDK.framework in Frameworks */, 6741AAC21BF356BA002C974C /* libcoding.a in Frameworks */, 6741AAC31BF356BA002C974C /* libexpat.a in Frameworks */, 6741AAC41BF356BA002C974C /* libfreetype.a in Frameworks */, @@ -2419,7 +2366,6 @@ 4577B28021F2066A00864FAC /* libvulkan_wrapper.a */, CDB4D4D4222D118E00104869 /* CarPlay.framework */, BB2C99AF21B6AB4500F7371C /* libdescriptions.a */, - 474C9F59213FF75800369009 /* StoreKit.framework */, 3D1958EA213804B6009A83EC /* libmetrics.a */, 4598438521394CFD00F8CAB2 /* MetalPerformanceShaders.framework */, BB8123CD212C264700ADE512 /* Metal.framework */, @@ -2432,6 +2378,10 @@ 4586D0E61F4813AB00DF9CE5 /* libmwm_diff.a */, 4586D0C31F48121A00DF9CE5 /* libbsdiff.a */, F6F8E3C41EF8469700F2DE8F /* libugc.a */, + AC79F1241E534E1700B7D954 /* AudioToolbox.framework */, + AC79F1221E534DFA00B7D954 /* SystemConfiguration.framework */, + AC79F1201E534D4000B7D954 /* CoreTelephony.framework */, + AC79F11E1E534D0B00B7D954 /* AVFoundation.framework */, 340474DB1E08199D00C92850 /* 3party */, 6741AAA21BF356B9002C974C /* libagg.a */, 6741AAA31BF356B9002C974C /* libalohalitics.a */, @@ -2450,7 +2400,6 @@ 6741AAB11BF356B9002C974C /* libmap.a */, 340DC82B1C4E72C700EAA2CC /* liboauthcpp.a */, 6741AAB31BF356B9002C974C /* libopening_hours.a */, - 6741AAB41BF356B9002C974C /* libosrm.a */, 3DDB4BC31DAB98F000F4D021 /* libpartners_api.a */, 6741AAB51BF356B9002C974C /* libplatform.a */, 6741AAB61BF356BA002C974C /* libprotobuf.a */, @@ -2528,22 +2477,10 @@ 340474DD1E08199D00C92850 /* Fabric.framework */, 347D15C71F82362900E86251 /* GoogleSignIn.framework */, 347D15C81F82362900E86251 /* GoogleSignInDependencies.framework */, - 340474E91E08199D00C92850 /* MyTarget */, ); path = 3party; sourceTree = ""; }; - 340474E91E08199D00C92850 /* MyTarget */ = { - isa = PBXGroup; - children = ( - 340474EA1E08199D00C92850 /* MWMMyTarget.h */, - 340474EB1E08199D00C92850 /* MWMMyTarget.mm */, - 340474EC1E08199D00C92850 /* MWMMyTargetDelegate.h */, - F68BDF041EEA9A830009BB81 /* MyTargetSDK.framework */, - ); - path = MyTarget; - sourceTree = ""; - }; 340475141E081A4600C92850 /* Common */ = { isa = PBXGroup; children = ( @@ -2596,7 +2533,6 @@ 472E3F4221468AF40020E412 /* Subscriptions */, 3472B5DD200F868E00DC6CD5 /* Editor */, 3472B5C8200F436700DC6CD5 /* BackgroundFetchScheduler */, - 34F4071C1E9E1AFF00E57AC0 /* Ads */, 347039A51FB9A5B400E47496 /* Bookmarks */, 3486B50F1E27AD3B0069C126 /* Framework */, 340475291E081A4600C92850 /* Location */, @@ -2666,7 +2602,6 @@ 3404753E1E081A4600C92850 /* MWMSearchObserver.h */, 3430643F1E9FDC7300DC7665 /* SearchIndex.swift */, 342639461EA0FDB30025EB89 /* MWMSearchItemType.h */, - 34926BE51EA4C2A700DCF14C /* SearchBanners.swift */, ); path = Search; sourceTree = ""; @@ -2736,18 +2671,6 @@ path = Storyboard; sourceTree = ""; }; - 3432E17F1E49BEFA008477E9 /* Ads */ = { - isa = PBXGroup; - children = ( - 474AC76A2139E4F2002F9BF9 /* RemoveAdsViewController.swift */, - 474AC76B2139E4F2002F9BF9 /* RemoveAdsViewController.xib */, - 3488B0101E9D0AEC0068AFD8 /* AdBannerCell.swift */, - 4738A8E6239FC513007C0F43 /* AdBannerView.swift */, - 4738A8E8239FC526007C0F43 /* AdBannerView.xib */, - ); - path = Ads; - sourceTree = ""; - }; 343D7B6B202AF283007D56A8 /* Permissions */ = { isa = PBXGroup; children = ( @@ -3377,46 +3300,6 @@ path = AvailableArea; sourceTree = ""; }; - 34F4071C1E9E1AFF00E57AC0 /* Ads */ = { - isa = PBXGroup; - children = ( - 34F4071D1E9E1AFF00E57AC0 /* Banner.swift */, - 34F4071E1E9E1AFF00E57AC0 /* BannersCache.swift */, - 34F4071F1E9E1AFF00E57AC0 /* BannerType.swift */, - 34F407211E9E1AFF00E57AC0 /* Facebook */, - 34F407231E9E1AFF00E57AC0 /* Mopub */, - 34F407281E9E1AFF00E57AC0 /* MWMBannerHelpers.h */, - 34F407291E9E1AFF00E57AC0 /* RB */, - ); - path = Ads; - sourceTree = ""; - }; - 34F407211E9E1AFF00E57AC0 /* Facebook */ = { - isa = PBXGroup; - children = ( - 34F407221E9E1AFF00E57AC0 /* FacebookBanner.swift */, - ); - path = Facebook; - sourceTree = ""; - }; - 34F407231E9E1AFF00E57AC0 /* Mopub */ = { - isa = PBXGroup; - children = ( - 34F407241E9E1AFF00E57AC0 /* MopubBanner.swift */, - 34F407251E9E1AFF00E57AC0 /* MPNativeAd+MWM.h */, - 34F407261E9E1AFF00E57AC0 /* MPNativeAd+MWM.m */, - ); - path = Mopub; - sourceTree = ""; - }; - 34F407291E9E1AFF00E57AC0 /* RB */ = { - isa = PBXGroup; - children = ( - 34F4072A1E9E1AFF00E57AC0 /* RBBanner.swift */, - ); - path = RB; - sourceTree = ""; - }; 34F73F5E1E082FF700AC1FD6 /* LocalizedStrings */ = { isa = PBXGroup; children = ( @@ -3430,7 +3313,6 @@ 34FE4C421BCC013500066718 /* Widgets */ = { isa = PBXGroup; children = ( - 996F8C9D24E1417600498993 /* DownloadBanner */, 34FE4C431BCC013500066718 /* MWMMapWidgets.h */, 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */, 3406FA131C6E0C3300E9FAD2 /* MWMMapDownloadDialog.h */, @@ -3926,22 +3808,6 @@ path = Pages; sourceTree = ""; }; - 996F8C9D24E1417600498993 /* DownloadBanner */ = { - isa = PBXGroup; - children = ( - 996D108724E16E6F002DD0E2 /* BookmarksBannerViewController.swift */, - 479D305922C62F4000D18278 /* BookmarksBannerViewController.xib */, - 479D305522C627CB00D18278 /* PartnerBannerViewController.xib */, - 3DBD7B9E242363E500ED9FE8 /* PartnerBannerViewController.swift */, - 996D107F24E14AEB002DD0E2 /* MultiPartnerBannerViewController.swift */, - 996D108024E14AEB002DD0E2 /* MultiPartnerBannerViewController.xib */, - 996F8C9E24E1420800498993 /* PartnerBannerViewModel.swift */, - 9948ADB324E14517003A826A /* PartnerBannerBuilder.swift */, - 996D108524E15FBE002DD0E2 /* DownloadBannerViewController.swift */, - ); - path = DownloadBanner; - sourceTree = ""; - }; 998927312449E5ED00260CE2 /* Menu */ = { isa = PBXGroup; children = ( @@ -4560,7 +4426,6 @@ 99BFEEFA24B48D3900A65F5B /* Subscription */, CDB4D4DA222D24EE00104869 /* CarPlay */, F6E407CC1FC45ED4001F7821 /* Discovery */, - 3432E17F1E49BEFA008477E9 /* Ads */, 34BBD6491F826BD50070CA50 /* Authorization */, F69018B51E9E5FEB00B3C10B /* Autoupdate */, 34E7760D1F14B165003040B3 /* AvailableArea */, @@ -5086,8 +4951,6 @@ 6741A9411BF340DE002C974C /* Resources */, 6741A9A01BF340DE002C974C /* Sources */, 6741AA311BF340DE002C974C /* Frameworks */, - 99B5F1D924A3628C006ACC52 /* Setup Google */, - 34F7422E1E08328300AC1FD6 /* Firebase Crashlytics */, AED76F73852BBAF00EEF9E66 /* [CP] Embed Pods Frameworks */, 4740184523F5BDE900A93C81 /* Embed Frameworks */, ); @@ -5114,14 +4977,11 @@ LastSwiftMigration = 1110; ProvisioningStyle = Automatic; SystemCapabilities = { - com.apple.InAppPurchase = { - enabled = 1; - }; com.apple.Push = { - enabled = 1; + enabled = 0; }; com.apple.SafariKeychain = { - enabled = 1; + enabled = 0; }; }; }; @@ -5189,7 +5049,6 @@ F642D1231F0F9D1D005E3C25 /* ugc_types.csv in Resources */, 6741A9531BF340DE002C974C /* 01_dejavusans.ttf in Resources */, 6741A9541BF340DE002C974C /* 02_droidsans-fallback.ttf in Resources */, - 479D305B22C62F4000D18278 /* BookmarksBannerViewController.xib in Resources */, 6741A9571BF340DE002C974C /* 03_jomolhari-id-a3d.ttf in Resources */, 3404F49A2028A20D0090E401 /* BMCCategoryCell.xib in Resources */, 6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */, @@ -5260,7 +5119,6 @@ 34D3B0331E389D05004100F9 /* MWMEditorCategoryCell.xib in Resources */, F6E2FDCB1E097BA00083EBEC /* MWMEditorNotesFooter.xib in Resources */, 3DB1C57122D5DDA60097EC4C /* PromoAfterBookingViewController.xib in Resources */, - 474AC76D2139E4F2002F9BF9 /* RemoveAdsViewController.xib in Resources */, 34D3B0391E389D05004100F9 /* MWMEditorSelectTableViewCell.xib in Resources */, 34AB663B1FC5AA330078E451 /* RouteManagerViewController.xib in Resources */, 34D3B03F1E389D05004100F9 /* MWMEditorSwitchTableViewCell.xib in Resources */, @@ -5296,7 +5154,6 @@ 342639361EA0E60A0025EB89 /* local_ads_symbols.txt in Resources */, 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */, 47CA68F2250B54AF00671019 /* BookmarkCell.xib in Resources */, - 479D305722C627CB00D18278 /* PartnerBannerViewController.xib in Resources */, 337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */, F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, 47CA68F6250B550C00671019 /* TrackCell.xib in Resources */, @@ -5335,7 +5192,6 @@ 408645FC21495EB1000A4A1D /* categories_cuisines.txt in Resources */, F6E2FF391E097BA00083EBEC /* MWMSearchSuggestionCell.xib in Resources */, 34AB66231FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */, - 996D108224E14AEB002DD0E2 /* MultiPartnerBannerViewController.xib in Resources */, BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */, 3404F4962028A1B80090E401 /* BMCPermissionsCell.xib in Resources */, F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */, @@ -5344,7 +5200,6 @@ 470A89FF2134517600D72FBF /* BookmarksTutorialBlur.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 */, 991A7271250F6C4A0075348C /* GuideDescriptionViewController.xib in Resources */, @@ -5398,21 +5253,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 34F7422E1E08328300AC1FD6 /* Firebase Crashlytics */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)", - ); - name = "Firebase Crashlytics"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#!/bin/bash\necho \"[Firebase Crashlytics] start\"\n\nLOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nPLIST_PATH=\"${PROJECT_DIR}/${BUNDLE_IDENTIFIER}/GoogleService-Info.plist\"\nDSYM_PATH=${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}\n\necho \"[Firebase Crashlytics] dsyms: ${DSYM_PATH}\"\necho \"[Firebase Crashlytics] plist: ${PLIST_PATH}\"\n# ONLY FOR Release, because for production we use Bitecode\n\nif [[ \"$LOWERED_CONFIG\" == *release* ]]; then\n if [ ! -f \"${PLIST_PATH}\" ]; then\n echo \"[Firebase Crashlytics] Google plist not found!\"\n exit 1\n fi\n bash \"${PODS_ROOT}/FirebaseCrashlytics/run -gsp ${PLIST_PATH} -p ios ${DSYM_PATH}\"\n echo \"[Firebase Crashlytics] done\"\nfi\n"; - }; 47C7F96D2191A3B600C2760C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -5430,24 +5270,6 @@ shellPath = /bin/sh; shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n../../tools/unix/check_cert.sh\n"; }; - 99B5F1D924A3628C006ACC52 /* Setup Google */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Setup Google "; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#!/bin/bash\necho \"[Setup Google] Start\"\n\nLOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nBUILD_APP_PATH=\"${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\"\nPLIST_PATH=\"${PROJECT_DIR}/${BUNDLE_IDENTIFIER}/GoogleService-Info.plist\"\n\necho \"[Setup Google] config: ${LOWERED_CONFIG}\"\necho \"[Setup Google] plist: ${PLIST_PATH}\"\necho \"[Setup Google] app: ${BUILD_APP_PATH}\"\n\nif [[ \"$LOWERED_CONFIG\" == *production* || \"$LOWERED_CONFIG\" == *release* ]]; then\n if [ ! -f \"${PLIST_PATH}\" ]; then\n echo \"[Setup Google] Google plist not found!\"\n exit 1\n fi\n cp \"${PLIST_PATH}\" \"${BUILD_APP_PATH}\"\n echo \"[Setup Google] done\"\nfi\n"; - }; AED76F73852BBAF00EEF9E66 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -5547,7 +5369,6 @@ 47B06DFE21B965950094CCAD /* Geo.swift in Sources */, 6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */, 990F33B624BC915200D0F426 /* SearchActionBarView.swift in Sources */, - 3DBD7B9F242363E500ED9FE8 /* PartnerBannerViewController.swift in Sources */, 99514BBA23E82B450085D3A7 /* ElevationProfileViewController.swift in Sources */, 340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */, 99D363172358647700941BF4 /* SubscriptionGroup.swift in Sources */, @@ -5566,10 +5387,8 @@ F6E2FE101E097BA00083EBEC /* MWMOpeningHoursTableViewCell.mm in Sources */, 47C8789D22DF662700A772DA /* SubscriptionExpiredViewController.swift in Sources */, 6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */, - 996D108824E16E6F002DD0E2 /* BookmarksBannerViewController.swift in Sources */, 993DF12723F6BDB100AC231A /* Fonts.swift in Sources */, 995714102518B5DA0070DD93 /* GuidesNavigationBarView.swift in Sources */, - 996D108624E15FBE002DD0E2 /* DownloadBannerViewController.swift in Sources */, 4719A645219CBD65009F9AA7 /* IPendingTransactionsHandler.swift in Sources */, 34F742321E0834F400AC1FD6 /* UIViewController+Navigation.m in Sources */, 340475811E081B3300C92850 /* iosOGLContextFactory.mm in Sources */, @@ -5579,14 +5398,12 @@ BB8123D62130427E00ADE512 /* MetalContextFactory.mm in Sources */, 99A906E823F6F7030005872B /* PlacePageReviewsViewController.swift in Sources */, 3467CEB2202C6EEE00D3C670 /* BMCNotificationsHeader.swift in Sources */, - 34F4072F1E9E1AFF00E57AC0 /* BannersCache.swift in Sources */, 34D3B0211E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.m in Sources */, 99D363192358685300941BF4 /* SubscriptionGroupItem.swift in Sources */, 340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */, 47D48BF52432A7CA00FEFB1F /* ChartViewRenderer.swift in Sources */, CDCA273A2237FCFE00167D87 /* SearchTemplateBuilder.swift in Sources */, 993DF10B23F6BDB100AC231A /* CheckmarkRenderer.swift in Sources */, - 34F4073E1E9E1AFF00E57AC0 /* MPNativeAd+MWM.m in Sources */, F6E2FED01E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */, CDB92CEE229E9CF900EC757C /* MWMDiscoveryMapObjects.mm in Sources */, 34B6FD5F2015E6BF00C18E97 /* DiscoveryBookingCell.swift in Sources */, @@ -5623,7 +5440,6 @@ 99CB34BF2369EAAC001D28AD /* TermsOfUseViewController.swift in Sources */, 6741A9B91BF340DE002C974C /* MWMRateAlert.mm in Sources */, 3404F48B202894EA0090E401 /* BMCViewController.swift in Sources */, - 4738A8E7239FC513007C0F43 /* AdBannerView.swift in Sources */, 349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */, 993F5511237C622700545511 /* DeepLinkCatalogueStrategy.swift in Sources */, F6E2FF3F1E097BA00083EBEC /* MWMSearchTableViewController.mm in Sources */, @@ -5678,7 +5494,6 @@ CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */, 99A906F323FA95AB0005872B /* PlacePageStyleSheet.swift in Sources */, 6741A9CF1BF340DE002C974C /* MWMLocationAlert.m in Sources */, - 474AC76C2139E4F2002F9BF9 /* RemoveAdsViewController.swift in Sources */, 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.m in Sources */, F6E2FDA11E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */, 999D3A67237BFA4600C5F7A8 /* SubscriptionViewBuilder.swift in Sources */, @@ -5723,7 +5538,6 @@ F61757ED1FC73027000AD0D0 /* DiscoveryOnlineTemplateCell.swift in Sources */, 99425AF4236855BB00D005C0 /* PromoDiscoveryRouter.swift in Sources */, F6E2FD5F1E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.m in Sources */, - 34F4073B1E9E1AFF00E57AC0 /* MopubBanner.swift in Sources */, 99A906E523F6F7030005872B /* ActionBarViewController.swift in Sources */, 47B9065421C7FA400079C85E /* UIImageView+WebImage.m in Sources */, F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */, @@ -5813,7 +5627,6 @@ 3404F4992028A20D0090E401 /* BMCCategoryCell.swift in Sources */, 47F6E51721FB3C51004580CA /* Notifications.swift in Sources */, F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */, - 34F407411E9E1AFF00E57AC0 /* RBBanner.swift in Sources */, 3444DFD21F17620C00E73099 /* MWMMapWidgetsHelper.mm in Sources */, 348A8DFB1F66775A00D83026 /* RatingViewSettings.swift in Sources */, 3472B5E1200F86C800DC6CD5 /* MWMEditorHelper.mm in Sources */, @@ -5827,7 +5640,6 @@ 34AB66771FC5AA330078E451 /* TransportRoutePreviewStatus.swift in Sources */, 34BBD6641F8270AC0070CA50 /* AuthorizationTransitioning.swift in Sources */, 34D3AFEA1E378AF1004100F9 /* UINib+Init.swift in Sources */, - 34F407321E9E1AFF00E57AC0 /* BannerType.swift in Sources */, F63AF5131EA6250F00A1DB98 /* FilterCollectionHolderCell.swift in Sources */, 34AB663E1FC5AA330078E451 /* RouteManagerTransitioning.swift in Sources */, 993F550B237C622700545511 /* DeepLinkIncorrectStrategy.swift in Sources */, @@ -5846,7 +5658,6 @@ 99A906ED23F6F7030005872B /* PlacePagePreviewViewController.swift in Sources */, 993DF10223F6BDB100AC231A /* Colors.swift in Sources */, 34AB66201FC5AA330078E451 /* RouteStartButton.swift in Sources */, - 34F4072C1E9E1AFF00E57AC0 /* Banner.swift in Sources */, 99DEF9D723E420F6006BFD21 /* ElevationProfileDescriptionCell.swift in Sources */, 993DF11623F6BDB100AC231A /* UIWindowRenderer.swift in Sources */, F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */, @@ -5906,7 +5717,6 @@ CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */, 47E3C7252111E41B008B3B27 /* DimmedModalPresentationController.swift in Sources */, 99CB34CD236B054B001D28AD /* DeepLinkInfoRouter.swift in Sources */, - 996F8C9F24E1420800498993 /* PartnerBannerViewModel.swift in Sources */, 99CB34B72369E188001D28AD /* WelcomeRouter.swift in Sources */, 99CB34CC236B054B001D28AD /* DeepLinkInfoPresenter.swift in Sources */, 47E3C72121108E9F008B3B27 /* BookmarksLoadedViewController.swift in Sources */, @@ -5922,7 +5732,6 @@ 34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */, 993DF12923F6BDB100AC231A /* ThemeManager.swift in Sources */, 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */, - 3488B0131E9D0AEC0068AFD8 /* AdBannerCell.swift in Sources */, 3404755F1E081A4600C92850 /* MWMLocationPredictor.mm in Sources */, 993DF11523F6BDB100AC231A /* UISearchBarRenderer.swift in Sources */, F6E2FE041E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.mm in Sources */, @@ -5945,13 +5754,11 @@ 47EF73FE247056A600D32AB8 /* GuidesGalleryCell.swift in Sources */, 47B06DF921B95F5E0094CCAD /* IGeoTracker.swift in Sources */, CDCA27812243F59800167D87 /* CarPlayRouter.swift in Sources */, - 34F407381E9E1AFF00E57AC0 /* FacebookBanner.swift in Sources */, 99CB34BD2369EAAC001D28AD /* TermsOfUsePresenter.swift in Sources */, 34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */, 99CB34C02369EAAC001D28AD /* TermsOfUseBuilder.swift in Sources */, 33BCDF8B218C976D00EF5B74 /* TagsCollectionViewLayout.swift in Sources */, 6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */, - 9948ADB424E14517003A826A /* PartnerBannerBuilder.swift in Sources */, F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */, 99EBF73024B4C89000FE1F1F /* AllPassSubscriptionBuilder.swift in Sources */, 47CA68F5250B550C00671019 /* TrackCell.swift in Sources */, @@ -6033,7 +5840,6 @@ F6E2FDA41E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */, 3454D7CB1E07F045004AF2AD /* UIColor+MapsMeColor.m in Sources */, 34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */, - 34926BE71EA4C2A700DCF14C /* SearchBanners.swift in Sources */, 34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m in Sources */, 33C558E3217F6CF100299E70 /* UploadActionCell.swift in Sources */, 993DF10523F6BDB100AC231A /* UINavigationItem+styleName.swift in Sources */, @@ -6067,7 +5873,6 @@ 344532561F7155540059FBCC /* UGCReviewModel.swift in Sources */, 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */, 346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */, - 340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */, 471A7BBE2481A3D000A0D4C1 /* EditBookmarkViewController.swift in Sources */, 340416501E7C086000E2B6D6 /* PhotoViewController.swift in Sources */, 470B3632244E2DE200C0EA9E /* GuidesGalleryCityCell.swift in Sources */, @@ -6118,7 +5923,6 @@ 99A906DD23F6F7030005872B /* AddReviewViewController.swift in Sources */, 993DF11323F6BDB100AC231A /* UITableViewRenderer.swift in Sources */, 3404F4952028A1B80090E401 /* BMCPermissionsCell.swift in Sources */, - 996D108124E14AEB002DD0E2 /* MultiPartnerBannerViewController.swift in Sources */, 340416441E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift in Sources */, 34AB66261FC5AA330078E451 /* RouteManagerDimView.swift in Sources */, 993F5514237C622700545511 /* DeepLinkStrategyFactory.swift in Sources */, @@ -6291,7 +6095,6 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = app.omaps.debug; PRODUCT_NAME = "OMaps Debug"; - PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; }; @@ -6317,7 +6120,6 @@ OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = app.omaps; PRODUCT_NAME = OMaps; - PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Release; }; @@ -6381,19 +6183,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - BUNDLE_IDENTIFIER = mapsme.release; + BUNDLE_IDENTIFIER = app.omaps.release; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; DEVELOPMENT_TEAM = N9X2A789QT; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/MyTarget", ); GCC_PREFIX_HEADER = Maps_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - NS_BLOCK_ASSERTIONS, - ); + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)", @@ -6403,10 +6201,7 @@ "$(OMIM_ROOT)/3party/jansson/src", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = ( "$(inherited)", "-Wall", diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift index af84f73003..87dba24ff5 100644 --- a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift @@ -44,11 +44,6 @@ final class PlacePagePreviewViewController: UIViewController { lazy var fullScreenDirectionView: DirectionView = { return Bundle.main.load(viewClass: DirectionView.self)! }() - lazy var adView: AdBannerView = { - let view = Bundle.main.load(viewClass: AdBannerView.self)?.first as! AdBannerView - view.isHidden = true - return view - }() var placePagePreviewData: PlacePagePreviewData! { didSet { @@ -79,8 +74,6 @@ final class PlacePagePreviewViewController: UIViewController { } else { placePageDirectionView?.imageView.isHidden = true } - - stackView.addArrangedSubview(adView) } private func updateViews() { @@ -129,13 +122,6 @@ final class PlacePagePreviewViewController: UIViewController { ugcContainerView.isHidden = !placePagePreviewData.isBookingPlace } - 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) { ugcContainerView.isHidden = false if let summaryRating = ugcData.summaryRating { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift index 674053ca43..7ed891892c 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift @@ -27,7 +27,6 @@ protocol IPlacePageLayout: class { var viewControllers: [UIViewController] { get } var actionBar: ActionBarViewController? { get } var navigationBar: UIViewController? { get } - var adState: AdBannerState { get set } func calculateSteps(inScrollView scrollView: UIScrollView, compact: Bool) -> [PlacePageState] } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift index cb6560756d..5c8540c93d 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift @@ -31,12 +31,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout { return placePageNavigationViewController } - var adState: AdBannerState = .unset { - didSet { - previewViewController.adView.state = self.adState - } - } - lazy var previewViewController: PlacePagePreviewViewController = { let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self) vc.placePagePreviewData = placePageData.previewData @@ -229,11 +223,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout { placePageData.loadUgc(completion: onLoadUgc) } - if placePageData.previewData.hasBanner, - let banners = placePageData.previewData.banners { - BannersCache.cache.get(coreBanners: banners, cacheOnly: false, loadNew: true, completion: onGetBanner) - } - if placePageData.buttonsData != nil { viewControllers.append(buttonsViewController) } @@ -401,11 +390,6 @@ extension PlacePageCommonLayout { } } - func onGetBanner(banner: MWMBanner, loadNew: Bool) -> Void { - previewViewController.updateBanner(banner) - presenter?.updatePreviewOffset() - } - func updateBookmarkRelatedSections() { var isBookmark = false if let bookmarkData = placePageData.bookmarkData { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift index 2fee36945f..333ad2c65d 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageElevationLayout.swift @@ -14,8 +14,6 @@ class PlacePageElevationLayout: IPlacePageLayout { return placePageNavigationViewController } - var adState: AdBannerState = .unset - lazy var header: PlacePageHeaderViewController? = { return PlacePageHeaderBuilder.build(data: placePageData.previewData, delegate: interactor, headerType: .flexible) } () diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageGalleryLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageGalleryLayout.swift index 8efb4568cb..6cfb498fbd 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageGalleryLayout.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageGalleryLayout.swift @@ -3,7 +3,6 @@ final class PlacePageGalleryLayout: IPlacePageLayout { var header: PlacePageHeaderViewController? { nil } var actionBar: ActionBarViewController? { nil } var navigationBar: UIViewController? { nil } - var adState: AdBannerState = .unset var viewControllers: [UIViewController] { [guidesGalleryViewController] diff --git a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift index df9c53cc2a..c4f2d137d5 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift @@ -81,7 +81,6 @@ final class PlacePageScrollView: UIScrollView { super.traitCollectionDidChange(previousTraitCollection) if self.previousTraitCollection != nil { DispatchQueue.main.async { - self.layout.adState = .detailed self.updateSteps() self.showLastStop() self.scrollView.contentInset = self.alternativeSizeClass(iPhone: UIEdgeInsets(top: self.scrollView.height, left: 0, bottom: 0, right: 0), @@ -300,27 +299,14 @@ extension PlacePageViewController: UIScrollViewDelegate { targetContentOffset: UnsafeMutablePointer) { let maxOffset = scrollSteps.last?.offset ?? 0 if targetContentOffset.pointee.y > maxOffset { - layout.adState = .detailed return } let targetState = findNextStop(scrollView.contentOffset.y, velocity: velocity.y) if targetState.offset > scrollView.contentSize.height - scrollView.contentInset.top { - layout.adState = .detailed return } - switch targetState { - case .closed: - fallthrough - case .preview: - layout.adState = .compact - case .previewPlus: - fallthrough - case .expanded: - fallthrough - case .full: - layout.adState = .detailed - } + updateSteps() let nextStep = findNextStop(scrollView.contentOffset.y, velocity: velocity.y) targetContentOffset.pointee = CGPoint(x: 0, y: nextStep.offset) diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm index b4e7b39bfa..55b9608eb3 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm @@ -54,7 +54,6 @@ NSString *GetLocalizedTypeName(search::Result const &result) { tableView.rowHeight = UITableViewAutomaticDimension; [tableView registerNibWithCellClass:[MWMSearchSuggestionCell class]]; [tableView registerNibWithCellClass:[MWMSearchCommonCell class]]; - [tableView registerClassWithCellClass:[MWMAdBannerCell class]]; } - (void)reloadData { @@ -104,16 +103,6 @@ NSString *GetLocalizedTypeName(search::Result const &result) { } case MWMSearchItemTypeMopub: case MWMSearchItemTypeFacebook: { - auto cell = static_cast([tableView dequeueReusableCellWithCellClass:[MWMAdBannerCell class] - indexPath:indexPath]); - auto ad = [MWMSearch adWithContainerIndex:containerIndex]; - [cell configWithAd:ad - containerType:MWMAdBannerContainerTypeSearch - canRemoveAds:[SubscriptionManager canMakePayments] - onRemoveAds:^{ - [[MapViewController sharedController] showRemoveAds]; - }]; - return cell; } case MWMSearchItemTypeSuggestion: { auto cell = static_cast( diff --git a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm index e794f4e9c8..d8804846c4 100644 --- a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm @@ -9,7 +9,7 @@ using namespace power_management; -@interface MWMSettingsViewController () +@interface MWMSettingsViewController () @property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell *profileCell; @@ -215,9 +215,6 @@ using namespace power_management; } - (void)showRemoveAds { - auto removeAds = [[RemoveAdsViewController alloc] init]; - removeAds.delegate = self; - [self.navigationController presentViewController:removeAds animated:YES completion:nil]; } #pragma mark - SettingsTableViewSwitchCellDelegate @@ -374,20 +371,6 @@ using namespace power_management; } } -#pragma mark - RemoveAdsViewControllerDelegate - -- (void)didCompleteSubscribtion:(RemoveAdsViewController *)viewController { - [self.navigationController dismissViewControllerAnimated:YES completion:nil]; - self.showOffersCell.isEnabled = NO; -} - -- (void)didCancelSubscribtion:(RemoveAdsViewController *)viewController { - [self.navigationController dismissViewControllerAnimated:YES - completion:^{ - self.showOffersCell.isOn = YES; - }]; -} - #pragma mark - RestoreSubscription - (void)restoreSubscription { diff --git a/iphone/Maps/main.mm b/iphone/Maps/main.mm index 1dd91634d8..867ce7026e 100644 --- a/iphone/Maps/main.mm +++ b/iphone/Maps/main.mm @@ -1,8 +1,6 @@ -#import #import "MapsAppDelegate.h" #ifdef OMIM_PRODUCTION -#import #include "fabric_logging.hpp" #endif @@ -10,46 +8,6 @@ #include "platform/platform.hpp" #include "platform/settings.hpp" -void setPushWooshSender() -{ - GetPlatform().GetMarketingService().SetPushWooshSender([](std::string const & tag, std::vector const & values) - { - if (values.empty() || tag.empty()) - return; - PushNotificationManager * pushManager = [PushNotificationManager pushManager]; - if (values.size() == 1) - { - [pushManager setTags:@{ @(tag.c_str()) : @(values.front().c_str()) }]; - } - else - { - NSMutableArray * tags = [@[] mutableCopy]; - for (auto const & value : values) - [tags addObject:@(value.c_str())]; - [pushManager setTags:@{ @(tag.c_str()) : tags }]; - } - }); -} - -void setMarketingSender() -{ - GetPlatform().GetMarketingService().SetMarketingSender([](std::string const & tag, std::map const & params) - { - if (tag.empty()) - return; - NSMutableDictionary * eventParams = [@{} mutableCopy]; - for (auto const & param : params) - { - NSString * key = @(param.first.c_str()); - NSString * value = @(param.second.c_str()); - eventParams[key] = value; - } - - #ifdef OMIM_PRODUCTION - [[AppsFlyerTracker sharedTracker] trackEvent:@(tag.c_str()) withValues:eventParams]; - #endif - }); -} int main(int argc, char * argv[]) { @@ -62,9 +20,6 @@ int main(int argc, char * argv[]) auto & p = GetPlatform(); LOG(LINFO, ("omaps started, detected CPU cores:", p.CpuCores())); - setPushWooshSender(); - setMarketingSender(); - int retVal; @autoreleasepool {