Skip to content

Commit cd8f29b

Browse files
committed
use FUI prefix
1 parent ec85171 commit cd8f29b

17 files changed

+215
-215
lines changed

FirebaseDatabaseUI/FUIArray.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
NS_ASSUME_NONNULL_BEGIN
2626

27-
@protocol FIRDataObservable <NSObject>
27+
@protocol FUIDataObservable <NSObject>
2828
@required
2929

3030
- (FIRDatabaseHandle)observeEventType:(FIRDataEventType)eventType
@@ -33,11 +33,11 @@ NS_ASSUME_NONNULL_BEGIN
3333

3434
- (void)removeObserverWithHandle:(FIRDatabaseHandle)handle;
3535

36-
- (id<FIRDataObservable>)child:(NSString *)path;
36+
- (id<FUIDataObservable>)child:(NSString *)path;
3737

3838
@end
3939

40-
@interface FIRDatabaseQuery (FIRDataObservable) <FIRDataObservable>
40+
@interface FIRDatabaseQuery (FUIDataObservable) <FUIDataObservable>
4141
@end
4242

4343
/**
@@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
5656
/**
5757
* The query on a Firebase reference that provides data to populate the array.
5858
*/
59-
@property(strong, nonatomic) id<FIRDataObservable> query;
59+
@property(strong, nonatomic) id<FUIDataObservable> query;
6060

6161
/**
6262
* The number of objects in the array.
@@ -77,7 +77,7 @@ NS_ASSUME_NONNULL_BEGIN
7777
* @param delegate An object conforming to FirebaseArrayDelegate that should receive delegate messages.
7878
* @return A FirebaseArray instance
7979
*/
80-
- (instancetype)initWithQuery:(id<FIRDataObservable>)query
80+
- (instancetype)initWithQuery:(id<FUIDataObservable>)query
8181
delegate:(nullable id<FUIArrayDelegate>)delegate NS_DESIGNATED_INITIALIZER;
8282

8383
/**
@@ -88,12 +88,12 @@ NS_ASSUME_NONNULL_BEGIN
8888
* @param query A query or Firebase database reference
8989
* @return An FUIArray instance
9090
*/
91-
- (instancetype)initWithQuery:(id<FIRDataObservable>)query;
91+
- (instancetype)initWithQuery:(id<FUIDataObservable>)query;
9292

9393
/**
9494
* See `initWithQuery:`
9595
*/
96-
+ (instancetype)arrayWithQuery:(id<FIRDataObservable>)query;
96+
+ (instancetype)arrayWithQuery:(id<FUIDataObservable>)query;
9797

9898
- (instancetype)init NS_UNAVAILABLE;
9999

FirebaseDatabaseUI/FUIArray.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ - (instancetype)initWithQuery:(FIRDatabaseQuery *)query delegate:(id<FUIArrayDel
5252
return self;
5353
}
5454

