Skip to content

Commit c9ac73c

Browse files
BeatsKitanoBeatsKitano
committed
nothing
1 parent abebe7a commit c9ac73c

File tree

3 files changed

+126
-117
lines changed

3 files changed

+126
-117
lines changed

‎SomoDemo/SomoDemo.xcodeproj/project.xcworkspace/xcuserdata/xorshine.xcuserdatad/UserInterfaceState.xcuserstate

12.7 KB
Binary file not shown.

‎SomoDemo/SomoDemo/Somo/SomoDataSourceProvider.h

+31-29
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,25 @@
1515
typedef UITableViewCell<SomoSkeletonLayoutProtocol> *(^SomoTableViewCellBlock)(UITableView *tableview, NSIndexPath *indexPath);
1616
typedef UICollectionViewCell<SomoSkeletonLayoutProtocol> *(^SomoCollectionViewCellBlock)(UICollectionView *collectionView, NSIndexPath *indexPath);
1717

18-
typedef CGFloat(^SomoTableViewCellHeightBlock)(UITableView *tableview, NSIndexPath *indexPath);
19-
20-
typedef NSInteger(^SomoCollectionViewNumberOfSectionBlock)(UICollectionView *collectionView);
21-
22-
typedef NSInteger(^SomoCollectionViewNumberOfRowInsSections)(UICollectionView *collectionView,NSInteger section);
23-
24-
typedef CGSize(^SomoCollectionViewLayoutSize)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSIndexPath *indexPath);
25-
26-
typedef UIEdgeInsets(^SomoCollectionViewLayoutEdgeInsets)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
27-
28-
typedef CGFloat(^SomoCollectionViewLayoutMinimumLineSpacing)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
29-
30-
typedef CGFloat(^SomoCollectionViewLayoutMinimumInteritemSpacing)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
31-
32-
typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForHeader)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
33-
34-
typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForFooter)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
18+
typedef NSInteger(^SomoTableViewNumberOfSectionsBlock)(UITableView *tableview, NSIndexPath *indexPath);
19+
typedef CGFloat(^SomoTableViewCellHeightBlock)(UITableView *tableview);
20+
typedef NSInteger(^SomoTableViewNumberOfRowsInSectionsSectionsBlock)(UITableView *tableview,NSInteger section);
21+
22+
//typedef NSInteger(^SomoCollectionViewNumberOfSectionBlock)(UICollectionView *collectionView);
23+
//
24+
//typedef NSInteger(^SomoCollectionViewNumberOfRowInsSections)(UICollectionView *collectionView,NSInteger section);
25+
//
26+
//typedef CGSize(^SomoCollectionViewLayoutSize)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSIndexPath *indexPath);
27+
//
28+
//typedef UIEdgeInsets(^SomoCollectionViewLayoutEdgeInsets)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
29+
//
30+
//typedef CGFloat(^SomoCollectionViewLayoutMinimumLineSpacing)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
31+
//
32+
//typedef CGFloat(^SomoCollectionViewLayoutMinimumInteritemSpacing)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
33+
//
34+
//typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForHeader)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
35+
//
36+
//typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForFooter)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
3537

3638

