Skip to content

Commit f282803

Browse files
yramanchukyramanchuk
committed
refactor Class names to use Prefix
1 parent ad3afe3 commit f282803

12 files changed

+51
-52
lines changed

‎samples/objc/FirebaseUIChat.xcodeproj/project.pbxproj

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
/* Begin PBXBuildFile section */
1010
34755DFFAC2DCB6B1176CE87 /* libPods-FirebaseUIChat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CFFAE2215B9D3116BF1AEEF /* libPods-FirebaseUIChat.a */; };
1111
C3AC675E1D81FE6B00FC956D /* FIRAuthViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67531D81FE6B00FC956D /* FIRAuthViewController.m */; };
12-
C3AC675F1D81FE6B00FC956D /* Message.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67561D81FE6B00FC956D /* Message.m */; };
13-
C3AC67601D81FE6B00FC956D /* MessageDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67581D81FE6B00FC956D /* MessageDataSource.m */; };
14-
C3AC67611D81FE6B00FC956D /* MessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675A1D81FE6B00FC956D /* MessageTableViewCell.m */; };
15-
C3AC67621D81FE6B00FC956D /* MessageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3AC675B1D81FE6B00FC956D /* MessageTableViewCell.xib */; };
16-
C3AC67631D81FE6B00FC956D /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675D1D81FE6B00FC956D /* ViewController.m */; };
12+
C3AC675F1D81FE6B00FC956D /* FIRChatMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67561D81FE6B00FC956D /* FIRChatMessage.m */; };
13+
C3AC67601D81FE6B00FC956D /* FIRChatMessageDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67581D81FE6B00FC956D /* FIRChatMessageDataSource.m */; };
14+
C3AC67611D81FE6B00FC956D /* FIRChatMessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675A1D81FE6B00FC956D /* FIRChatMessageTableViewCell.m */; };
15+
C3AC67621D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3AC675B1D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib */; };
16+
C3AC67631D81FE6B00FC956D /* FIRChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */; };
1717
C3AC67661D82002F00FC956D /* FIRSample.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67651D82002F00FC956D /* FIRSample.m */; };
1818
C3F23ECB1D80F26E0020509F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C3F23ECA1D80F26E0020509F /* GoogleService-Info.plist */; };
1919
C3F23ED01D80F58A0020509F /* FIRSamplesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F23ECF1D80F58A0020509F /* FIRSamplesViewController.m */; };
@@ -30,15 +30,15 @@
3030
92E1431893A040764FCC115E /* Pods-FirebaseUIChat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUIChat.release.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUIChat/Pods-FirebaseUIChat.release.xcconfig"; sourceTree = "<group>"; };
3131
C3AC67521D81FE6B00FC956D /* FIRAuthViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRAuthViewController.h; sourceTree = "<group>"; };
3232
C3AC67531D81FE6B00FC956D /* FIRAuthViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRAuthViewController.m; sourceTree = "<group>"; };
33-
C3AC67551D81FE6B00FC956D /* Message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Message.h; sourceTree = "<group>"; };
34-
C3AC67561D81FE6B00FC956D /* Message.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Message.m; sourceTree = "<group>"; };
35-
C3AC67571D81FE6B00FC956D /* MessageDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageDataSource.h; sourceTree = "<group>"; };
36-
C3AC67581D81FE6B00FC956D /* MessageDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageDataSource.m; sourceTree = "<group>"; };
37-
C3AC67591D81FE6B00FC956D /* MessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageTableViewCell.h; sourceTree = "<group>"; };
38-
C3AC675A1D81FE6B00FC956D /* MessageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageTableViewCell.m; sourceTree = "<group>"; };
39-
C3AC675B1D81FE6B00FC956D /* MessageTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageTableViewCell.xib; sourceTree = "<group>"; };
40-
C3AC675C1D81FE6B00FC956D /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
41-
C3AC675D1D81FE6B00FC956D /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
33+
C3AC67551D81FE6B00FC956D /* FIRChatMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatMessage.h; sourceTree = "<group>"; };
34+
C3AC67561D81FE6B00FC956D /* FIRChatMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatMessage.m; sourceTree = "<group>"; };
35+
C3AC67571D81FE6B00FC956D /* FIRChatMessageDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatMessageDataSource.h; sourceTree = "<group>"; };
36+
C3AC67581D81FE6B00FC956D /* FIRChatMessageDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatMessageDataSource.m; sourceTree = "<group>"; };
37+
C3AC67591D81FE6B00FC956D /* FIRChatMessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatMessageTableViewCell.h; sourceTree = "<group>"; };
38+
C3AC675A1D81FE6B00FC956D /* FIRChatMessageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatMessageTableViewCell.m; sourceTree = "<group>"; };
39+
C3AC675B1D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FIRChatMessageTableViewCell.xib; sourceTree = "<group>"; };
40+
C3AC675C1D81FE6B00FC956D /* FIRChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRChatViewController.h; sourceTree = "<group>"; };
41+
C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatViewController.m; sourceTree = "<group>"; };
4242
C3AC67641D82002F00FC956D /* FIRSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRSample.h; sourceTree = "<group>"; };
4343
C3AC67651D82002F00FC956D /* FIRSample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRSample.m; sourceTree = "<group>"; };
4444
C3F23ECA1D80F26E0020509F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "FirebaseUIChat/GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -104,15 +104,15 @@
104104
C3AC67541D81FE6B00FC956D /* Chat */ = {
105105
isa = PBXGroup;
106106
children = (
107-
C3AC67551D81FE6B00FC956D /* Message.h */,
108-
C3AC67561D81FE6B00FC956D /* Message.m */,
109-
C3AC67571D81FE6B00FC956D /* MessageDataSource.h */,
110-
C3AC67581D81FE6B00FC956D /* MessageDataSource.m */,
111-
C3AC67591D81FE6B00FC956D /* MessageTableViewCell.h */,
112-
C3AC675A1D81FE6B00FC956D /* MessageTableViewCell.m */,
113-
C3AC675B1D81FE6B00FC956D /* MessageTableViewCell.xib */,
114-
C3AC675C1D81FE6B00FC956D /* ViewController.h */,
115-
C3AC675D1D81FE6B00FC956D /* ViewController.m */,
107+
C3AC67551D81FE6B00FC956D /* FIRChatMessage.h */,
108+
C3AC67561D81FE6B00FC956D /* FIRChatMessage.m */,
109+
C3AC67571D81FE6B00FC956D /* FIRChatMessageDataSource.h */,
110+
C3AC67581D81FE6B00FC956D /* FIRChatMessageDataSource.m */,
111+
C3AC67591D81FE6B00FC956D /* FIRChatMessageTableViewCell.h */,
112+
C3AC675A1D81FE6B00FC956D /* FIRChatMessageTableViewCell.m */,
113+
C3AC675B1D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib */,
114+
C3AC675C1D81FE6B00FC956D /* FIRChatViewController.h */,
115+
C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */,
116116
);
117117
path = Chat;
118118
sourceTree = "<group>";
@@ -225,7 +225,7 @@
225225
files = (
226226
D81A05FF1B86A78700498183 /* Main.storyboard in Resources */,
227227
C3F23ECB1D80F26E0020509F /* GoogleService-Info.plist in Resources */,
228-
C3AC67621D81FE6B00FC956D /* MessageTableViewCell.xib in Resources */,
228+
C3AC67621D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib in Resources */,
229229
D81A06041B86A78700498183 /* LaunchScreen.xib in Resources */,
230230
D81A06011B86A78700498183 /* Images.xcassets in Resources */,
231231
);
@@ -288,10 +288,10 @@
288288
files = (
289289
D81A05F91B86A78700498183 /* AppDelegate.m in Sources */,
290290
C3F23ED01D80F58A0020509F /* FIRSamplesViewController.m in Sources */,
291-
C3AC67631D81FE6B00FC956D /* ViewController.m in Sources */,
292-
C3AC67611D81FE6B00FC956D /* MessageTableViewCell.m in Sources */,
293-
C3AC67601D81FE6B00FC956D /* MessageDataSource.m in Sources */,
294-
C3AC675F1D81FE6B00FC956D /* Message.m in Sources */,
291+
C3AC67631D81FE6B00FC956D /* FIRChatViewController.m in Sources */,
292+
C3AC67611D81FE6B00FC956D /* FIRChatMessageTableViewCell.m in Sources */,
293+
C3AC67601D81FE6B00FC956D /* FIRChatMessageDataSource.m in Sources */,
294+
C3AC675F1D81FE6B00FC956D /* FIRChatMessage.m in Sources */,
295295
D81A05F61B86A78700498183 /* main.m in Sources */,
296296
C3AC67661D82002F00FC956D /* FIRSample.m in Sources */,
297297
C3AC675E1D81FE6B00FC956D /* FIRAuthViewController.m in Sources */,

‎samples/objc/FirebaseUIChat/Base.lproj/Main.storyboard

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="7RW-VL-qNI">
33
<dependencies>
4-
<deployment identifier="iOS"/>
54
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
65
</dependencies>
76
<scenes>
@@ -27,7 +26,7 @@
2726
<!--FirebaseUI Chat-->
2827
<scene sceneID="ufC-wZ-h7g">
2928
<objects>
30-
<viewController storyboardIdentifier="ViewController" title="FirebaseUI Chat" useStoryboardIdentifierAsRestorationIdentifier="YES" id="vXZ-lx-hvc" customClass="ViewController" sceneMemberID="viewController">
29+
<viewController storyboardIdentifier="ViewController" title="FirebaseUI Chat" useStoryboardIdentifierAsRestorationIdentifier="YES" id="vXZ-lx-hvc" customClass="FIRChatViewController" sceneMemberID="viewController">
3130
<layoutGuides>
3231
<viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
3332
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>

‎samples/objc/FirebaseUIChat/FIRSamplesViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#import "FIRSample.h"
2020
#import "FIRSamplesViewController.h"
21-
#import "ViewController.h"
21+
#import "FIRChatViewController.h"
2222

2323
@interface FIRSamplesViewController ()
2424

‎samples/objc/FirebaseUIChat/Samples/Chat/Message.h renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import <Foundation/Foundation.h>
1818

19-
@interface Message : NSObject
19+
@interface FIRChatMessage : NSObject
2020

2121
@property(strong, nonatomic) NSString *name;
2222
@property(strong, nonatomic) NSString *text;

‎samples/objc/FirebaseUIChat/Samples/Chat/Message.m renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessage.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// limitations under the License.
1515
//
1616

17-
#import "Message.h"
17+
#import "FIRChatMessage.h"
1818

19-
@implementation Message
19+
@implementation FIRChatMessage
2020

2121
- (instancetype)init {
2222
return [self initWithName:@"" andText:@""];

‎samples/objc/FirebaseUIChat/Samples/Chat/MessageDataSource.h renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessageDataSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//@import FirebaseDatabaseUI;
1919
#import <FirebaseTableViewDataSource.h>
2020

21-
@interface MessageDataSource : FirebaseTableViewDataSource
21+
@interface FIRChatMessageDataSource : FirebaseTableViewDataSource
2222

2323
@end
2424

‎samples/objc/FirebaseUIChat/Samples/Chat/MessageDataSource.m renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessageDataSource.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
// limitations under the License.
1515
//
1616

17-
#import "MessageDataSource.h"
17+
#import "FIRChatMessageDataSource.h"
1818
@import FirebaseDatabase;
1919

20-
@implementation MessageDataSource
20+
@implementation FIRChatMessageDataSource
2121

2222
- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
2323
return YES; }

‎samples/objc/FirebaseUIChat/Samples/Chat/MessageTableViewCell.h renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessageTableViewCell.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import <UIKit/UIKit.h>
1818

19-
@interface MessageTableViewCell : UITableViewCell
19+
@interface FIRChatMessageTableViewCell : UITableViewCell
2020
@property(weak, nonatomic) IBOutlet UILabel *myMessageLabel;
2121
@property(weak, nonatomic) IBOutlet UILabel *myNameLabel;
2222

‎samples/objc/FirebaseUIChat/Samples/Chat/MessageTableViewCell.m renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessageTableViewCell.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
// limitations under the License.
1515
//
1616

17-
#import "MessageTableViewCell.h"
17+
#import "FIRChatMessageTableViewCell.h"
1818

19-
@implementation MessageTableViewCell
19+
@implementation FIRChatMessageTableViewCell
2020

2121
- (instancetype)initWithFrame:(CGRect)frame {
2222
return [super initWithFrame:frame];

‎samples/objc/FirebaseUIChat/Samples/Chat/MessageTableViewCell.xib renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatMessageTableViewCell.xib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<objects>
1010
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
1111
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
12-
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="d6M-nO-3us" customClass="MessageTableViewCell">
12+
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="d6M-nO-3us" customClass="FIRChatMessageTableViewCell">
1313
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
1414
<autoresizingMask key="autoresizingMask"/>
1515
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="d6M-nO-3us" id="oUR-sj-R1e">

‎samples/objc/FirebaseUIChat/Samples/Chat/ViewController.h renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatViewController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
//@import FirebaseDatabaseUI;
2222
#import <FirebaseTableViewDataSource.h>
2323

24-
@interface ViewController : UIViewController <UITableViewDelegate, UITextFieldDelegate>
24+
@interface FIRChatViewController : UIViewController <UITableViewDelegate, UITextFieldDelegate>
2525

2626
@property (strong, nonatomic) FIRDatabaseReference *ref;
2727
@property (strong, nonatomic) FirebaseTableViewDataSource *dataSource;

‎samples/objc/FirebaseUIChat/Samples/Chat/ViewController.m renamed to ‎samples/objc/FirebaseUIChat/Samples/Chat/FIRChatViewController.m

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@
1818
//@import FirebaseAuthUI;
1919
#import <FirebaseAuthUI.h>
2020

21-
#import "ViewController.h"
22-
#import "Message.h"
23-
#import "MessageTableViewCell.h"
24-
#import "MessageDataSource.h"
21+
#import "FIRChatViewController.h"
22+
#import "FIRChatMessage.h"
23+
#import "FIRChatMessageTableViewCell.h"
24+
#import "FIRChatMessageDataSource.h"
2525

26-
@implementation ViewController
26+
@implementation FIRChatViewController
2727

2828
- (void)viewDidLoad {
2929
[super viewDidLoad];
3030

3131
self.ref = [FIRDatabase database].reference;
3232

3333
self.dataSource =
34-
[[MessageDataSource alloc] initWithRef:self.ref
35-
modelClass:[Message class]
36-
nibNamed:@"MessageTableViewCell"
34+
[[FIRChatMessageDataSource alloc] initWithRef:self.ref
35+
modelClass:[FIRChatMessage class]
36+
nibNamed:@"FIRChatMessageTableViewCell"
3737
cellReuseIdentifier:@"cellReuseIdentifier"
3838
view:self.tableView];
3939

4040
[self.dataSource
41-
populateCellWithBlock:^void(MessageTableViewCell *__nonnull cell,
42-
Message *__nonnull message) {
41+
populateCellWithBlock:^void(FIRChatMessageTableViewCell *__nonnull cell,
42+
FIRChatMessage *__nonnull message) {
4343

4444
if ([message.name isEqualToString:[FIRAuth auth].currentUser.displayName]) {
4545
cell.myMessageLabel.text = message.text;

0 commit comments

Comments
 (0)