firebase · morganchen12 · Nov 3, 2016 · Nov 3, 2016 · Nov 3, 2016 · Nov 3, 2016
diff --git a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj
diff --git a/samples/objc/FirebaseUI-demo-objc/Base.lproj/Main.storyboard b/samples/objc/FirebaseUI-demo-objc/Base.lproj/Main.storyboard
diff --git a/...s/objc/FirebaseUI-demo-objc/AppDelegate.h → ...bjc/FirebaseUI-demo-objc/FUIAppDelegate.h b/...s/objc/FirebaseUI-demo-objc/AppDelegate.h → ...bjc/FirebaseUI-demo-objc/FUIAppDelegate.h
@@ -16,8 +16,8 @@
 
 #import <UIKit/UIKit.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
+@interface FUIAppDelegate : UIResponder <UIApplicationDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
 
-@end
+@end
diff --git a/...s/objc/FirebaseUI-demo-objc/AppDelegate.m → ...bjc/FirebaseUI-demo-objc/FUIAppDelegate.m b/...s/objc/FirebaseUI-demo-objc/AppDelegate.m → ...bjc/FirebaseUI-demo-objc/FUIAppDelegate.m
@@ -14,15 +14,15 @@
 //  limitations under the License.
 //
 
-#import "AppDelegate.h"
+#import "FUIAppDelegate.h"
 
 @import Firebase;
 #import <Fabric/Fabric.h>
 #import <FirebaseAuthUI/FirebaseAuthUI.h>
 #import <TwitterKit/Twitter.h>
 
 
-@implementation AppDelegate
+@implementation FUIAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   [Fabric with:@[[Twitter class]]];

diff --git a/...les/objc/FirebaseUI-demo-objc/FIRSample.h → ...les/objc/FirebaseUI-demo-objc/FUISample.h b/...les/objc/FirebaseUI-demo-objc/FIRSample.h → ...les/objc/FirebaseUI-demo-objc/FUISample.h
@@ -1,5 +1,5 @@
 //
-//  FIRSampleContainer.h
+//  FUISample.h
 //
 //  Copyright (c) 2016 Google Inc.
 //
@@ -21,7 +21,7 @@
 
 typedef UIViewController *(^FIRControllerBlock)();
 
-@interface FIRSample : NSObject
+@interface FUISample : NSObject
 
 + (instancetype)sampleWithTitle:(NSString *)title
               sampleDescription:(NSString *)description
@@ -32,4 +32,4 @@ typedef UIViewController *(^FIRControllerBlock)();
 @property (nonatomic, copy) FIRControllerBlock controllerBlock;
 
 
-@end
+@end
diff --git a/...les/objc/FirebaseUI-demo-objc/FIRSample.m → ...les/objc/FirebaseUI-demo-objc/FUISample.m b/...les/objc/FirebaseUI-demo-objc/FIRSample.m → ...les/objc/FirebaseUI-demo-objc/FUISample.m
@@ -1,5 +1,5 @@
 //
-//  FIRSampleContainer.m
+//  FUISample.m
 //
 //  Copyright (c) 2016 Google Inc.
 //
@@ -16,9 +16,9 @@
 //  limitations under the License.
 //
 
-#import "FIRSample.h"
+#import "FUISample.h"
 
-@implementation FIRSample
+@implementation FUISample
 
 - (id)initWithTitle:(NSString *)title
   sampleDescription:(NSString *)description
