Skip to content

Commit d48313b

Browse files
wolfconwolfcon
authored
Add some Chaining grammar (#1499)
* Add some Chaining grammar
1 parent 7705ff8 commit d48313b

File tree

13 files changed

+214
-134
lines changed

13 files changed

+214
-134
lines changed

‎MJRefresh/Base/MJRefreshComponent.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,23 @@ typedef void (^MJRefreshComponentAction)(void);
113113
- (CGFloat)mj_textWidth;
114114
@end
115115

116+
@interface MJRefreshComponent (ChainingGrammar)
117+
118+
#pragma mark - <<< 为 Swift 扩展链式语法 >>> -
119+
/// 自动变化透明度
120+
- (instancetype)autoChangeTransparency:(BOOL)isAutoChange;
121+
/// 刷新开始后立即调用的回调
122+
- (instancetype)afterBeginningAction:(MJRefreshComponentAction)action;
123+
/// 刷新动画开始后立即调用的回调
124+
- (instancetype)endingAnimationBeginningAction:(MJRefreshComponentAction)action;
125+
/// 刷新结束后立即调用的回调
126+
- (instancetype)afterEndingAction:(MJRefreshComponentAction)action;
127+
128+
129+
/// 需要子类必须实现
130+
/// @param scrollView 赋值给的 ScrollView 的 Header/Footer/Trailer
131+
- (instancetype)assignTo:(UIScrollView *)scrollView;
132+
133+
@end
116134

117135
NS_ASSUME_NONNULL_END

‎MJRefresh/Base/MJRefreshComponent.m‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,3 +275,30 @@ - (CGFloat)mj_textWidth {
275275
return stringWidth;
276276
}
277277
@end
278+
279+
280+
#pragma mark - <<< 为 Swift 扩展链式语法 >>> -
281+
@implementation MJRefreshComponent (ChainingGrammar)
282+
283+
- (instancetype)autoChangeTransparency:(BOOL)isAutoChange {
284+
self.automaticallyChangeAlpha = isAutoChange;
285+
return self;
286+
}
287+
- (instancetype)afterBeginningAction:(MJRefreshComponentAction)action {
288+
self.beginRefreshingCompletionBlock = action;
289+
return self;
290+
}
291+
- (instancetype)endingAnimationBeginningAction:(MJRefreshComponentAction)action {
292+
self.endRefreshingAnimationBeginAction = action;
293+
return self;
294+
}
295+
- (instancetype)afterEndingAction:(MJRefreshComponentAction)action {
296+
self.endRefreshingCompletionBlock = action;
297+
return self;
298+
}
299+
300+
- (instancetype)assignTo:(UIScrollView *)scrollView {
301+
return self;
302+
}
303+
304+
@end

‎MJRefresh/Base/MJRefreshFooter.m‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ - (void)prepare
4040
// self.automaticallyHidden = NO;
4141
}
4242

43+
#pragma mark . 链式语法部分 .
44+
45+
- (instancetype)assignTo:(UIScrollView *)scrollView {
46+
scrollView.mj_footer = self;
47+
return self;
48+
}
49+
4350
#pragma mark - 公共方法
4451
- (void)endRefreshingWithNoMoreData
4552
{

‎MJRefresh/Base/MJRefreshHeader.m‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,13 @@ - (void)headerRefreshingAction {
242242
}
243243
}
244244

245+
#pragma mark . 链式语法部分 .
246+
247+
- (instancetype)assignTo:(UIScrollView *)scrollView {
248+
scrollView.mj_header = self;
249+
return self;
250+
}
251+
245252
#pragma mark - CAAnimationDelegate
246253
- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
247254
NSString *identity = [anim valueForKey:@"identity"];

‎MJRefresh/Base/MJRefreshTrailer.m‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,14 @@ - (void)willMoveToSuperview:(UIView *)newSuperview {
150150
}
151151
}
152152

