From 172f6448a7c7508b65ea11c752ac0e3bcd6f0d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=80=D0=B5=D1=87=D1=83?= =?UTF-8?q?=D1=85=D0=B8=D0=BD?= Date: Fri, 20 Nov 2015 17:59:23 +0300 Subject: [PATCH] [ios] Optimized showcase load. --- .../BottomMenu/MWMBottomMenuViewController.mm | 5 +---- iphone/Maps/Classes/MapViewController.h | 1 + iphone/Maps/Classes/MapViewController.mm | 9 +++++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm index 09e1ab5a18..a36fc99f27 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm @@ -574,10 +574,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) - (NSUInteger)additionalButtonsCount { - BOOL const haveAppWall = (self.controller.appWallAd != nil); - BOOL const haveBanners = (self.controller.appWallAd.banners && self.controller.appWallAd.banners != 0); - BOOL const adForbidden = (!haveAppWall || !haveBanners); - return MWMBottomMenuViewCellCount - (adForbidden ? 1 : 0); + return MWMBottomMenuViewCellCount - (self.controller.isAppWallAdActive ? 0 : 1); } @end diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index a65f3d6bc6..7dc96da2d5 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -47,6 +47,7 @@ namespace search { struct AddressInfo; } - (void)openBookmarks; @property (nonatomic) MTRGNativeAppwallAd * appWallAd; +@property (nonatomic, readonly) BOOL isAppWallAdActive; @property (nonatomic) UIPopoverController * popoverVC; @property (nonatomic) ShareActionSheet * shareActionSheet; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 9cb11bba83..fc96a8c87b 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -800,6 +800,8 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction) self.appWallAd = nil; return; } + if (self.isAppWallAdActive) + return; self.appWallAd = [[MTRGNativeAppwallAd alloc]initWithSlotId:@(MY_TARGET_KEY)]; self.appWallAd.handleLinksInApp = YES; self.appWallAd.closeButtonTitle = L(@"close"); @@ -965,4 +967,11 @@ NSInteger compareAddress(id l, id r, void * context) return _controlsManager; } +- (BOOL)isAppWallAdActive +{ + BOOL const haveAppWall = (self.appWallAd != nil); + BOOL const haveBanners = (self.appWallAd.banners && self.appWallAd.banners != 0); + return haveAppWall && haveBanners; +} + @end