allow any FUICollection to be used in data sources

Author: morganchen12

FirebaseDatabaseUI/FUICollectionViewDataSource.h

@@ -51,6 +51,26 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Initialize an instance of FUICollectionViewDataSource that populates
  * UICollectionViewCells with FIRDataSnapshots.
+ * @param collection A FUICollection that the data source uses to pull snapshots
+ *   from Firebase Database.
+ * @param collectionView An instance of a UICollectionView to bind to. This view
+ *   is not retained by its data source.
+ * @param populateCell A closure used by the data source to create the cells that
+ *   are displayed in the collection view. This closure is retained by the data
+ *   source, so if you capture self in the closure and also claim ownership of the
+ *   data source, be sure to avoid retain cycles by capturing a weak reference to self.
+ * @return An instance of FUICollectionViewDataSource that populates
+ *   UICollectionViewCells with FIRDataSnapshots.
+ */
+- (instancetype)initWithCollection:(id<FUICollection>)collection
+                              view:(UICollectionView *)view
+                      populateCell:(UICollectionViewCell *(^)(UICollectionView *collectionView,
+                                                              NSIndexPath *indexPath,
+                                                              FIRDataSnapshot *object))populateCell NS_DESIGNATED_INITIALIZER;
+
+/**
+ * Initialize an unsorted instance of FUICollectionViewDataSource that populates
+ * UICollectionViewCells with FIRDataSnapshots.
  * @param query A Firebase query to bind the data source to.
  * @param collectionView An instance of a UICollectionView to bind to. This view
  *   is not retained by its data source.
@@ -65,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN
                          view:(UICollectionView *)collectionView
                  populateCell:(UICollectionViewCell *(^)(UICollectionView *collectionView,
                                                          NSIndexPath *indexPath,
-                                                         FIRDataSnapshot *object))populateCell NS_DESIGNATED_INITIALIZER;
+                                                         FIRDataSnapshot *object))populateCell;
 
 - (instancetype)initWithCollection:(id<FUICollection>)collection NS_UNAVAILABLE;
 

FirebaseDatabaseUI/FUICollectionViewDataSource.m

@@ -26,18 +26,26 @@ @implementation FUICollectionViewDataSource
 
 #pragma mark - FUIDataSource initializer methods
 
+- (instancetype)initWithCollection:(id<FUICollection>)collection
+                              view:(UICollectionView *)view
+                      populateCell:(UICollectionViewCell * (^)(UICollectionView *,
+                                                               NSIndexPath *,
+                                                               FIRDataSnapshot *))populateCell {
+  self = [super initWithCollection:collection];
+  if (self) {
+    _collectionView = view;
+    _populateCellAtIndexPath = populateCell;
+  }
+  return self;
+}
+
 - (instancetype)initWithQuery:(FIRDatabaseQuery *)query
                          view:(UICollectionView *)collectionView
                  populateCell:(UICollectionViewCell *(^)(UICollectionView *,
                                                          NSIndexPath *,
                                                          FIRDataSnapshot *))populateCell {
   FUIArray *array = [[FUIArray alloc] initWithQuery:query];
-  self = [super initWithCollection:array];
-  if (self) {
-    _collectionView = collectionView;
-    _populateCellAtIndexPath = populateCell;
-  }
-  return self;
+  return [self initWithCollection:array view:collectionView populateCell:populateCell];
 }
 
 #pragma mark - FUICollectionDelegate methods

FirebaseDatabaseUI/FUITableViewDataSource.h

@@ -48,6 +48,26 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Initialize an instance of FUITableViewDataSource.
+ * @param collection An FUICollection used by the data source to pull data
+ *   from Firebase Database.
+ * @param tableView An instance of a UITableView to bind to. This view is
+ *   not retained by the data source.
+ * @param populateCell A closure used by the data source to create/reuse
+ *   table view cells and populate their content. This closure is retained
+ *   by the data source, so if you capture self in the closure and also claim ownership
+ *   of the data source, be sure to avoid retain cycles by capturing a weak reference to self.
+ * @return An instance of FUITableViewDataSource.
+ */
+- (instancetype)initWithCollection:(id<FUICollection>)collection
+                              view:(UITableView *)tableView
+                      populateCell:(UITableViewCell *(^)(UITableView *tableView,
+                                                         NSIndexPath *indexPath,
+                                                         FIRDataSnapshot *object))populateCell NS_DESIGNATED_INITIALIZER;
+
+
+/**
+ * Initialize an instance of FUITableViewDataSource with contents ordered
+ * by the query.
  * @param query A Firebase query to bind the data source to.
  * @param tableView An instance of a UITableView to bind to. This view is
  *   not retained by the data source.
@@ -61,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN
                          view:(UITableView *)tableView
                  populateCell:(UITableViewCell *(^)(UITableView *tableView,
                                                     NSIndexPath *indexPath,
-                                                    FIRDataSnapshot *object))populateCell NS_DESIGNATED_INITIALIZER;
+                                                    FIRDataSnapshot *object))populateCell;
 
 - (instancetype)initWithCollection:(id<FUICollection>)collection NS_UNAVAILABLE;
 

FirebaseDatabaseUI/FUITableViewDataSource.m

@@ -35,18 +35,26 @@ @implementation FUITableViewDataSource
 
 #pragma mark - FUIDataSource initializer methods
 
+- (instancetype)initWithCollection:(id<FUICollection>)collection
+                              view:(UITableView *)tableView
+                      populateCell:(UITableViewCell *(^)(UITableView *,
+                                                         NSIndexPath *,
+                                                         FIRDataSnapshot *))populateCell {
+  self = [super initWithCollection:collection];
+  if (self != nil) {
+    self.tableView = tableView;
+    self.populateCell = populateCell;
+  }
+  return self;
+}
+
 - (instancetype)initWithQuery:(FIRDatabaseQuery *)query
                          view:(UITableView *)tableView
                  populateCell:(UITableViewCell *(^)(UITableView *,
                                                     NSIndexPath *,
                                                     FIRDataSnapshot *))populateCell {
   FUIArray *array = [[FUIArray alloc] initWithQuery:query];
-  self = [super initWithCollection:array];
-  if (self) {
-    self.tableView = tableView;
-    self.populateCell = populateCell;
-  }
-  return self;
+  return [self initWithCollection:array view:tableView populateCell:populateCell];
 }
 
 #pragma mark - FUICollectionDelegate methods