153-
#pragma mark 刚好看到上拉刷新控件时的contentOffset.x
153+
#pragma mark . 链式语法部分 .
154+
155+
- (instancetype)assignTo:(UIScrollView *)scrollView {
156+
scrollView.mj_trailer = self;
157+
return self;
158+
}
159+
160+
#pragma mark - 刚好看到上拉刷新控件时的contentOffset.x
154161
- (CGFloat)happenOffsetX {
155162
CGFloat deltaW = [self widthForContentBreakView];
156163
if (deltaW > 0) {

‎MJRefreshExample.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
01A2CE0C21ACE01500BEE365 /* MJRefreshConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 01A2CE0B21ACE01500BEE365 /* MJRefreshConfig.m */; };
11-
01EB8272236846CE00813DAA /* MJWKWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 01EB8271236846CE00813DAA /* MJWKWebViewController.m */; };
11+
01A5EB2B25EF62B80091554E /* MJWKWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A5EB2A25EF62B80091554E /* MJWKWebViewController.swift */; };
1212
2D4698861D0EE6A400CB8025 /* NSBundle+MJRefresh.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D4698851D0EE6A400CB8025 /* NSBundle+MJRefresh.m */; };
1313
2D9BEB091BB15F4A00AED473 /* UIViewController+Example.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D9BEAE01BB15F4A00AED473 /* UIViewController+Example.m */; };
1414
2D9BEB0A1BB15F4A00AED473 /* MJChiBaoZiFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D9BEAE31BB15F4A00AED473 /* MJChiBaoZiFooter.m */; };
@@ -130,8 +130,8 @@
130130
/* Begin PBXFileReference section */
131131
01A2CE0A21ACE01500BEE365 /* MJRefreshConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MJRefreshConfig.h; sourceTree = "<group>"; };
132132
01A2CE0B21ACE01500BEE365 /* MJRefreshConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MJRefreshConfig.m; sourceTree = "<group>"; };
133-
01EB8270236846CE00813DAA /* MJWKWebViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MJWKWebViewController.h; sourceTree = "<group>"; };
134-
01EB8271236846CE00813DAA /* MJWKWebViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MJWKWebViewController.m; sourceTree = "<group>"; };
133+
01A5EB2925EF62B80091554E /* MJRefreshExample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MJRefreshExample-Bridging-Header.h"; sourceTree = "<group>"; };
134+
01A5EB2A25EF62B80091554E /* MJWKWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MJWKWebViewController.swift; sourceTree = "<group>"; };
135135
2D4698841D0EE6A400CB8025 /* NSBundle+MJRefresh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSBundle+MJRefresh.h"; sourceTree = "<group>"; };
136136
2D4698851D0EE6A400CB8025 /* NSBundle+MJRefresh.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSBundle+MJRefresh.m"; sourceTree = "<group>"; };
137137
2D9BEADF1BB15F4A00AED473 /* UIViewController+Example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Example.h"; sourceTree = "<group>"; };
@@ -257,6 +257,15 @@
257257
/* End PBXFrameworksBuildPhase section */
258258

