From eb0cdd8fb0f3946059748a50cb0fd887a9c7ac55 Mon Sep 17 00:00:00 2001 From: Keith Lazuka Date: Sun, 3 Jan 2010 08:31:17 -0500 Subject: [PATCH] Removed dead code and did a little cleanup. --- Kal.xcodeproj/project.pbxproj | 6 ------ Kal/KalDate.m | 6 +++++- Kal/KalGridView.m | 4 ++-- Kal/KalLogic.m | 4 ++-- Kal/KalMonthView.h | 2 +- Kal/KalMonthView.m | 10 +++++----- Kal/KalPrivate.h | 1 - Kal/NSDateAdditions.h | 6 ------ Kal/NSDateAdditions.m | 26 -------------------------- Kal/NSMutableArrayAdditions.h | 14 -------------- Kal/NSMutableArrayAdditions.m | 23 ----------------------- 11 files changed, 15 insertions(+), 87 deletions(-) delete mode 100644 Kal/NSMutableArrayAdditions.h delete mode 100644 Kal/NSMutableArrayAdditions.m diff --git a/Kal.xcodeproj/project.pbxproj b/Kal.xcodeproj/project.pbxproj index 5e7fa2a..4fbc9d8 100755 --- a/Kal.xcodeproj/project.pbxproj +++ b/Kal.xcodeproj/project.pbxproj @@ -42,7 +42,6 @@ 53D9F89010DD9CEE00759172 /* KalView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D9F87510DD9CEE00759172 /* KalView.m */; }; 53D9F89110DD9CEE00759172 /* KalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D9F87710DD9CEE00759172 /* KalViewController.m */; }; 53D9F89710DD9CEE00759172 /* NSDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D9F87E10DD9CEE00759172 /* NSDateAdditions.m */; }; - 53D9F89810DD9CEE00759172 /* NSMutableArrayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D9F88010DD9CEE00759172 /* NSMutableArrayAdditions.m */; }; 53D9F89F10DD9CEE00759172 /* UIViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D9F88910DD9CEE00759172 /* UIViewAdditions.m */; }; 53D9F8AE10DD9D9D00759172 /* HolidayAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D9F8AC10DD9D9D00759172 /* HolidayAppDelegate.m */; }; 53D9F95F10DFC21D00759172 /* kal_grid_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 53D9F95310DFC21D00759172 /* kal_grid_background.png */; }; @@ -109,8 +108,6 @@ 53D9F87710DD9CEE00759172 /* KalViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KalViewController.m; sourceTree = ""; }; 53D9F87D10DD9CEE00759172 /* NSDateAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDateAdditions.h; sourceTree = ""; }; 53D9F87E10DD9CEE00759172 /* NSDateAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSDateAdditions.m; sourceTree = ""; }; - 53D9F87F10DD9CEE00759172 /* NSMutableArrayAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMutableArrayAdditions.h; sourceTree = ""; }; - 53D9F88010DD9CEE00759172 /* NSMutableArrayAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSMutableArrayAdditions.m; sourceTree = ""; }; 53D9F88810DD9CEE00759172 /* UIViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIViewAdditions.h; sourceTree = ""; }; 53D9F88910DD9CEE00759172 /* UIViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIViewAdditions.m; sourceTree = ""; }; 53D9F8A910DD9D9D00759172 /* Holiday_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Holiday_Prefix.pch; sourceTree = ""; }; @@ -252,8 +249,6 @@ children = ( 53D9F87D10DD9CEE00759172 /* NSDateAdditions.h */, 53D9F87E10DD9CEE00759172 /* NSDateAdditions.m */, - 53D9F87F10DD9CEE00759172 /* NSMutableArrayAdditions.h */, - 53D9F88010DD9CEE00759172 /* NSMutableArrayAdditions.m */, 53D9F88810DD9CEE00759172 /* UIViewAdditions.h */, 53D9F88910DD9CEE00759172 /* UIViewAdditions.m */, ); @@ -361,7 +356,6 @@ 53D9F89010DD9CEE00759172 /* KalView.m in Sources */, 53D9F89110DD9CEE00759172 /* KalViewController.m in Sources */, 53D9F89710DD9CEE00759172 /* NSDateAdditions.m in Sources */, - 53D9F89810DD9CEE00759172 /* NSMutableArrayAdditions.m in Sources */, 53D9F89F10DD9CEE00759172 /* UIViewAdditions.m in Sources */, 53D9F8AE10DD9D9D00759172 /* HolidayAppDelegate.m in Sources */, 5387B4A310E902EF0011C4BA /* KalMonthView.m in Sources */, diff --git a/Kal/KalDate.m b/Kal/KalDate.m index cd73676..f8b07b0 100644 --- a/Kal/KalDate.m +++ b/Kal/KalDate.m @@ -43,7 +43,11 @@ - (unsigned int)year { return a.year; } - (NSDate *)NSDate { - return [NSDate cc_dateForDay:a.day month:a.month year:a.year]; + NSDateComponents *c = [[[NSDateComponents alloc] init] autorelease]; + c.day = a.day; + c.month = a.month; + c.year = a.year; + return [[NSCalendar currentCalendar] dateFromComponents:c]; } - (BOOL)isToday { return [self isEqual:today]; } diff --git a/Kal/KalGridView.m b/Kal/KalGridView.m index a2d9c9e..0378ef5 100644 --- a/Kal/KalGridView.m +++ b/Kal/KalGridView.m @@ -205,8 +205,8 @@ - (void)slide:(int)direction // that is sliding offscreen. [backMonthView showDates:[logic daysInSelectedMonth] - beginShared:[logic daysInFinalWeekOfPreviousMonth] - endShared:[logic daysInFirstWeekOfFollowingMonth]]; + leadingAdjacentDates:[logic daysInFinalWeekOfPreviousMonth] + trailingAdjacentDates:[logic daysInFirstWeekOfFollowingMonth]]; BOOL keepOneRow = (direction == SLIDE_UP && [[logic daysInFinalWeekOfPreviousMonth] count] > 0) || (direction == SLIDE_DOWN && [[logic daysInFirstWeekOfFollowingMonth] count] > 0); diff --git a/Kal/KalLogic.m b/Kal/KalLogic.m index be51ae4..bc7dc40 100644 --- a/Kal/KalLogic.m +++ b/Kal/KalLogic.m @@ -24,7 +24,7 @@ + (NSSet *)keyPathsForValuesAffectingSelectedMonthNameAndYear - (id)init { if ((self = [super init])) { - self.baseDate = [[NSDate cc_today] cc_dateByMovingToFirstDayOfTheMonth]; + self.baseDate = [[NSDate date] cc_dateByMovingToFirstDayOfTheMonth]; monthAndYearFormatter = [[NSDateFormatter alloc] init]; [monthAndYearFormatter setDateFormat:@"MMMM yyyy"]; } @@ -43,7 +43,7 @@ - (void)advanceToFollowingMonth - (void)moveToTodaysMonth { - self.baseDate = [[NSDate cc_today] cc_dateByMovingToFirstDayOfTheMonth]; + self.baseDate = [[NSDate date] cc_dateByMovingToFirstDayOfTheMonth]; } - (NSArray *)daysInFinalWeekOfPreviousMonth diff --git a/Kal/KalMonthView.h b/Kal/KalMonthView.h index eb2ecf0..c5401ed 100644 --- a/Kal/KalMonthView.h +++ b/Kal/KalMonthView.h @@ -17,7 +17,7 @@ @property (nonatomic) NSUInteger numWeeks; - (id)initWithFrame:(CGRect)rect; // designated initializer -- (void)showDates:(NSArray *)mainDates beginShared:(NSArray *)firstWeekShared endShared:(NSArray *)finalWeekShared; +- (void)showDates:(NSArray *)mainDates leadingAdjacentDates:(NSArray *)leadingAdjacentDates trailingAdjacentDates:(NSArray *)trailingAdjacentDates; - (KalTileView *)todaysTileIfVisible; - (KalTileView *)firstTileOfMonth; - (KalTileView *)tileForDate:(KalDate *)date; diff --git a/Kal/KalMonthView.m b/Kal/KalMonthView.m index 2ee0d55..6032f35 100644 --- a/Kal/KalMonthView.m +++ b/Kal/KalMonthView.m @@ -31,14 +31,14 @@ - (id)initWithFrame:(CGRect)frame return self; } -- (void)showDates:(NSArray *)mainDates beginShared:(NSArray *)firstWeekShared endShared:(NSArray *)finalWeekShared +- (void)showDates:(NSArray *)mainDates leadingAdjacentDates:(NSArray *)leadingAdjacentDates trailingAdjacentDates:(NSArray *)trailingAdjacentDates { int i = 0; - self.fromDate = [firstWeekShared count] > 0 ? [firstWeekShared objectAtIndex:0] : [mainDates objectAtIndex:0]; - self.toDate = [finalWeekShared count] > 0 ? [finalWeekShared lastObject] : [mainDates lastObject]; + self.fromDate = [leadingAdjacentDates count] > 0 ? [leadingAdjacentDates objectAtIndex:0] : [mainDates objectAtIndex:0]; + self.toDate = [trailingAdjacentDates count] > 0 ? [trailingAdjacentDates lastObject] : [mainDates lastObject]; - for (KalDate *d in firstWeekShared) { + for (KalDate *d in leadingAdjacentDates) { KalTileView *tile = [self.subviews objectAtIndex:i]; [tile resetState]; tile.type = KalTileTypeAdjacent; @@ -56,7 +56,7 @@ - (void)showDates:(NSArray *)mainDates beginShared:(NSArray *)firstWeekShared en i++; } - for (KalDate *d in finalWeekShared) { + for (KalDate *d in trailingAdjacentDates) { KalTileView *tile = [self.subviews objectAtIndex:i]; [tile resetState]; tile.type = KalTileTypeAdjacent; diff --git a/Kal/KalPrivate.h b/Kal/KalPrivate.h index c2bb739..fe6eb97 100644 --- a/Kal/KalPrivate.h +++ b/Kal/KalPrivate.h @@ -5,5 +5,4 @@ #import "UIViewAdditions.h" #import "NSDateAdditions.h" -#import "NSMutableArrayAdditions.h" diff --git a/Kal/NSDateAdditions.h b/Kal/NSDateAdditions.h index 449ff64..b268b53 100644 --- a/Kal/NSDateAdditions.h +++ b/Kal/NSDateAdditions.h @@ -8,19 +8,13 @@ // All of the following methods use [NSCalendar currentCalendar] to perform // their calculations. -+ (NSDate *)cc_today; -+ (NSDate *)cc_dateForDay:(NSUInteger)day month:(NSUInteger)month year:(NSUInteger)year; - -- (BOOL)cc_isToday; - (NSDate *)cc_dateByMovingToBeginningOfDay; - (NSDate *)cc_dateByMovingToEndOfDay; - (NSDate *)cc_dateByMovingToFirstDayOfTheMonth; - (NSDate *)cc_dateByMovingToFirstDayOfThePreviousMonth; - (NSDate *)cc_dateByMovingToFirstDayOfTheFollowingMonth; - (NSDateComponents *)cc_componentsForMonthDayAndYear; -- (NSUInteger)cc_day; - (NSUInteger)cc_weekday; - (NSUInteger)cc_numberOfDaysInMonth; - @end \ No newline at end of file diff --git a/Kal/NSDateAdditions.m b/Kal/NSDateAdditions.m index b5ac9c8..924a5aa 100644 --- a/Kal/NSDateAdditions.m +++ b/Kal/NSDateAdditions.m @@ -7,27 +7,6 @@ @implementation NSDate (KalAdditions) -+ (NSDate *)cc_today { return [NSDate date]; } - -+ (NSDate *)cc_dateForDay:(NSUInteger)day month:(NSUInteger)month year:(NSUInteger)year -{ - NSDateComponents *c = [[[NSDateComponents alloc] init] autorelease]; - c.day = day; - c.month = month; - c.year = year; - return [[NSCalendar currentCalendar] dateFromComponents:c]; -} - -- (BOOL)cc_isToday -{ - // Performance optimization because [NSCalendar components:fromDate:] is expensive. - // (I verified this with Shark) - if (ABS([self timeIntervalSinceDate:[NSDate date]]) > 86400) - return NO; - - return [self cc_day] == [[NSDate cc_today] cc_day]; -} - - (NSDate *)cc_dateByMovingToBeginningOfDay { unsigned int flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit; @@ -75,11 +54,6 @@ - (NSDateComponents *)cc_componentsForMonthDayAndYear return [[NSCalendar currentCalendar] components:NSYearCalendarUnit|NSMonthCalendarUnit|NSDayCalendarUnit fromDate:self]; } -- (NSUInteger)cc_day -{ - return (NSUInteger)[[[NSCalendar currentCalendar] components:NSDayCalendarUnit fromDate:self] day]; -} - - (NSUInteger)cc_weekday { return [[NSCalendar currentCalendar] ordinalityOfUnit:NSDayCalendarUnit inUnit:NSWeekCalendarUnit forDate:self]; diff --git a/Kal/NSMutableArrayAdditions.h b/Kal/NSMutableArrayAdditions.h deleted file mode 100644 index 4b86221..0000000 --- a/Kal/NSMutableArrayAdditions.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2009 Keith Lazuka - * License: http://www.opensource.org/licenses/mit-license.html - */ - -#import - - -@interface NSMutableArray (KalAdditions) - -- (void)enqueue:(id)anObject; -- (id)dequeue; - -@end diff --git a/Kal/NSMutableArrayAdditions.m b/Kal/NSMutableArrayAdditions.m deleted file mode 100644 index f33ded2..0000000 --- a/Kal/NSMutableArrayAdditions.m +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2009 Keith Lazuka - * License: http://www.opensource.org/licenses/mit-license.html - */ - -#import "NSMutableArrayAdditions.h" - - -@implementation NSMutableArray (KalAdditions) - -- (void)enqueue:(id)anObject -{ - [self insertObject:anObject atIndex:0]; -} - -- (id)dequeue -{ - id anObject = [[self lastObject] retain]; - [self removeLastObject]; - return [anObject autorelease]; -} - -@end