Skip to content

Commit f634a7b

Browse files
authored
Merge pull request dogo#272 from lolgear/develop
2 parents 2e1d0fb + a9cf31d commit f634a7b

2 files changed

Lines changed: 16 additions & 18 deletions

File tree

SCLAlertView/SCLAlertView.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,9 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
473473
- (void)setupFluent;
474474
@end
475475

476-
@interface SCLAlertViewShowBuilder : NSObject <SCLItemsBuilder__Protocol__Fluent>
476+
@interface SCLAlertViewBuilder__WithFluent: NSObject <SCLItemsBuilder__Protocol__Fluent> @end
477+
478+
@interface SCLAlertViewShowBuilder : SCLAlertViewBuilder__WithFluent
477479

478480
@property(weak, nonatomic, readonly) UIViewController *parameterViewController;
479481
@property(copy, nonatomic, readonly) UIImage *parameterImage;
@@ -501,7 +503,7 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
501503
@property(copy, nonatomic, readonly) void (^show)(SCLAlertView *view, UIViewController *controller);
502504
@end
503505

504-
@interface SCLALertViewTextFieldBuilder : NSObject <SCLItemsBuilder__Protocol__Fluent>
506+
@interface SCLALertViewTextFieldBuilder : SCLAlertViewBuilder__WithFluent
505507

506508
#pragma mark - Available later after adding
507509
@property(weak, nonatomic, readonly) SCLTextView *textField;
@@ -511,7 +513,7 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
511513

512514
@end
513515

514-
@interface SCLALertViewButtonBuilder : NSObject <SCLItemsBuilder__Protocol__Fluent>
516+
@interface SCLALertViewButtonBuilder : SCLAlertViewBuilder__WithFluent
515517

516518
#pragma mark - Available later after adding
517519
@property(weak, nonatomic, readonly) SCLButton *button;
@@ -525,7 +527,7 @@ typedef NS_ENUM(NSInteger, SCLAlertViewBackground)
525527

526528
@end
527529

528-
@interface SCLAlertViewBuilder : NSObject <SCLItemsBuilder__Protocol__Fluent>
530+
@interface SCLAlertViewBuilder : SCLAlertViewBuilder__WithFluent
529531

530532
#pragma mark - Parameters
531533
@property (strong, nonatomic, readonly) SCLAlertView *alertView;

SCLAlertView/SCLAlertView.m

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,16 @@ - (void)simplyAppear
16631663

16641664
@end
16651665

1666+
@implementation SCLAlertViewBuilder__WithFluent
1667+
- (instancetype)init {
1668+
if (self = [super init]) {
1669+
[self setupFluent];
1670+
}
1671+
return self;
1672+
}
1673+
- (void)setupFluent {}
1674+
@end
1675+
16661676
@interface SCLALertViewTextFieldBuilder()
16671677
#pragma mark - Parameters
16681678
@property(copy, nonatomic) NSString *parameterTitle;
@@ -1682,13 +1692,6 @@ - (void)setupFluent {
16821692
return weakSelf;
16831693
};
16841694
}
1685-
1686-
- (instancetype)init {
1687-
if (self = [super init]) {
1688-
[self setupFluent];
1689-
}
1690-
return self;
1691-
}
16921695
@end
16931696

16941697
@interface SCLALertViewButtonBuilder()
@@ -1737,13 +1740,6 @@ - (void)setupFluent {
17371740
};
17381741
}
17391742

1740-
- (instancetype)init {
1741-
if (self = [super init]) {
1742-
[self setupFluent];
1743-
}
1744-
return self;
1745-
}
1746-
17471743
@end
17481744

17491745

0 commit comments

Comments
 (0)