vendor/UICCalendarPicker/Classes/UICCalendarPickerAppDelegate.h vendor/UICCalendarPicker/Classes/UICCalendarPickerAppDelegate.m vendor/UICCalendarPicker/Classes/UICCalendarPickerViewController.h vendor/UICCalendarPicker/Classes/UICCalendarPickerViewController.m vendor/UICCalendarPicker/uiccalendar_calendar_button.png vendor/UICCalendarPicker/uiccalendar_cell_custom1.png vendor/UICCalendarPicker/uiccalendar_cell_custom2.png @@ -5,8 +5,8 @@ type: :feature component: milpon release: beta08 reporter: mootoh <mootoh@gmail.com> -status: :unstarted -disposition: +status: :closed +disposition: :fixed creation_time: 2009-04-19 09:30:06.322368 Z references: [] @@ -16,5 +16,9 @@ log_events: - mootoh <mootoh@gmail.com> - created - "" +- - 2009-04-22 02:56:05.397201 Z + - mootoh <mootoh@gmail.com> + - closed with disposition fixed + - use latest UICCalendarPicker to enlarge the picker. git_branch: claimer: .ditz/issue-31d1bebd86131c139cd5f1a28b638a75715605fe.yaml @@ -59,9 +59,9 @@ #if 0 toggleCalendarDisplay = toggleCalendarDisplay ? NO : YES; if (toggleCalendarDisplay) { - UICCalendarPicker *picker = [[UICCalendarPicker alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 204.0f, 234.0f)]; + UICCalendarPicker *picker = [[UICCalendarPicker alloc] initWithSize:UICCalendarPickerSizeExtraLarge]; [picker setDelegate:viewController]; - [picker showInView:self.superview]; + [picker showInView:self.superview animated:NO]; [picker release]; } #endif // 0 ui/AttributeView.m @@ -22,7 +22,7 @@ enum { // The designated initializer. Override to perform setup that is required before the view is loaded. - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - calendar_picker = [[UICCalendarPicker alloc] initWithFrame:CGRectMake(58.0f, 52.0f, 204.0f, 234.0f)]; + calendar_picker = [[UICCalendarPicker alloc] initWithSize:UICCalendarPickerSizeExtraLarge]; calendar_picker.delegate = self; } return self; @@ -79,7 +79,7 @@ enum { cell.text = @"Tomorrow"; break; case ROW_CALENDAR: - [calendar_picker showInView:cell.contentView]; + [calendar_picker showInView:cell.contentView animated:NO]; //[cell.contentView addSubview:calendar_picker]; break; default: ui/DueDateSelectController.m @@ -38,9 +38,9 @@ toggleCalendarDisplay = !toggleCalendarDisplay; if (toggleCalendarDisplay) { - UICCalendarPicker *picker = [[UICCalendarPicker alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 204.0f, 234.0f)]; + UICCalendarPicker *picker = [[UICCalendarPicker alloc] initWithSize:UICCalendarPickerSizeExtraLarge]; [picker setDelegate:viewController]; - [picker showInView:self.superview]; + [picker showInView:self.superview animated:NO]; [picker release]; } } ui/TaskViewController.m @@ -1,5 +1,14 @@ #import <UIKit/UIKit.h> +@class UICCalendarPickerDateButton; + +typedef enum { + UICCalendarPickerSizeSmall, + UICCalendarPickerSizeMedium, + UICCalendarPickerSizeLarge, + UICCalendarPickerSizeExtraLarge, +} UICCalendarPickerSize; + typedef enum { UICCalendarPickerStyleDefault, UICCalendarPickerStyleBlackOpaque, @@ -12,12 +21,50 @@ typedef enum { UICCalendarPickerSelectionModeRangeSelection, } UICCalendarPickerSelectionMode; +typedef enum { + UICCalendarPickerDayOfWeekSunday = 1, + UICCalendarPickerDayOfWeekMonday, + UICCalendarPickerDayOfWeekTuesday, + UICCalendarPickerDayOfWeekWednesday, + UICCalendarPickerDayOfWeekThursday, + UICCalendarPickerDayOfWeekFriday, + UICCalendarPickerDayOfWeekSaturday, +} UICCalendarPickerDayOfWeek; + +@class UICCalendarPicker; + +@protocol UICCalendarPickerDelegate<NSObject> +@optional +- (void)picker:(UICCalendarPicker *)picker pushedCloseButton:(id)sender; +- (void)picker:(UICCalendarPicker *)picker pushedPrevButton:(id)sender; +- (void)picker:(UICCalendarPicker *)picker pushedNextButton:(id)sender; +- (void)picker:(UICCalendarPicker *)picker didSelectDate:(NSArray *)selectedDate; +@end + +@protocol UICCalendarPickerDataSource<NSObject> +@optional +- (NSString *)picker:(UICCalendarPicker *)picker textForYearMonth:(NSDate *)aDate; +- (void)picker:(UICCalendarPicker *)picker buttonForDateToday:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDateWeekday:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDateSaturday:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDateSunday:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDateMonthOut:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDateOutOfRange:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDateSelected:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDateBlank:(UICCalendarPickerDateButton *)button; +- (void)picker:(UICCalendarPicker *)picker buttonForDate:(UICCalendarPickerDateButton *)button; +@end + @interface UICCalendarPicker : UIImageView { - id delegate; + id<UICCalendarPickerDelegate> delegate; + id<UICCalendarPickerDataSource> dataSource; UICCalendarPickerStyle style; UICCalendarPickerSelectionMode selectionMode; + NSString *titleText; + NSArray *weekText; + NSDate *pageDate; NSDate *currentDate; NSDate *today; @@ -35,21 +82,29 @@ typedef enum { NSDateFormatter *dateFormatter; } -@property (nonatomic, retain) id delegate; +@property (nonatomic, assign) id delegate; +@property (nonatomic, assign) id dataSource; @property (nonatomic) UICCalendarPickerStyle style; @property (nonatomic) UICCalendarPickerSelectionMode selectionMode; -@property (nonatomic, retain) NSMutableArray *selectedDates; +@property (nonatomic, retain, setter=setTitleText:) NSString *titleText; +@property (nonatomic, retain, setter=setWeekText:) NSArray *weekText; + +@property (nonatomic, retain, readonly) NSMutableArray *selectedDates; @property (nonatomic, retain) NSDate *pageDate; +@property (nonatomic, retain) NSDate *today; @property (nonatomic, retain, setter=setMinDate:) NSDate *minDate; @property (nonatomic, retain, setter=setMaxDate:) NSDate *maxDate; +- (id)init; +- (id)initWithSize:(UICCalendarPickerSize)viewSize; - (void)addSelectedDate:(NSDate *)aDate; - (void)addSelectedDates:(NSArray *)dates; -- (void)showInView:(UIView *)aView; -- (void)dismiss:(id)sender; +- (void)showInView:(UIView *)aView animated:(BOOL)animated; +- (void)showAtPoint:(CGPoint)point inView:(UIView *)aView animated:(BOOL)animated; +- (void)dismiss:(id)sender animated:(BOOL)animated; @end vendor/UICCalendarPicker/Classes/UICCalendarPicker.h @@ -1,30 +1,62 @@ #import "UICCalendarPicker.h" #import "UICCalendarPickerDateButton.h" -#import "UICCalendarPickerDelegate.h" #import "Debug.h" -#define UICCALENDAR_CONTROL_BUTTON_WIDTH 30.0f -#define UICCALENDAR_CONTROL_BUTTON_HEIGHT 21.0f +#define UICCALENDAR_CALENDAR_VIEW_WIDTH 204.0f +#define UICCALENDAR_CALENDAR_VIEW_HEIGHT 234.0f + +#define UICCALENDAR_CONTROL_BUTTON_SMALL_WIDTH 25.0f +#define UICCALENDAR_CONTROL_BUTTON_SMALL_HEIGHT 15.0f +#define UICCALENDAR_CONTROL_BUTTON_MEDIUM_WIDTH 27.0f +#define UICCALENDAR_CONTROL_BUTTON_MEDIUM_HEIGHT 16.0f +#define UICCALENDAR_CONTROL_BUTTON_LARGE_WIDTH 30.0f +#define UICCALENDAR_CONTROL_BUTTON_LARGE_HEIGHT 18.0f +#define UICCALENDAR_CONTROL_BUTTON_EXTRALARGE_WIDTH 32.0f +#define UICCALENDAR_CONTROL_BUTTON_EXTRALARGE_HEIGHT 19.0f #define UICCALENDAR_TITLE_FONT_SIZE 13.0f #define UICCALENDAR_TITLE_LABEL_WIDTH 140.0f #define UICCALENDAR_TITLE_LABEL_HEIGHT 15.0f + #define UICCALENDAR_TITLE_LABEL_TAG 100 +#define UICCALENDAR_MONTH_LABEL_TAG 200 +#define UICCALENDAR_WEEK_LABEL_TAG 300 #define UICCALENDAR_CELL_FONT_SIZE 13.0f -#define UICCALENDAR_CELL_WIDTH 27.0f -#define UICCALENDAR_CELL_HEIGHT 24.0f +#define UICCALENDAR_CELL_SMALL_WIDTH 27.0f +#define UICCALENDAR_CELL_SMALL_HEIGHT 24.0f +#define UICCALENDAR_CELL_MEDIUM_WIDTH 29.0f +#define UICCALENDAR_CELL_MEDIUM_HEIGHT 26.0f +#define UICCALENDAR_CELL_LARGE_WIDTH 33.0f +#define UICCALENDAR_CELL_LARGE_HEIGHT 28.0f +#define UICCALENDAR_CELL_EXTRALARGE_WIDTH 35.0f +#define UICCALENDAR_CELL_EXTRALARGE_HEIGHT 31.0f @interface UICCalendarPicker(Private) +- (void)closeButtonPushed:(id)sender; +- (void)prevButtonPushed:(id)sender; +- (void)nextButtonPushed:(id)sender; +- (void)dateButtonPushed:(id)sender; - (void)moveLastMonth:(id)sender; - (void)moveNextMonth:(id)sender; - (void)setUpCalendarWithDate:(NSDate *)aDate; - (void)addRangeDateObjects; +- (void)resetButtonAtributes:(UICCalendarPickerDateButton *)button; +- (void)resetButtonState:(UICCalendarPickerDateButton *)button; - (NSDateComponents *)getDateComponentsFromDate:(NSDate *)date; @end @implementation UICCalendarPicker +static float controlButtonWidth[] = +{UICCALENDAR_CONTROL_BUTTON_SMALL_WIDTH, UICCALENDAR_CONTROL_BUTTON_MEDIUM_WIDTH, UICCALENDAR_CONTROL_BUTTON_LARGE_WIDTH, UICCALENDAR_CONTROL_BUTTON_EXTRALARGE_WIDTH}; +static float controlButtonHeight[] = +{UICCALENDAR_CONTROL_BUTTON_SMALL_HEIGHT, UICCALENDAR_CONTROL_BUTTON_MEDIUM_HEIGHT, UICCALENDAR_CONTROL_BUTTON_LARGE_HEIGHT, UICCALENDAR_CONTROL_BUTTON_EXTRALARGE_HEIGHT}; +static float cellWidth[] = +{UICCALENDAR_CELL_SMALL_WIDTH, UICCALENDAR_CELL_MEDIUM_WIDTH, UICCALENDAR_CELL_LARGE_WIDTH, UICCALENDAR_CELL_EXTRALARGE_WIDTH}; +static float cellHeight[] = +{UICCALENDAR_CELL_SMALL_HEIGHT, UICCALENDAR_CELL_MEDIUM_HEIGHT, UICCALENDAR_CELL_LARGE_HEIGHT, UICCALENDAR_CELL_EXTRALARGE_HEIGHT}; + static UIImage *normalCell; static UIImage *selectedCell; static UIImage *disabledCell; @@ -39,12 +71,17 @@ static UIColor *disabledColor; static UIColor *monthoutColor; static UIColor *holidayColor; +@synthesize titleText; +@synthesize weekText; + @synthesize delegate; +@synthesize dataSource; @synthesize style; @synthesize selectionMode; @synthesize pageDate; +@synthesize today; @synthesize selectedDates; @@ -68,67 +105,94 @@ static UIColor *holidayColor; holidayColor = [[UIColor redColor] retain]; } -- (id)initWithFrame:(CGRect) aRect { - if (self = [super initWithFrame:aRect]) { +- (id)init { + return [self initWithSize:UICCalendarPickerSizeMedium]; +} + +- (id)initWithSize:(UICCalendarPickerSize)viewSize { + LOG_CURRENT_METHOD; + if (self = [super initWithFrame:CGRectMake(0.0f, 0.0f, cellWidth[viewSize] * 7 - 6.0f + 21.0f, cellHeight[viewSize] * 6 - 5.0f + 95.0f)]) { + self.titleText = @"Calendar"; + self.weekText = [NSArray arrayWithObjects:@"Su", @"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", nil]; + [self setImage:[UIImage imageNamed:@"uiccalendar_background.png"]]; + [self setUserInteractionEnabled:YES]; - + UIButton *closeButton = [UIButton buttonWithType:UIButtonTypeCustom]; [closeButton setBackgroundImage:[UIImage imageNamed:@"uiccalendar_close.png"] forState:UIControlStateNormal]; - [closeButton setFrame:CGRectMake(173.0f, 6.0f, UICCALENDAR_CONTROL_BUTTON_WIDTH, UICCALENDAR_CONTROL_BUTTON_HEIGHT)]; + [closeButton setFrame:CGRectMake(self.frame.size.width - 31.0f - viewSize * 3, 6.0f, controlButtonWidth[viewSize], controlButtonHeight[viewSize])]; [closeButton setShowsTouchWhenHighlighted:NO]; - [closeButton addTarget:self action:@selector(dismiss:) forControlEvents:UIControlEventTouchUpInside]; + [closeButton addTarget:self action:@selector(closeButtonPushed:) forControlEvents:UIControlEventTouchUpInside]; [self addSubview:closeButton]; UIButton *prevButton = [UIButton buttonWithType:UIButtonTypeCustom]; [prevButton setBackgroundImage:[UIImage imageNamed:@"uiccalendar_left_arrow.png"] forState:UIControlStateNormal]; - [prevButton setFrame:CGRectMake(6.0f, 36.0f, UICCALENDAR_CONTROL_BUTTON_WIDTH, UICCALENDAR_CONTROL_BUTTON_HEIGHT)]; + [prevButton setFrame:CGRectMake(6.0f, 36.0f, controlButtonWidth[viewSize], controlButtonHeight[viewSize])]; [prevButton setShowsTouchWhenHighlighted:NO]; - [prevButton addTarget:self action:@selector(moveLastMonth:) forControlEvents:UIControlEventTouchUpInside]; + [prevButton addTarget:self action:@selector(prevButtonPushed:) forControlEvents:UIControlEventTouchUpInside]; [self addSubview:prevButton]; UIButton *nextButton = [UIButton buttonWithType:UIButtonTypeCustom]; [nextButton setBackgroundImage:[UIImage imageNamed:@"uiccalendar_right_arrow.png"] forState:UIControlStateNormal]; - [nextButton setFrame:CGRectMake(173.0f, 36.0f, UICCALENDAR_CONTROL_BUTTON_WIDTH, UICCALENDAR_CONTROL_BUTTON_HEIGHT)]; + [nextButton setFrame:CGRectMake(self.frame.size.width - 31.0f - viewSize * 3, 36.0f, controlButtonWidth[viewSize], controlButtonHeight[viewSize])]; [nextButton setShowsTouchWhenHighlighted:NO]; - [nextButton addTarget:self action:@selector(moveNextMonth:) forControlEvents:UIControlEventTouchUpInside]; + [nextButton addTarget:self action:@selector(nextButtonPushed:) forControlEvents:UIControlEventTouchUpInside]; [self addSubview:nextButton]; + UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectZero]; + [titleLabel setTag:UICCALENDAR_TITLE_LABEL_TAG]; + [titleLabel setBackgroundColor:[UIColor clearColor]]; + [titleLabel setTextColor:[UIColor blackColor]]; + [titleLabel setTextAlignment:UITextAlignmentLeft]; + [titleLabel setFont:[UIFont fontWithName:@"Arial-BoldMT" size:UICCALENDAR_TITLE_FONT_SIZE]]; + [titleLabel setFrame:CGRectMake(11.0f, 6.0f + viewSize, self.frame.size.width, UICCALENDAR_TITLE_LABEL_HEIGHT)]; + [titleLabel setText:titleText]; + [self addSubview:titleLabel]; + [titleLabel release]; + UILabel *monthLabel = [[UILabel alloc] initWithFrame:CGRectZero]; - [monthLabel setTag:UICCALENDAR_TITLE_LABEL_TAG]; + [monthLabel setTag:UICCALENDAR_MONTH_LABEL_TAG]; [monthLabel setBackgroundColor:[UIColor clearColor]]; [monthLabel setTextColor:[UIColor blackColor]]; [monthLabel setTextAlignment:UITextAlignmentCenter]; [monthLabel setFont:[UIFont fontWithName:@"Arial-BoldMT" size:UICCALENDAR_TITLE_FONT_SIZE]]; - [monthLabel setFrame:CGRectMake(self.frame.size.width / 2 - UICCALENDAR_TITLE_LABEL_WIDTH / 2, 36.0f, UICCALENDAR_TITLE_LABEL_WIDTH, UICCALENDAR_TITLE_LABEL_HEIGHT)]; + [monthLabel setFrame:CGRectMake(self.frame.size.width / 2 - UICCALENDAR_TITLE_LABEL_WIDTH / 2, 36.0f + viewSize, UICCALENDAR_TITLE_LABEL_WIDTH, UICCALENDAR_TITLE_LABEL_HEIGHT)]; [self addSubview:monthLabel]; [monthLabel release]; + for (int i = 0; i < 7; i++) { + UILabel *weekLabel = [[UILabel alloc] initWithFrame:CGRectZero]; + [weekLabel setTag:UICCALENDAR_WEEK_LABEL_TAG + i]; + [weekLabel setBackgroundColor:[UIColor clearColor]]; + [weekLabel setTextColor:[UIColor blackColor]]; + [weekLabel setTextAlignment:UITextAlignmentCenter]; + [weekLabel setFont:[UIFont fontWithName:@"Arial-BoldMT" size:UICCALENDAR_TITLE_FONT_SIZE]]; + [weekLabel setFrame:CGRectMake(10.0f + (cellWidth[viewSize] - 1) * (i % 7), 63.0f, cellWidth[viewSize] , UICCALENDAR_TITLE_LABEL_HEIGHT)]; + [weekLabel setText:[weekText objectAtIndex:i]]; + [self addSubview:weekLabel]; + [weekLabel release]; + } + for (int i = 0; i < 42; i++) { UICCalendarPickerDateButton *dateButton = [[UICCalendarPickerDateButton alloc] init]; + [dateButton setFrame: + CGRectMake(11.0f + cellWidth[viewSize] * (i % 7) - (i % 7), 84.0f + cellHeight[viewSize] * (i / 7) - (i / 7), cellWidth[viewSize], cellHeight[viewSize])]; [dateButton setTag:i + 1]; - [dateButton setBackgroundImage:normalCell forState:UIControlStateNormal]; - [dateButton setBackgroundImage:selectedCell forState:UIControlStateSelected]; - [dateButton setBackgroundImage:disabledCell forState:UIControlStateDisabled]; - [dateButton setTitleColor:normalColor forState:UIControlStateNormal]; - [dateButton setTitleColor:selectedColor forState:UIControlStateSelected]; - [dateButton setTitleColor:disabledColor forState:UIControlStateDisabled]; - [dateButton setFont:[UIFont fontWithName:@"ArialMT" size:UICCALENDAR_CELL_FONT_SIZE]]; - [dateButton setFrame:CGRectMake(11.0f + UICCALENDAR_CELL_WIDTH * (i % 7) - (i % 7), 84.0f + UICCALENDAR_CELL_HEIGHT * (i / 7) - (i / 7), UICCALENDAR_CELL_WIDTH, UICCALENDAR_CELL_HEIGHT)]; - [dateButton setShowsTouchWhenHighlighted:NO]; [dateButton addTarget:self action:@selector(dateButtonPushed:) forControlEvents:UIControlEventTouchUpInside]; - + [self resetButtonAtributes:dateButton]; [self addSubview:dateButton]; [dateButton release]; } - self.selectedDates = [NSMutableArray array]; + selectedDates = [[NSMutableArray alloc] init]; gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; dateFormatter = [[NSDateFormatter alloc] init]; + [dateFormatter setLocale:[[[NSLocale alloc] initWithLocaleIdentifier:@"US"] autorelease]]; - today = [NSDate date]; - NSDateComponents *todayComponents = [self getDateComponentsFromDate:today]; + NSDate *now = [NSDate date]; + NSDateComponents *todayComponents = [self getDateComponentsFromDate:now]; today = [[gregorian dateFromComponents:todayComponents] retain]; self.pageDate = today; @@ -140,16 +204,171 @@ static UIColor *holidayColor; LOG_CURRENT_METHOD; [dateFormatter release]; [gregorian release]; + [maxDate release]; [minDate release]; + + [rangeEndDate release]; + [rangeStartDate release]; + [selectedDates release]; + [today release]; [currentDate release]; [pageDate release]; - [delegate release]; + + [weekText release]; + [titleText release]; + [super dealloc]; } +- (void)drawRect:(CGRect)rect { + [super drawRect:rect]; +} + +#pragma mark <UICCalendarPickerDataSource> Methods + +- (NSString *)picker:(UICCalendarPicker *)picker textForYearMonth:(NSDate *)aDate { + [dateFormatter setDateFormat:@"MMM yyyy"]; + return [dateFormatter stringFromDate:aDate]; +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateToday:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + [button setBackgroundImage:todayCell forState:UIControlStateNormal]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDateToday:)]) { + [dataSource picker:self buttonForDateToday:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateWeekday:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + [button setBackgroundImage:normalCell forState:UIControlStateNormal]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDateWeekday:)]) { + [dataSource picker:self buttonForDateWeekday:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateSaturday:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + [button setBackgroundImage:normalCell forState:UIControlStateNormal]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDateSaturday:)]) { + [dataSource picker:self buttonForDateSaturday:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateSunday:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + [button setBackgroundImage:holidayCell forState:UIControlStateNormal]; + [button setTitleColor:holidayColor forState:UIControlStateNormal]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDateSunday:)]) { + [dataSource picker:self buttonForDateSunday:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateMonthOut:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + [button setBackgroundImage:monthoutCell forState:UIControlStateNormal]; + [button setTitleColor:monthoutColor forState:UIControlStateNormal]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDateMonthOut:)]) { + [dataSource picker:self buttonForDateMonthOut:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateOutOfRange:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + [button setEnabled:NO]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDateOutOfRange:)]) { + [dataSource picker:self buttonForDateOutOfRange:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateSelected:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + if (button.isToday) { + [button setBackgroundImage:todaySelectedCell forState:UIControlStateSelected]; + } else { + [button setBackgroundImage:selectedCell forState:UIControlStateSelected]; + } + if ([dataSource respondsToSelector:@selector(picker:buttonForDateSelected:)]) { + [dataSource picker:self buttonForDateSelected:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDateBlank:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + [button setSelected:NO]; + [button setEnabled:NO]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDateBlank:)]) { + [dataSource picker:self buttonForDateBlank:button]; + } +} + +- (void)picker:(UICCalendarPicker *)picker buttonForDate:(UICCalendarPickerDateButton *)button { + [self resetButtonState:button]; + + if (button.dayOfWeek == UICCalendarPickerDayOfWeekSunday) { + [self picker:self buttonForDateSunday:button]; + } else if (button.dayOfWeek == UICCalendarPickerDayOfWeekSaturday) { + [self picker:self buttonForDateSaturday:button]; + } else { + [self picker:self buttonForDateWeekday:button]; + } + + if (button.isToday) { + [self picker:self buttonForDateToday:button]; + } + + if (button.monthout) { + [self picker:self buttonForDateMonthOut:button]; + } + + if (button.selected) { + [self picker:self buttonForDateSelected:button]; + } + + if (button.outOfRange) { + [self picker:self buttonForDateOutOfRange:button]; + } + + if (!button.date) { + [self picker:self buttonForDateBlank:button]; + } +} + +#pragma mark <UICCalendarPicker> Methods + +- (void)setTitleText:(NSString *)text { + if (text != titleText) { + [titleText release]; + } + titleText = [text retain]; + UILabel *titleLabel = (UILabel *)[self viewWithTag:UICCALENDAR_TITLE_LABEL_TAG]; + [titleLabel setText:text]; +} + +- (void)setWeekText:(NSArray *)text { + if (text != weekText) { + [weekText release]; + } + weekText = [text retain]; + int i = 0; + for (NSString *s in text) { + UILabel *weekLabel = (UILabel *)[self viewWithTag:UICCALENDAR_WEEK_LABEL_TAG + i]; + [weekLabel setText:s]; + i++; + } +} + +- (void)setToday:(NSDate *)aDate { + if (aDate != today) { + [today release]; + } + NSDateComponents *components = [self getDateComponentsFromDate:aDate]; + today = [[gregorian dateFromComponents:components] retain]; +} + - (void)setMinDate:(NSDate *)aDate { if (aDate != minDate) { [minDate release]; @@ -178,26 +397,134 @@ static UIColor *holidayColor; } } -- (void)showInView:(UIView *)aView { - //[self setCenter:CGPointMake(aView.frame.size.width / 2, self.frame.size.height / 2)]; +- (void)showInView:(UIView *)aView animated:(BOOL)animated { + [self setCenter:CGPointMake(aView.frame.size.width / 2, self.frame.size.height / 2)]; + + [self setUpCalendarWithDate:pageDate]; + + if (animated) { + [self setAlpha:0.0f]; + [aView addSubview:self]; + + CGRect frame = [self frame]; + frame.origin.y = frame.origin.y - frame.size.height / 2; + self.frame = frame; + + [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; + [UIView commitAnimations]; + } else { + [aView addSubview:self]; + } +} + +- (void)showAtPoint:(CGPoint)point inView:(UIView *)aView animated:(BOOL)animated { [self setUpCalendarWithDate:pageDate]; - /*if (style == UICCalendarPickerStyleDefault) { - [self setBackgroundColor:[UIColor darkGrayColor]]; - } else if (style == UICCalendarPickerStyleBlackOpaque) { - [self setBackgroundColor:[UIColor blackColor]]; + 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; + self.frame = frame; + + [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; + [UIView commitAnimations]; } else { - [self setBackgroundColor:[UIColor blackColor]]; - [self setAlpha:0.8f]; - }*/ + CGRect frame = [self frame]; + frame.origin.x = point.x; + frame.origin.y = point.y; + self.frame = frame; + [aView addSubview:self]; + } +} - [aView addSubview:self]; +- (void)dismiss:(id)sender animated:(BOOL)animated { + if (animated) { + [UIView beginAnimations:nil context:NULL]; + [UIView setAnimationDelegate:self]; + [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; + [UIView commitAnimations]; + } else { + [self removeFromSuperview]; + } } -- (void)dismiss:(id)sender { +- (void)animationFinished:(NSString *)animationID finished:(BOOL)finished context:(void *)context { [self removeFromSuperview]; } +#pragma mark Private Methods + +- (void)resetButtonAtributes:(UICCalendarPickerDateButton *)button { + [button setDate:nil]; + [button setToday:NO]; + [button setDayOfWeek:UICCalendarPickerDayOfWeekSunday]; + [button setMonthout:NO]; + [button setOutOfRange:NO]; + [button setEnabled:YES]; + [button setBackgroundImage:normalCell forState:UIControlStateNormal]; + [button setBackgroundImage:selectedCell forState:UIControlStateSelected]; + [button setBackgroundImage:disabledCell forState:UIControlStateDisabled]; + [button setTitleColor:normalColor forState:UIControlStateNormal]; + [button setTitleColor:selectedColor forState:UIControlStateSelected]; + [button setTitleColor:disabledColor forState:UIControlStateDisabled]; + [button setFont:[UIFont fontWithName:@"ArialMT" size:UICCALENDAR_CELL_FONT_SIZE]]; + [button setShowsTouchWhenHighlighted:NO]; +} + +- (void)resetButtonState:(UICCalendarPickerDateButton *)button { + [button setBackgroundImage:normalCell forState:UIControlStateNormal]; + [button setBackgroundImage:selectedCell forState:UIControlStateSelected]; + [button setBackgroundImage:disabledCell forState:UIControlStateDisabled]; + [button setTitleColor:normalColor forState:UIControlStateNormal]; + [button setTitleColor:selectedColor forState:UIControlStateSelected]; + [button setTitleColor:disabledColor forState:UIControlStateDisabled]; + [button setFont:[UIFont fontWithName:@"ArialMT" size:UICCALENDAR_CELL_FONT_SIZE]]; + [button setShowsTouchWhenHighlighted:NO]; +} + +- (void)closeButtonPushed:(id)sender { + if ([delegate respondsToSelector:@selector(picker:pushedCloseButton:)]) { + [delegate picker:self pushedCloseButton:sender]; + } else { + [self dismiss:sender animated:YES]; + } +} + +- (void)prevButtonPushed:(id)sender { + if ([delegate respondsToSelector:@selector(picker:pushedPrevButton:)]) { + [delegate picker:self pushedPrevButton:sender]; + } else { + [self moveLastMonth:sender]; + } +} + +- (void)nextButtonPushed:(id)sender { + if ([delegate respondsToSelector:@selector(picker:pushedNextButton:)]) { + [delegate picker:self pushedNextButton:sender]; + } else { + [self moveNextMonth:sender]; + } +} + - (void)dateButtonPushed:(id)sender { @synchronized(self) { UICCalendarPickerDateButton *dateButton = (UICCalendarPickerDateButton *)sender; @@ -248,9 +575,23 @@ static UIColor *holidayColor; } else { if ([rangeStartDate isEqualToDate:[dateButton date]]) { [rangeStartDate release]; - rangeStartDate = nil; + rangeStartDate = nil; + [rangeEndDate release]; + rangeEndDate = nil; [selectedDates removeAllObjects]; [dateButton setSelected:NO]; + } else if (rangeEndDate){ + if (rangeStartDate != [dateButton date]) { + [rangeStartDate release]; + } + if (rangeEndDate != [dateButton date]) { + [rangeEndDate release]; + } + rangeStartDate = [[dateButton date] retain]; + rangeEndDate = nil; + [selectedDates removeAllObjects]; + [selectedDates addObject:rangeStartDate]; + [dateButton setSelected:YES]; } else { if (rangeEndDate != [dateButton date]) { [rangeEndDate release]; @@ -292,7 +633,7 @@ static UIColor *holidayColor; if (currentDate != aDate) { [currentDate release]; } - currentDate = [aDate retain];; + currentDate = [aDate retain]; NSDateComponents *components = [self getDateComponentsFromDate:currentDate]; [components setDay:1]; @@ -304,32 +645,34 @@ static UIColor *holidayColor; NSDate *lastManthDate = [gregorian dateByAddingComponents:minusComponents toDate:date options:0]; NSDateComponents *lastManthDateComponents = [self getDateComponentsFromDate:lastManthDate]; - NSInteger weekday = [lastManthDateComponents weekday]; + NSUInteger weekday = [lastManthDateComponents weekday]; while (weekday != 7) { - NSInteger day = [lastManthDateComponents day]; + NSUInteger day = [lastManthDateComponents day]; UICCalendarPickerDateButton *dateButton = (UICCalendarPickerDateButton *)[self viewWithTag:(7 * 0) + weekday]; + [self resetButtonAtributes:dateButton]; + [dateButton setTitle:[NSString stringWithFormat:@"%d", day] forState:UIControlStateNormal]; - [dateButton setBackgroundImage:monthoutCell forState:UIControlStateNormal]; - [dateButton setTitleColor:monthoutColor forState:UIControlStateNormal]; - if ([selectedDates containsObject:lastManthDate]) { - [dateButton setSelected:YES]; - } else { - [dateButton setSelected:NO]; - } + [dateButton setDate:lastManthDate]; + + [dateButton setMonthout:YES]; + + [dateButton setSelected:[selectedDates containsObject:lastManthDate]]; - [dateButton setEnabled:YES]; if (minDate != nil && [lastManthDate compare:minDate] != NSOrderedDescending && [lastManthDate compare:minDate] != NSOrderedSame) { - [dateButton setEnabled:NO]; + [dateButton setOutOfRange:YES]; } if (maxDate != nil - && [lastManthDate compare:maxDate] != NSOrderedAscending && [lastManthDate compare:maxDate] != NSOrderedSame) { - [dateButton setEnabled:NO]; + && [lastManthDate compare:maxDate] == NSOrderedDescending && [lastManthDate compare:maxDate] != NSOrderedSame) { + [dateButton setOutOfRange:YES]; } - [dateButton setDate:lastManthDate]; + [self picker:self buttonForDate:dateButton]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDate:)]) { + [dataSource picker:self buttonForDate:dateButton]; + } lastManthDate = [gregorian dateByAddingComponents:minusComponents toDate:lastManthDate options:0]; lastManthDateComponents = [self getDateComponentsFromDate:lastManthDate]; @@ -340,54 +683,44 @@ static UIColor *holidayColor; [plusComponents setDay:1]; //NSInteger year = [components year]; - NSInteger month = [components month]; - UILabel *monthLabel = (UILabel *)[self viewWithTag:UICCALENDAR_TITLE_LABEL_TAG]; - [dateFormatter setLocale:[[[NSLocale alloc] initWithLocaleIdentifier:@"US"] autorelease]]; - [dateFormatter setDateFormat:@"MMMM yyyy"]; - [monthLabel setText:[dateFormatter stringFromDate:date]]; + NSUInteger month = [components month]; + UILabel *monthLabel = (UILabel *)[self viewWithTag:UICCALENDAR_MONTH_LABEL_TAG]; + [monthLabel setText:[self picker:self textForYearMonth:currentDate]]; + if ([dataSource respondsToSelector:@selector(picker:textForYearMonth:)]) { + [monthLabel setText:[dataSource picker:self textForYearMonth:currentDate]]; + } - NSInteger weekOfMonth = 0; + NSUInteger weekOfMonth = 0; do { - NSInteger day = [components day]; - NSInteger weekday = [components weekday]; + NSUInteger day = [components day]; + NSUInteger weekday = [components weekday]; UICCalendarPickerDateButton *dateButton = (UICCalendarPickerDateButton *)[self viewWithTag:(7 * weekOfMonth) + weekday]; + [self resetButtonAtributes:dateButton]; + [dateButton setTitle:[NSString stringWithFormat:@"%d", day] forState:UIControlStateNormal]; - if (weekday == 1) { - [dateButton setBackgroundImage:holidayCell forState:UIControlStateNormal]; - [dateButton setTitleColor:holidayColor forState:UIControlStateNormal]; - } else { - [dateButton setBackgroundImage:normalCell forState:UIControlStateNormal]; - [dateButton setTitleColor:normalColor forState:UIControlStateNormal]; - } + [dateButton setDate:date]; - if ([date isEqualToDate:today]) { - [dateButton setBackgroundImage:todayCell forState:UIControlStateNormal]; - } + [dateButton setToday:[date isEqualToDate:today]]; - if ([selectedDates containsObject:date]) { - if ([date isEqualToDate:today]) { - [dateButton setBackgroundImage:todaySelectedCell forState:UIControlStateSelected]; - } else { - [dateButton setBackgroundImage:selectedCell forState:UIControlStateSelected]; - } - [dateButton setSelected:YES]; - } else { - [dateButton setSelected:NO]; - } + [dateButton setDayOfWeek:weekday]; + + [dateButton setSelected:[selectedDates containsObject:date]]; - [dateButton setEnabled:YES]; if (minDate != nil && [date compare:minDate] != NSOrderedDescending && [date compare:minDate] != NSOrderedSame) { - [dateButton setEnabled:NO]; + [dateButton setOutOfRange:YES]; } if (maxDate != nil && [date compare:maxDate] == NSOrderedDescending && [date compare:maxDate] != NSOrderedSame) { - [dateButton setEnabled:NO]; + [dateButton setOutOfRange:YES]; } - [dateButton setDate:date]; + [self picker:self buttonForDate:dateButton]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDate:)]) { + [dataSource picker:self buttonForDate:dateButton]; + } date = [gregorian dateByAddingComponents:plusComponents toDate:date options:0]; components = [self getDateComponentsFromDate:date]; @@ -399,30 +732,37 @@ static UIColor *holidayColor; weekday = [components weekday]; while (weekday != 1) { - NSInteger day = [components day]; + NSUInteger day = [components day]; UICCalendarPickerDateButton *dateButton = (UICCalendarPickerDateButton *)[self viewWithTag:(7 * weekOfMonth) + weekday]; - [dateButton setTitle:[NSString stringWithFormat:@"%d", day] forState:UIControlStateNormal]; - [dateButton setBackgroundImage:monthoutCell forState:UIControlStateNormal]; - [dateButton setTitleColor:monthoutColor forState:UIControlStateNormal]; - if ([selectedDates containsObject:date]) { - [dateButton setSelected:YES]; - } else { - [dateButton setSelected:NO]; + if (weekday == 7) { + weekOfMonth++; } - [dateButton setEnabled:YES]; + [self resetButtonAtributes:dateButton]; + + [dateButton setTitle:[NSString stringWithFormat:@"%d", day] forState:UIControlStateNormal]; + + [dateButton setDate:date]; + + [dateButton setMonthout:YES]; + + [dateButton setSelected:[selectedDates containsObject:date]]; + if (minDate != nil && [date compare:minDate] != NSOrderedDescending && [date compare:minDate] != NSOrderedSame) { - [dateButton setEnabled:NO]; + [dateButton setOutOfRange:YES]; } if (maxDate != nil && [date compare:maxDate] == NSOrderedDescending && [date compare:maxDate] != NSOrderedSame) { - [dateButton setEnabled:NO]; + [dateButton setOutOfRange:YES]; } - [dateButton setDate:date]; + [self picker:self buttonForDate:dateButton]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDate:)]) { + [dataSource picker:self buttonForDate:dateButton]; + } date = [gregorian dateByAddingComponents:plusComponents toDate:date options:0]; @@ -430,12 +770,15 @@ static UIColor *holidayColor; weekday = [components weekday]; } - if (weekOfMonth == 4) { - for (int i = 35 + weekday; i <= 42; i++) { - UICCalendarPickerDateButton *dateButton = (UICCalendarPickerDateButton *)[self viewWithTag:i]; - [dateButton setTitle:nil forState:UIControlStateNormal]; - [dateButton setSelected:NO]; - [dateButton setEnabled:NO]; + for (int i = (7 * weekOfMonth) + weekday; i <= 42; i++) { + UICCalendarPickerDateButton *dateButton = (UICCalendarPickerDateButton *)[self viewWithTag:i]; + [self resetButtonAtributes:dateButton]; + + [dateButton setTitle:nil forState:UIControlStateNormal]; + [dateButton setDate:nil]; + [self picker:self buttonForDate:dateButton]; + if ([dataSource respondsToSelector:@selector(picker:buttonForDate:)]) { + [dataSource picker:self buttonForDate:dateButton]; } } } @@ -466,8 +809,4 @@ static UIColor *holidayColor; } while ([rangeDate compare:rangeEndDate] != NSOrderedSame); } -- (void)drawRect:(CGRect)rect { - [super drawRect:rect]; -} - @end vendor/UICCalendarPicker/Classes/UICCalendarPicker.m @@ -1,11 +1,19 @@ #import <UIKit/UIKit.h> +#import "UICCalendarPicker.h" @interface UICCalendarPickerDateButton : UIButton { UIButton *button; NSDate *date; + BOOL isToday; + UICCalendarPickerDayOfWeek dayOfWeek; + BOOL monthout; + BOOL outOfRange; } -@property (nonatomic, retain) UIButton *button; @property (nonatomic, retain) NSDate *date; +@property (nonatomic, getter=isToday, setter=setToday:) BOOL isToday; +@property (nonatomic) UICCalendarPickerDayOfWeek dayOfWeek; +@property (nonatomic) BOOL monthout; +@property (nonatomic) BOOL outOfRange; @end vendor/UICCalendarPicker/Classes/UICCalendarPickerDateButton.h @@ -4,17 +4,30 @@ @implementation UICCalendarPickerDateButton @synthesize date; -@synthesize button; +@synthesize dayOfWeek; +@synthesize monthout; +@synthesize outOfRange; + +- (BOOL)isToday { + return isToday; +} + +- (void)setToday:(BOOL)b { + isToday = b; +} - (id)init { if (self = [super init]) { - self.button = [UIButton buttonWithType:UIButtonTypeCustom]; + button = [[UIButton buttonWithType:UIButtonTypeCustom] retain]; + date = nil; + isToday = NO; + dayOfWeek = UICCalendarPickerDayOfWeekSunday; + outOfRange = NO; } return self; } - (void)dealloc { - LOG_CURRENT_METHOD; [date release]; [button release]; [super dealloc]; vendor/UICCalendarPicker/Classes/UICCalendarPickerDateButton.m vendor/UICCalendarPicker/uiccalendar_background.png vendor/UICCalendarPicker/uiccalendar_main.png vendor/UICCalendarPicker/uiccalendar_title.png vendor/UICCalendarPicker/Classes/UICCalendarPickerDelegate.h d62e933d91e2b23a4d3aa030ed6272aad85f381e mootoh mootoh@gmail.com http://github.com/mootoh/milpon/commit/6f4f462b4ec3a665b87bc09be7a1124b47897bc7 6f4f462b4ec3a665b87bc09be7a1124b47897bc7 2009-04-21T19:57:16-07:00 2009-04-21T19:57:16-07:00 fixed #87: use latest UICCalendarPicker. 8b0a1bb771a104d81919277ce619d9e07b8b3a98 mootoh mootoh@gmail.com