Skip to content

Commit 5e77c22

Browse files
yramanchukyramanchuk
committed
fix chat app (show loved in user)
fix code formatting
1 parent d9fbedb commit 5e77c22

File tree

3 files changed

+27
-90
lines changed

3 files changed

+27
-90
lines changed

‎samples/objc/FirebaseUIChat/FIRSamplesViewController.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,9 @@ - (void)populateSamples {
5858
return controller;
5959
}]];
6060

61-
6261
_samplesContainer = samples;
6362
}
6463

65-
- (void)didReceiveMemoryWarning {
66-
[super didReceiveMemoryWarning];
67-
}
68-
6964
#pragma mark - Table view data source
7065

7166
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -84,7 +79,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
8479
cell.textLabel.text = sample.title;
8580
cell.detailTextLabel.text = sample.sampleDescription;
8681

87-
8882
return cell;
8983
}
9084

‎samples/objc/FirebaseUIChat/Samples/Auth/FIRAuthViewController.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ @interface FIRAuthViewController ()
3838

3939
@property (nonatomic) FIRAuth *auth;
4040
@property (nonatomic) FIRAuthUI *authUI;
41-
@property (nonatomic) FIRUser *authUser;
4241

4342
@property (nonatomic) FIRAuthStateDidChangeListenerHandle authStateDidChangeHandle;
4443

@@ -70,7 +69,6 @@ - (void)viewWillAppear:(BOOL)animated {
7069
[weakSelf updateUI:auth withUser:user];
7170
}];
7271

73-
7472
}
7573

