增加不同cell高度的支持

Author: BeatsKitano

README.md

@@ -3,13 +3,12 @@
 ![](https://img.shields.io/cocoapods/v/{Somo}.svg?style=flat)
 ![](https://img.shields.io/badge/platform-ios-lightgrey.svg)
 ![](https://img.shields.io/badge/language-objc-orange.svg)
-
-#### <a id="somo_intro"></a>简介 
- 
+  
 - [x] iOS 7.0+
 - [x] 多样式
 - [x] 轻量级，核心实现仅仅是对UIView进行扩展 
 - [x] 可以自定义
+- [x] 支持不同高度的cell
 
 <table>
 <tr>
@@ -81,14 +80,34 @@ pod 'Somo'
 的SomoDataSourceProvider实例。当数据着陆后，将tableview的datasource和delegate指向controller或其他。
 
 * 数据着陆前：
+
 ```objective-c
-#pragma mark - provider
+
 //将tableview的datasource指向SomoDataSourceProvider
 //当数据加载完成后，将tableview的datasource指向self
+//cell高度相同
 self.provider = [SomoDataSourceProvider dataSourceProviderWithCellReuseIdentifier:@"id"];
 self.tableView.dataSource = self.provider;
 self.tableView.delegate = self.provider;
 ```
+
+//cell高度不同
+
+```objective-c
+self.provider = [[SomoDataSourceProvider alloc] initWithTableViewCellBlock:^UITableViewCell<SomoSkeletonLayoutProtocol> *(UITableView *tableView, NSIndexPath *indexPath) {
+		if(indexPath.row%2 == 0){
+			return [tableView dequeueReusableCellWithIdentifier:@"id" forIndexPath:indexPath];
+		}else{
+			return [tableView dequeueReusableCellWithIdentifier:@"oid" forIndexPath:indexPath];
+		} 
+	} heightBlock:^CGFloat(UITableView *tableview, NSIndexPath *indexPath) {
+		if(indexPath.row%2 == 0){
+			return 120;
+		}else{
+			return 80;
+		}
+	}];
+```
 * 数据着陆后：
 ```objective-c
 #pragma mark - 

Somo.podspec

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

SomoDemo/SomoDemo.xcodeproj/project.pbxproj

@@ -12,6 +12,8 @@
 		983656721FD79CA7008F57D4 /* DataSourceTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 983656701FD79CA7008F57D4 /* DataSourceTableViewController.xib */; };
 		983656761FD7A519008F57D4 /* DataSourceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 983656741FD7A519008F57D4 /* DataSourceTableViewCell.m */; };
 		983656771FD7A519008F57D4 /* DataSourceTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 983656751FD7A519008F57D4 /* DataSourceTableViewCell.xib */; };
+		9863805E20664BCD00D44555 /* OtherTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9863805C20664BCD00D44555 /* OtherTableViewCell.m */; };
+		9863805F20664BCD00D44555 /* OtherTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9863805D20664BCD00D44555 /* OtherTableViewCell.xib */; };
 		98F5EADA1FC6A74C00D91FA1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 98F5EAD91FC6A74C00D91FA1 /* AppDelegate.m */; };
 		98F5EAE01FC6A74C00D91FA1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 98F5EADE1FC6A74C00D91FA1 /* Main.storyboard */; };
 		98F5EAE21FC6A74C00D91FA1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 98F5EAE11FC6A74C00D91FA1 /* Assets.xcassets */; };
@@ -38,6 +40,9 @@
 		983656731FD7A519008F57D4 /* DataSourceTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DataSourceTableViewCell.h; sourceTree = "<group>"; };
 		983656741FD7A519008F57D4 /* DataSourceTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DataSourceTableViewCell.m; sourceTree = "<group>"; };
 		983656751FD7A519008F57D4 /* DataSourceTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DataSourceTableViewCell.xib; sourceTree = "<group>"; };
+		9863805B20664BCD00D44555 /* OtherTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OtherTableViewCell.h; sourceTree = "<group>"; };
+		9863805C20664BCD00D44555 /* OtherTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OtherTableViewCell.m; sourceTree = "<group>"; };
+		9863805D20664BCD00D44555 /* OtherTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OtherTableViewCell.xib; sourceTree = "<group>"; };
 		98D3E36A1FC95EEA007F5A97 /* SomoDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SomoDefines.h; sourceTree = "<group>"; };
 		98F5EAD51FC6A74C00D91FA1 /* SomoDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SomoDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		98F5EAD81FC6A74C00D91FA1 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -80,6 +85,24 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		9863806020664C3C00D44555 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				98F5EAF71FC8148B00D91FA1 /* SView.h */,
+				98F5EAF81FC8148B00D91FA1 /* SView.m */,
+				98F5EB021FC91EE600D91FA1 /* TableViewCell.h */,
+				98F5EB031FC91EE600D91FA1 /* TableViewCell.m */,
+				98F5EB041FC91EE600D91FA1 /* TableViewCell.xib */,
+				9863805B20664BCD00D44555 /* OtherTableViewCell.h */,
+				9863805C20664BCD00D44555 /* OtherTableViewCell.m */,
+				9863805D20664BCD00D44555 /* OtherTableViewCell.xib */,
+				983656731FD7A519008F57D4 /* DataSourceTableViewCell.h */,
+				983656741FD7A519008F57D4 /* DataSourceTableViewCell.m */,
+				983656751FD7A519008F57D4 /* DataSourceTableViewCell.xib */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		98F5EACC1FC6A74C00D91FA1 = {
 			isa = PBXGroup;
 			children = (
@@ -113,14 +136,7 @@
 				9836566E1FD79CA7008F57D4 /* DataSourceTableViewController.h */,
 				9836566F1FD79CA7008F57D4 /* DataSourceTableViewController.m */,
 				983656701FD79CA7008F57D4 /* DataSourceTableViewController.xib */,
-				98F5EB021FC91EE600D91FA1 /* TableViewCell.h */,
-				98F5EB031FC91EE600D91FA1 /* TableViewCell.m */,
-				98F5EB041FC91EE600D91FA1 /* TableViewCell.xib */,
-				983656731FD7A519008F57D4 /* DataSourceTableViewCell.h */,
-				983656741FD7A519008F57D4 /* DataSourceTableViewCell.m */,
-				983656751FD7A519008F57D4 /* DataSourceTableViewCell.xib */,
-				98F5EAF71FC8148B00D91FA1 /* SView.h */,
-				98F5EAF81FC8148B00D91FA1 /* SView.m */,
+				9863806020664C3C00D44555 /* Views */,
 				98F5EADE1FC6A74C00D91FA1 /* Main.storyboard */,
 				98F5EAE11FC6A74C00D91FA1 /* Assets.xcassets */,
 				98F5EAE31FC6A74C00D91FA1 /* LaunchScreen.storyboard */,
@@ -211,6 +227,7 @@
 				98F5EAE51FC6A74C00D91FA1 /* LaunchScreen.storyboard in Resources */,
 				983656721FD79CA7008F57D4 /* DataSourceTableViewController.xib in Resources */,
 				98F5EAE21FC6A74C00D91FA1 /* Assets.xcassets in Resources */,
+				9863805F20664BCD00D44555 /* OtherTableViewCell.xib in Resources */,
 				98F5EAE01FC6A74C00D91FA1 /* Main.storyboard in Resources */,
 				98F5EB0D1FC9213D00D91FA1 /* CommonViewController.xib in Resources */,
 			);
@@ -230,6 +247,7 @@
 				98F5EAF11FC6B69D00D91FA1 /* UIView+SomoSkeleton.m in Sources */,
 				9836566D1FD798CF008F57D4 /* SomoDataSourceProvider.m in Sources */,
 				983656761FD7A519008F57D4 /* DataSourceTableViewCell.m in Sources */,
+				9863805E20664BCD00D44555 /* OtherTableViewCell.m in Sources */,
 				98F5EB051FC91EE600D91FA1 /* TableViewCell.m in Sources */,
 				98F5EADA1FC6A74C00D91FA1 /* AppDelegate.m in Sources */,
 				98F5EAF51FC7F92D00D91FA1 /* SomoView.m in Sources */,

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

@@ -8,6 +8,7 @@
 
 #import "DataSourceTableViewController.h"
 #import "DataSourceTableViewCell.h"
+#import "OtherTableViewCell.h"
 #import "Somo.h"
 
 @interface DataSourceTableViewController ()
@@ -22,17 +23,29 @@ @implementation DataSourceTableViewController
 
 - (void)viewDidLoad {
 	[super viewDidLoad];
-	
-	self.tableView.rowHeight = 100;
+	 
 	[self.tableView registerNib:[UINib nibWithNibName:@"DataSourceTableViewCell" bundle:nil] forCellReuseIdentifier:@"id"];
+	[self.tableView registerNib:[UINib nibWithNibName:@"OtherTableViewCell" bundle:nil] forCellReuseIdentifier:@"oid"];
 
 	self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Logo"]];
 	self.navigationItem.titleView.contentMode = UIViewContentModeScaleAspectFit;
 
 	#pragma mark - provider
 //	将tableview的datasource指向SomoDataSourceProvider
 //	当数据加载完成后，将tableview的datasource指向self
-	self.provider = [SomoDataSourceProvider dataSourceProviderWithCellReuseIdentifier:@"id"];
+	self.provider = [[SomoDataSourceProvider alloc] initWithTableViewCellBlock:^UITableViewCell<SomoSkeletonLayoutProtocol> *(UITableView *tableView, NSIndexPath *indexPath) {
+		if(indexPath.row%2 == 0){
+			return [tableView dequeueReusableCellWithIdentifier:@"id" forIndexPath:indexPath];
+		}else{
+			return [tableView dequeueReusableCellWithIdentifier:@"oid" forIndexPath:indexPath];
+		} 
+	} heightBlock:^CGFloat(UITableView *tableview, NSIndexPath *indexPath) {
+		if(indexPath.row%2 == 0){
+			return 120;
+		}else{
+			return 80;
+		}
+	}];
 	self.tableView.dataSource = self.provider;
 	self.tableView.delegate = self.provider;
 }
@@ -60,9 +73,9 @@ - (void)load{
 	#pragma mark -
 	//==================================================
 	self.tableView.dataSource = self;
-	self.tableView.delegate = self;
-	//==================================================
+	self.tableView.delegate = self; 
 	[self.tableView reloadData];
+	//==================================================
 }
 
 #pragma mark - Table view data source
@@ -71,9 +84,20 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 	return self.dataSource.count;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+	if(indexPath.row%2 == 0){
+		return 120;
+	}else{
+		return 80;
+	}
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"id" forIndexPath:indexPath];
-	return cell;
+	if(indexPath.row%2 == 0){
+		return [tableView dequeueReusableCellWithIdentifier:@"id" forIndexPath:indexPath];
+	}else{
+		return [tableView dequeueReusableCellWithIdentifier:@"oid" forIndexPath:indexPath];
+	}
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{

SomoDemo/SomoDemo/DataSourceTableViewController.m

@@ -13,56 +13,26 @@
 @protocol SomoSkeletonLayoutProtocol;
 
 typedef UITableViewCell<SomoSkeletonLayoutProtocol> *(^SomoTableViewCellBlock)(UITableView *tableview, NSIndexPath *indexPath);
-typedef UICollectionViewCell<SomoSkeletonLayoutProtocol> *(^SomoCollectionViewCellBlock)(UICollectionView *collectionView, NSIndexPath *indexPath);
-
-typedef NSInteger(^SomoTableViewNumberOfSectionsBlock)(UITableView *tableview, NSIndexPath *indexPath);
-typedef CGFloat(^SomoTableViewCellHeightBlock)(UITableView *tableview);
-typedef NSInteger(^SomoTableViewNumberOfRowsInSectionsSectionsBlock)(UITableView *tableview,NSInteger section);
-
-//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);
-//
-//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);
-
-
+typedef CGFloat(^SomoTableViewCellHeightBlock)(UITableView *tableView,NSIndexPath *indexPath);
+ 
 @interface SomoDataSourceProvider : NSObject<UITableViewDataSource,UITableViewDelegate,UICollectionViewDelegate,UICollectionViewDataSource>
 
 /**
- default 15
+ default 20
  */
 @property (assign, nonatomic) NSInteger numberOfRowsInSection;
 
 /**
- If you have only one cell style, use the following method
+ If you have only one cell style, using the following methods
  */
 - (instancetype)initWithCellReuseIdentifier:(NSString *)reuseIdentifier;
 + (instancetype)dataSourceProviderWithCellReuseIdentifier:(NSString *)reuseIdentifier;
 
 /**
- If you have different cell styles, use the following method
+ If you use different cell styles, using the following methods
  */
-//- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block
-//							   heightBlock:(SomoTableViewCellHeightBlock)heightBlock;
-//
-//- (instancetype)initWithCollectionViewCellBlock:(SomoCollectionViewCellBlock)block
-//									   sections:(SomoCollectionViewNumberOfSectionBlock)sections
-//										   rows:(SomoCollectionViewNumberOfRowInsSections)rows
-//										   size:(SomoCollectionViewLayoutSize)size
-//									 edgeInsets:(SomoCollectionViewLayoutEdgeInsets)edgeInsets
-//							 minimumLineSpacing:(SomoCollectionViewLayoutMinimumLineSpacing)minimumLineSpacing
-//						minimumInteritemSpacing:(SomoCollectionViewLayoutMinimumInteritemSpacing)minimumInteritemSpacing
-//						 referenceSizeForHeader:(SomoCollectionViewLayoutReferenceSizeForHeader)referenceSizeForHeader
-//						 referenceSizeForFooter:(SomoCollectionViewLayoutReferenceSizeForFooter)referenceSizeForFooter;
+- (instancetype)initWithTableViewCellBlock:(SomoTableViewCellBlock)block
+							   heightBlock:(SomoTableViewCellHeightBlock)heightBlock;
+
 
 @end