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

Merge pull request #4552 from VladiMihaylenko/master

Browse source 
[ios] Fixed crash with opening hours.
This commit is contained in:
mpimenov 2016-10-25 15:43:47 +03:00 • committed by GitHub
commit 0a34ded0eb
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
@interface MWMOpeningHoursCell : MWMTableViewCell
- (void)configureWithOpeningHours:(NSString *)openningHours
- (void)configureWithOpeningHours:(NSString *)openingHours
updateLayoutDelegate:(id<MWMPlacePageCellUpdateProtocol>)delegate
isClosedNow:(BOOL)isClosedNow;
@end

17
iphone/Maps/Classes/MWMOpeningHoursCell.mm
View file

@ -99,6 +99,7 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
@property(weak, nonatomic) IBOutlet UITableView * tableView;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * tableViewHeight;
@property(copy, nonatomic) NSString * rawString;
@property(weak, nonatomic) id<MWMPlacePageCellUpdateProtocol> delegate;
@ -123,7 +124,7 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
[self registerObserver];
}
- (void)configureWithOpeningHours:(NSString *)openningHours
- (void)configureWithOpeningHours:(NSString *)openingHours
updateLayoutDelegate:(id<MWMPlacePageCellUpdateProtocol>)delegate
isClosedNow:(BOOL)isClosedNow;
{
@ -132,9 +133,11 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
self.isExtended = NO;
self.delegate = delegate;
self.isClosedNow = isClosedNow;
// If we can't parse opening hours string then leave it as is.
self.rawString = openingHours;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
self->m_days = [MWMOpeningHours processRawString:openningHours];
self->m_days = [MWMOpeningHours processRawString:openingHours];
dispatch_async(dispatch_get_main_queue(), ^{
self.tableView.delegate = self;
self.tableView.dataSource = self;
@ -147,7 +150,7 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return self.isExtended ? m_days.size() : 1;
return self.isExtended && !m_days.empty() ? m_days.size() : 1;
}
- (UITableViewCell *)tableView:(UITableView *)tableView
@ -159,7 +162,6 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
{
_MWMOHHeaderCell * cell =
[tableView dequeueReusableCellWithIdentifier:[_MWMOHHeaderCell className]];
cell.text.attributedText = richStringFromDay(day, self.isClosedNow);
if (m_days.size() > 1)
{
@ -185,6 +187,13 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
cell.tapAction = nil;
cell.arrowIcon.hidden = YES;
}
// This means that we couldn't parse opening hours string.
if (m_days.empty())
cell.text.text = self.rawString;
else
cell.text.attributedText = richStringFromDay(day, self.isClosedNow);
return cell;
}
else