@@ -96,6 +96,7 @@ NSDateComponents *offsetComponent = [[NSDateComponents alloc] init]; [offsetComponent setDay:1]; [self setNavigationBarTitle:[formatter stringFromDate:[gregorian dateByAddingComponents:offsetComponent toDate:sharedTVListingsApp.baseDate options:0]]]; + [offsetComponent release]; } else { [self setNavigationBarTitle:[formatter stringFromDate:sharedTVListingsApp.baseDate]]; } Classes/TVListViewController.m @@ -100,6 +100,7 @@ static NSDictionary *abbreviationMappings = NULL; [parser start]; NSArray *items = [[parser channel] objectForKey:@"items"]; LOG(@"feed data: %@", items); + [parser release]; programs = [NSMutableDictionary dictionaryWithCapacity:10]; for (id item in items) { Classes/TVManager.m @@ -70,6 +70,7 @@ } - (void)drawRect:(CGRect)rect { + [super drawRect:rect]; [[UIColor colorWithRed:0.0f green:0.2f blue:0.8f alpha:1.0f] set]; [time drawInRect:CGRectMake(2.0f, 2.0f, 74.0f, 21.0f) withFont:[UIFont boldSystemFontOfSize:12.0f]]; [[UIColor blackColor] set]; Classes/TVProgramCell.m @@ -12,6 +12,7 @@ } - (void)drawRect:(CGRect)rect { + [super drawRect:rect]; [[UIColor colorWithRed:0.0f green:0.2f blue:0.8f alpha:1.0f] set]; [time drawInRect:CGRectMake(2.0f, 3.0f, 98.0f, 18.0f) withFont:[UIFont boldSystemFontOfSize:16.0f]]; [[UIColor blackColor] set]; Classes/TVProgramCellExtraLarge.m @@ -12,6 +12,7 @@ } - (void)drawRect:(CGRect)rect { + [super drawRect:rect]; [[UIColor colorWithRed:0.0f green:0.2f blue:0.8f alpha:1.0f] set]; [time drawInRect:CGRectMake(2.0f, 2.0f, 86.0f, 18.0f) withFont:[UIFont boldSystemFontOfSize:14.0f]]; [[UIColor blackColor] set]; Classes/TVProgramCellLarge.m @@ -12,6 +12,7 @@ } - (void)drawRect:(CGRect)rect { + [super drawRect:rect]; [[UIColor colorWithRed:0.0f green:0.2f blue:0.8f alpha:1.0f] set]; [time drawInRect:CGRectMake(2.0f, 2.0f, 86.0f, 18.0f) withFont:[UIFont boldSystemFontOfSize:14.0f]]; [[UIColor blackColor] set]; Classes/TVProgramCellMedium.m @@ -426,20 +426,21 @@ static UIColor *holidayColor; [self setUpCalendarWithDate:pageDate]; if (animated) { - [self setAlpha:0.0f]; [aView addSubview:self]; CGRect frame = [self frame]; frame.origin.x = point.x; - frame.origin.y = point.y - frame.size.height / 2; + frame.origin.y = point.y; self.frame = frame; + self.alpha = 0.0f; + self.transform = CGAffineTransformMakeScale(0.5f, 0.5f); + [UIView beginAnimations:nil context:NULL]; [UIView setAnimationDuration:0.3f]; [UIView setAnimationTransition:UIViewAnimationCurveEaseInOut forView:self cache:NO]; [self setAlpha:1.0f]; - frame.origin.y = frame.origin.y + frame.size.height / 2; - self.frame = frame; + self.transform = CGAffineTransformIdentity; [UIView commitAnimations]; } else { CGRect frame = [self frame]; @@ -457,10 +458,8 @@ static UIColor *holidayColor; [UIView setAnimationDidStopSelector:@selector(animationFinished:finished:context:)]; [UIView setAnimationDuration:0.3f]; [UIView setAnimationTransition:UIViewAnimationCurveEaseInOut forView:self cache:NO]; - [self setAlpha:0.0f]; - CGRect frame = [self frame]; - frame.origin.y = frame.origin.y - frame.size.height / 2; - self.frame = frame; + self.alpha = 0.0f; + self.transform = CGAffineTransformMakeScale(0.5f, 0.5f); [UIView commitAnimations]; } else { [self removeFromSuperview]; Classes/UICCalendarPicker.m @@ -678,7 +678,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "/usr/include/libxml2/**"; IPHONEOS_DEPLOYMENT_TARGET = 2.2.1; - OTHER_LDFLAGS = "-licucore"; + "OTHER_LDFLAGS[sdk=iphoneos3.1.2][arch=*]" = ( + "$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.1.sdk/usr/lib/libxml2.dylib", + "-licucore", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.1.2][arch=*]" = ( + "-lxml2", + "-licucore", + ); PREBINDING = NO; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "56DD5709-6F51-455B-B301-C65B856A0F8C"; SDKROOT = iphoneos3.1.2; @@ -765,7 +772,14 @@ HEADER_SEARCH_PATHS = "/usr/include/libxml2/**"; IPHONEOS_DEPLOYMENT_TARGET = 2.2.1; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "-licucore"; + "OTHER_LDFLAGS[sdk=iphoneos3.1.2][arch=*]" = ( + "$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.1.sdk/usr/lib/libxml2.dylib", + "-licucore", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.1.2][arch=*]" = ( + "-lxml2", + "-licucore", + ); PREBINDING = NO; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos3.1.2; @@ -783,7 +797,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "/usr/include/libxml2/**"; IPHONEOS_DEPLOYMENT_TARGET = 2.2.1; - OTHER_LDFLAGS = "-licucore"; + "OTHER_LDFLAGS[sdk=iphoneos3.1.2][arch=*]" = ( + "$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.1.sdk/usr/lib/libxml2.dylib", + "-licucore", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator3.1.2][arch=*]" = ( + "-lxml2", + "-licucore", + ); PREBINDING = NO; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos3.1.2; TVListings.xcodeproj/project.pbxproj 97ee45fd5030fa09295ac465df18016fc856f9ae Kishikawa Katsumi katsumi@MacBook-Late-2008.local http://github.com/kishikawakatsumi/tv-listings/commit/17ad96a094cb54c57443bb4adbe5e0219db9982e 17ad96a094cb54c57443bb4adbe5e0219db9982e 2009-10-18T06:54:24-07:00 2009-10-18T06:54:24-07:00 Some leaks fixed. Calendar animation changed. 191c2da8fb7577ca31628034ad8ffb5ae3110c95 Kishikawa Katsumi katsumi@MacBook-Late-2008.local