Skip to content

Commit af83fed

Browse files
youngsoftyoungsoft
committed
修改方法命名。
1 parent e98c483 commit af83fed

11 files changed

+36
-36
lines changed

‎MyLayout/Lib/MyBaseLayout.m

+5-5
Original file line numberDiff line numberDiff line change
@@ -2219,7 +2219,7 @@ - (CGFloat)myGetBoundLimitMeasure:(MyLayoutSize *)anchor subview:(UIView *)subvi
22192219
} else if (valType == MyLayoutValType_LayoutSize) {
22202220
if (anchor.anchorVal.view == self) {
22212221
if (anchor.anchorVal.anchorType == MyLayoutAnchorType_Width) {
2222-
value = selfLayoutSize.width - (self.myLayoutLeadingPadding + self.myLayoutTrailingPadding);
2222+
value = selfLayoutSize.width - (self.myLayoutPaddingLeading + self.myLayoutPaddingTrailing);
22232223
} else {
22242224
value = selfLayoutSize.height - (self.myLayoutPaddingTop + self.myLayoutPaddingBottom);
22252225
}
@@ -2433,11 +2433,11 @@ - (CGFloat)myLayoutPaddingLeft {
24332433
- (CGFloat)myLayoutPaddingRight {
24342434
return self.myCurrentSizeClass.myLayoutPaddingRight;
24352435
}
2436-
- (CGFloat)myLayoutLeadingPadding {
2437-
return self.myCurrentSizeClass.myLayoutLeadingPadding;
2436+
- (CGFloat)myLayoutPaddingLeading {
2437+
return self.myCurrentSizeClass.myLayoutPaddingLeading;
24382438
}
2439-
- (CGFloat)myLayoutTrailingPadding {
2440-
return self.myCurrentSizeClass.myLayoutTrailingPadding;
2439+
- (CGFloat)myLayoutPaddingTrailing {
2440+
return self.myCurrentSizeClass.myLayoutPaddingTrailing;
24412441
}
24422442

24432443
- (void)myLayout:(MyLayoutTraits *)layoutTraits adjustScrollViewContentWithSize:(CGSize)newSize {

‎MyLayout/Lib/MyFloatLayout.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ - (CGSize)calcLayoutSize:(CGSize)size subviewEngines:(NSMutableArray<MyLayoutEng
111111
context->subviewEngines = [layoutTraits filterEngines:subviewEngines];
112112
context->paddingTop = layoutTraits.myLayoutPaddingTop;
113113
context->paddingBottom = layoutTraits.myLayoutPaddingBottom;
114-
context->paddingLeading = layoutTraits.myLayoutLeadingPadding;
115-
context->paddingTrailing = layoutTraits.myLayoutTrailingPadding;
114+
context->paddingLeading = layoutTraits.myLayoutPaddingLeading;
115+
context->paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
116116
context->vertGravity = MYVERTGRAVITY(layoutTraits.gravity);
117117
context->horzGravity = [MyViewTraits convertLeadingTrailingGravityFromLeftRightGravity:MYHORZGRAVITY(layoutTraits.gravity)];
118118
context->vertSpace = layoutTraits.subviewVSpace;
@@ -667,7 +667,7 @@ - (void)myDoVertOrientationLayoutWithContext:(MyLayoutContext *)context {
667667
if (lineHasAlignment) {
668668
CGFloat baselinePos = CGFLOAT_MAX;
669669
for (NSInteger i = lineFirstIndex; i <= idx; i++) {
670-
MyLayoutEngine *subviewEngine = context->subviewEngines[i];
670+
MyLayoutEngine *subviewEngine = context->subviewEngines[i];
671671
MyViewTraits *subviewTraits = subviewEngine.currentSizeClass;
672672
MyGravity subviewVertAlignment = MYVERTGRAVITY(subviewTraits.alignment);
673673
UIFont *subviewFont = nil;

‎MyLayout/Lib/MyFlowLayout.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ - (CGSize)calcLayoutSize:(CGSize)size subviewEngines:(NSMutableArray<MyLayoutEng
158158
MyFlowLayoutTraits *layoutTraits = (MyFlowLayoutTraits *)context->layoutViewEngine.currentSizeClass;
159159
context->paddingTop = layoutTraits.myLayoutPaddingTop;
160160
context->paddingBottom = layoutTraits.myLayoutPaddingBottom;
161-
context->paddingLeading = layoutTraits.myLayoutLeadingPadding;
162-
context->paddingTrailing = layoutTraits.myLayoutTrailingPadding;
161+
context->paddingLeading = layoutTraits.myLayoutPaddingLeading;
162+
context->paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
163163
context->vertGravity = MYVERTGRAVITY(layoutTraits.gravity);
164164
context->horzGravity = [MyViewTraits convertLeadingTrailingGravityFromLeftRightGravity:MYHORZGRAVITY(layoutTraits.gravity)];
165165
context->vertSpace = layoutTraits.subviewVSpace;

‎MyLayout/Lib/MyFrameLayout.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ - (CGSize)calcLayoutSize:(CGSize)size subviewEngines:(NSMutableArray<MyLayoutEng
1919
MyFrameLayoutTraits *layoutTraits = (MyFrameLayoutTraits *)context->layoutViewEngine.currentSizeClass;
2020
context->paddingTop = layoutTraits.myLayoutPaddingTop;
2121
context->paddingBottom = layoutTraits.myLayoutPaddingBottom;
22-
context->paddingLeading = layoutTraits.myLayoutLeadingPadding;
23-
context->paddingTrailing = layoutTraits.myLayoutTrailingPadding;
22+
context->paddingLeading = layoutTraits.myLayoutPaddingLeading;
23+
context->paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
2424
context->vertGravity = MYVERTGRAVITY(layoutTraits.gravity);
2525
context->horzGravity = [MyViewTraits convertLeadingTrailingGravityFromLeftRightGravity:MYHORZGRAVITY(layoutTraits.gravity)];
2626
if (context->subviewEngines == nil) {

‎MyLayout/Lib/MyGridLayout.m

+6-6
Original file line numberDiff line numberDiff line change
@@ -629,8 +629,8 @@ - (CGSize)calcLayoutSize:(CGSize)size subviewEngines:(NSMutableArray *)subviewEn
629629

630630
context->paddingTop = layoutTraits.myLayoutPaddingTop;
631631
context->paddingBottom = layoutTraits.myLayoutPaddingBottom;
632-
context->paddingLeading = layoutTraits.myLayoutLeadingPadding;
633-
context->paddingTrailing = layoutTraits.myLayoutTrailingPadding;
632+
context->paddingLeading = layoutTraits.myLayoutPaddingLeading;
633+
context->paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
634634
context->vertGravity = MYVERTGRAVITY(layoutTraits.gravity);
635635
context->horzGravity = [MyViewTraits convertLeadingTrailingGravityFromLeftRightGravity:MYHORZGRAVITY(layoutTraits.gravity)];
636636
context->vertSpace = layoutTraits.subviewVSpace;
@@ -750,9 +750,9 @@ - (void)myTraversalGrid:(id<MyGridNode>)grid gridOrigin:(CGPoint)gridOrigin layo
750750
CGFloat paddingTrailing;
751751
if (grid == (id<MyGridNode>)layoutTraits) {
752752
paddingTop = layoutTraits.myLayoutPaddingTop;
753-
paddingLeading = layoutTraits.myLayoutLeadingPadding;
753+
paddingLeading = layoutTraits.myLayoutPaddingLeading;
754754
paddingBottom = layoutTraits.myLayoutPaddingBottom;
755-
paddingTrailing = layoutTraits.myLayoutTrailingPadding;
755+
paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
756756
} else {
757757
UIEdgeInsets gridPadding = grid.padding;
758758
paddingTop = gridPadding.top;
@@ -928,9 +928,9 @@ - (CGFloat)myTraversalGrid:(id<MyGridNode>)grid gridSize:(CGSize)gridSize lsc:(M
928928
CGFloat paddingTrailing;
929929
if (grid == (id<MyGridNode>)lsc) {
930930
paddingTop = lsc.myLayoutPaddingTop;
931-
paddingLeading = lsc.myLayoutLeadingPadding;
931+
paddingLeading = lsc.myLayoutPaddingLeading;
932932
paddingBottom = lsc.myLayoutPaddingBottom;
933-
paddingTrailing = lsc.myLayoutTrailingPadding;
933+
paddingTrailing = lsc.myLayoutPaddingTrailing;
934934
} else {
935935
UIEdgeInsets gridPadding = grid.padding;
936936
paddingTop = gridPadding.top;

‎MyLayout/Lib/MyLayoutInner.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ typedef struct _MyLayoutContext {
7171
- (CGFloat)myLayoutPaddingBottom;
7272
- (CGFloat)myLayoutPaddingLeft;
7373
- (CGFloat)myLayoutPaddingRight;
74-
- (CGFloat)myLayoutLeadingPadding;
75-
- (CGFloat)myLayoutTrailingPadding;
74+
- (CGFloat)myLayoutPaddingLeading;
75+
- (CGFloat)myLayoutPaddingTrailing;
7676

7777
- (void)myAdjustSizeSettingOfSubviewEngine:(MyLayoutEngine *)subviewEngine withContext:(MyLayoutContext *)context;
7878

‎MyLayout/Lib/MyLayoutSizeClass.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@
190190
- (CGFloat)myLayoutPaddingBottom;
191191
- (CGFloat)myLayoutPaddingLeft;
192192
- (CGFloat)myLayoutPaddingRight;
193-
- (CGFloat)myLayoutLeadingPadding;
194-
- (CGFloat)myLayoutTrailingPadding;
193+
- (CGFloat)myLayoutPaddingLeading;
194+
- (CGFloat)myLayoutPaddingTrailing;
195195

196196
@property (nonatomic, assign) UIRectEdge insetsPaddingFromSafeArea;
197197

‎MyLayout/Lib/MyLayoutSizeClass.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ - (CGFloat)myLayoutPaddingBottom {
751751
return self.paddingBottom;
752752
}
753753

754-
- (CGFloat)myLayoutLeadingPadding {
754+
- (CGFloat)myLayoutPaddingLeading {
755755
if (self.paddingLeading >= MyLayoutPos.safeAreaMargin - 2000 && self.paddingLeading <= MyLayoutPos.safeAreaMargin + 2000) {
756756
CGFloat paddingLeadingAdd = 0;
757757
#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || (__TV_OS_VERSION_MAX_ALLOWED >= 110000)
@@ -785,7 +785,7 @@ - (CGFloat)myLayoutLeadingPadding {
785785
return self.paddingLeading + inset;
786786
}
787787

788-
- (CGFloat)myLayoutTrailingPadding {
788+
- (CGFloat)myLayoutPaddingTrailing {
789789
if (self.paddingTrailing >= MyLayoutPos.safeAreaMargin - 2000 && self.paddingTrailing <= MyLayoutPos.safeAreaMargin + 2000) {
790790
CGFloat paddingTrailingAdd = 0;
791791
#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 110000) || (__TV_OS_VERSION_MAX_ALLOWED >= 110000)
@@ -820,10 +820,10 @@ - (CGFloat)myLayoutTrailingPadding {
820820
}
821821

822822
- (CGFloat)myLayoutPaddingLeft {
823-
return [MyViewTraits isRTL] ? [self myLayoutTrailingPadding] : [self myLayoutLeadingPadding];
823+
return [MyViewTraits isRTL] ? [self myLayoutPaddingTrailing] : [self myLayoutPaddingLeading];
824824
}
825825
- (CGFloat)myLayoutPaddingRight {
826-
return [MyViewTraits isRTL] ? [self myLayoutLeadingPadding] : [self myLayoutTrailingPadding];
826+
return [MyViewTraits isRTL] ? [self myLayoutPaddingLeading] : [self myLayoutPaddingTrailing];
827827
}
828828

829829
- (CGFloat)subviewSpace {

‎MyLayout/Lib/MyLinearLayout.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ - (CGSize)calcLayoutSize:(CGSize)size subviewEngines:(NSMutableArray<MyLayoutEng
136136
MyLinearLayoutTraits *layoutTraits = (MyLinearLayoutTraits *)context->layoutViewEngine.currentSizeClass;
137137
context->paddingTop = layoutTraits.myLayoutPaddingTop;
138138
context->paddingBottom = layoutTraits.myLayoutPaddingBottom;
139-
context->paddingLeading = layoutTraits.myLayoutLeadingPadding;
140-
context->paddingTrailing = layoutTraits.myLayoutTrailingPadding;
139+
context->paddingLeading = layoutTraits.myLayoutPaddingLeading;
140+
context->paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
141141
context->vertGravity = MYVERTGRAVITY(layoutTraits.gravity);
142142
context->horzGravity = [MyViewTraits convertLeadingTrailingGravityFromLeftRightGravity:MYHORZGRAVITY(layoutTraits.gravity)];
143143
context->vertSpace = layoutTraits.subviewVSpace;

‎MyLayout/Lib/MyPathLayout.m

+6-6
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ - (void)beginSubviewPathPoint:(BOOL)full {
264264
context.selfSize = self.bounds.size;
265265
context.paddingTop = layoutTraits.myLayoutPaddingTop;
266266
context.paddingBottom = layoutTraits.myLayoutPaddingBottom;
267-
context.paddingLeading = layoutTraits.myLayoutLeadingPadding;
268-
context.paddingTrailing = layoutTraits.myLayoutTrailingPadding;
267+
context.paddingLeading = layoutTraits.myLayoutPaddingLeading;
268+
context.paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
269269

270270
if (full) {
271271
NSMutableArray *pointIndexs = [NSMutableArray new];
@@ -351,8 +351,8 @@ - (CGPathRef)createPath:(NSInteger)subviewCount {
351351
context.selfSize = self.bounds.size;
352352
context.paddingTop = layoutTraits.myLayoutPaddingTop;
353353
context.paddingBottom = layoutTraits.myLayoutPaddingBottom;
354-
context.paddingLeading = layoutTraits.myLayoutLeadingPadding;
355-
context.paddingTrailing = layoutTraits.myLayoutTrailingPadding;
354+
context.paddingLeading = layoutTraits.myLayoutPaddingLeading;
355+
context.paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
356356

357357
CGMutablePathRef retPath = CGPathCreateMutable();
358358

@@ -476,8 +476,8 @@ - (CGSize)calcLayoutSize:(CGSize)size subviewEngines:(NSMutableArray<MyLayoutEng
476476
MyPathLayoutTraits *layoutTraits = (MyPathLayoutTraits *)context->layoutViewEngine.currentSizeClass;
477477
context->paddingTop = layoutTraits.myLayoutPaddingTop;
478478
context->paddingBottom = layoutTraits.myLayoutPaddingBottom;
479-
context->paddingLeading = layoutTraits.myLayoutLeadingPadding;
480-
context->paddingTrailing = layoutTraits.myLayoutTrailingPadding;
479+
context->paddingLeading = layoutTraits.myLayoutPaddingLeading;
480+
context->paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
481481
if (context->subviewEngines == nil) {
482482
context->subviewEngines = [layoutTraits filterEngines:subviewEngines];
483483
}

‎MyLayout/Lib/MyRelativeLayout.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ - (CGSize)calcLayoutSize:(CGSize)size subviewEngines:(NSMutableArray<MyLayoutEng
1919
MyRelativeLayoutTraits *layoutTraits = (MyRelativeLayoutTraits *)context->layoutViewEngine.currentSizeClass;
2020
context->paddingTop = layoutTraits.myLayoutPaddingTop;
2121
context->paddingBottom = layoutTraits.myLayoutPaddingBottom;
22-
context->paddingLeading = layoutTraits.myLayoutLeadingPadding;
23-
context->paddingTrailing = layoutTraits.myLayoutTrailingPadding;
22+
context->paddingLeading = layoutTraits.myLayoutPaddingLeading;
23+
context->paddingTrailing = layoutTraits.myLayoutPaddingTrailing;
2424
context->subviewEngines = subviewEngines;
2525

2626
if (layoutTraits.widthSizeInner.wrapVal) {

0 commit comments

Comments
 (0)