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

[ios] Attempt to fix crash with place page opening hours layout.

Browse source
This commit is contained in:
VladiMihaylenko 2017-02-01 12:42:13 +03:00 • committed by Илья Гречухин
parent 5017b013e9
commit 01353f902a
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm
View file

@ -164,9 +164,15 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
if (self.isExtended)
{
[self extendMetainfoRowsWithSize:ip.count];
[tableView insertRowsAtIndexPaths:ip
withRowAnimation:UITableViewRowAnimationLeft];
if ([self extendMetainfoRowsWithSize:ip.count])
{
[tableView insertRowsAtIndexPaths:ip
withRowAnimation:UITableViewRowAnimationLeft];
}
else
{
LOG(LWARNING, ("Incorrect raw opening hours string: ", self.rawString.UTF8String));
}
}
else
{
@ -203,12 +209,12 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
}
}
- (void)extendMetainfoRowsWithSize:(NSUInteger)size
- (BOOL)extendMetainfoRowsWithSize:(NSUInteger)size
{
if (size == 0)
{
NSAssert(false, @"Incorrect number of days!");
return;
LOG(LWARNING, ("Incorrect number of days!"));
return NO;
}
auto & metainfoRows = self.data.mutableMetainfoRows;
@ -218,10 +224,11 @@ NSAttributedString * richStringFromDay(osmoh::Day const & day, BOOL isClosedNow)
if (it == metainfoRows.end())
{
LOG(LERROR, ("Incorrect state!"));
return;
return NO;
}
metainfoRows.insert(++it, size, MetainfoRows::ExtendedOpeningHours);
return YES;
}
- (void)reduceMetainfoRows