change renamed classes in other files, break swift sample

Author: morganchen12

FirebaseDatabaseUI/FUIArray.h

@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /**
- * FirebaseArray provides an array structure that is synchronized with a Firebase reference or
+ * FUIArray provides an array structure that is synchronized with a Firebase reference or
  * query. It is useful for building custom data structures or sources, and provides the base for
  * FirebaseDataSource.
  */
@@ -54,37 +54,39 @@ NS_ASSUME_NONNULL_BEGIN
 @property(weak, nonatomic, nullable) id<FUIArrayDelegate> delegate;
 
 /**
- * The query on a Firebase reference that provides data to populate the instance of FirebaseArray.
+ * The query on a Firebase reference that provides data to populate the array.
  */
 @property(strong, nonatomic) id<FIRDataObservable> query;
 
 /**
- * The number of objects in the FirebaseArray.
+ * The number of objects in the array.
  */
 @property(nonatomic, readonly) NSUInteger count;
 
 /**
- * The items currently in the FirebaseArray.
+ * The items currently in the array.
  */
 @property(nonatomic, readonly, copy) NSArray *items;
 
 #pragma mark - Initializer methods
 
 /**
- * Initalizes FirebaseArray with a Firebase query (FIRDatabaseQuery) or database reference
+ * Initalizes an FUIArray with a Firebase query (FIRDatabaseQuery) or database reference
  * (FIRDatabaseReference).
  * @param query    A query or Firebase database reference
  * @param delegate An object conforming to FirebaseArrayDelegate that should receive delegate messages.
  * @return A FirebaseArray instance
  */
 - (instancetype)initWithQuery:(id<FIRDataObservable>)query
-                     delegate:(nullable id<FirebaseArrayDelegate>)delegate NS_DESIGNATED_INITIALIZER;
+                     delegate:(nullable id<FUIArrayDelegate>)delegate NS_DESIGNATED_INITIALIZER;
 
 /**
  * Initalizes FirebaseArray with a Firebase query (FIRDatabaseQuery) or database reference
  * (FIRDatabaseReference).
- * @param query    A query or Firebase database reference
+ * @param query A query or Firebase database reference
  * @return A FirebaseArray instance
+ * @param query A query or Firebase database reference
+ * @return An FUIArray instance
  */
 - (instancetype)initWithQuery:(id<FIRDataObservable>)query;
 
@@ -98,14 +100,14 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - Public API methods
 
 /**
- * Returns an object at a specific index in the FirebaseArray.
+ * Returns an object at a specific index in the array.
  * @param index The index of the item to retrieve
  * @return The object at the given index
  */
 - (id)objectAtIndex:(NSUInteger)index;
 
 /**
- * Returns a Firebase reference for an object at a specific index in the FirebaseArray.
+ * Returns a Firebase reference for an object at a specific index in the array.
  * @param index The index of the item to retrieve a reference for
  * @return A Firebase reference for the object at the given index
  */

FirebaseDatabaseUI/FUIArray.m

@@ -23,7 +23,7 @@
 @interface FUIArray ()
 
 /**
- * The backing collection that holds all of the FirebaseArray's data.
+ * The backing collection that holds all of the array's data.
  */
 @property(strong, nonatomic) NSMutableArray<FIRDataSnapshot *> *snapshots;
 
@@ -39,7 +39,7 @@ @implementation FUIArray
 
 #pragma mark - Initializer methods
 
