Several enhancements

.gitignore

@@ -1,5 +1,16 @@
-.DS_Store
-.svn/
-build/
+# Xcode
+*.DS_Store
+build/*
 *.pbxuser
+!default.pbxuser
 *.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+*.xcworkspace
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside

Calendar.xcodeproj/project.pbxproj

@@ -25,9 +25,9 @@
 		3B96AA7D1139BC99003FF405 /* GCCalendar.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA621139BC99003FF405 /* GCCalendar.m */; };
 		3B96AA7E1139BC99003FF405 /* GCCalendarDayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA641139BC99003FF405 /* GCCalendarDayView.m */; };
 		3B96AA7F1139BC99003FF405 /* GCCalendarEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA661139BC99003FF405 /* GCCalendarEvent.m */; };
-		3B96AA801139BC99003FF405 /* GCCalendarPortraitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA681139BC99003FF405 /* GCCalendarPortraitView.m */; };
-		3B96AA811139BC99003FF405 /* GCCalendarTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA6B1139BC99003FF405 /* GCCalendarTile.m */; };
-		3B96AA821139BC99003FF405 /* GCCalendarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA6D1139BC99003FF405 /* GCCalendarView.m */; };
+		3B96AA801139BC99003FF405 /* GCCalendarPortraitViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA681139BC99003FF405 /* GCCalendarPortraitViewController.m */; };
+		3B96AA811139BC99003FF405 /* GCCalendarTileView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA6B1139BC99003FF405 /* GCCalendarTileView.m */; };
+		3B96AA821139BC99003FF405 /* GCCalendarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA6D1139BC99003FF405 /* GCCalendarViewController.m */; };
 		3B96AA831139BC99003FF405 /* GCDatePickerControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B96AA6F1139BC99003FF405 /* GCDatePickerControl.m */; };
 		3B96AA841139BC99003FF405 /* GCDatePickerControlBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B96AA701139BC99003FF405 /* GCDatePickerControlBackground.png */; };
 		3B96AA851139BC99003FF405 /* GCDatePickerControlLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B96AA711139BC99003FF405 /* GCDatePickerControlLeft.png */; };
@@ -59,13 +59,13 @@
 		3B96AA641139BC99003FF405 /* GCCalendarDayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarDayView.m; sourceTree = "<group>"; };
 		3B96AA651139BC99003FF405 /* GCCalendarEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarEvent.h; sourceTree = "<group>"; };
 		3B96AA661139BC99003FF405 /* GCCalendarEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarEvent.m; sourceTree = "<group>"; };
-		3B96AA671139BC99003FF405 /* GCCalendarPortraitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarPortraitView.h; sourceTree = "<group>"; };
-		3B96AA681139BC99003FF405 /* GCCalendarPortraitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarPortraitView.m; sourceTree = "<group>"; };
+		3B96AA671139BC99003FF405 /* GCCalendarPortraitViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarPortraitViewController.h; sourceTree = "<group>"; };
+		3B96AA681139BC99003FF405 /* GCCalendarPortraitViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarPortraitViewController.m; sourceTree = "<group>"; };
 		3B96AA691139BC99003FF405 /* GCCalendarProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarProtocols.h; sourceTree = "<group>"; };
-		3B96AA6A1139BC99003FF405 /* GCCalendarTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarTile.h; sourceTree = "<group>"; };
-		3B96AA6B1139BC99003FF405 /* GCCalendarTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarTile.m; sourceTree = "<group>"; };
-		3B96AA6C1139BC99003FF405 /* GCCalendarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarView.h; sourceTree = "<group>"; };
-		3B96AA6D1139BC99003FF405 /* GCCalendarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarView.m; sourceTree = "<group>"; };
+		3B96AA6A1139BC99003FF405 /* GCCalendarTileView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarTileView.h; sourceTree = "<group>"; };
+		3B96AA6B1139BC99003FF405 /* GCCalendarTileView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarTileView.m; sourceTree = "<group>"; };
+		3B96AA6C1139BC99003FF405 /* GCCalendarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCCalendarViewController.h; sourceTree = "<group>"; };
+		3B96AA6D1139BC99003FF405 /* GCCalendarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCCalendarViewController.m; sourceTree = "<group>"; };
 		3B96AA6E1139BC99003FF405 /* GCDatePickerControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDatePickerControl.h; sourceTree = "<group>"; };
 		3B96AA6F1139BC99003FF405 /* GCDatePickerControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDatePickerControl.m; sourceTree = "<group>"; };
 		3B96AA701139BC99003FF405 /* GCDatePickerControlBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = GCDatePickerControlBackground.png; sourceTree = "<group>"; };
@@ -165,13 +165,13 @@
 				3B96AA641139BC99003FF405 /* GCCalendarDayView.m */,
 				3B96AA651139BC99003FF405 /* GCCalendarEvent.h */,
 				3B96AA661139BC99003FF405 /* GCCalendarEvent.m */,
