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.

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

Displaying week of year. #175

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions JTCalendar/JTCalendarDelegate.h
Expand Up @@ -99,6 +99,13 @@
- (UIView<JTCalendarDay> *)calendarBuildDayView:(JTCalendarManager *)calendar;


/*!
* Provide a view conforming to `JTCalendarDay` protocol.
* Return an instance of `JTCalendarDayView` by default.
*/
- (UIView<JTCalendarDay> *)calendarBuildWeekNumberView:(JTCalendarManager *)calendar;


// Day view


Expand All @@ -112,4 +119,15 @@
*/
- (void)calendar:(JTCalendarManager *)calendar didTouchDayView:(UIView<JTCalendarDay> *)dayView;


/*!
* Used to customize the dayView.
*/
- (void)calendar:(JTCalendarManager *)calendar prepareWeekNumberView:(UIView<JTCalendarDay> *)weekNumberView;

/*!
* Indicate the dayView just get touched.
*/
- (void)calendar:(JTCalendarManager *)calendar didTouchWeekNumberView:(UIView<JTCalendarDay> *)weekNumberView;

@end
2 changes: 2 additions & 0 deletions JTCalendar/JTCalendarSettings.h
Expand Up @@ -21,6 +21,8 @@ typedef NS_ENUM(NSInteger, JTCalendarWeekDayFormat) {
@property (nonatomic) BOOL pageViewHideWhenPossible;
@property (nonatomic) BOOL weekModeEnabled;

@property (nonatomic) BOOL weekNumber;


// Page view

Expand Down
1 change: 1 addition & 0 deletions JTCalendar/JTCalendarSettings.m
Expand Up @@ -28,6 +28,7 @@ - (void)commonInit
_pageViewHaveWeekDaysView = YES;
_weekDayFormat = JTCalendarWeekDayFormatShort;
_weekModeEnabled = NO;
_weekNumber = YES;
}

@end
4 changes: 4 additions & 0 deletions JTCalendar/Managers/JTCalendarDelegateManager.h
Expand Up @@ -38,11 +38,15 @@
// Week view

- (UIView<JTCalendarDay> *)buildDayView;
- (UIView<JTCalendarDay> *)buildWeekNumberView;


// Day view

- (void)prepareDayView:(UIView<JTCalendarDay> *)dayView;
- (void)didTouchDayView:(UIView<JTCalendarDay> *)dayView;
- (void)prepareWeekNumberView:(UIView<JTCalendarDay> *)weekNumberView;
- (void)didTouchWeekNumberView:(UIView<JTCalendarDay> *)weekNumberView;


@end
27 changes: 27 additions & 0 deletions JTCalendar/Managers/JTCalendarDelegateManager.m
Expand Up @@ -13,6 +13,7 @@
#import "JTCalendarWeekDayView.h"
#import "JTCalendarWeekView.h"
#import "JTCalendarDayView.h"
#import "JTCalendarWeekNumberView.h"

@implementation JTCalendarDelegateManager

Expand Down Expand Up @@ -145,6 +146,15 @@ - (NSDate *)dateForNextPageWithCurrentDate:(NSDate *)currentDate
return [JTCalendarDayView new];
}

- (UIView<JTCalendarDay> *)buildWeekNumberView
{
if(_manager.delegate && [_manager.delegate respondsToSelector:@selector(calendarBuildWeekNumberView:)]){
return [_manager.delegate calendarBuildWeekNumberView:self.manager];
}

return [JTCalendarWeekNumberView new];
}

#pragma mark - Day view

- (void)prepareDayView:(UIView<JTCalendarDay> *)dayView
Expand All @@ -161,4 +171,21 @@ - (void)didTouchDayView:(UIView<JTCalendarDay> *)dayView
}
}

#pragma mark - Week number view

- (void)prepareWeekNumberView:(UIView<JTCalendarDay> *)weekNumberView
{
if(_manager.delegate && [_manager.delegate respondsToSelector:@selector(calendar:prepareWeekNumberView:)]){
[_manager.delegate calendar:self.manager prepareWeekNumberView:weekNumberView];
}
}

- (void)didTouchWeekNumberView:(UIView<JTCalendarDay> *)weekNumberView
{
if(_manager.delegate && [_manager.delegate respondsToSelector:@selector(calendar:didTouchWeekNumberView:)]){
[_manager.delegate calendar:self.manager didTouchWeekNumberView:weekNumberView];
}
}


@end
1 change: 1 addition & 0 deletions JTCalendar/Views/JTCalendarWeekDayView.h
Expand Up @@ -14,6 +14,7 @@
@property (nonatomic, weak) JTCalendarManager *manager;

@property (nonatomic, readonly) NSArray *dayViews;
@property (nonatomic, readonly) UILabel *weekNumberView;

