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

[MAPSME-6077] [ios] Fixed PPP banner display.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-12-04 18:26:53 +03:00
parent 22b779d4f1
commit 53a5720c4e
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm
View file

@ -115,25 +115,18 @@ array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class],
@interface MWMPPPreviewLayoutHelper ()
@property(weak, nonatomic) UITableView * tableView;
@property(weak, nonatomic) NSLayoutConstraint * distanceCellTrailing;
@property(weak, nonatomic) UIView * distanceView;
@property(weak, nonatomic) MWMPlacePageData * data;
@property(weak, nonatomic) id<MWMPPPreviewLayoutHelperDelegate> delegate;
@property(nonatomic) CGFloat leading;
@property(nonatomic) MWMDirectionView * directionView;
@property(copy, nonatomic) NSString * distance;
@property(copy, nonatomic) NSString * speedAndAltitude;
@property(weak, nonatomic) UIImageView * compass;
@property(nonatomic) NSIndexPath * lastCellIndexPath;
@property(nonatomic) BOOL lastCellIsBanner;
@property(nonatomic) MWMDirectionView * directionView;
@property(nonatomic) NSUInteger distanceRow;
@property(weak, nonatomic) MWMAdBanner * cachedBannerCell;
@property(weak, nonatomic) MWMPlacePageData * data;
@property(weak, nonatomic) NSLayoutConstraint * distanceCellTrailing;
@property(weak, nonatomic) UIImageView * compass;
@property(weak, nonatomic) UITableView * tableView;
@property(weak, nonatomic) UIView * distanceView;
@property(weak, nonatomic) _MWMPPPSubtitle * cachedSubtitle;
@property(weak, nonatomic) id<MWMPPPreviewLayoutHelperDelegate> delegate;
@end
@ -162,8 +155,6 @@ array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class],
self.data = data;
auto const & previewRows = data.previewRows;
using place_page::PreviewRows;
self.lastCellIsBanner = NO;
self.lastCellIndexPath = [NSIndexPath indexPathForRow:previewRows.size() - 1 inSection:0];
if (data.isMyPosition || previewRows.size() == 1)
{
@ -340,12 +331,6 @@ array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class],
auto data = self.data;
if (!data)
return;
auto const & previewRows = data.previewRows;
auto const size = previewRows.size();
self.lastCellIsBanner = previewRows.back() == place_page::PreviewRows::Banner;
self.lastCellIndexPath =
[NSIndexPath indexPathForRow:size - 1
inSection:static_cast<NSUInteger>(place_page::Sections::Preview)];
[self.tableView insertRowsAtIndexPaths:@[ self.lastCellIndexPath ]
withRowAnimation:UITableViewRowAnimationLeft];
[self.delegate heightWasChanged];
@ -392,4 +377,21 @@ array<Class, 8> const kPreviewCells = {{[_MWMPPPTitle class],
return _directionView;
}
- (NSIndexPath *)lastCellIndexPath
{
auto data = self.data;
if (!data)
return nil;
return [NSIndexPath indexPathForRow:data.previewRows.size() - 1
inSection:static_cast<NSUInteger>(place_page::Sections::Preview)];
}
- (BOOL)lastCellIsBanner
{
auto data = self.data;
if (!data)
return NO;
return data.previewRows.back() == place_page::PreviewRows::Banner;
}
@end