-				3B96AA671139BC99003FF405 /* GCCalendarPortraitView.h */,
-				3B96AA681139BC99003FF405 /* GCCalendarPortraitView.m */,
+				3B96AA671139BC99003FF405 /* GCCalendarPortraitViewController.h */,
+				3B96AA681139BC99003FF405 /* GCCalendarPortraitViewController.m */,
 				3B96AA691139BC99003FF405 /* GCCalendarProtocols.h */,
-				3B96AA6A1139BC99003FF405 /* GCCalendarTile.h */,
-				3B96AA6B1139BC99003FF405 /* GCCalendarTile.m */,
-				3B96AA6C1139BC99003FF405 /* GCCalendarView.h */,
-				3B96AA6D1139BC99003FF405 /* GCCalendarView.m */,
+				3B96AA6A1139BC99003FF405 /* GCCalendarTileView.h */,
+				3B96AA6B1139BC99003FF405 /* GCCalendarTileView.m */,
+				3B96AA6C1139BC99003FF405 /* GCCalendarViewController.h */,
+				3B96AA6D1139BC99003FF405 /* GCCalendarViewController.m */,
 				3B96AA6E1139BC99003FF405 /* GCDatePickerControl.h */,
 				3B96AA6F1139BC99003FF405 /* GCDatePickerControl.m */,
 				3B96AA701139BC99003FF405 /* GCDatePickerControlBackground.png */,
@@ -208,7 +208,11 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Calendar" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -251,9 +255,9 @@
 				3B96AA7D1139BC99003FF405 /* GCCalendar.m in Sources */,
 				3B96AA7E1139BC99003FF405 /* GCCalendarDayView.m in Sources */,
 				3B96AA7F1139BC99003FF405 /* GCCalendarEvent.m in Sources */,
