kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[xc-scheme] [ios] Fixed crash.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-02-16 13:23:21 +03:00 • committed by Sergey Yershov
parent 91a5d7d6d7
commit 3b310a71fc
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -177,15 +177,26 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
dateStyle:NSDateFormatterNoStyle
timeStyle:NSDateFormatterShortStyle];
}
self.distanceLabel.text = info.targetDistance;
self.distanceLegendLabel.text = info.targetUnits;
NSMutableAttributedString * distance =
[[NSMutableAttributedString alloc] initWithString:info.targetDistance
attributes:routingNumberAttributes];
[distance
appendAttributedString:[[NSAttributedString alloc] initWithString:info.targetUnits
attributes:routingLegendAttributes]];
self.distanceWithLegendLabel.attributedText = distance;
NSString * targetDistance = info.targetDistance;
NSMutableAttributedString * distance;
if (targetDistance)
{
self.distanceLabel.text = targetDistance;
distance = [[NSMutableAttributedString alloc] initWithString:targetDistance
attributes:routingNumberAttributes];
}
NSString * targetUnits = info.targetUnits;
if (targetUnits)
{
self.distanceLegendLabel.text = targetUnits;
if (distance)
{
[distance appendAttributedString:[[NSAttributedString alloc] initWithString:targetUnits
attributes:routingLegendAttributes]];
self.distanceWithLegendLabel.attributedText = distance;
}
}
NSString * currentSpeed = info.speed ?: @"0";
self.speedLabel.text = currentSpeed;