From 3eccc3ad7df3e54ce2e50fe3dcdf427acb6230c2 Mon Sep 17 00:00:00 2001 From: Wenchao Ding Date: Thu, 22 Dec 2016 09:03:47 +0800 Subject: [PATCH] Public The UILabel array of FSCalendarWeekdayView --- FSCalendar/FSCalendarDynamicHeader.h | 6 ++++++ FSCalendar/FSCalendarWeekdayView.h | 5 ++++- FSCalendar/FSCalendarWeekdayView.m | 16 +++++++++------- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/FSCalendar/FSCalendarDynamicHeader.h b/FSCalendar/FSCalendarDynamicHeader.h index 334b69f..b6f0777 100644 --- a/FSCalendar/FSCalendarDynamicHeader.h +++ b/FSCalendar/FSCalendarDynamicHeader.h @@ -67,6 +67,12 @@ @end +@interface FSCalendarWeekdayView (Dynamic) + +@property (readwrite, nonatomic) FSCalendar *calendar; + +@end + @interface FSCalendarDelegationProxy() @end diff --git a/FSCalendar/FSCalendarWeekdayView.h b/FSCalendar/FSCalendarWeekdayView.h index 78c5abb..282c90e 100644 --- a/FSCalendar/FSCalendarWeekdayView.h +++ b/FSCalendar/FSCalendarWeekdayView.h @@ -15,7 +15,10 @@ NS_ASSUME_NONNULL_BEGIN @interface FSCalendarWeekdayView : UIView -@property (weak, nonatomic) FSCalendar *calendar; +/** + An array of UILabel objects displaying the weekday symbols. + */ +@property (readonly, nonatomic) NSArray *weekdayLabels; - (void)configureAppearance; diff --git a/FSCalendar/FSCalendarWeekdayView.m b/FSCalendar/FSCalendarWeekdayView.m index b1b936e..bdb9d26 100644 --- a/FSCalendar/FSCalendarWeekdayView.m +++ b/FSCalendar/FSCalendarWeekdayView.m @@ -13,8 +13,9 @@ @interface FSCalendarWeekdayView() -@property (strong, nonatomic) NSPointerArray *weekdayLabels; +@property (strong, nonatomic) NSPointerArray *weekdayPointers; @property (weak , nonatomic) UIView *contentView; +@property (weak , nonatomic) FSCalendar *calendar; - (void)commonInit; @@ -46,12 +47,12 @@ [self addSubview:contentView]; _contentView = contentView; - _weekdayLabels = [NSPointerArray weakObjectsPointerArray]; + _weekdayPointers = [NSPointerArray weakObjectsPointerArray]; for (int i = 0; i < 7; i++) { UILabel *weekdayLabel = [[UILabel alloc] initWithFrame:CGRectZero]; weekdayLabel.textAlignment = NSTextAlignmentCenter; [self.contentView addSubview:weekdayLabel]; - [_weekdayLabels addPointer:(__bridge void * _Nullable)(weekdayLabel)]; + [_weekdayPointers addPointer:(__bridge void * _Nullable)(weekdayLabel)]; } } @@ -62,7 +63,7 @@ self.contentView.frame = self.bounds; CGFloat weekdayWidth = self.fs_width/self.weekdayLabels.count; - [self.weekdayLabels.allObjects enumerateObjectsUsingBlock:^(UILabel *weekdayLabel, NSUInteger index, BOOL *stop) { + [self.weekdayLabels enumerateObjectsUsingBlock:^(UILabel *weekdayLabel, NSUInteger index, BOOL *stop) { weekdayLabel.frame = CGRectMake(index*weekdayWidth, 0, weekdayWidth, self.contentView.fs_height); }]; @@ -89,11 +90,11 @@ }; #if TARGET_INTERFACE_BUILDER - [self.weekdayLabels.allObjects enumerateObjectsUsingBlock:^(UILabel * _Nonnull label, NSUInteger idx, BOOL * _Nonnull stop) { + [self.weekdayLabels enumerateObjectsUsingBlock:^(UILabel * _Nonnull label, NSUInteger idx, BOOL * _Nonnull stop) { configureLabel(label,idx); }]; #else - [self.weekdayLabels.allObjects enumerateObjectsWithOptions:NSEnumerationConcurrent usingBlock:^(UILabel * _Nonnull label, NSUInteger idx, BOOL * _Nonnull stop) { + [self.weekdayLabels enumerateObjectsWithOptions:NSEnumerationConcurrent usingBlock:^(UILabel * _Nonnull label, NSUInteger idx, BOOL * _Nonnull stop) { if ([NSThread isMainThread]) { configureLabel(label,idx); } else { @@ -104,7 +105,8 @@ }]; #endif - } +- (NSArray *)weekdayLabels { return self.weekdayPointers.allObjects; } + @end