-				3B96AA801139BC99003FF405 /* GCCalendarPortraitView.m in Sources */,
-				3B96AA811139BC99003FF405 /* GCCalendarTile.m in Sources */,
-				3B96AA821139BC99003FF405 /* GCCalendarView.m in Sources */,
+				3B96AA801139BC99003FF405 /* GCCalendarPortraitViewController.m in Sources */,
+				3B96AA811139BC99003FF405 /* GCCalendarTileView.m in Sources */,
+				3B96AA821139BC99003FF405 /* GCCalendarViewController.m in Sources */,
 				3B96AA831139BC99003FF405 /* GCDatePickerControl.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -277,6 +281,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -291,6 +296,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Calendar_Prefix.pch;
@@ -308,7 +314,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos3.1.2;
+				SDKROOT = iphoneos;
 			};
 			name = Debug;
 		};
@@ -321,7 +327,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = iphoneos3.1.2;
+				SDKROOT = iphoneos;
 			};
 			name = Release;
 		};

Classes/CalendarAppDelegate.m

@@ -12,17 +12,17 @@ @implementation CalendarAppDelegate
 
 - (void)applicationDidFinishLaunching:(UIApplication *)application {
 	// create calendar view
-	GCCalendarPortraitView *calendar = [[[GCCalendarPortraitView alloc] init] autorelease];
+	GCCalendarPortraitViewController *calendar = [[GCCalendarPortraitViewController alloc] init];
 	calendar.dataSource = self;
 	calendar.delegate = self;
 	calendar.hasAddButton = YES;
 
 	// create navigation view
-	UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:calendar] autorelease];
+	UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:calendar];
 
 	// create tab controller
 	tabController = [[UITabBarController alloc] init];
-	tabController.viewControllers = [NSArray arrayWithObject:nav];
+	tabController.viewControllers = @[nav];
 
 	// setup window
 	window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
@@ -32,13 +32,10 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application {
 
 
 - (void)dealloc {
-    [window release];
 	window = nil;
 
-	[tabController release];
 	tabController = nil;
 
-    [super dealloc];
 }
 
 #pragma mark GCCalendarDataSource
@@ -68,7 +65,6 @@ - (NSArray *)calendarEventsForDate:(NSDate *)date {
 		event.endDate = [[NSCalendar currentCalendar] dateFromComponents:components];
 
 		[events addObject:event];
-		[event release];
 	}
 
 
@@ -83,23 +79,41 @@ - (NSArray *)calendarEventsForDate:(NSDate *)date {
 	[components setHour:20];
 	evt.endDate = [[NSCalendar currentCalendar] dateFromComponents:components];
 	[events addObject:evt];
-	[evt release];
+
+    evt = [[GCCalendarEvent alloc] init];
+	evt.eventName = @"Test event";
+	evt.eventDescription = @"Description for test event. This is intentionnaly too long to stay on a single line.";
+	[components setHour:17];
+	[components setMinute:0];
+	evt.startDate = [[NSCalendar currentCalendar] dateFromComponents:components];
+	[components setHour:20];
+	evt.endDate = [[NSCalendar currentCalendar] dateFromComponents:components];
+	[events addObject:evt];
 
+    evt = [[GCCalendarEvent alloc] init];
+	evt.eventName = @"Test event";
+	[components setHour:19];
+	[components setMinute:0];
+	evt.startDate = [[NSCalendar currentCalendar] dateFromComponents:components];
+	[components setHour:20];
+    [components setMinute:30];
+	evt.endDate = [[NSCalendar currentCalendar] dateFromComponents:components];
+	[events addObject:evt];
+
 	// create an all day event
 	GCCalendarEvent *event = [[GCCalendarEvent alloc] init];
 	event.allDayEvent = YES;
 	event.eventName = @"All Day Event";
 	[events addObject:event];
-	[event release];
 
 	return events;
 }
 
 #pragma mark GCCalendarDelegate
-- (void)calendarTileTouchedInView:(GCCalendarView *)view withEvent:(GCCalendarEvent *)event {
+- (void)calendarTileTouchedInView:(GCCalendarViewController *)view withEvent:(GCCalendarEvent *)event {
 	NSLog(@"Touch event %@", event.eventName);
 }
-- (void)calendarViewAddButtonPressed:(GCCalendarView *)view {
+- (void)calendarViewAddButtonPressed:(GCCalendarViewController *)view {
 	NSLog(@"%s", __PRETTY_FUNCTION__);
 }
 

GCCalendar/EAGlossyBox.h

@@ -0,0 +1,17 @@
+//
+//  EAGlossyBox.h
+//  EventApp
+//
+//  Created by Jon Manning on 29/08/12.
+//  Copyright (c) 2012 Secret Lab. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface EAGlossyBox : UIView
+
+@property (assign) CGFloat radius;
+
+- (void) setColor:(UIColor*)color;
+
+@end

GCCalendar/EAGlossyBox.m

@@ -0,0 +1,62 @@
+//
+//  EAGlossyBox.m
+//  EventApp
+//
+//  Created by Jon Manning on 29/08/12.
+//  Copyright (c) 2012 Secret Lab. All rights reserved.
+//
+
+#import "EAGlossyBox.h"
+#import <QuartzCore/QuartzCore.h>
+
+@interface EAGlossyBox () {
+    UIImageView* _glossImage;
+}
+
+@end
+
+@implementation EAGlossyBox
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.layer.cornerRadius = 5;
+        self.layer.borderColor = [UIColor colorWithWhite:0 alpha:0.2].CGColor;
+        self.layer.borderWidth = 1;
+
+
+        _glossImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Calendar-Tile-Gloss-Pattern"]];
+        [self addSubview:_glossImage];
+        self.clipsToBounds = YES;
+
+    }
+    return self;
+}
+
+// If we're in a UITableViewCell, when selected we appear to receive
+// a call to setBackgroundColor: that sets our color to clear.
+// We only want to do this when the 'color' property is set,
+// so ignore this call.
+- (void)setBackgroundColor:(UIColor *)backgroundColor {
+
+}
+
+- (void)setColor:(UIColor *)color {
+    [super setBackgroundColor:color];
+}
+
+- (void)layoutSubviews {
+    _glossImage.frame = CGRectMake(0, 0, CGRectGetWidth(self.frame), CGRectGetHeight(_glossImage.bounds));
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect
+{
+    // Drawing code
+}
+*/
+
+@end

