Skip to content

COMPATIBILITY: Updating deprecated enumeration values for NSCalendar in iOS7+ #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrmomoko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

COMPATIBILITY: Updating deprecated enumeration values for NSCalendar in iOS7+ #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DSLCalendarView/DSLCalendarMonthSelectorView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ - (void)awakeFromNib {
[super awakeFromNib];

// Get a dictionary of localised day names
NSDateComponents *dateComponents = [[NSCalendar currentCalendar] components:NSCalendarCalendarUnit | NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSWeekdayCalendarUnit fromDate:[NSDate date]];
NSDateComponents *dateComponents = [[NSCalendar currentCalendar] components:NSCalendarUnitCalendar | NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitWeekday fromDate:[NSDate date]];
NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
formatter.dateFormat = @"EEE";
NSMutableDictionary *dayNames = [[NSMutableDictionary alloc] init];
Expand All @@ -90,7 +90,7 @@ - (void)awakeFromNib {
[dayNames setObject:[formatter stringFromDate:dateComponents.date] forKey:@(weekday)];

dateComponents.day = dateComponents.day + 1;
dateComponents = [dateComponents.calendar components:NSCalendarCalendarUnit | NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSWeekdayCalendarUnit fromDate:dateComponents.date];
dateComponents = [dateComponents.calendar components:NSCalendarUnitCalendar | NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitWeekday fromDate:dateComponents.date];
}

// Set the day name label texts to localised day names
Expand Down
2 changes: 1 addition & 1 deletion DSLCalendarView/DSLCalendarMonthView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ - (void)createDayViews {
NSDate *firstDate = [day.calendar dateFromComponents:day];
day = [firstDate dslCalendarView_dayWithCalendar:self.month.calendar];

NSInteger numberOfDaysInMonth = [day.calendar rangeOfUnit:NSDayCalendarUnit inUnit:NSMonthCalendarUnit forDate:[day date]].length;
NSInteger numberOfDaysInMonth = [day.calendar rangeOfUnit:NSCalendarUnitDay inUnit:NSCalendarUnitMonth forDate:[day date]].length;

NSInteger startColumn = day.weekday - day.calendar.firstWeekday;
if (startColumn < 0) {
Expand Down
10 changes: 5 additions & 5 deletions DSLCalendarView/DSLCalendarView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ - (id)initWithFrame:(CGRect)frame {
- (void)commonInit {
_dayViewHeight = 44;

_visibleMonth = [[NSCalendar currentCalendar] components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSWeekdayCalendarUnit | NSCalendarCalendarUnit fromDate:[NSDate date]];
_visibleMonth = [[NSCalendar currentCalendar] components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitWeekday | NSCalendarUnitCalendar fromDate:[NSDate date]];
_visibleMonth.day = 1;

_showDayCalloutView = YES;
Expand Down Expand Up @@ -194,12 +194,12 @@ - (void)updateMonthLabelMonth:(NSDateComponents*)month {
}

- (NSString*)monthViewKeyForMonth:(NSDateComponents*)month {
month = [month.calendar components:NSYearCalendarUnit | NSMonthCalendarUnit fromDate:month.date];
month = [month.calendar components:NSCalendarUnitYear | NSCalendarUnitMonth fromDate:month.date];
return [NSString stringWithFormat:@"%ld.%ld", (long)month.year, (long)month.month];
}

- (DSLCalendarMonthView*)cachedOrCreatedMonthViewForMonth:(NSDateComponents*)month {
month = [month.calendar components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSWeekdayCalendarUnit | NSCalendarCalendarUnit fromDate:month.date];
month = [month.calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitWeekday | NSCalendarUnitCalendar fromDate:month.date];

NSString *monthViewKey = [self monthViewKeyForMonth:month];
DSLCalendarMonthView *monthView = [self.monthViews objectForKey:monthViewKey];
Expand Down Expand Up @@ -232,7 +232,7 @@ - (void)positionViewsForMonth:(NSDateComponents*)month fromMonth:(NSDateComponen
for (NSInteger monthOffset = -2; monthOffset <= 2; monthOffset += 1) {
NSDateComponents *offsetMonth = [month copy];
offsetMonth.month = offsetMonth.month + monthOffset;
offsetMonth = [offsetMonth.calendar components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSWeekdayCalendarUnit | NSCalendarCalendarUnit fromDate:offsetMonth.date];
offsetMonth = [offsetMonth.calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitWeekday | NSCalendarUnitCalendar fromDate:offsetMonth.date];

// Check if this month should overlap the previous month
if (![self monthStartsOnFirstDayOfWeek:offsetMonth]) {
Expand Down Expand Up @@ -351,7 +351,7 @@ - (void)positionViewsForMonth:(NSDateComponents*)month fromMonth:(NSDateComponen

- (BOOL)monthStartsOnFirstDayOfWeek:(NSDateComponents*)month {
// Make sure we have the components we need to do the calculation
month = [month.calendar components:NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSWeekdayCalendarUnit | NSCalendarCalendarUnit fromDate:month.date];
month = [month.calendar components:NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitWeekday | NSCalendarUnitCalendar fromDate:month.date];

return (month.weekday - month.calendar.firstWeekday == 0);
}
Expand Down
4 changes: 2 additions & 2 deletions DSLCalendarView/NSDate+DSLCalendarView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
@implementation NSDate (DSLCalendarView)

- (NSDateComponents*)dslCalendarView_dayWithCalendar:(NSCalendar*)calendar {
return [calendar components:NSCalendarCalendarUnit | NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSWeekdayCalendarUnit fromDate:self];
return [calendar components:NSCalendarUnitCalendar | NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitWeekday fromDate:self];
}

- (NSDateComponents*)dslCalendarView_monthWithCalendar:(NSCalendar*)calendar {
return [calendar components:NSCalendarCalendarUnit | NSYearCalendarUnit | NSMonthCalendarUnit fromDate:self];
return [calendar components:NSCalendarUnitCalendar | NSCalendarUnitYear | NSCalendarUnitMonth fromDate:self];
}

@end
4 changes: 2 additions & 2 deletions Example/DSLCalendarViewExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
SDKROOT = iphoneos;
};
name = Debug;
Expand All @@ -375,7 +375,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down