remove cell registration and creation from collection view data source

Author: morganchen12

FirebaseDatabaseUI/FirebaseArray.h

@@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * The delegate object that array changes are surfaced to, which conforms to the
- * [FirebaseArrayDelegate Protocol](FirebaseArrayDelegate).
+ * @c FirebaseArrayDelegate protocol.
  */
 @property(weak, nonatomic, nullable) id<FirebaseArrayDelegate> delegate;
 

FirebaseDatabaseUI/FirebaseCollectionViewDataSource.h

@@ -46,203 +46,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FirebaseCollectionViewDataSource : FirebaseDataSource<UICollectionViewDataSource>
 
-/**
- * The model class to coerce FIRDataSnapshots to (if desired). For instance, if
- * the modelClass is set
- * to [Message class] in Obj-C or Message.self in Swift, then objects of type
- * Message will be
- * returned instead of type FIRDataSnapshot.
- * Defaults to FIRDataSnapshot.
- */
-@property(strong, nonatomic, null_resettable) Class modelClass;
-
-/**
- * The cell class to coerce UICollectionViewCells to (if desired). For instance,
- * if the cellClass is
- * set to [CustomCollectionViewCell class] in Obj-C or CustomCollectionViewCell
- * in Swift, then
- * objects of type CustomCollectionViewCell will be returned instead of type
- * UICollectionViewCell.
- * Defaults to UICollectionViewCell.
- */
-@property(strong, nonatomic, null_resettable) Class cellClass;
-
-/**
- * The reuse identifier for cells in the UICollectionView.
- */
-@property(strong, nonatomic) NSString *reuseIdentifier;
-
 /**
  * The UICollectionView instance that operations (inserts, removals, moves,
- * etc.) are performed
- * against.
+ * etc.) are performed against. The data source does not claim ownership of
+ * the collection view it populates.
  */
-@property(strong, nonatomic) UICollectionView *collectionView;
-
-/**
- * Property to keep track of prototype cell use, to not register a class for the
- * UICollectionView or
- * do similar book keeping.
- */
-@property BOOL hasPrototypeCell;
+@property (nonatomic, readonly, weak) UICollectionView *collectionView;
 
 /**
  * The callback to populate a subclass of UICollectionViewCell with an object
- * provided by the
- * datasource.
- */
-@property(strong, nonatomic, readonly) void (^populateCell)
-    (__kindof UICollectionViewCell *cell, __kindof NSObject *object);
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells
- * with FIRDataSnapshots.
- * @param ref A Firebase reference to bind the datasource to
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells with
- * FIRDataSnapshots
- */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells
- * with FIRDataSnapshots. Note that this method is used when using prototype
- * cells, where the cells
- * don't need to be registered in the class.
- * @param ref A Firebase reference to bind the datasource to
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells with
- * FIRDataSnapshots
- */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-   prototypeReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with FIRDataSnapshots.
- * @param ref A Firebase reference to bind the datasource to
- * @param cell A subclass of UICollectionViewCell used to populate the
- * UICollectionView, defaults to
- * UICollectionViewCell if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with FIRDataSnapshots
- */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                  cellClass:(nullable Class)cell
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with
- * FIRDataSnapshots.
- * @param ref A Firebase reference to bind the datasource to
- * @param nibName The name of a xib file to create the layout for a
- * UICollectionViewCell
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with
- * FIRDataSnapshots
- */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                   nibNamed:(NSString *)nibName
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells
- * with a custom model class.
- * @param ref A Firebase reference to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells with
- * a custom model class
- */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(nullable Class)model
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells
- * with a custom model class. Note that this method is used when using prototype
- * cells, where the
- * cells don't need to be registered in the class.
- * @param ref A Firebase reference to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells with
- * a custom model class
- */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(nullable Class)model
-   prototypeReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with a custom model class.
- * @param ref A Firebase reference to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param cell A subclass of UICollectionViewCell used to populate the
- * UICollectionView, defaults to
- * UICollectionViewCell if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with a custom model class
- */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(nullable Class)model
-                  cellClass:(nullable Class)cell
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with a
- * custom model class.
- * @param ref A Firebase reference to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param nibName The name of a xib file to create the layout for a
- * UICollectionViewCell
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with a custom
- * model class
+ * provided by the datasource.
  */