GCCalendar/EATintedImageView.h

@@ -0,0 +1,16 @@
+//
+//  EATintedImageView.h
+//  EventApp
+//
+//  Created by Jon Manning on 28/08/12.
+//  Copyright (c) 2012 Secret Lab. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface EATintedImageView : UIView
+
+@property (strong) UIImage* image;
+@property (strong) UIColor* overlayColor;
+
+@end

GCCalendar/EATintedImageView.m

@@ -0,0 +1,46 @@
+//
+//  EATintedImageView.m
+//  EventApp
+//
+//  Created by Jon Manning on 28/08/12.
+//  Copyright (c) 2012 Secret Lab. All rights reserved.
+//
+
+#import "EATintedImageView.h"
+
+@implementation EATintedImageView
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        // Initialization code
+    }
+    return self;
+}
+
+- (void) drawRect:(CGRect)area
+{
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSaveGState(context);
+
+    [self.image drawInRect:self.bounds];
+
+    if (self.overlayColor) {
+        CGContextSetBlendMode (context, kCGBlendModeHue);
+        CGContextSetFillColor(context, CGColorGetComponents(self.overlayColor.CGColor));
+        CGContextFillRect (context, self.bounds);
+    }
+    CGContextRestoreGState(context);
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect
+{
+    // Drawing code
+}
+*/
+
+@end

GCCalendar/GCCalendar.h

@@ -10,10 +10,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "GCCalendarView.h"
+#import "GCCalendarViewController.h"
 #import "GCCalendarEvent.h"
 #import "GCCalendarProtocols.h"
-#import "GCCalendarPortraitView.h"
+#import "GCCalendarPortraitViewController.h"
 
 // calendar notificaions
 static NSString * const GCCalendarShouldReloadNotification = @"GCCalendarShouldReload";

GCCalendar/GCCalendar.m

@@ -65,7 +65,7 @@ + (NSDateFormatter *)timeFormatter {
 #pragma mark color list
 + (NSArray *)colors {
 	if (colors == nil) {
-		colors = [[NSArray arrayWithObjects:@"BLUE", @"GREEN", @"ORANGE", @"MAGENTA", @"PURPLE", @"RED", @"YELLOW", nil] retain];
+		colors = @[@"BLUE", @"GREEN", @"ORANGE", @"MAGENTA", @"PURPLE", @"RED", @"YELLOW"];
 	}
 
 	return colors;