Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
iOS SDK 8.1 warning fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@chencan
chencan committed Jan 8, 2015
1 parent f865107 commit e67180f
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions NSDate+TimeAgo.m
View file
Expand Up @@ -130,13 +130,13 @@ - (NSString *)dateTimeAgo
NSCalendar *calendar = [NSCalendar currentCalendar];
NSDate * now = [NSDate date];
NSDateComponents *components = [calendar components:
NSYearCalendarUnit|
NSMonthCalendarUnit|
NSWeekCalendarUnit|
NSDayCalendarUnit|
NSHourCalendarUnit|
NSMinuteCalendarUnit|
NSSecondCalendarUnit
NSCalendarUnitYear|
NSCalendarUnitMonth|
NSCalendarUnitWeekOfYear|
NSCalendarUnitDay|
NSCalendarUnitHour|
NSCalendarUnitMinute|
NSCalendarUnitSecond
fromDate:self
toDate:now
options:0];
Expand All @@ -157,13 +157,13 @@ - (NSString *)dateTimeAgo
}
return [self stringFromFormat:@"%%d %@months ago" withValue:components.month];
}
else if (components.week >= 1)
else if (components.weekOfYear >= 1)
{
if (components.week == 1)
if (components.weekOfYear == 1)
{
return NSDateTimeAgoLocalizedStrings(@"1 week ago");
}
return [self stringFromFormat:@"%%d %@weeks ago" withValue:components.week];
return [self stringFromFormat:@"%%d %@weeks ago" withValue:components.weekOfYear];
}
else if (components.day >= 1) // up to 6 days ago
{
Expand Down Expand Up @@ -205,25 +205,25 @@ - (NSString *)dateTimeUntilNow
NSDate * now = [NSDate date];
NSCalendar *calendar = [NSCalendar currentCalendar];

NSDateComponents *components = [calendar components:NSHourCalendarUnit
NSDateComponents *components = [calendar components:NSCalendarUnitHour
fromDate:self
toDate:now
options:0];

if (components.hour >= 6) // if more than 6 hours ago, change precision
{
NSInteger startDay = [calendar ordinalityOfUnit:NSDayCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger startDay = [calendar ordinalityOfUnit:NSCalendarUnitDay
inUnit:NSCalendarUnitEra
forDate:self];
NSInteger endDay = [calendar ordinalityOfUnit:NSDayCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger endDay = [calendar ordinalityOfUnit:NSCalendarUnitDay
inUnit:NSCalendarUnitEra
forDate:now];

NSInteger diffDays = endDay - startDay;
if (diffDays == 0) // today!
{
NSDateComponents * startHourComponent = [calendar components:NSHourCalendarUnit fromDate:self];
NSDateComponents * endHourComponent = [calendar components:NSHourCalendarUnit fromDate:self];
NSDateComponents * startHourComponent = [calendar components:NSCalendarUnitHour fromDate:self];
NSDateComponents * endHourComponent = [calendar components:NSCalendarUnitHour fromDate:self];
if (startHourComponent.hour < 12 &&
endHourComponent.hour > 12)
{
Expand All @@ -243,11 +243,11 @@ - (NSString *)dateTimeUntilNow
}
else
{
NSInteger startWeek = [calendar ordinalityOfUnit:NSWeekCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger startWeek = [calendar ordinalityOfUnit:NSCalendarUnitWeekOfYear
inUnit:NSCalendarUnitEra
forDate:self];
NSInteger endWeek = [calendar ordinalityOfUnit:NSWeekCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger endWeek = [calendar ordinalityOfUnit:NSCalendarUnitWeekOfYear
inUnit:NSCalendarUnitEra
forDate:now];
NSInteger diffWeeks = endWeek - startWeek;
if (diffWeeks == 0)
Expand All @@ -260,11 +260,11 @@ - (NSString *)dateTimeUntilNow
}
else
{
NSInteger startMonth = [calendar ordinalityOfUnit:NSMonthCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger startMonth = [calendar ordinalityOfUnit:NSCalendarUnitMonth
inUnit:NSCalendarUnitEra
forDate:self];
NSInteger endMonth = [calendar ordinalityOfUnit:NSMonthCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger endMonth = [calendar ordinalityOfUnit:NSCalendarUnitMonth
inUnit:NSCalendarUnitEra
forDate:now];
NSInteger diffMonths = endMonth - startMonth;
if (diffMonths == 0)
Expand All @@ -277,11 +277,11 @@ - (NSString *)dateTimeUntilNow
}
else
{
NSInteger startYear = [calendar ordinalityOfUnit:NSYearCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger startYear = [calendar ordinalityOfUnit:NSCalendarUnitYear
inUnit:NSCalendarUnitEra
forDate:self];
NSInteger endYear = [calendar ordinalityOfUnit:NSYearCalendarUnit
inUnit:NSEraCalendarUnit
NSInteger endYear = [calendar ordinalityOfUnit:NSCalendarUnitYear
inUnit:NSCalendarUnitEra
forDate:now];
NSInteger diffYears = endYear - startYear;
if (diffYears == 0)
Expand Down

0 comments on commit e67180f

Please sign in to comment.