update DB structure for demo projects: issue# 135

Author: yramanchuk

samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessage.h

@@ -18,9 +18,10 @@
 
 @interface FIRChatMessage : NSObject
 
-@property(strong, nonatomic) NSString *name;
-@property(strong, nonatomic) NSString *text;
+@property(copy, nonatomic) NSString *name;
+@property(copy, nonatomic) NSString *text;
+@property(copy, nonatomic) NSString *uid;
 
-- (instancetype)initWithName:(NSString *)name andText:(NSString *)text;
+- (instancetype)initWithName:(NSString *)name andText:(NSString *)text userId:(NSString *)uid;
 
 @end

samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessage.m

@@ -19,14 +19,15 @@
 @implementation FIRChatMessage
 
 - (instancetype)init {
-  return [self initWithName:@"" andText:@""];
+  return [self initWithName:@"" andText:@"" userId:@""];
 }
 
-- (instancetype)initWithName:(NSString *)name andText:(NSString *)text {
+- (instancetype)initWithName:(NSString *)name andText:(NSString *)text userId:(NSString *)uid {
   self = [super init];
   if (self) {
     self.name = name;
     self.text = text;
+    self.uid = uid;
   }
   return self;
 }

samples/objc/FirebaseUIChat/Samples/Chat/FIRChatViewController.m

@@ -15,6 +15,7 @@
 //
 
 #import <FirebaseAuthUI/FirebaseAuthUI.h>
+#import <FirebaseAuth/FirebaseAuth.h>
 
 #import "FIRChatViewController.h"
 #import "FIRChatMessage.h"
@@ -26,7 +27,7 @@ @implementation FIRChatViewController
 - (void)viewDidLoad {
   [super viewDidLoad];
 
-  self.ref = [FIRDatabase database].reference;
+  self.ref = [[FIRDatabase database].reference child:@"objc_demo-chat"];
 
   self.dataSource =
   [[FIRChatMessageDataSource alloc] initWithRef:self.ref
@@ -39,7 +40,7 @@ - (void)viewDidLoad {
    populateCellWithBlock:^void(FIRChatMessageTableViewCell *__nonnull cell,
                                FIRChatMessage *__nonnull message) {
 
-     if ([message.name isEqualToString:[FIRAuth auth].currentUser.displayName]) {
+     if ([message.uid isEqualToString:[FIRAuth auth].currentUser.uid]) {
        cell.myMessageLabel.text = message.text;
        cell.myNameLabel.text = message.name;
        cell.myNameLabel.textColor = [UIColor colorWithRed:164.0 / 255.0
@@ -82,10 +83,11 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
 
-  NSString *currentUser = [FIRAuth auth].currentUser.displayName ?: @"iOS User";
+  FIRUser *cuurentUser = [FIRAuth auth].currentUser;
+  NSString *currentUser = cuurentUser.displayName ?: @"iOS User";
 
   [[self.ref childByAutoId]
-      setValue:@{@"name" : currentUser, @"text" : textField.text}];
+      setValue:@{@"name" : currentUser, @"text" : textField.text, @"uid" : cuurentUser.uid}];
   [textField resignFirstResponder];
   textField.text = @"";
   return YES;

samples/swift/uidemo/ChatViewController.swift

@@ -43,7 +43,7 @@ class ChatViewController: UIViewController, UICollectionViewDelegateFlowLayout {
   @IBOutlet private var bottomConstraint: NSLayoutConstraint!
 
   private let auth = FIRAuth.auth()
-  private let chatReference = FIRDatabase.database().reference().child("chats")
+  private let chatReference = FIRDatabase.database().reference().child("swift_demo-chat")
 
   private var collectionViewDataSource: FirebaseCollectionViewDataSource!