Rename the delegate property name.

Since there are lots of subclasses may use the original default name inside.
xingheng · Dec 17, 2018 · 171b7ff · 171b7ff
1 parent 6d18e0c
commit 171b7ff
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/DSBaseViewController/DSBaseViewController.h b/DSBaseViewController/DSBaseViewController.h
@@ -75,7 +75,7 @@ typedef void (^LoadViewControllerBlock)(__kindof DSBaseViewController *controlle
 
 @interface DSBaseViewController : UIViewController <BuildViewDelegate>
 
-@property (nonatomic, weak) id<BuildViewDelegate> delegate; // defaults to the instance of itself.
+@property (nonatomic, weak) id<BuildViewDelegate> buildDelegate; // defaults to the instance of itself.
 
 @property (nonatomic, assign, readonly) BOOL visible;
 

diff --git a/DSBaseViewController/DSBaseViewController.m b/DSBaseViewController/DSBaseViewController.m
@@ -35,10 +35,10 @@ - (void)viewDidLoad
 
     [self _setupAppearance];
 
-    if ([self.delegate respondsToSelector:@selector(buildSubview:controller:)]) {
-        [self.delegate buildSubview:self.view controller:self];
+    if ([self.buildDelegate respondsToSelector:@selector(buildSubview:controller:)]) {
+        [self.buildDelegate buildSubview:self.view controller:self];
     } else {
-        DDLogError(@"%@ doesn't comform the required delegate methods of BuildViewDelegate!", self.delegate);
+        DDLogError(@"%@ doesn't comform the required delegate methods of BuildViewDelegate!", self.buildDelegate);
     }
 
     if (![self _hasInvalidStatusData]) {
@@ -58,7 +58,7 @@ - (void)viewWillAppear:(BOOL)animated
     }
 
     if (self.willAppearBlock) {
-        self.willAppearBlock( animated);
+        self.willAppearBlock(animated);
     }
 
     if (self.fReceivedMemoryWarning) {
@@ -167,13 +167,13 @@ + (void)setupWithOptionBlock:(LoadViewControllerBlock)loadOptionBlock
 
 #pragma mark - Property
 
-- (id<BuildViewDelegate>)delegate
+- (id<BuildViewDelegate>)buildDelegate
 {
-    if (!_delegate) {
-        _delegate = self;
+    if (!_buildDelegate) {
+        _buildDelegate = self;
     }
 
-    return _delegate;
+    return _buildDelegate;
 }
 
 - (BOOL)visible
@@ -203,24 +203,24 @@ - (void)_setupAppearance
 
 - (void)_loadDataSafely
 {
-    if ([self.delegate respondsToSelector:@selector(loadDataForController:)]) {
-        [self.delegate loadDataForController:self];
+    if ([self.buildDelegate respondsToSelector:@selector(loadDataForController:)]) {
+        [self.buildDelegate loadDataForController:self];
     }
 }
 
 - (void)_unloadDataSafely
 {
-    if ([self.delegate respondsToSelector:@selector(loadDataForController:)]) {
-        [self.delegate tearDown:self];
+    if ([self.buildDelegate respondsToSelector:@selector(loadDataForController:)]) {
+        [self.buildDelegate tearDown:self];
     }
 }
 
 - (BOOL)_hasInvalidStatusData
 {
     BOOL result = NO;
 
-    if ([self.delegate respondsToSelector:@selector(shouldInvalidateDataForController:)]) {
-        result = [self.delegate shouldInvalidateDataForController:self];
+    if ([self.buildDelegate respondsToSelector:@selector(shouldInvalidateDataForController:)]) {
+        result = [self.buildDelegate shouldInvalidateDataForController:self];
     }
 
     return result;

diff --git a/Example/DSBaseViewController-Example/AppDelegate.m b/Example/DSBaseViewController-Example/AppDelegate.m
@@ -23,7 +23,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [self setupDDLog];
 
     [BaseViewController setupWithOptionBlock:^(__kindof DSBaseViewController *controller) {
-        controller.view.backgroundColor = [UIColor colorWithRed:0.9f green:0.9f blue:0.9f alpha:1.0];
+        controller.view.backgroundColor = [UIColor colorWithRed:0.9f
+                                                          green:0.9f
+                                                           blue:0.9f
+                                                          alpha:1.0];
     }];
 
     MainViewController *mainVC = [MainViewController new];