0.7.8

Author: BeatsKitano

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

@@ -10,7 +10,7 @@
 #import "SView.h"
 #import "Somo.h"
 
-@interface CommonViewController ()<UICollectionViewDelegateFlowLayout>
+@interface CommonViewController ()
 @property (weak, nonatomic) IBOutlet SView *sview;
 
 @end

SomoDemo/SomoDemo/CommonViewController.m

@@ -17,6 +17,10 @@ typedef UICollectionViewCell<SomoSkeletonLayoutProtocol> *(^SomoCollectionViewCe
 
 typedef CGFloat(^SomoTableViewCellHeightBlock)(UITableView *tableview, NSIndexPath *indexPath);
 
+typedef NSInteger(^SomoCollectionViewNumberOfSectionBlock)(UICollectionView *collectionView);
+
+typedef NSInteger(^SomoCollectionViewNumberOfRowInsSections)(UICollectionView *collectionView,NSInteger section);
+
 typedef CGSize(^SomoCollectionViewLayoutSize)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSIndexPath *indexPath);
 
 typedef UIEdgeInsets(^SomoCollectionViewLayoutEdgeInsets)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
@@ -50,6 +54,8 @@ typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForFooter)(UICollectionView
 							   heightBlock:(SomoTableViewCellHeightBlock)heightBlock;
 
 - (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
+									   sections:(SomoCollectionViewNumberOfSectionBlock)sections
+										   rows:(SomoCollectionViewNumberOfRowInsSections)rows
 										   size:(SomoCollectionViewLayoutSize)size
 									 edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
 							 minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing

SomoDemo/SomoDemo/Somo/SomoDataSourceProvider.h

@@ -14,6 +14,8 @@
 @implementation SomoDataSourceProvider
 {
 	NSString * _reuseIdentifier;
+	SomoCollectionViewNumberOfSectionBlock _sectionsBlock;
+	SomoCollectionViewNumberOfRowInsSections _rowsBlock;
 	SomoTableViewCellBlock _tableViewCellBlock;
 	SomoTableViewCellHeightBlock _heightBlock;
 	SomoCollectionViewCellBlock _collectionViewCellBlock;
@@ -47,6 +49,8 @@ - (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block heightB
 }
 
 - (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
+									   sections:(SomoCollectionViewNumberOfSectionBlock)sections
+										   rows:(SomoCollectionViewNumberOfRowInsSections)rows
 										   size:(SomoCollectionViewLayoutSize)size
 									 edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
 							 minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
@@ -55,6 +59,8 @@ - (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)blo
 						 referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter{
 	if (self = [super init]) {
 		_collectionViewCellBlock = block;
+		_sectionsBlock = sections;
+		_rowsBlock = rows;
 		_numberOfRowsInSection = 30;
 		_sizeBlock = size;
 		_insetsBlock = edgeInsets;
@@ -92,8 +98,12 @@ - (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)ce
 
 #pragma mark - collection
 
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView{
+	return _sectionsBlock(collectionView);
+}
+
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
-	return self.numberOfRowsInSection;
+	return _rowsBlock(collectionView,section);
 }
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
@@ -109,27 +119,27 @@ - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICol
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
-	return _sizeBlock(collectionView,collectionViewLayout,indexPath);
+	return _sizeBlock ? _sizeBlock(collectionView,collectionViewLayout,indexPath) : CGSizeZero;
 }
 
 - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
-	return _insetsBlock(collectionView,collectionViewLayout,section);
+	return _insetsBlock ? _insetsBlock(collectionView,collectionViewLayout,section) : UIEdgeInsetsZero;
 }
 
 - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
-	return _minimumLineSpacingBlock(collectionView,collectionViewLayout,section);
+	return _minimumLineSpacingBlock ? _minimumLineSpacingBlock(collectionView,collectionViewLayout,section) : 0.f;
 }
 
 - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
-	return _minimumInteritemSpacingBlock(collectionView,collectionViewLayout,section);
+	return _minimumInteritemSpacingBlock ? _minimumInteritemSpacingBlock(collectionView,collectionViewLayout,section) : 0.f;
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
-	return _referenceSizeForHeaderBlock(collectionView,collectionViewLayout,section);
+	return _referenceSizeForHeaderBlock ? _referenceSizeForHeaderBlock(collectionView,collectionViewLayout,section) : CGSizeZero;
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section{
-	return _referenceSizeForFooterBlock(collectionView,collectionViewLayout,section);
+	return _referenceSizeForFooterBlock ? _referenceSizeForFooterBlock(collectionView,collectionViewLayout,section) : CGSizeZero;
 }
 
 @end