Skip to content
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

Jump to bottom

Calendar Month Grid: Added support for multiple dots in the calendar #207

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

Calendar Month Grid: Added support for multiple dots in the calendar #207

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/iPhone/AppDelegate_iPhone.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#import "RootViewController.h"

@implementation AppDelegate_iPhone
@synthesize root=_root,navigationController=_navigationController;
@synthesize root=_root,navigationController=_navigationController,window=_window;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

demo seems to crash without this line



#pragma mark -
Expand Down
10 changes: 7 additions & 3 deletions demo/iPhone/DemoCalendarMonth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,18 @@ - (void) generateRandomDataForStartDate:(NSDate*)start endDate:(NSDate*)end{
int r = arc4random();
if(r % 3==1){
[self.dataDictionary setObject:[NSArray arrayWithObjects:@"Item one",@"Item two",nil] forKey:d];
[self.dataArray addObject:[NSNumber numberWithBool:YES]];
[self.dataArray addObject:[NSNumber numberWithInt:2]]; //choose amount of dots

}else if(r%4==1){
[self.dataDictionary setObject:[NSArray arrayWithObjects:@"Item one",nil] forKey:d];
[self.dataArray addObject:[NSNumber numberWithBool:YES]];
[self.dataArray addObject:[NSNumber numberWithInt:1]];

}else if(r%5==1){
[self.dataDictionary setObject:[NSArray arrayWithObjects:@"Item one", @"Item two", @"Item three", @"Item four", nil] forKey:d];
[self.dataArray addObject:[NSNumber numberWithInt:4]];

}else
[self.dataArray addObject:[NSNumber numberWithBool:NO]];
[self.dataArray addObject:[NSNumber numberWithInt:0]];


TKDateInformation info = [d dateInformationWithTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
Expand Down
2 changes: 1 addition & 1 deletion src/TapkuLibrary/TKCalendarMonthView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
@param monthView The calendar month grid.
@param startDate The first date shown by the calendar month grid.
@param lastDate The last date shown by the calendar month grid.
@return Returns an array of NSNumber objects corresponding the number of days specified in the start and last day parameters. Each NSNumber variable will give a BOOL value that will be used to display a dot under the day.
@return Returns an array of NSNumber objects corresponding the number of days specified in the start and last day parameters. Each NSNumber variable will give a INTEGER value that will be used to display 1 or more dots under the day.

*/
- (NSArray*) calendarMonthView:(TKCalendarMonthView*)monthView marksFromDate:(NSDate*)startDate toDate:(NSDate*)lastDate;
Expand Down
40 changes: 11 additions & 29 deletions src/TapkuLibrary/TKCalendarMonthView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ @implementation TKCalendarMonthTiles

#define dotFontSize 18.0
#define dateFontSize 22.0
#define numberOfMaxDots 6
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this could become a property once..


#pragma mark Accessibility Container methods
- (BOOL) isAccessibilityElement{
Expand Down Expand Up @@ -277,7 +278,7 @@ - (CGRect) rectForCellAtIndex:(int)index{

return CGRectMake(col*46, row*44+6, 47, 45);
}
- (void) drawTileInRect:(CGRect)r day:(int)day mark:(BOOL)mark font:(UIFont*)f1 font2:(UIFont*)f2{
- (void) drawTileInRect:(CGRect)r day:(int)day mark:(int)mark font:(UIFont*)f1 font2:(UIFont*)f2{

NSString *str = [NSString stringWithFormat:@"%d",day];

Expand All @@ -292,7 +293,7 @@ - (void) drawTileInRect:(CGRect)r day:(int)day mark:(BOOL)mark font:(UIFont*)f1
r.size.height = 10;
r.origin.y += 18;

[@"•" drawInRect: r
[[@"••••••" substringToIndex:MIN(MAX(mark, 0), numberOfMaxDots)] drawInRect: r
withFont: f2
lineBreakMode: UILineBreakModeWordWrap
alignment: UITextAlignmentCenter];
Expand Down Expand Up @@ -327,9 +328,9 @@ - (void) drawRect:(CGRect)rect {
for(int i = firstOfPrev;i<= lastOfPrev;i++){
r = [self rectForCellAtIndex:index];
if ([marks count] > 0)
[self drawTileInRect:r day:i mark:[[marks objectAtIndex:index] boolValue] font:font font2:font2];
[self drawTileInRect:r day:i mark:[[marks objectAtIndex:index] intValue] font:font font2:font2];
else
[self drawTileInRect:r day:i mark:NO font:font font2:font2];
[self drawTileInRect:r day:i mark:0 font:font font2:font2];
index++;
}
}
Expand All @@ -343,9 +344,9 @@ - (void) drawRect:(CGRect)rect {
if(today == i) [[UIColor whiteColor] set];

if ([marks count] > 0)
[self drawTileInRect:r day:i mark:[[marks objectAtIndex:index] boolValue] font:font font2:font2];
[self drawTileInRect:r day:i mark:[[marks objectAtIndex:index] intValue] font:font font2:font2];
else
[self drawTileInRect:r day:i mark:NO font:font font2:font2];
[self drawTileInRect:r day:i mark:0 font:font font2:font2];
if(today == i) [color set];
index++;
}
Expand All @@ -355,9 +356,9 @@ - (void) drawRect:(CGRect)rect {
while(index % 7 != 0){
r = [self rectForCellAtIndex:index] ;
if ([marks count] > 0)
[self drawTileInRect:r day:i mark:[[marks objectAtIndex:index] boolValue] font:font font2:font2];
[self drawTileInRect:r day:i mark:[[marks objectAtIndex:index] intValue] font:font font2:font2];
else
[self drawTileInRect:r day:i mark:NO font:font font2:font2];
[self drawTileInRect:r day:i mark:0 font:font font2:font2];
i++;
index++;
}
Expand Down Expand Up @@ -398,18 +399,7 @@ - (void) selectDay:(int)day{
[self addSubview:self.selectedImageView];
self.currentDay.text = [NSString stringWithFormat:@"%d",day];

if ([marks count] > 0) {

if([[marks objectAtIndex: row * 7 + column ] boolValue]){
[self.selectedImageView addSubview:self.dot];
}else{
[self.dot removeFromSuperview];
}


}else{
[self.dot removeFromSuperview];
}
self.dot.text = [@"••••••" substringToIndex:MIN(MAX([[marks objectAtIndex:(row*7+column)] intValue], 0), numberOfMaxDots)];

if(column < 0){
column = 6;
Expand Down Expand Up @@ -494,14 +484,7 @@ - (void) reactToTouch:(UITouch*)touch down:(BOOL)down{
[self addSubview:self.selectedImageView];
self.currentDay.text = [NSString stringWithFormat:@"%d",day];

if ([marks count] > 0) {
if([[marks objectAtIndex: row * 7 + column] boolValue])
[self.selectedImageView addSubview:self.dot];
else
[self.dot removeFromSuperview];
}else{
[self.dot removeFromSuperview];
}
self.dot.text = [@"••••••" substringToIndex:MIN(MAX([[marks objectAtIndex:(row*7+column)] intValue], 0), numberOfMaxDots)];



Expand Down Expand Up @@ -559,7 +542,6 @@ - (UILabel *) dot{
r.origin.y += 29;
r.size.height -= 31;
_dot = [[UILabel alloc] initWithFrame:r];
_dot.text = @"•";
_dot.textColor = [UIColor whiteColor];
_dot.backgroundColor = [UIColor clearColor];
_dot.font = [UIFont boldSystemFontOfSize:dotFontSize];
Expand Down