diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm index e8e643da41..df63b54111 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm @@ -11,21 +11,22 @@ { UICollectionViewLayoutAttributes * attr = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath]; - CGSize const size = self.collectionView.frame.size; + CGPoint origin = {}; + CGSize size = self.collectionView.frame.size; CGFloat const position = (CGFloat)indexPath.item / self.buttonsCount; attr.hidden = (size.width == 0.0 || size.height == 0.0); if (size.width > self.layoutThreshold) { - CGFloat const xPos = nearbyint(position * size.width); - CGFloat const width = nearbyint(size.width / self.buttonsCount); - attr.frame = {{xPos, 0.0}, {width, size.height}}; + origin = {nearbyint(position * size.width), 0.0}; + size.width = nearbyint(size.width / self.buttonsCount); } else { - CGFloat const yPos = nearbyint(position * size.height); - CGFloat const height = nearbyint(size.height / self.buttonsCount); - attr.frame = {{0.0, yPos}, {size.width, height}}; + origin = {0.0, nearbyint(position * size.height)}; + size.height = nearbyint(size.height / self.buttonsCount); } + NSAssert(!CGSizeEqualToSize(size, CGSizeZero), @"Invalid cell size"); + attr.frame = {origin, size}; return attr; } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm index f7a8e75208..0076c09f62 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm @@ -286,10 +286,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) { MTRGNativeAppwallBanner * banner = [self.controller.appWallAd.banners firstObject]; [self.controller.appWallAd handleShow:banner]; - UIImage * image = banner.icon.image; - UIImage * highlightedImage = banner.itemHighlightIcon.image; - NSString * title = banner.title; - [cell configureWithImage:image highlightedImage:highlightedImage label:title badgeCount:0]; + [cell configureWithImageName:@"ic_menu_showcase" label:L(@"showcase_more_apps") badgeCount:0]; } break; case MWMBottomMenuViewCellCount: @@ -381,10 +378,11 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) - (void)menuActionOpenAd { - NSAssert(self.controller.appWallAd.banners.count != 0, @"Banners collection can not be empty!"); + NSArray * banners = self.controller.appWallAd.banners; + NSAssert(banners.count != 0, @"Banners collection can not be empty!"); [[Statistics instance] logEvent:kStatMenu withParameters:@{kStatButton : kStatMoreApps}]; self.state = self.restoreState; - [self.controller.appWallAd handleClick:[self.controller.appWallAd.banners firstObject] + [self.controller.appWallAd handleClick:[banners firstObject] withController:self.controller]; } diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json new file mode 100644 index 0000000000..536501036c --- /dev/null +++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_menu_showcase.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_menu_showcase@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_menu_showcase@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png new file mode 100644 index 0000000000..e9d1787c57 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase.png differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png new file mode 100644 index 0000000000..0972f7f1fd Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png new file mode 100644 index 0000000000..1f8e51c14c Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase.imageset/ic_menu_showcase@3x.png differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/Contents.json new file mode 100644 index 0000000000..740c008e1a --- /dev/null +++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_menu_showcase_press.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_menu_showcase_press@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_menu_showcase_press@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press.png new file mode 100644 index 0000000000..4531c8092e Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press.png differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press@2x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press@2x.png new file mode 100644 index 0000000000..a766a4ee06 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press@2x.png differ diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press@3x.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press@3x.png new file mode 100644 index 0000000000..c0fbbacef7 Binary files /dev/null and b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_showcase_press.imageset/ic_menu_showcase_press@3x.png differ