Use internal delegate instead of overriding existing delegate.

Mu-L · Oct 12, 2018 · 4a4175b · 4a4175b
1 parent d1476b2
commit 4a4175b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/FSCalendar/FSCalendar.m b/FSCalendar/FSCalendar.m
@@ -43,7 +43,7 @@ typedef NS_ENUM(NSUInteger, FSCalendarOrientation) {
     FSCalendarOrientationPortrait
 };
 
-@interface FSCalendar ()<FSCalendarCollectionViewDataSource,FSCalendarCollectionViewDelegate,UIGestureRecognizerDelegate>
+@interface FSCalendar ()<UICollectionViewDataSource,UICollectionViewDelegate,FSCalendarCollectionViewInternalDelegate,UIGestureRecognizerDelegate>
 {
     NSMutableArray  *_selectedDates;
 }
@@ -208,6 +208,7 @@ - (void)initialize
                                                                           collectionViewLayout:collectionViewLayout];
     collectionView.dataSource = self;
     collectionView.delegate = self;
+    collectionView.internalDelegate = self;
     collectionView.backgroundColor = [UIColor clearColor];
     collectionView.pagingEnabled = YES;
     collectionView.showsHorizontalScrollIndicator = NO;

diff --git a/FSCalendar/FSCalendarCollectionView.h b/FSCalendar/FSCalendarCollectionView.h
@@ -9,11 +9,8 @@
 #import <UIKit/UIKit.h>
 @class FSCalendarCollectionView;
 
-@protocol FSCalendarCollectionViewDataSource <UICollectionViewDataSource>
 
-@end
-
-@protocol FSCalendarCollectionViewDelegate <UICollectionViewDelegate>
+@protocol FSCalendarCollectionViewInternalDelegate <UICollectionViewDelegate>
 
 @optional
 - (void)collectionViewDidFinishLayoutSubviews:(FSCalendarCollectionView *)collectionView;
@@ -22,7 +19,6 @@
 
 @interface FSCalendarCollectionView : UICollectionView
 
-@property (assign, nonatomic) id<FSCalendarCollectionViewDataSource> dataSource;
-@property (assign, nonatomic) id<FSCalendarCollectionViewDelegate> delegate;
+@property (weak, nonatomic) id<FSCalendarCollectionViewInternalDelegate> internalDelegate;
 
 @end
diff --git a/FSCalendar/FSCalendarCollectionView.m b/FSCalendar/FSCalendarCollectionView.m
@@ -21,7 +21,6 @@ - (void)commonInit;
 @implementation FSCalendarCollectionView
 
 @synthesize scrollsToTop = _scrollsToTop, contentInset = _contentInset;
-@dynamic dataSource, delegate;
 
 - (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout
 {
@@ -52,8 +51,8 @@ - (void)commonInit
 - (void)layoutSubviews
 {
     [super layoutSubviews];
-    if (self.delegate && [self.delegate respondsToSelector:@selector(collectionViewDidFinishLayoutSubviews:)]) {
-        [self.delegate collectionViewDidFinishLayoutSubviews:self];
+    if (self.internalDelegate && [self.internalDelegate respondsToSelector:@selector(collectionViewDidFinishLayoutSubviews:)]) {
+        [self.internalDelegate collectionViewDidFinishLayoutSubviews:self];
     }
 }
 

diff --git a/FSCalendar/FSCalendarHeaderView.m b/FSCalendar/FSCalendarHeaderView.m
@@ -12,7 +12,7 @@
 #import "FSCalendarCollectionView.h"
 #import "FSCalendarDynamicHeader.h"
 
-@interface FSCalendarHeaderView ()<FSCalendarCollectionViewDataSource,FSCalendarCollectionViewDelegate>
+@interface FSCalendarHeaderView ()<UICollectionViewDataSource,UICollectionViewDelegate,FSCalendarCollectionViewInternalDelegate>
 
 - (void)scrollToOffset:(CGFloat)scrollOffset animated:(BOOL)animated;
 - (void)configureCell:(FSCalendarHeaderCell *)cell atIndexPath:(NSIndexPath *)indexPath;