Merge branch 'master' of https://github.com/norsez/BDDynamicGridViewC…

…ontroller # By Nuno Sousa # Via Norsez Orankijanan (2) and Nuno Sousa (1) * 'master' of https://github.com/norsez/BDDynamicGridViewController: Remove default white background from cells Added ability to define number of views per cell
norsez · Dec 15, 2014 · 69821ed · 69821ed
2 parents e97a8db + 6433895
commit 69821ed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/Classes/BDDynamicGridViewController.m b/Classes/BDDynamicGridViewController.m
@@ -170,14 +170,23 @@ - (void)reloadData
         NSAssert(kMinViewsPerCell <= kMaxViewsPerCell, @"Minimum number of views per row cannot be greater than maximum number of views per row.");
 
         while (accumNumOfViews < self.delegate.numberOfViews) {
-            NSUInteger numOfViews = (arc4random() % kMaxViewsPerCell) + kMinViewsPerCell;
-            if (numOfViews > kMaxViewsPerCell) {
-                numOfViews = kMaxViewsPerCell;
-            }
-            numOfViews = (accumNumOfViews+numOfViews <= self.delegate.numberOfViews)?numOfViews:(self.delegate.numberOfViews-accumNumOfViews);
+            NSUInteger numOfViews = 0;
+
             ri = [BDRowInfo new];
             ri.order = _rowInfos.count;
             ri.accumulatedViews = accumNumOfViews;
+
+            if ([self.delegate respondsToSelector:@selector(numberOfViewsPerCell:)]) {
+                numOfViews = [self.delegate numberOfViewsPerCell:ri];
+            } else {
+                numOfViews = (arc4random() % kMaxViewsPerCell) + kMinViewsPerCell;
+
+                if (numOfViews > kMaxViewsPerCell) {
+                    numOfViews = kMaxViewsPerCell;
+                }
+                numOfViews = (accumNumOfViews+numOfViews <= self.delegate.numberOfViews)?numOfViews:(self.delegate.numberOfViews-accumNumOfViews);
+            }
+
             ri.viewsPerCell = numOfViews;
             accumNumOfViews = accumNumOfViews + numOfViews;
             _rowInfos = [_rowInfos arrayByAddingObject:ri];
@@ -304,6 +313,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     //clear for updated list of views
     [cell setViews:nil];
     cell.viewBorderWidth = self.borderWidth;
+    cell.backgroundColor = nil;
 
     cell.rowInfo = ri;
     NSArray * viewsForRow = [NSArray array];

diff --git a/Classes/BDDynamicGridViewDelegate.h b/Classes/BDDynamicGridViewDelegate.h
@@ -111,6 +111,11 @@
  */
 - (void) gridViewDidEndScrolling;
 
+/**
+ This method is called to determine the number of views in a cell.
+ @param rowInfo the row being calculated.
+ */
+- (NSUInteger)numberOfViewsPerCell:(BDRowInfo*)rowInfo;
 
 /**
  This method is called to determine the height of the specified row.