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

Merge pull request #3806 from igrechuhin/navigation

Browse source 
[ios] Fixed eta formatter.
This commit is contained in:
Vlad Mihaylenko 2016-07-18 12:43:18 +04:00 • committed by GitHub
commit 4f92d16e45
4 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
iphone/Maps/Categories/TimeUtils.h
View file

@ -3,7 +3,6 @@
@interface NSDateFormatter (Utils)
+ (NSString *)estimatedArrivalTimeWithSeconds:(NSNumber *)seconds;
+ (NSDate *)dateWithString:(NSString *)dateString;
+ (NSString *)estimatedArrivalTimeWithSeconds:(NSTimeInterval)seconds;
@end

32
iphone/Maps/Categories/TimeUtils.mm
View file

@ -1,27 +1,25 @@
#import "TimeUtils.h"
#import "Common.h"
@implementation NSDateFormatter (Seconds)
+ (NSString *)estimatedArrivalTimeWithSeconds:(NSNumber *)seconds
+ (NSString *)estimatedArrivalTimeWithSeconds:(NSTimeInterval)seconds
{
NSInteger const ti = [seconds integerValue];
NSInteger const minutes = ti / 60;
NSInteger const hours = minutes / 60;
return [NSString stringWithFormat:@"%ld:%02ld", (long)hours, (long)(minutes % 60)];
}
+ (NSDate *)dateWithString:(NSString *)dateString
{
static NSDateFormatter * dateFormatter;
if (!dateFormatter)
if (isIOS7)
{
dateFormatter = [NSDateFormatter new];
dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
dateFormatter.dateFormat = @"yyyy-MM-dd'T'HH:mm:ss";
NSInteger const minutes = seconds / 60;
NSInteger const hours = minutes / 60;
return [NSString stringWithFormat:@"%ld:%02ld", (long)hours, (long)(minutes % 60)];
}
else
{
NSDateComponentsFormatter * formatter = [[NSDateComponentsFormatter alloc] init];
formatter.allowedUnits = NSCalendarUnitMinute | NSCalendarUnitHour | NSCalendarUnitDay;
formatter.maximumUnitCount = 2;
formatter.unitsStyle = NSDateComponentsFormatterUnitsStyleAbbreviated;
formatter.zeroFormattingBehavior = NSDateComponentsFormatterZeroFormattingBehaviorDropAll;
return [formatter stringFromTimeInterval:seconds];
}
NSDate * date = [dateFormatter dateFromString:dateString];
return date;
}
@end

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -149,7 +149,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
self.navigationInfo = info;
if (self.routingInfoPageControl.currentPage == 0)
{
self.timeLabel.text = [NSDateFormatter estimatedArrivalTimeWithSeconds:@(info.timeToTarget)];
self.timeLabel.text = [NSDateFormatter estimatedArrivalTimeWithSeconds:info.timeToTarget];
}
else
{

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm
View file

@ -323,7 +323,7 @@ static CGFloat constexpr kAdditionalHeight = 20.;
- (void)updateNavigationInfo:(MWMNavigationDashboardEntity *)info
{
NSString * eta = [NSDateFormatter estimatedArrivalTimeWithSeconds:@(info.timeToTarget)];
NSString * eta = [NSDateFormatter estimatedArrivalTimeWithSeconds:info.timeToTarget];
NSString * resultString =
[NSString stringWithFormat:@"%@ • %@ %@", eta, info.targetDistance, info.targetUnits];
NSMutableAttributedString * result =