3739
@interface SomoDataSourceProvider : NSObject<UITableViewDataSource,UITableViewDelegate,UICollectionViewDelegate,UICollectionViewDataSource>
@@ -50,17 +52,17 @@ typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForFooter)(UICollectionView
5052
/**
5153
If you have different cell styles, use the following method
5254
*/
53-
- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block
54-
heightBlock:(SomoTableViewCellHeightBlock)heightBlock;
55-
56-
- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
57-
sections:(SomoCollectionViewNumberOfSectionBlock)sections
58-
rows:(SomoCollectionViewNumberOfRowInsSections)rows
59-
size:(SomoCollectionViewLayoutSize)size
60-
edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
61-
minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
62-
minimumInteritemSpacing:(SomoCollectionViewLayoutMinimumInteritemSpacing)minimumInteritemSpacing
63-
referenceSizeForHeader:(SomoCollectionViewLayoutReferenceSizeForHeader)referenceSizeForHeader
64-
referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter;
55+
//- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block
56+
// heightBlock:(SomoTableViewCellHeightBlock)heightBlock;
57+
//
58+
//- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
59+
// sections:(SomoCollectionViewNumberOfSectionBlock)sections
60+
// rows:(SomoCollectionViewNumberOfRowInsSections)rows
61+
// size:(SomoCollectionViewLayoutSize)size
62+
// edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
63+
// minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
64+
// minimumInteritemSpacing:(SomoCollectionViewLayoutMinimumInteritemSpacing)minimumInteritemSpacing
65+
// referenceSizeForHeader:(SomoCollectionViewLayoutReferenceSizeForHeader)referenceSizeForHeader
66+
// referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter;
6567

6668
@end

‎SomoDemo/SomoDemo/Somo/SomoDataSourceProvider.m

+95-88
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
@implementation SomoDataSourceProvider
1515
{
1616
NSString * _reuseIdentifier;
17-
SomoCollectionViewNumberOfSectionBlock _sectionsBlock;
18-
SomoCollectionViewNumberOfRowInsSections _rowsBlock;
19-
SomoTableViewCellBlock _tableViewCellBlock;
20-
SomoTableViewCellHeightBlock _heightBlock;
21-
SomoCollectionViewCellBlock _collectionViewCellBlock;
22-
SomoCollectionViewLayoutSize _sizeBlock;
23-
SomoCollectionViewLayoutEdgeInsets _insetsBlock;
24-
SomoCollectionViewLayoutMinimumLineSpacing _minimumLineSpacingBlock;
25-
SomoCollectionViewLayoutMinimumInteritemSpacing _minimumInteritemSpacingBlock;
26-
SomoCollectionViewLayoutReferenceSizeForHeader _referenceSizeForHeaderBlock;
27-
SomoCollectionViewLayoutReferenceSizeForFooter _referenceSizeForFooterBlock;
17+
// SomoCollectionViewNumberOfSectionBlock _sectionsBlock;
18+
// SomoCollectionViewNumberOfRowInsSections _rowsBlock;
19+
// SomoTableViewCellBlock _tableViewCellBlock;
20+
// SomoTableViewCellHeightBlock _heightBlock;
21+
// SomoCollectionViewCellBlock _collectionViewCellBlock;
22+
// SomoCollectionViewLayoutSize _sizeBlock;
23+
// SomoCollectionViewLayoutEdgeInsets _insetsBlock;
24+
// SomoCollectionViewLayoutMinimumLineSpacing _minimumLineSpacingBlock;
25+
// SomoCollectionViewLayoutMinimumInteritemSpacing _minimumInteritemSpacingBlock;
26+
// SomoCollectionViewLayoutReferenceSizeForHeader _referenceSizeForHeaderBlock;
27+
// SomoCollectionViewLayoutReferenceSizeForFooter _referenceSizeForFooterBlock;
2828
}
2929

3030
- (instancetype)initWithCellReuseIdentifier:(NSString *)reuseIdentifier{
@@ -39,57 +39,62 @@ + (instancetype)dataSourceProviderWithCellReuseIdentifier:(NSString *)reuseIdent
3939
return [[[self class] alloc] initWithCellReuseIdentifier:reuseIdentifier];
4040
}
4141

42-
- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block heightBlock:(SomoTableViewCellHeightBlock)heightBlock{
43-
if (self = [super init]) {
44-
_tableViewCellBlock = block;
45-
_heightBlock = heightBlock;
46-
_numberOfRowsInSection = 30;
47-
}
48-
return self;
49-
}
50-
51-
- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
52-
sections:(SomoCollectionViewNumberOfSectionBlock)sections
53-
rows:(SomoCollectionViewNumberOfRowInsSections)rows
54-
size:(SomoCollectionViewLayoutSize)size
55-
edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
56-
minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
57-
minimumInteritemSpacing:(SomoCollectionViewLayoutMinimumInteritemSpacing)minimumInteritemSpacing
58-
referenceSizeForHeader:(SomoCollectionViewLayoutReferenceSizeForHeader)referenceSizeForHeader
59-
referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter{
60-
if (self = [super init]) {
61-
_collectionViewCellBlock = block;
62-
_sectionsBlock = sections;
63-
_rowsBlock = rows;
64-
_numberOfRowsInSection = 30;
65-
_sizeBlock = size;
66-
_insetsBlock = edgeInsets;
67-
_minimumLineSpacingBlock = minimumLineSpacing;
68-
_minimumInteritemSpacingBlock = minimumInteritemSpacing;
69-
_referenceSizeForHeaderBlock = referenceSizeForHeader;
70-
_referenceSizeForFooterBlock = referenceSizeForFooter;
71-
}
72-
return self;
73-
}
42+
//- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block heightBlock:(SomoTableViewCellHeightBlock)heightBlock{
43+
// if (self = [super init]) {
44+
// _tableViewCellBlock = block;
45+
// _heightBlock = heightBlock;
46+
// _numberOfRowsInSection = 30;
47+
// }
48+
// return self;
49+
//}
50+
//
51+
//- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
52+
// sections:(SomoCollectionViewNumberOfSectionBlock)sections
53+
// rows:(SomoCollectionViewNumberOfRowInsSections)rows
54+
// size:(SomoCollectionViewLayoutSize)size
55+
// edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
56+
// minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
57+
// minimumInteritemSpacing:(SomoCollectionViewLayoutMinimumInteritemSpacing)minimumInteritemSpacing
58+
// referenceSizeForHeader:(SomoCollectionViewLayoutReferenceSizeForHeader)referenceSizeForHeader
59+
// referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter{
60+
// if (self = [super init]) {
61+
// _collectionViewCellBlock = block;
62+
// _sectionsBlock = sections;
63+
// _rowsBlock = rows;
64+
// _numberOfRowsInSection = 30;
65+
// _sizeBlock = size;
66+
// _insetsBlock = edgeInsets;
67+
// _minimumLineSpacingBlock = minimumLineSpacing;
68+
// _minimumInteritemSpacingBlock = minimumInteritemSpacing;
69+
// _referenceSizeForHeaderBlock = referenceSizeForHeader;
70+
// _referenceSizeForFooterBlock = referenceSizeForFooter;
71+
// }
72+
// return self;
73+
//}
74+
75+
//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
76+
// return <#expression#>
77+
//}
7478

7579
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
7680
return self.numberOfRowsInSection;
7781
}
7882