/*!
* Must be call if override the class
Expand Down
24 changes: 23 additions & 1 deletion JTCalendar/Views/JTCalendarWeekDayView.m
Expand Up @@ -41,6 +41,16 @@ - (void)commonInit
{
NSMutableArray *dayViews = [NSMutableArray new];

if (_manager.settings.weekNumber) {
UILabel *label = [UILabel new];
[self addSubview:label];
_weekNumberView = label;

label.textAlignment = NSTextAlignmentCenter;
label.textColor = [UIColor colorWithRed:152./256. green:147./256. blue:157./256. alpha:1.];
label.font = [UIFont systemFontOfSize:11];
}

for(int i = 0; i < NUMBER_OF_DAY_BY_WEEK; ++i){
UILabel *label = [UILabel new];
[self addSubview:label];
Expand Down Expand Up @@ -105,10 +115,22 @@ - (void)layoutSubviews
return;
}

int numberOfDays = NUMBER_OF_DAY_BY_WEEK;

if (_manager.settings.weekNumber) {
numberOfDays ++;
}

CGFloat x = 0;
CGFloat dayWidth = self.frame.size.width / NUMBER_OF_DAY_BY_WEEK;
CGFloat dayWidth = self.frame.size.width / numberOfDays;
CGFloat dayHeight = self.frame.size.height;

if (_manager.settings.weekNumber) {
_weekNumberView.frame = CGRectMake(x, 0, dayWidth, dayHeight);
x += dayWidth;

}

for(UIView *dayView in _dayViews){
dayView.frame = CGRectMake(x, 0, dayWidth, dayHeight);
x += dayWidth;
Expand Down
13 changes: 13 additions & 0 deletions JTCalendar/Views/JTCalendarWeekNumberView.h
@@ -0,0 +1,13 @@
//
// JTCalendarWeekNumberView.h
// Pods
//
// Created by SSL on 23/07/15.
//
//

#import "JTCalendarDayView.h"

@interface JTCalendarWeekNumberView : JTCalendarDayView<JTCalendarDay>

@end
36 changes: 36 additions & 0 deletions JTCalendar/Views/JTCalendarWeekNumberView.m
@@ -0,0 +1,36 @@
//
// JTCalendarWeekNumberView.m
// Pods
//
// Created by SSL on 23/07/15.
//
//

#import "JTCalendarWeekNumberView.h"
#import "JTCalendarManager.h"


@implementation JTCalendarWeekNumberView

- (void)reload
{
static NSCalendar *cal = nil;

if (!cal) {
cal = [NSCalendar currentCalendar];
}

NSDateComponents *components = [cal components:NSWeekOfYearCalendarUnit fromDate:self.date];
self.textLabel.text = [NSString stringWithFormat:@"%ld", [components weekOfYear]];


[self.manager.delegateManager prepareWeekNumberView:self];
}

- (void)didTouch
{
[self.manager.delegateManager didTouchWeekNumberView:self];
}


@end
25 changes: 24 additions & 1 deletion JTCalendar/Views/JTCalendarWeekView.m
Expand Up @@ -13,6 +13,7 @@

@interface JTCalendarWeekView (){
NSMutableArray *_daysViews;
UIView<JTCalendarDay> *_weekNumberView;
}

@end
Expand Down Expand Up @@ -66,6 +67,10 @@ - (void)reloadAndUpdateAnotherMonth:(BOOL)enable monthDate:(NSDate *)monthDate
{
NSDate *dayDate = _startDate;

if (_manager.settings.weekNumber) {
_weekNumberView.date = dayDate;
}

for(UIView<JTCalendarDay> *dayView in _daysViews){
// Must done before setDate to dayView for `prepareDayView` method
if(!enable){
Expand All @@ -88,6 +93,13 @@ - (void)reloadAndUpdateAnotherMonth:(BOOL)enable monthDate:(NSDate *)monthDate
- (void)createDayViews
{
if(!_daysViews){

if (_manager.settings.weekNumber) {
_weekNumberView = [_manager.delegateManager buildWeekNumberView];
_weekNumberView.manager = _manager;
[self addSubview:_weekNumberView];
}

_daysViews = [NSMutableArray new];

for(int i = 0; i < NUMBER_OF_DAY_BY_WEEK; ++i){
Expand All @@ -106,10 +118,21 @@ - (void)layoutSubviews
return;
}

int numberOfDays = NUMBER_OF_DAY_BY_WEEK;

if (_manager.settings.weekNumber) {
numberOfDays ++;
}

CGFloat x = 0;
CGFloat dayWidth = self.frame.size.width / NUMBER_OF_DAY_BY_WEEK;
CGFloat dayWidth = self.frame.size.width / numberOfDays;
CGFloat dayHeight = self.frame.size.height;

if (_manager.settings.weekNumber) {
_weekNumberView.frame = CGRectMake(x, 0, dayWidth, dayHeight);
x += dayWidth;
}

for(UIView *dayView in _daysViews){
dayView.frame = CGRectMake(x, 0, dayWidth, dayHeight);
x += dayWidth;
Expand Down