-- (instancetype)initWithRef:(FIRDatabaseReference *)ref
-                 modelClass:(nullable Class)model
-                   nibNamed:(NSString *)nibName
-        cellReuseIdentifier:(NSString *)identifier
-                       view:(UICollectionView *)collectionView;
+@property(strong, nonatomic, readonly) UICollectionViewCell *(^populateCellAtIndexPath)
+  (NSIndexPath *indexPath, UICollectionView *collectionView, FIRDataSnapshot *object);
 
 /**
  * Initialize an instance of FirebaseCollectionViewDataSource that populates
@@ -256,154 +72,10 @@ NS_ASSUME_NONNULL_BEGIN
  * FIRDataSnapshots
  */
 - (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells
- * with FIRDataSnapshots. Note that this method is used when using prototype
- * cells, where the cells
- * don't need to be registered in the class.
- * @param query A Firebase query to bind the datasource to
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells with
- * FIRDataSnapshots
- */
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-     prototypeReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with FIRDataSnapshots.
- * @param query A Firebase query to bind the datasource to
- * @param cell A subclass of UICollectionViewCell used to populate the
- * UICollectionView, defaults to
- * UICollectionViewCell if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with FIRDataSnapshots
- */
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                    cellClass:(nullable Class)cell
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with
- * FIRDataSnapshots.
- * @param query A Firebase query to bind the datasource to
- * @param nibName The name of a xib file to create the layout for a
- * UICollectionViewCell
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with
- * FIRDataSnapshots
- */
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                     nibNamed:(NSString *)nibName
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells
- * with a custom model class.
- * @param query A Firebase query to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells with
- * a custom model class
- */
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(nullable Class)model
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells
- * with a custom model class. Note that this method is used when using prototype
- * cells, where the
- * cells don't need to be registered in the class.
- * @param query A Firebase query to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates
- * UICollectionViewCells with
- * a custom model class
- */
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(nullable Class)model
-     prototypeReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with a custom model class.
- * @param query A Firebase query to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param cell A subclass of UICollectionViewCell used to populate the
- * UICollectionView, defaults to
- * UICollectionViewCell if nil
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom subclass of
- * UICollectionViewCell with a custom model class
- */
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(nullable Class)model
-                    cellClass:(nullable Class)cell
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * Initialize an instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with a
- * custom model class.
- * @param query A Firebase query to bind the datasource to
- * @param model A custom class that FIRDataSnapshots are coerced to, defaults to
- * FIRDataSnapshot if nil
- * @param nibName The name of a xib file to create the layout for a
- * UICollectionViewCell
- * @param identifier A string to use as a CellReuseIdentifier
- * @param collectionView An instance of a UICollectionView to bind to
- * @return An instance of FirebaseCollectionViewDataSource that populates a
- * custom xib with a custom
- * model class
- */
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query
-                   modelClass:(nullable Class)model
-                     nibNamed:(NSString *)nibName
-          cellReuseIdentifier:(NSString *)identifier
-                         view:(UICollectionView *)collectionView;
-
-/**
- * This method populates the fields of a UICollectionViewCell or subclass given
- * an FIRDataSnapshot (or
- * custom model object).
- * @param callback A block which returns an initialized UICollectionViewCell (or
- * subclass) and the
- * corresponding object to populate the cell with.
- */
-- (void)populateCellWithBlock:(void (^)(__kindof UICollectionViewCell *cell,
-                                        __kindof NSObject *object))callback;
+                         view:(UICollectionView *)collectionView
+                 populateCell:(UICollectionViewCell * (^)(NSIndexPath *indexPath,
+                                                          UICollectionView *collectionView,
+                                                          FIRDataSnapshot *object))populateCell;
 
 @end