79-
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
80-
if (_reuseIdentifier) {
81-
return tableView.rowHeight;
82-
}else{
83-
return _heightBlock(tableView, indexPath);
84-
}
85-
}
86-
83+
//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
84+
// if (_reuseIdentifier) {
85+
// return tableView.rowHeight;
86+
// }else{
87+
// return _heightBlock(tableView, indexPath);
88+
// }
89+
//}
90+
8791
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
88-
if (_reuseIdentifier) {
89-
return [tableView dequeueReusableCellWithIdentifier:_reuseIdentifier forIndexPath:indexPath];
90-
}else{
91-
return _tableViewCellBlock(tableView,indexPath);
92-
}
92+
return [tableView dequeueReusableCellWithIdentifier:_reuseIdentifier forIndexPath:indexPath];
93+
// if (_reuseIdentifier) {
94+
// return [tableView dequeueReusableCellWithIdentifier:_reuseIdentifier forIndexPath:indexPath];
95+
// }else{
96+
// return _tableViewCellBlock(tableView,indexPath);
97+
// }
9398
}
9499

95100
- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -98,48 +103,50 @@ - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)ce
98103

99104
#pragma mark - collection
100105

101-
- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{
102-
return _sectionsBlock(collectionView);
103-
}
106+
//- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{
107+
// return _sectionsBlock(collectionView);
108+
//}
104109

105110
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
106-
return _rowsBlock(collectionView,section);
111+
// return _rowsBlock(collectionView,section);
112+
return _numberOfRowsInSection;
107113
}
108114

109115
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
110-
if (_reuseIdentifier) {
111-
return [collectionView dequeueReusableCellWithReuseIdentifier:_reuseIdentifier forIndexPath:indexPath];
112-
}else{
113-
return _collectionViewCellBlock(collectionView, indexPath);
114-
}
116+
return [collectionView dequeueReusableCellWithReuseIdentifier:_reuseIdentifier forIndexPath:indexPath];
117+
// if (_reuseIdentifier) {
118+
//
119+
// }else{
120+
// return _collectionViewCellBlock(collectionView, indexPath);
121+
// }
115122
}
116123

117124
- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath{
118125
[cell beginSomo];
119126
}
120127

121-
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
122-
return _sizeBlock ? _sizeBlock(collectionView,collectionViewLayout,indexPath) : CGSizeZero;
123-
}
124-
125-
- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
126-
return _insetsBlock ? _insetsBlock(collectionView,collectionViewLayout,section) : UIEdgeInsetsZero;
127-
}
128-
129-
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
130-
return _minimumLineSpacingBlock ? _minimumLineSpacingBlock(collectionView,collectionViewLayout,section) : 0.f;
131-
}
132-
133-
- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
134-
return _minimumInteritemSpacingBlock ? _minimumInteritemSpacingBlock(collectionView,collectionViewLayout,section) : 0.f;
135-
}
136-
137-
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
138-
return _referenceSizeForHeaderBlock ? _referenceSizeForHeaderBlock(collectionView,collectionViewLayout,section) : CGSizeZero;
139-
}
140-
141-
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section{
142-
return _referenceSizeForFooterBlock ? _referenceSizeForFooterBlock(collectionView,collectionViewLayout,section) : CGSizeZero;
143-
}
128+
//- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
129+
// return _sizeBlock ? _sizeBlock(collectionView,collectionViewLayout,indexPath) : CGSizeZero;
130+
//}
131+
//
132+
//- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
133+
// return _insetsBlock ? _insetsBlock(collectionView,collectionViewLayout,section) : UIEdgeInsetsZero;
134+
//}
135+
//
136+
//- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
137+
// return _minimumLineSpacingBlock ? _minimumLineSpacingBlock(collectionView,collectionViewLayout,section) : 0.f;
138+
//}
139+
//
140+
//- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
141+
// return _minimumInteritemSpacingBlock ? _minimumInteritemSpacingBlock(collectionView,collectionViewLayout,section) : 0.f;
142+
//}
143+
//
144+
//- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
145+
// return _referenceSizeForHeaderBlock ? _referenceSizeForHeaderBlock(collectionView,collectionViewLayout,section) : CGSizeZero;
146+
//}
147+
//
148+
//- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section{
149+
// return _referenceSizeForFooterBlock ? _referenceSizeForFooterBlock(collectionView,collectionViewLayout,section) : CGSizeZero;
150+
//}
144151

145152
@end

0 commit comments

Comments
 (0)