0.7.7

Author: BeatsKitano

Somo.podspec

@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Somo"
-  s.version      = "0.7.5"
+  s.version      = "0.7.7"
   s.summary      = "Somo is a Skeleton-style animation library that's simple enough."
 
   s.homepage     = "https://github.com/xorshine/Somo"

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

@@ -10,7 +10,7 @@
 #import "SView.h"
 #import "Somo.h"
 
-@interface CommonViewController ()
+@interface CommonViewController ()<UICollectionViewDelegateFlowLayout>
 @property (weak, nonatomic) IBOutlet SView *sview;
 
 @end
@@ -22,7 +22,7 @@ - (void)viewDidLoad {
 
 	self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Logo"]];
 	self.navigationItem.titleView.contentMode = UIViewContentModeScaleAspectFit;
-	
+	UICollectionView *c;
 	[self.sview beginSomo];
 }
 

SomoDemo/SomoDemo/CommonViewController.m

@@ -13,10 +13,23 @@
 @protocol SomoSkeletonLayoutProtocol;
 
 typedef UITableViewCell<SomoSkeletonLayoutProtocol> *(^SomoTableViewCellBlock)(UITableView *tableview, NSIndexPath *indexPath);
-typedef UICollectionViewCell<SomoSkeletonLayoutProtocol> *(^SomoCollectionViewCellBlock)(UICollectionView *tableview, NSIndexPath *indexPath);
+typedef UICollectionViewCell<SomoSkeletonLayoutProtocol> *(^SomoCollectionViewCellBlock)(UICollectionView *collectionView, NSIndexPath *indexPath);
 
 typedef CGFloat(^SomoTableViewCellHeightBlock)(UITableView *tableview, NSIndexPath *indexPath);
 
+typedef CGSize(^SomoCollectionViewLayoutSize)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSIndexPath *indexPath);
+
+typedef UIEdgeInsets(^SomoCollectionViewLayoutEdgeInsets)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
+
+typedef CGFloat(^SomoCollectionViewLayoutMinimumLineSpacing)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
+
+typedef CGFloat(^SomoCollectionViewLayoutMinimumInteritemSpacing)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
+
+typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForHeader)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
+
+typedef CGSize(^SomoCollectionViewLayoutReferenceSizeForFooter)(UICollectionView *collectionView,UICollectionViewLayout*collectionViewLayout,NSInteger section);
+
+
 @interface SomoDataSourceProvider : NSObject<UITableViewDataSource,UITableViewDelegate,UICollectionViewDelegate,UICollectionViewDataSource>
 
 /**
@@ -33,7 +46,15 @@ typedef CGFloat(^SomoTableViewCellHeightBlock)(UITableView *tableview, NSIndexPa
 /**
  If you have different cell styles, use the following method
  */
-- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block heightBlock:(SomoTableViewCellHeightBlock)heightBlock;
-- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block;
+- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block
+							   heightBlock:(SomoTableViewCellHeightBlock)heightBlock;
+
+- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
+										   size:(SomoCollectionViewLayoutSize)size
+									 edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
+							 minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
+						minimumInteritemSpacing:(SomoCollectionViewLayoutMinimumInteritemSpacing)minimumInteritemSpacing
+						 referenceSizeForHeader:(SomoCollectionViewLayoutReferenceSizeForHeader)referenceSizeForHeader
+						 referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter;
 
 @end

SomoDemo/SomoDemo/Somo/SomoDataSourceProvider.h

@@ -17,6 +17,12 @@ @implementation SomoDataSourceProvider
 	SomoTableViewCellBlock _tableViewCellBlock;
 	SomoTableViewCellHeightBlock _heightBlock;
 	SomoCollectionViewCellBlock _collectionViewCellBlock;
+	SomoCollectionViewLayoutSize _sizeBlock;
+	SomoCollectionViewLayoutEdgeInsets _insetsBlock;
+	SomoCollectionViewLayoutMinimumLineSpacing _minimumLineSpacingBlock;
+	SomoCollectionViewLayoutMinimumInteritemSpacing _minimumInteritemSpacingBlock;
+	SomoCollectionViewLayoutReferenceSizeForHeader _referenceSizeForHeaderBlock;
+	SomoCollectionViewLayoutReferenceSizeForFooter _referenceSizeForFooterBlock;
 }
 
 - (instancetype)initWithCellReuseIdentifier:(NSString *)reuseIdentifier{
@@ -40,10 +46,22 @@ - (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block heightB
 	return self;
 }
 
-- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block{
+- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
+										   size:(SomoCollectionViewLayoutSize)size
+									 edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
+							 minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
+						minimumInteritemSpacing:(SomoCollectionViewLayoutMinimumInteritemSpacing)minimumInteritemSpacing
+						 referenceSizeForHeader:(SomoCollectionViewLayoutReferenceSizeForHeader)referenceSizeForHeader
+						 referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter{
 	if (self = [super init]) {
 		_collectionViewCellBlock = block;
 		_numberOfRowsInSection = 30;
+		_sizeBlock = size;
+		_insetsBlock = edgeInsets;
+		_minimumLineSpacingBlock = minimumLineSpacing;
+		_minimumInteritemSpacingBlock = minimumInteritemSpacing;
+		_referenceSizeForHeaderBlock = referenceSizeForHeader;
+		_referenceSizeForFooterBlock = referenceSizeForFooter;
 	}
 	return self;
 }
@@ -90,4 +108,28 @@ - (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICol
 	[cell beginSomo];
 }
 
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{
+	return _sizeBlock(collectionView,collectionViewLayout,indexPath);
+}
+
+- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{
+	return _insetsBlock(collectionView,collectionViewLayout,section);
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{
+	return _minimumLineSpacingBlock(collectionView,collectionViewLayout,section);
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{
+	return _minimumInteritemSpacingBlock(collectionView,collectionViewLayout,section);
+}
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{
+	return _referenceSizeForHeaderBlock(collectionView,collectionViewLayout,section);
+}
+
+- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section{
+	return _referenceSizeForFooterBlock(collectionView,collectionViewLayout,section);
+}
+
 @end