7674
-(void)viewDidDisappear:(BOOL)animated {
@@ -79,7 +77,6 @@ -(void)viewDidDisappear:(BOOL)animated {
7977
}
8078

8179
- (void)updateUI:(FIRAuth * _Nonnull) auth withUser:(FIRUser * _Nullable) user {
82-
self.authUser = user;
8380
if (user) {
8481
self.cellSignIn.textLabel.text = @"YES";
8582
self.cellName.textLabel.text = user.displayName;
@@ -99,7 +96,7 @@ - (void)updateUI:(FIRAuth * _Nonnull) auth withUser:(FIRUser * _Nullable) user {
9996
}
10097

10198
- (IBAction)onAuthorization:(id)sender {
102-
if (!self.authUser) {
99+
if (!self.auth.currentUser) {
103100
UIViewController *controller = [self.authUI authViewController];
104101
[self presentViewController:controller animated:YES completion:nil];
105102
} else {

‎samples/objc/FirebaseUIChat/Samples/Chat/ViewController.m

Lines changed: 26 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -18,116 +18,62 @@
1818
#import "Message.h"
1919
#import "MessageTableViewCell.h"
2020
#import "MessageDataSource.h"
21+
// Uncomment when using frawemorks
22+
//@import FirebaseAuthUI;
23+
#import <FirebaseAuthUI.h>
2124

22-
@interface ViewController ()
23-
24-
@end
25-
26-
@implementation ViewController {
27-
// FAuthData *_currentUser;
28-
}
25+
@implementation ViewController
2926

3027
- (void)viewDidLoad {
3128
[super viewDidLoad];
3229

3330
self.ref = [FIRDatabase database].reference;
3431

3532
self.dataSource =
36-
[[MessageDataSource alloc] initWithRef:self.ref
37-
modelClass:[Message class]
38-
nibNamed:@"MessageTableViewCell"
39-
cellReuseIdentifier:@"cellReuseIdentifier"
40-
view:self.tableView];
33+
[[MessageDataSource alloc] initWithRef:self.ref
34+
modelClass:[Message class]
35+
nibNamed:@"MessageTableViewCell"
36+
cellReuseIdentifier:@"cellReuseIdentifier"
37+
view:self.tableView];
4138

4239
[self.dataSource
43-
populateCellWithBlock:^void(MessageTableViewCell *__nonnull cell,
44-
Message *__nonnull message) {
45-
// if ([message.name isEqualToString:[self usernameForProvider:[self.loginViewController currentUser].provider]]) {
46-
// cell.myMessageLabel.text = message.text;
47-
// cell.myNameLabel.text = message.name;
48-
// cell.myNameLabel.textColor = [UIColor colorWithRed:52.0 / 255.0
49-
// green:170.0 / 255.0
50-
// blue:220.0 / 255.0
51-
// alpha:1.0];
52-
// [cell.otherMessageLabel setHidden:YES];
53-
// [cell.otherNameLabel setHidden:YES];
54-
// [cell.myMessageLabel setHidden:NO];
55-
// [cell.myNameLabel setHidden:NO];
56-
// } else {
57-
cell.otherMessageLabel.text = message.text;
58-
cell.otherNameLabel.text = message.name;
59-
cell.otherNameLabel.textColor = [UIColor colorWithRed:164.0 / 255.0
60-
green:199.0 / 255.0
61-
blue:57.0 / 255.0
62-
alpha:1.0];
63-
[cell.otherMessageLabel setHidden:NO];
64-
[cell.otherNameLabel setHidden:NO];
65-
[cell.myMessageLabel setHidden:YES];
66-
[cell.myNameLabel setHidden:YES];
67-
// }
68-
}];
40+
populateCellWithBlock:^void(MessageTableViewCell *__nonnull cell,
41+
Message *__nonnull message) {
42+
cell.otherMessageLabel.text = message.text;
43+
cell.otherNameLabel.text = message.name;
44+
cell.otherNameLabel.textColor = [UIColor colorWithRed:164.0 / 255.0
45+
green:199.0 / 255.0
46+
blue:57.0 / 255.0
47+
alpha:1.0];
48+
[cell.otherMessageLabel setHidden:NO];
49+
[cell.otherNameLabel setHidden:NO];
50+
[cell.myMessageLabel setHidden:YES];
51+
[cell.myNameLabel setHidden:YES];
52+
}];
6953

7054
self.tableView.dataSource = self.dataSource;
7155
self.tableView.delegate = self;
72-
73-
// self.loginViewController = [[FirebaseLoginViewController alloc] initWithRef:self.ref];
74-
// Only enable social providers that you've configured
75-
// [self.loginViewController enableProvider:FAuthProviderFacebook];
76-
// [self.loginViewController enableProvider:FAuthProviderGoogle];
77-
// [self.loginViewController enableProvider:FAuthProviderTwitter];
78-
// [self.loginViewController enableProvider:FAuthProviderPassword];
7956

80-
// self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:nil style:UIBarButtonItemStylePlain target:self action:@selector(toggleAuth)];
8157
}
8258

83-
- (void)didReceiveMemoryWarning {
84-
[super didReceiveMemoryWarning];
85-
}
8659

8760
- (void)viewWillAppear:(BOOL)animated {
88-
// _currentUser = [self.loginViewController currentUser];
89-
// self.title = [self usernameForProvider:[self.loginViewController currentUser].provider];
90-
// self.navigationItem.rightBarButtonItem.title = _currentUser ? @"Logout" : @"Login";
9161
[self.tableView reloadData];
9262
}
9363

94-
//- (void)toggleAuth {
95-
// if (_currentUser) {
96-
// [self.loginViewController logout];
97-
// _currentUser = nil;
98-
// self.title = @"iOS User";
99-
// [self.tableView reloadData];
100-
// } else {
101-
// [self presentViewController:self.loginViewController animated:YES completion:nil];
102-
// }
103-
// self.navigationItem.rightBarButtonItem.title = _currentUser ? @"Logout" : @"Login";
104-
//}
105-
10664
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
10765
[self.tableView deselectRowAtIndexPath:indexPath animated:YES];
10866
}
10967

11068
- (BOOL)textFieldShouldReturn:(UITextField *)textField {
69+
70+
NSString *currentUser = [FIRAuth auth].currentUser.displayName ?: @"iOS User";
71+
11172
[[self.ref childByAutoId]
112-
// setValue:@{@"name" : [self usernameForProvider:[self.loginViewController currentUser].provider], @"text" : textField.text}];
113-
setValue:@{@"name" : @"iOS User", @"text" : textField.text}];
73+
setValue:@{@"name" : currentUser, @"text" : textField.text}];
11474
[textField resignFirstResponder];
11575
textField.text = @"";
11676
return YES;
11777
}
11878

119-
//- (NSString *)usernameForProvider:(NSString *)provider {
120-
// if ([provider isEqualToString:kGoogleAuthProvider]) {
121-
// return _currentUser.providerData[@"displayName"];
122-
// } else if ([provider isEqualToString:kFacebookAuthProvider]) {
123-
// return _currentUser.providerData[@"displayName"];
124-
// } else if ([provider isEqualToString:kTwitterAuthProvider]) {
125-
// return [NSString stringWithFormat:@"@%@", _currentUser.providerData[@"username"]];
126-
// } else if ([provider isEqualToString:kPasswordAuthProvider]) {
127-
// return _currentUser.providerData[@"email"];
128-
// } else {
129-
// return @"iOS User";
130-
// }
131-
//}
132-
13379
@end

0 commit comments

Comments
 (0)