55-
- (instancetype)initWithQuery:(id<FIRDataObservable>)query {
55+
- (instancetype)initWithQuery:(id<FUIDataObservable>)query {
5656
return [self initWithQuery:query delegate:nil];
5757
}
5858

59-
+ (instancetype)arrayWithQuery:(id<FIRDataObservable>)query {
59+
+ (instancetype)arrayWithQuery:(id<FUIDataObservable>)query {
6060
return [[self alloc] initWithQuery:query];
6161
}
6262

FirebaseDatabaseUI/FirebaseIndexArray.h renamed to FirebaseDatabaseUI/FUIIndexArray.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
NS_ASSUME_NONNULL_BEGIN
2424

25-
@class FirebaseIndexArray;
25+
@class FUIIndexArray;
2626

2727
/**
28-
* A protocol to allow instances of FirebaseIndexArray to raise events through a
28+
* A protocol to allow instances of FUIIndexArray to raise events through a
2929
* delegate. Raises all Firebase events except @c FIRDataEventTypeValue.
3030
*/
31-
@protocol FirebaseIndexArrayDelegate <NSObject>
31+
@protocol FUIIndexArrayDelegate <NSObject>
3232

3333
@optional
3434

@@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
4040
* @param object The database reference's contents.
4141
* @param index The index of the reference that was loaded.
4242
*/
43-
- (void)array:(FirebaseIndexArray *)array
43+
- (void)array:(FUIIndexArray *)array
4444
reference:(FIRDatabaseReference *)ref
4545
didLoadObject:(FIRDataSnapshot *)object
4646
atIndex:(NSUInteger)index;
@@ -53,7 +53,7 @@ didLoadObject:(FIRDataSnapshot *)object
5353
* @param index The index in the array of the reference that failed to load.
5454
* @param error The error that occurred.
5555
*/
56-
- (void)array:(FirebaseIndexArray *)array
56+
- (void)array:(FUIIndexArray *)array
5757
reference:(FIRDatabaseReference *)ref
5858
atIndex:(NSUInteger)index
5959
didFailLoadWithError:(NSError *)error;
@@ -65,7 +65,7 @@ didFailLoadWithError:(NSError *)error;
6565
* @param ref The database reference added to the array
6666
* @param index The index the reference was added at
6767
*/
68-
- (void)array:(FirebaseIndexArray *)array didAddReference:(FIRDatabaseReference *)ref atIndex:(NSUInteger)index;
68+
- (void)array:(FUIIndexArray *)array didAddReference:(FIRDatabaseReference *)ref atIndex:(NSUInteger)index;
6969

7070
/**
7171
* Delegate method which is called whenever an object is changed in a
@@ -74,7 +74,7 @@ didFailLoadWithError:(NSError *)error;
7474
* @param ref The database reference that changed in the array
7575
* @param index The index the reference was changed at
7676
*/
77-
- (void)array:(FirebaseIndexArray *)array didChangeReference:(FIRDatabaseReference *)ref atIndex:(NSUInteger)index;
77+
- (void)array:(FUIIndexArray *)array didChangeReference:(FIRDatabaseReference *)ref atIndex:(NSUInteger)index;
7878

7979
/**
8080
* Delegate method which is called whenever an object is removed from a
@@ -83,7 +83,7 @@ didFailLoadWithError:(NSError *)error;
8383
* @param ref The database reference removed from the array
8484
* @param index The index the reference was removed at
8585
*/
86-
- (void)array:(FirebaseIndexArray *)array didRemoveReference:(FIRDatabaseReference *)ref atIndex:(NSUInteger)index;
86+
- (void)array:(FUIIndexArray *)array didRemoveReference:(FIRDatabaseReference *)ref atIndex:(NSUInteger)index;
8787

8888
/**
8989
* Delegate method which is called whenever an object is moved within a
@@ -93,24 +93,24 @@ didFailLoadWithError:(NSError *)error;
9393
* @param fromIndex The index the reference is being moved from
9494
* @param toIndex The index the reference is being moved to
9595
*/
96-
- (void)array:(FirebaseIndexArray *)array didMoveReference:(FIRDatabaseReference *)ref fromIndex:(NSUInteger)fromIndex toIndex:(NSUInteger)toIndex;
96+
- (void)array:(FUIIndexArray *)array didMoveReference:(FIRDatabaseReference *)ref fromIndex:(NSUInteger)fromIndex toIndex:(NSUInteger)toIndex;
9797

9898
/**
9999
* Delegate method which is called whenever the backing query is canceled. This error is fatal
100100
* and the index array will become unusable afterward, so please handle it appropriately
101101
* (i.e. by displaying a modal error explaining why there's no content).
102102
* @param error the error that was raised
103103
*/
104-
- (void)array:(FirebaseIndexArray *)array queryCancelledWithError:(NSError *)error;
104+
- (void)array:(FUIIndexArray *)array queryCancelledWithError:(NSError *)error;
105105

106106
@end
107107

108108
/**
109-
* A FirebaseIndexArray instance uses a query's contents to query children of
109+
* A FUIIndexArray instance uses a query's contents to query children of
110110
* a separate database reference, which is useful for displaying an indexed list
111111
* of data as described in https://firebase.google.com/docs/database/ios/structure-data
112112
*/
113-
@interface FirebaseIndexArray : NSObject
113+
@interface FUIIndexArray : NSObject
114114

115115
/**
116116
* An immutable copy of the loaded contents in the array. Returns an
@@ -121,7 +121,7 @@ didFailLoadWithError:(NSError *)error;
121121
/**
122122
* The delegate that this array should forward events to.
123123
*/
124-
@property(nonatomic, weak) id<FirebaseIndexArrayDelegate> delegate;
124+
@property(nonatomic, weak) id<FUIIndexArrayDelegate> delegate;
125125

126126
/**
127127
* Returns the number of items in the array.
@@ -131,7 +131,7 @@ didFailLoadWithError:(NSError *)error;
131131
- (instancetype)init NS_UNAVAILABLE;
132132

133133
/**
134-
* Initializes a FirebaseIndexArray with an index query and a data query.
134+
* Initializes a FUIIndexArray with an index query and a data query.
135135
* The array expects the keys of the children of the index query to match exactly children
136136
* of the data query.
137137
* @param index A Firebase database query whose childrens' keys are all children
@@ -140,21 +140,21 @@ didFailLoadWithError:(NSError *)error;
140140
* to populate the array's contents according to the index query.
141141
* @param delegate The delegate that events should be forwarded to.
142142
*/
143-
- (instancetype)initWithIndex:(id<FIRDataObservable>)index
144-
data:(id<FIRDataObservable>)data
145-
delegate:(nullable id<FirebaseIndexArrayDelegate>)delegate NS_DESIGNATED_INITIALIZER;
143+
- (instancetype)initWithIndex:(id<FUIDataObservable>)index
144+
data:(id<FUIDataObservable>)data
145+
delegate:(nullable id<FUIIndexArrayDelegate>)delegate NS_DESIGNATED_INITIALIZER;
146146

147147
/**
148-
* Initializes a FirebaseIndexArray with an index query and a data query.
148+
* Initializes a FUIIndexArray with an index query and a data query.
149149
* The array expects the keys of the children of the index query to be children
150150
* of the data query.
151151
* @param index A Firebase database query whose childrens' keys are all children
152152
* of the data query.
153153
* @param data A Firebase database reference whose children will be fetched and used
154154
* to populate the array's contents according to the index query.
155155
*/
156-
- (instancetype)initWithIndex:(id<FIRDataObservable>)index
157-
data:(id<FIRDataObservable>)data;
156+
- (instancetype)initWithIndex:(id<FUIDataObservable>)index
157+
data:(id<FUIDataObservable>)data;
158158

159159
/**
160160
* Returns the snapshot at the given index, if it has loaded.

FirebaseDatabaseUI/FirebaseIndexArray.m renamed to FirebaseDatabaseUI/FUIIndexArray.m

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818

1919
// clang-format on
2020

21-
#import "FirebaseIndexArray.h"
22-
#import "FirebaseQueryObserver.h"
21+
#import "FUIIndexArray.h"
22+
#import "FUIQueryObserver.h"
2323

24-
@interface FirebaseIndexArray () <FUIArrayDelegate>
24+
@interface FUIIndexArray () <FUIArrayDelegate>
2525

26-
@property (nonatomic, readonly) id<FIRDataObservable> index;
27-
@property (nonatomic, readonly) id<FIRDataObservable> data;
26+
@property (nonatomic, readonly) id<FUIDataObservable> index;
27+
@property (nonatomic, readonly) id<FUIDataObservable> data;
2828

2929
@property (nonatomic, readonly) FUIArray *indexArray;
3030

31-
@property (nonatomic, readonly) NSMutableArray<FirebaseQueryObserver *> *observers;
31+
@property (nonatomic, readonly) NSMutableArray<FUIQueryObserver *> *observers;
3232

3333
@end
3434

3535
/**
36-
* FirebaseIndexArray manages an instance of FirebaseArray internally to
36+
* FUIIndexArray manages an instance of FirebaseArray internally to
3737
* keep track of which queries it should be updating. The FirebaseArrayDelegate
3838
* methods are responsible for keeping observers up-to-date as the contents of
3939
* the FirebaseArray change.
4040
*/
41-
@implementation FirebaseIndexArray
41+
@implementation FUIIndexArray
4242

4343
- (instancetype)init {
4444
NSException *e =
@@ -48,9 +48,9 @@ - (instancetype)init {
4848
@throw e;
4949
}
5050

51-
- (instancetype)initWithIndex:(id<FIRDataObservable>)index
52-
data:(id<FIRDataObservable>)data
53-
delegate:(nullable id<FirebaseIndexArrayDelegate>)delegate; {
51+
- (instancetype)initWithIndex:(id<FUIDataObservable>)index
52+
data:(id<FUIDataObservable>)data
53+
delegate:(nullable id<FUIIndexArrayDelegate>)delegate; {
5454
NSParameterAssert(index != nil);
5555
NSParameterAssert(data != nil);
5656
self = [super init];
@@ -64,8 +64,8 @@ - (instancetype)initWithIndex:(id<FIRDataObservable>)index
6464
return self;
6565
}
6666

67-
- (instancetype)initWithIndex:(id<FIRDataObservable>)index
68-
data:(id<FIRDataObservable>)data {
67+
- (instancetype)initWithIndex:(id<FUIDataObservable>)index
68+
data:(id<FUIDataObservable>)data {
6969
return [self initWithIndex:index data:data delegate:nil];
7070
}
7171

@@ -76,7 +76,7 @@ - (void)observeQueries {
7676
- (NSArray <FIRDataSnapshot *> *)items {
7777
NSArray *observers = [self.observers copy];
7878
NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:observers.count];
79-
for (FirebaseQueryObserver *observer in observers) {
79+
for (FUIQueryObserver *observer in observers) {
8080
if (observer.contents != nil) {
8181
[array addObject:observer.contents];
8282
}
@@ -88,10 +88,10 @@ - (NSUInteger)count {
8888
return self.observers.count;
8989
}
9090

91-
// FirebaseIndexArray instance becomes unusable after invalidation.
91+
// FUIIndexArray instance becomes unusable after invalidation.
9292
- (void)invalidate {
9393
for (NSInteger i = 0; i < self.observers.count; i++) {
94-
FirebaseQueryObserver *observer = self.observers[i];
94+
FUIQueryObserver *observer = self.observers[i];
9595
[observer removeAllObservers];
9696
}
9797
_observers = nil;
@@ -107,7 +107,7 @@ - (void)dealloc {
107107

108108
#pragma mark - FirebaseArrayDelegate
109109

110-
- (void)observer:(FirebaseQueryObserver *)obs
110+
- (void)observer:(FUIQueryObserver *)obs
111111
didFinishLoadWithSnap:(FIRDataSnapshot *)snap
112112
error:(NSError *)error {
113113
// Need to look up location in array to account for possible moves
@@ -129,10 +129,10 @@ - (void)array:(FUIArray *)array
129129
didAddObject:(FIRDataSnapshot *)object
130130
atIndex:(NSUInteger)index {
131131
NSParameterAssert([object.key isKindOfClass:[NSString class]]);
132-
id<FIRDataObservable> query = [self.data child:object.key];
132+
id<FUIDataObservable> query = [self.data child:object.key];
133133
__weak typeof(self) wSelf = self;
134-
FirebaseQueryObserver *obs = [FirebaseQueryObserver observerForQuery:query
135-
completion:^(FirebaseQueryObserver *observer,
134+
FUIQueryObserver *obs = [FUIQueryObserver observerForQuery:query
135+
completion:^(FUIQueryObserver *observer,
136136
FIRDataSnapshot *snap,
137137
NSError *error) {
138138
[wSelf observer:observer didFinishLoadWithSnap:snap error:error];
@@ -149,7 +149,7 @@ - (void)array:(FUIArray *)array
149149
fromIndex:(NSUInteger)fromIndex
150150
toIndex:(NSUInteger)toIndex {
151151
NSParameterAssert([object.key isKindOfClass:[NSString class]]);
152-
FirebaseQueryObserver *obs = self.observers[fromIndex];
152+
FUIQueryObserver *obs = self.observers[fromIndex];
153153

154154
[self.observers removeObjectAtIndex:fromIndex];
155155
[self.observers insertObject:obs atIndex:toIndex];
@@ -169,9 +169,9 @@ - (void)array:(FUIArray *)array
169169

170170
// Add new observer
171171
__weak typeof(self) wSelf = self;
172-
id<FIRDataObservable> query = [self.data child:object.key];
173-
FirebaseQueryObserver *obs = [FirebaseQueryObserver observerForQuery:query
174-
completion:^(FirebaseQueryObserver *observer,
172+
id<FUIDataObservable> query = [self.data child:object.key];
173+
FUIQueryObserver *obs = [FUIQueryObserver observerForQuery:query
174+
completion:^(FUIQueryObserver *observer,
175175
FIRDataSnapshot *snap,
176176
NSError *error) {
177177
[wSelf observer:observer didFinishLoadWithSnap:snap error:error];
@@ -191,7 +191,7 @@ - (void)array:(FUIArray *)array
191191

192192
[self.observers removeObjectAtIndex:index];
193193

194-
id<FIRDataObservable> query = [self.data child:object.key];
194+
id<FUIDataObservable> query = [self.data child:object.key];
195195
if ([self.delegate respondsToSelector:@selector(array:didRemoveReference:atIndex:)]) {
196196
[self.delegate array:self didRemoveReference:query atIndex:index];
197197
}

0 commit comments

Comments
 (0)