-- (instancetype)initWithQuery:(FIRDatabaseQuery *)query delegate:(id<FirebaseArrayDelegate>)delegate {
+- (instancetype)initWithQuery:(FIRDatabaseQuery *)query delegate:(id<FUIArrayDelegate>)delegate {
   NSParameterAssert(query != nil);
   self = [super init];
   if (self) {

FirebaseDatabaseUI/FUIArrayDelegate.h

@@ -21,45 +21,45 @@
 @class FUIArray;
 
 /**
- * A protocol to allow instances of FirebaseArray to raise events through a
- * delegate. Raises all Firebase events except @c FIRDataEventTypeValue.
+ * A protocol to allow instances of FUIArray to raise events through a
+ * delegate. Raises all Firebase events except FIRDataEventTypeValue.
  */
 @protocol FUIArrayDelegate<NSObject>
 
 @optional
 
 /**
- * Delegate method which is called whenever an object is added to a
- * FirebaseArray. On a FirebaseArray synchronized to a Firebase reference, 
- * this corresponds to a @c FIRDataEventTypeChildAdded event being raised.
- * @param object The object added to the FirebaseArray
+ * Delegate method which is called whenever an object is added to an FUIArray.
+ * On a FUIArray synchronized to a Firebase reference, this corresponds to a
+ * @c FIRDataEventTypeChildAdded event being raised.
+ * @param object The object added to the FUIArray
  * @param index The index the child was added at
  */
 - (void)array:(FUIArray *)array didAddObject:(id)object atIndex:(NSUInteger)index;
 
 /**
- * Delegate method which is called whenever an object is changed in a
- * FirebaseArray. On a FirebaseArray synchronized to a Firebase reference, 
- * this corresponds to a @c FIRDataEventTypeChildChanged event being raised.
- * @param object The object that changed in the FirebaseArray
+ * Delegate method which is called whenever an object is changed in an
+ * FUIArray. On a FUIArray synchronized to a Firebase reference, this
+ * corresponds to a @c FIRDataEventTypeChildChanged event being raised.
+ * @param object The object that changed in the FUIArray
  * @param index The index the child was changed at
  */
 - (void)array:(FUIArray *)array didChangeObject:(id)object atIndex:(NSUInteger)index;
 
 /**
- * Delegate method which is called whenever an object is removed from a
- * FirebaseArray. On a FirebaseArray synchronized to a Firebase reference, 
- * this corresponds to a @c FIRDataEventTypeChildRemoved event being raised.
- * @param object The object removed from the FirebaseArray
+ * Delegate method which is called whenever an object is removed from an
+ * FUIArray. On a FUIArray synchronized to a Firebase reference, this
+ * corresponds to a @c FIRDataEventTypeChildRemoved event being raised.
+ * @param object The object removed from the FUIArray
  * @param index The index the child was removed at
  */
 - (void)array:(FUIArray *)array didRemoveObject:(id)object atIndex:(NSUInteger)index;
 
 /**
  * Delegate method which is called whenever an object is moved within a
- * FirebaseArray. On a FirebaseArray synchronized to a Firebase reference, 
- * this corresponds to a @c FIRDataEventTypeChildMoved event being raised.
- * @param object The object that has moved locations in the FirebaseArray
+ * FUIArray. On a FUIArray synchronized to a Firebase reference, this
+ * corresponds to a @c FIRDataEventTypeChildMoved event being raised.
+ * @param object The object that has moved locations in the FUIArray
  * @param fromIndex The index the child is being moved from
  * @param toIndex The index the child is being moved to
  */

FirebaseDatabaseUI/FUICollectionViewDataSource.h

@@ -85,9 +85,9 @@ NS_ASSUME_NONNULL_BEGIN
  *   view is in use.
  */
 - (FUICollectionViewDataSource *)bindToQuery:(FIRDatabaseQuery *)query
-                                     populateCell:(UICollectionViewCell *(^)(UICollectionView *collectionView,
-                                                                             NSIndexPath *indexPath,
-                                                                             FIRDataSnapshot *object))populateCell __attribute__((warn_unused_result));
+                                populateCell:(UICollectionViewCell *(^)(UICollectionView *collectionView,
+                                                                        NSIndexPath *indexPath,
+                                                                        FIRDataSnapshot *object))populateCell __attribute__((warn_unused_result));
 
 @end
 

FirebaseDatabaseUI/FUICollectionViewDataSource.m

@@ -88,9 +88,9 @@ - (NSInteger)collectionView:(nonnull UICollectionView *)collectionView
 @implementation UICollectionView (FUICollectionViewDataSource)
 
 - (FUICollectionViewDataSource *)bindToQuery:(FIRDatabaseQuery *)query
-                                     populateCell:(UICollectionViewCell *(^)(UICollectionView *,
-                                                                             NSIndexPath *,
-                                                                             FIRDataSnapshot *))populateCell {
+                                populateCell:(UICollectionViewCell *(^)(UICollectionView *,
+                                                                        NSIndexPath *,
+                                                                        FIRDataSnapshot *))populateCell {
   FUICollectionViewDataSource *dataSource =
     [[FUICollectionViewDataSource alloc] initWithQuery:query view:self populateCell:populateCell];
   self.dataSource = dataSource;

FirebaseDatabaseUI/FUIDataSource.h

@@ -45,6 +45,7 @@
 @property (nonatomic, readonly) NSUInteger count;
 
 - (instancetype)initWithArray:(FUIArray *)array NS_DESIGNATED_INITIALIZER;
+
 - (instancetype)init NS_UNAVAILABLE;
 
 /**

FirebaseDatabaseUI/FUITableViewDataSource.h

@@ -81,9 +81,9 @@ NS_ASSUME_NONNULL_BEGIN
  *   view is in use.
  */
 - (FUITableViewDataSource *)bindToQuery:(FIRDatabaseQuery *)query
-                                populateCell:(UITableViewCell *(^)(UITableView *tableView,
-                                                                   NSIndexPath *indexPath,
-                                                                   FIRDataSnapshot *object))populateCell __attribute__((warn_unused_result));
+                           populateCell:(UITableViewCell *(^)(UITableView *tableView,
+                                                              NSIndexPath *indexPath,
+                                                              FIRDataSnapshot *object))populateCell __attribute__((warn_unused_result));
 
 @end
 

FirebaseDatabaseUI/FUITableViewDataSource.m

@@ -98,9 +98,9 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 @implementation UITableView (FUITableViewDataSource)
 
 - (FUITableViewDataSource *)bindToQuery:(FIRDatabaseQuery *)query
-                                populateCell:(UITableViewCell *(^)(UITableView *tableView,
-                                                                   NSIndexPath *indexPath,
-                                                                   FIRDataSnapshot *snap))populateCell {
+                           populateCell:(UITableViewCell *(^)(UITableView *tableView,
+                                                              NSIndexPath *indexPath,
+                                                              FIRDataSnapshot *snap))populateCell {
   FUITableViewDataSource *dataSource =
     [[FUITableViewDataSource alloc] initWithQuery:query view:self populateCell:populateCell];
   self.dataSource = dataSource;

FirebaseDatabaseUI/FirebaseIndexArray.h

@@ -18,7 +18,7 @@
 
 // clang-format on
 
-#import "FirebaseArray.h"
+#import "FUIArray.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseDatabaseUI/FirebaseIndexArray.m

@@ -21,12 +21,12 @@
 #import "FirebaseIndexArray.h"
 #import "FirebaseQueryObserver.h"
 
-@interface FirebaseIndexArray () <FirebaseArrayDelegate>
+@interface FirebaseIndexArray () <FUIArrayDelegate>
 
 @property (nonatomic, readonly) id<FIRDataObservable> index;
 @property (nonatomic, readonly) id<FIRDataObservable> data;
 
-@property (nonatomic, readonly) FirebaseArray *indexArray;
+@property (nonatomic, readonly) FUIArray *indexArray;
 
 @property (nonatomic, readonly) NSMutableArray<FirebaseQueryObserver *> *observers;
 
@@ -70,7 +70,7 @@ - (instancetype)initWithIndex:(id<FIRDataObservable>)index
 }
 
 - (void)observeQueries {
-  _indexArray = [[FirebaseArray alloc] initWithQuery:self.index delegate:self];
+  _indexArray = [[FUIArray alloc] initWithQuery:self.index delegate:self];
 }
 
 - (NSArray <FIRDataSnapshot *> *)items {
@@ -125,7 +125,7 @@ - (void)observer:(FirebaseQueryObserver *)obs
   }
 }
 
-- (void)array:(FirebaseArray *)array
+- (void)array:(FUIArray *)array
  didAddObject:(FIRDataSnapshot *)object
       atIndex:(NSUInteger)index {
   NSParameterAssert([object.key isKindOfClass:[NSString class]]);
@@ -144,7 +144,7 @@ - (void)array:(FirebaseArray *)array
   }
 }
 
-- (void)array:(FirebaseArray *)array
+- (void)array:(FUIArray *)array
 didMoveObject:(FIRDataSnapshot *)object
     fromIndex:(NSUInteger)fromIndex
       toIndex:(NSUInteger)toIndex {
@@ -159,7 +159,7 @@ - (void)array:(FirebaseArray *)array
   }
 }
 
-- (void)array:(FirebaseArray *)array
+- (void)array:(FUIArray *)array
 didChangeObject:(FIRDataSnapshot *)object
       atIndex:(NSUInteger)index {
   NSParameterAssert([object.key isKindOfClass:[NSString class]]);
@@ -183,7 +183,7 @@ - (void)array:(FirebaseArray *)array
   }
 }
 
-- (void)array:(FirebaseArray *)array
+- (void)array:(FUIArray *)array
 didRemoveObject:(FIRDataSnapshot *)object
       atIndex:(NSUInteger)index {
   // Cancel loads on old observer
@@ -197,7 +197,7 @@ - (void)array:(FirebaseArray *)array
   }
 }
 
-- (void)array:(FirebaseArray *)array queryCancelledWithError:(NSError *)error {
+- (void)array:(FUIArray *)array queryCancelledWithError:(NSError *)error {
   [self invalidate];
   if ([self.delegate respondsToSelector:@selector(array:queryCancelledWithError:)]) {
     [self.delegate array:self queryCancelledWithError:error];