259259
/* Begin PBXGroup section */
260+
01A5EB2825EF62930091554E /* SwiftExample */ = {
261+
isa = PBXGroup;
262+
children = (
263+
01A5EB2A25EF62B80091554E /* MJWKWebViewController.swift */,
264+
01A5EB2925EF62B80091554E /* MJRefreshExample-Bridging-Header.h */,
265+
);
266+
path = SwiftExample;
267+
sourceTree = "<group>";
268+
};
260269
2D9BEADE1BB15F4A00AED473 /* Category */ = {
261270
isa = PBXGroup;
262271
children = (
@@ -328,8 +337,6 @@
328337
2D9BEB061BB15F4A00AED473 /* MJWebViewViewController.h */,
329338
2D9BEB071BB15F4A00AED473 /* MJWebViewViewController.m */,
330339
2D9BEB081BB15F4A00AED473 /* MJWebViewViewController.xib */,
331-
01EB8270236846CE00813DAA /* MJWKWebViewController.h */,
332-
01EB8271236846CE00813DAA /* MJWKWebViewController.m */,
333340
);
334341
path = Second;
335342
sourceTree = "<group>";
@@ -410,6 +417,7 @@
410417
2D9BEAE11BB15F4A00AED473 /* DIY */,
411418
2D9BEAEE1BB15F4A00AED473 /* First */,
412419
2D9BEAFE1BB15F4A00AED473 /* Second */,
420+
01A5EB2825EF62930091554E /* SwiftExample */,
413421
);
414422
path = Classes;
415423
sourceTree = "<group>";
@@ -631,6 +639,7 @@
631639
};
632640
2DA7F9241AA6B4C4005627AB = {
633641
CreatedOnToolsVersion = 6.1;
642+
LastSwiftMigration = 1220;
634643
};
635644
2DA7F93D1AA6B4C4005627AB = {
636645
CreatedOnToolsVersion = 6.1;
@@ -744,6 +753,7 @@
744753
2D9BEB1B1BB15F4A00AED473 /* MJWebViewViewController.m in Sources */,
745754
2DB2EA171BECBE6700D58F6A /* MJRefreshAutoFooter.m in Sources */,
746755
2D9BEB101BB15F4A00AED473 /* MJExample.m in Sources */,
756+
01A5EB2B25EF62B80091554E /* MJWKWebViewController.swift in Sources */,
747757
2DB2EA201BECBE6700D58F6A /* MJRefreshBackNormalFooter.m in Sources */,
748758
2DA7F92B1AA6B4C4005627AB /* main.m in Sources */,
749759
2DB2EA1E1BECBE6700D58F6A /* MJRefreshAutoStateFooter.m in Sources */,
@@ -757,7 +767,6 @@
757767
2D9BEB0C1BB15F4A00AED473 /* MJChiBaoZiHeader.m in Sources */,
758768
88E3201224839B2300069FA7 /* MJRefreshNormalTrailer.m in Sources */,
759769
2DB2EA1B1BECBE6700D58F6A /* MJRefreshHeader.m in Sources */,
760-
01EB8272236846CE00813DAA /* MJWKWebViewController.m in Sources */,
761770
2D9BEB191BB15F4A00AED473 /* MJTestViewController.m in Sources */,
762771
2DB2EA211BECBE6700D58F6A /* MJRefreshBackStateFooter.m in Sources */,
763772
2DB2EA281BECBE6700D58F6A /* UIScrollView+MJRefresh.m in Sources */,
@@ -1000,6 +1009,7 @@
10001009
isa = XCBuildConfiguration;
10011010
buildSettings = {
10021011
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1012+
CLANG_ENABLE_MODULES = YES;
10031013
CODE_SIGN_IDENTITY = "iPhone Developer";
10041014
DEVELOPMENT_TEAM = "";
10051015
GCC_PREFIX_HEADER = MJRefreshExample/PrefixHeader.pch;
@@ -1010,13 +1020,17 @@
10101020
);
10111021
PRODUCT_BUNDLE_IDENTIFIER = com.mj.MJRefresh;
10121022
PRODUCT_NAME = "$(TARGET_NAME)";
1023+
SWIFT_OBJC_BRIDGING_HEADER = "MJRefreshExample/Classes/SwiftExample/MJRefreshExample-Bridging-Header.h";
1024+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1025+
SWIFT_VERSION = 5.0;
10131026
};
10141027
name = Debug;
10151028
};
10161029
2DA7F94A1AA6B4C4005627AB /* Release */ = {
10171030
isa = XCBuildConfiguration;
10181031
buildSettings = {
10191032
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1033+
CLANG_ENABLE_MODULES = YES;
10201034
CODE_SIGN_IDENTITY = "iPhone Developer";
10211035
DEVELOPMENT_TEAM = "";
10221036
GCC_PREFIX_HEADER = MJRefreshExample/PrefixHeader.pch;
@@ -1027,12 +1041,15 @@
10271041
);
10281042
PRODUCT_BUNDLE_IDENTIFIER = com.mj.MJRefresh;
10291043
PRODUCT_NAME = "$(TARGET_NAME)";
1044+
SWIFT_OBJC_BRIDGING_HEADER = "MJRefreshExample/Classes/SwiftExample/MJRefreshExample-Bridging-Header.h";
1045+
SWIFT_VERSION = 5.0;
10301046
};
10311047
name = Release;
10321048
};
10331049
2DA7F94C1AA6B4C4005627AB /* Debug */ = {
10341050
isa = XCBuildConfiguration;
10351051
buildSettings = {
1052+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
10361053
BUNDLE_LOADER = "$(TEST_HOST)";
10371054
FRAMEWORK_SEARCH_PATHS = (
10381055
"$(SDKROOT)/System/Library/Frameworks",
@@ -1057,6 +1074,7 @@
10571074
2DA7F94D1AA6B4C4005627AB /* Release */ = {
10581075
isa = XCBuildConfiguration;
10591076
buildSettings = {
1077+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
10601078
BUNDLE_LOADER = "$(TEST_HOST)";
10611079
FRAMEWORK_SEARCH_PATHS = (
10621080
"$(SDKROOT)/System/Library/Frameworks",

‎MJRefreshExample/Classes/First/MJExampleViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#import "MJExample.h"
1414
#import "UIViewController+Example.h"
1515
#import "MJRefresh.h"
16-
#import "MJWKWebViewController.h"
1716
#import "MJHorizontalCollectionViewController.h"
17+
#import "MJRefreshExample-Swift.h"
1818

1919
static NSString *const MJExample00 = @"UITableView + 下拉刷新";
2020
static NSString *const MJExample10 = @"UITableView + 上拉刷新";

‎MJRefreshExample/Classes/Second/MJWKWebViewController.h‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎MJRefreshExample/Classes/Second/MJWKWebViewController.m‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎MJRefreshExample/Classes/Second/MJWebViewViewController.m‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ - (void)example31
2525
__weak UIScrollView *scrollView = self.webView.scrollView;
2626

2727
// 添加下拉刷新控件
28-
scrollView.mj_header= [MJChiBaoZiHeader headerWithRefreshingBlock:^{
29-
[webView reload];
30-
}];
28+
[[[MJChiBaoZiHeader headerWithRefreshingBlock:^{
29+
[webView reload];
30+
}]
31+
assignTo:scrollView]
32+
autoChangeTransparency:YES];
3133

3234
// 如果是上拉刷新，就以此类推
3335
[scrollView.mj_header beginRefreshing];

0 commit comments

Comments
 (0)