@@ -35,12 +35,12 @@ - (id)initWithTitle:(NSString *)title
 + (instancetype)sampleWithTitle:(NSString *)title
               sampleDescription:(NSString *)description
                      controller:(FIRControllerBlock)block {
-  FIRSample *sample = [(FIRSample *)[self alloc] initWithTitle:title
+  FUISample *sample = [(FUISample *)[self alloc] initWithTitle:title
                                              sampleDescription:description
                                                     controller:block];
 
   return sample;
 }
 
 
-@end
+@end
diff --git a/...seUI-demo-objc/FIRSamplesViewController.h → ...seUI-demo-objc/FUISamplesViewController.h b/...seUI-demo-objc/FIRSamplesViewController.h → ...seUI-demo-objc/FUISamplesViewController.h
@@ -18,6 +18,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface FIRSamplesViewController : UITableViewController
+@interface FUISamplesViewController : UITableViewController
 
 @end
diff --git a/...seUI-demo-objc/FIRSamplesViewController.m → ...seUI-demo-objc/FUISamplesViewController.m b/...seUI-demo-objc/FIRSamplesViewController.m → ...seUI-demo-objc/FUISamplesViewController.m
@@ -16,17 +16,17 @@
 //  limitations under the License.
 //
 
-#import "FIRSample.h"
-#import "FIRSamplesViewController.h"
-#import "FIRChatViewController.h"
+#import "FUISample.h"
+#import "FUISamplesViewController.h"
+#import "FUIChatViewController.h"
 
-@interface FIRSamplesViewController ()
+@interface FUISamplesViewController ()
 
 @property (nonatomic) NSArray *samplesContainer;
 
 @end
 
-@implementation FIRSamplesViewController
+@implementation FUISamplesViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
@@ -40,7 +40,7 @@ - (void)viewDidLoad {
 - (void)populateSamples {
   NSMutableArray *samples = [[NSMutableArray alloc] init];
 
-  [samples addObject:[FIRSample sampleWithTitle:@"Auth"
+  [samples addObject:[FUISample sampleWithTitle:@"Auth"
                               sampleDescription:@"Demonstrates the FirebaseAuthUI flow with customization options"
                                      controller:^UIViewController *{
                                        UIViewController *controller =
@@ -49,20 +49,20 @@ - (void)populateSamples {
                                        return controller;
                                      }]];
 
-  [samples addObject:[FIRSample sampleWithTitle:@"Chat"
+  [samples addObject:[FUISample sampleWithTitle:@"Chat"
                               sampleDescription:@"Demonstrates using a FUICollectionViewDataSource to load data from Firebase Database into a UICollectionView for a basic chat app."
                                      controller:^UIViewController *{
                                        UIViewController *controller =
                                        [[UIStoryboard storyboardWithName:@"Main"
                                                                   bundle:NULL] instantiateViewControllerWithIdentifier:@"ViewController"];
                                        return controller;
                                      }]];
-  [samples addObject:[FIRSample sampleWithTitle:@"Storage"
+  [samples addObject:[FUISample sampleWithTitle:@"Storage"
                               sampleDescription:@"Demonstrates using FirebaseStorageUI to populate an image view."
                                      controller:^UIViewController *{
                                        UIViewController *controller =
                                        [[UIStoryboard storyboardWithName:@"Main"
-                                                                  bundle:NULL] instantiateViewControllerWithIdentifier:@"FIRStorageViewController"];
+                                                                  bundle:NULL] instantiateViewControllerWithIdentifier:@"FUIStorageViewController"];
                                        return controller;
                                      }]];
 
@@ -80,18 +80,18 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-  static NSString *cellId = @"FIRSampleCell";
+  static NSString *cellId = @"FUISampleCell";
   UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellId forIndexPath:indexPath];
 
-  FIRSample *sample = _samplesContainer[indexPath.row];
+  FUISample *sample = _samplesContainer[indexPath.row];
   cell.textLabel.text = sample.title;
   cell.detailTextLabel.text = sample.sampleDescription;
 
   return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-  FIRSample *sample = _samplesContainer[indexPath.row];
+  FUISample *sample = _samplesContainer[indexPath.row];
   UIViewController *viewController = sample.controllerBlock();
 
   [self.navigationController pushViewController:viewController animated:YES];

diff --git a/...I-demo-objc/Samples/Chat/FIRChatMessage.h → ...I-demo-objc/Samples/Chat/FUIChatMessage.h b/...I-demo-objc/Samples/Chat/FIRChatMessage.h → ...I-demo-objc/Samples/Chat/FUIChatMessage.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface FIRChatMessage : NSObject
+@interface FUIChatMessage : NSObject
 
 @property(copy, nonatomic) NSString *name;
 @property(copy, nonatomic) NSString *text;

diff --git a/...I-demo-objc/Samples/Chat/FIRChatMessage.m → ...I-demo-objc/Samples/Chat/FUIChatMessage.m b/...I-demo-objc/Samples/Chat/FIRChatMessage.m → ...I-demo-objc/Samples/Chat/FUIChatMessage.m
@@ -14,9 +14,9 @@
 //  limitations under the License.
 //
 
-#import "FIRChatMessage.h"
+#import "FUIChatMessage.h"
 
-@implementation FIRChatMessage
+@implementation FUIChatMessage
 
 - (instancetype)init {
   return [self initWithName:@"" andText:@"" userId:@""];

diff --git a/...c/Samples/Chat/FIRChatMessageDataSource.h → ...c/Samples/Chat/FUIChatMessageDataSource.h b/...c/Samples/Chat/FIRChatMessageDataSource.h → ...c/Samples/Chat/FUIChatMessageDataSource.h
@@ -14,8 +14,8 @@
 //  limitations under the License.
 //
 
-#import <FirebaseDatabaseUI/FUITableViewDataSource.h>
+#import <FirebaseDatabaseUI/FirebaseDatabaseUI.h>
 
-@interface FIRChatMessageDataSource : FUITableViewDataSource
+@interface FUIChatMessageDataSource : FUITableViewDataSource
 
 @end
diff --git a/...c/Samples/Chat/FIRChatMessageDataSource.m → ...c/Samples/Chat/FUIChatMessageDataSource.m b/...c/Samples/Chat/FIRChatMessageDataSource.m → ...c/Samples/Chat/FUIChatMessageDataSource.m
@@ -14,10 +14,10 @@
 //  limitations under the License.
 //
 
-#import "FIRChatMessageDataSource.h"
+#import "FUIChatMessageDataSource.h"
 @import FirebaseDatabase;
 
-@implementation FIRChatMessageDataSource
+@implementation FUIChatMessageDataSource
 
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
   return YES; }

diff --git a/...amples/Chat/FIRChatMessageTableViewCell.h → ...amples/Chat/FUIChatMessageTableViewCell.h b/...amples/Chat/FIRChatMessageTableViewCell.h → ...amples/Chat/FUIChatMessageTableViewCell.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface FIRChatMessageTableViewCell : UITableViewCell
+@interface FUIChatMessageTableViewCell : UITableViewCell
 @property(weak, nonatomic) IBOutlet UILabel *myMessageLabel;
 @property(weak, nonatomic) IBOutlet UILabel *myNameLabel;
 

diff --git a/...amples/Chat/FIRChatMessageTableViewCell.m → ...amples/Chat/FUIChatMessageTableViewCell.m b/...amples/Chat/FIRChatMessageTableViewCell.m → ...amples/Chat/FUIChatMessageTableViewCell.m
@@ -14,9 +14,9 @@
 //  limitations under the License.
 //
 
-#import "FIRChatMessageTableViewCell.h"
+#import "FUIChatMessageTableViewCell.h"
 
-@implementation FIRChatMessageTableViewCell
+@implementation FUIChatMessageTableViewCell
 
 - (instancetype)initWithFrame:(CGRect)frame {
   return [super initWithFrame:frame];

diff --git a/...ples/Chat/FIRChatMessageTableViewCell.xib → ...ples/Chat/FUIChatMessageTableViewCell.xib b/...ples/Chat/FIRChatMessageTableViewCell.xib → ...ples/Chat/FUIChatMessageTableViewCell.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
@@ -10,11 +10,11 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="d6M-nO-3us" customClass="FIRChatMessageTableViewCell">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="d6M-nO-3us" customClass="FUIChatMessageTableViewCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="d6M-nO-3us" id="oUR-sj-R1e">
-                <frame key="frameInset" width="320" height="43"/>
+                <frame key="frameInset" width="320" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Other Message" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5a3-Gg-71z">

diff --git a/...objc/Samples/Chat/FIRChatViewController.h → ...objc/Samples/Chat/FUIChatViewController.h b/...objc/Samples/Chat/FIRChatViewController.h → ...objc/Samples/Chat/FUIChatViewController.h
@@ -17,9 +17,9 @@
 @import UIKit;
 @import FirebaseDatabase;
 
-#import <FirebaseDatabaseUI/FUITableViewDataSource.h>
+#import <FirebaseDatabaseUI/FirebaseDatabaseUI.h>
 
-@interface FIRChatViewController : UIViewController <UITableViewDelegate, UITextFieldDelegate>
+@interface FUIChatViewController : UIViewController <UITableViewDelegate, UITextFieldDelegate>
 
 @property (strong, nonatomic) FIRDatabaseReference *ref;
 @property (strong, nonatomic) FUITableViewDataSource *dataSource;

diff --git a/...objc/Samples/Chat/FIRChatViewController.m → ...objc/Samples/Chat/FUIChatViewController.m b/...objc/Samples/Chat/FIRChatViewController.m → ...objc/Samples/Chat/FUIChatViewController.m
@@ -17,31 +17,31 @@
 #import <FirebaseAuthUI/FirebaseAuthUI.h>
 #import <FirebaseAuth/FirebaseAuth.h>
 
-#import "FIRChatViewController.h"
-#import "FIRChatMessage.h"
-#import "FIRChatMessageTableViewCell.h"
-#import "FIRChatMessageDataSource.h"
+#import "FUIChatViewController.h"
+#import "FUIChatMessage.h"
+#import "FUIChatMessageTableViewCell.h"
+#import "FUIChatMessageDataSource.h"
 
-@implementation FIRChatViewController
+@implementation FUIChatViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
 
   self.ref = [[FIRDatabase database].reference child:@"objc_demo-chat"];
 
   NSString *identifier = @"cellReuseIdentifier";
-  UINib *nib = [UINib nibWithNibName:@"FIRChatMessageTableViewCell" bundle:nil];
+  UINib *nib = [UINib nibWithNibName:@"FUIChatMessageTableViewCell" bundle:nil];
   [self.tableView registerNib:nib forCellReuseIdentifier:identifier];
   self.dataSource =
-  [[FIRChatMessageDataSource alloc] initWithQuery:self.ref
+  [[FUIChatMessageDataSource alloc] initWithQuery:self.ref
                                              view:self.tableView
                                      populateCell:^UITableViewCell *(UITableView *tableView,
                                                                      NSIndexPath *indexPath,
                                                                      FIRDataSnapshot *snap) {
-    FIRChatMessage *message = [[FIRChatMessage alloc] initWithName:snap.value[@"name"]
+    FUIChatMessage *message = [[FUIChatMessage alloc] initWithName:snap.value[@"name"]
                                                            andText:snap.value[@"text"]
                                                             userId:snap.value[@"uid"]];
-    FIRChatMessageTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:identifier];
+    FUIChatMessageTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:identifier];
     if ([message.uid isEqualToString:[FIRAuth auth].currentUser.uid]) {
       cell.myMessageLabel.text = message.text;
       cell.myNameLabel.text = message.name;

diff --git a/...amples/Storage/FIRStorageViewController.h → ...amples/Storage/FUIStorageViewController.h b/...amples/Storage/FIRStorageViewController.h → ...amples/Storage/FUIStorageViewController.h
@@ -18,6 +18,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface FIRStorageViewController : UIViewController
+@interface FUIStorageViewController : UIViewController
 
 @end
diff --git a/...amples/Storage/FIRStorageViewController.m → ...amples/Storage/FUIStorageViewController.m b/...amples/Storage/FIRStorageViewController.m → ...amples/Storage/FUIStorageViewController.m
@@ -16,20 +16,20 @@
 //  limitations under the License.
 //
 
-#import "FIRStorageViewController.h"
+#import "FUIStorageViewController.h"
 
 #import <FirebaseStorage/FirebaseStorage.h>
 #import <FirebaseStorageUI/FirebaseStorageUI.h>
 
-@interface FIRStorageViewController ()
+@interface FUIStorageViewController ()
 @property (nonatomic, strong) IBOutlet UIImageView *imageView;
 @property (nonatomic, strong) IBOutlet UITextField *textField;
 
 /// Used to move the view's contents when the keyboard appears.
 @property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstraint;
 @end
 
-@implementation FIRStorageViewController
+@implementation FUIStorageViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];

diff --git a/samples/objc/FirebaseUI-demo-objc/main.m b/samples/objc/FirebaseUI-demo-objc/main.m
@@ -15,10 +15,10 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "AppDelegate.h"
+#import "FUIAppDelegate.h"
 
 int main(int argc, char * argv[]) {
     @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([FUIAppDelegate class]));
     }
 }