Skip to content

Commit bb47379

Browse files
author
dzenbot
committed
Renames clases to fit the new library name
1 parent c1ecc6e commit bb47379

61 files changed

Lines changed: 1327 additions & 1374 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Examples/ChatRoom/ChatRoom.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,10 @@
1515
4F3EDB59199ED00F004C15D6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F3EDB58199ED00F004C15D6 /* main.m */; };
1616
4F3EDB5D199ED00F004C15D6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F3EDB5C199ED00F004C15D6 /* AppDelegate.m */; };
1717
4F3EDB68199ED00F004C15D6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4F3EDB67199ED00F004C15D6 /* Images.xcassets */; };
18-
4F3EDB6F199ED00F004C15D6 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F3EDB6E199ED00F004C15D6 /* XCTest.framework */; };
19-
4F3EDB70199ED00F004C15D6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F3EDB4C199ED00F004C15D6 /* Foundation.framework */; };
20-
4F3EDB71199ED00F004C15D6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F3EDB50199ED00F004C15D6 /* UIKit.framework */; };
21-
4F3EDB79199ED00F004C15D6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4F3EDB77199ED00F004C15D6 /* InfoPlist.strings */; };
22-
4F3EDB7B199ED00F004C15D6 /* ChatRoomTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F3EDB7A199ED00F004C15D6 /* ChatRoomTests.m */; };
2318
4F3EDB90199ED091004C15D6 /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F3EDB8F199ED091004C15D6 /* ChatRoomViewController.m */; };
2419
4F72F3CC19B4E51A009CD8F4 /* ChatViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F72F3CB19B4E51A009CD8F4 /* ChatViewCell.m */; };
2520
/* End PBXBuildFile section */
2621

27-
/* Begin PBXContainerItemProxy section */
28-
4F3EDB72199ED00F004C15D6 /* PBXContainerItemProxy */ = {
29-
isa = PBXContainerItemProxy;
30-
containerPortal = 4F3EDB41199ED00F004C15D6 /* Project object */;
31-
proxyType = 1;
32-
remoteGlobalIDString = 4F3EDB48199ED00F004C15D6;
33-
remoteInfo = ChatRoom;
34-
};
35-
/* End PBXContainerItemProxy section */
36-
3722
/* Begin PBXFileReference section */
3823
1142AE8585EB462B8CC69D35 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
3924
4F3EDB49199ED00F004C15D6 /* ChatRoom.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChatRoom.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -47,11 +32,7 @@
4732
4F3EDB5B199ED00F004C15D6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4833
4F3EDB5C199ED00F004C15D6 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
4934
4F3EDB67199ED00F004C15D6 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
50-
4F3EDB6D199ED00F004C15D6 /* ChatRoomTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChatRoomTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5135
4F3EDB6E199ED00F004C15D6 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
52-
4F3EDB76199ED00F004C15D6 /* ChatRoomTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ChatRoomTests-Info.plist"; sourceTree = "<group>"; };
53-
4F3EDB78199ED00F004C15D6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
54-
4F3EDB7A199ED00F004C15D6 /* ChatRoomTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatRoomTests.m; sourceTree = "<group>"; };
5536
4F3EDB8E199ED091004C15D6 /* ChatRoomViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatRoomViewController.h; sourceTree = "<group>"; };
5637
4F3EDB8F199ED091004C15D6 /* ChatRoomViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatRoomViewController.m; sourceTree = "<group>"; };
5738
4F72F3CA19B4E51A009CD8F4 /* ChatViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatViewCell.h; sourceTree = "<group>"; };
@@ -71,24 +52,13 @@
7152
);
7253
runOnlyForDeploymentPostprocessing = 0;
7354
};
74-
4F3EDB6A199ED00F004C15D6 /* Frameworks */ = {
75-
isa = PBXFrameworksBuildPhase;
76-
buildActionMask = 2147483647;
77-
files = (
78-
4F3EDB6F199ED00F004C15D6 /* XCTest.framework in Frameworks */,
79-
4F3EDB71199ED00F004C15D6 /* UIKit.framework in Frameworks */,
80-
4F3EDB70199ED00F004C15D6 /* Foundation.framework in Frameworks */,
81-
);
82-
runOnlyForDeploymentPostprocessing = 0;
83-
};
8455
/* End PBXFrameworksBuildPhase section */
8556

8657
/* Begin PBXGroup section */
8758
4F3EDB40199ED00F004C15D6 = {
8859
isa = PBXGroup;
8960
children = (
9061
4F3EDB52199ED00F004C15D6 /* ChatRoom */,
91-
4F3EDB74199ED00F004C15D6 /* ChatRoomTests */,
9262
4F3EDB4B199ED00F004C15D6 /* Frameworks */,
9363
4F3EDB4A199ED00F004C15D6 /* Products */,
9464
8522B79647AD437F85843A28 /* Pods.xcconfig */,
@@ -99,7 +69,6 @@
9969
isa = PBXGroup;
10070
children = (
10171
4F3EDB49199ED00F004C15D6 /* ChatRoom.app */,
102-
4F3EDB6D199ED00F004C15D6 /* ChatRoomTests.xctest */,
10372
);
10473
name = Products;
10574
sourceTree = "<group>";
@@ -142,24 +111,6 @@
142111
name = "Supporting Files";
143112
sourceTree = "<group>";
144113
};
145-
4F3EDB74199ED00F004C15D6 /* ChatRoomTests */ = {
146-
isa = PBXGroup;
147-
children = (
148-
4F3EDB7A199ED00F004C15D6 /* ChatRoomTests.m */,
149-
4F3EDB75199ED00F004C15D6 /* Supporting Files */,
150-
);
151-
path = ChatRoomTests;
152-
sourceTree = "<group>";
153-
};
154-
4F3EDB75199ED00F004C15D6 /* Supporting Files */ = {
155-
isa = PBXGroup;
156-
children = (
157-
4F3EDB76199ED00F004C15D6 /* ChatRoomTests-Info.plist */,
158-
4F3EDB77199ED00F004C15D6 /* InfoPlist.strings */,
159-
);
160-
name = "Supporting Files";
161-
sourceTree = "<group>";
162-
};
163114
/* End PBXGroup section */
164115

165116
/* Begin PBXNativeTarget section */
@@ -182,24 +133,6 @@
182133
productReference = 4F3EDB49199ED00F004C15D6 /* ChatRoom.app */;
183134
productType = "com.apple.product-type.application";
184135
};
185-
4F3EDB6C199ED00F004C15D6 /* ChatRoomTests */ = {
186-
isa = PBXNativeTarget;
187-
buildConfigurationList = 4F3EDB81199ED00F004C15D6 /* Build configuration list for PBXNativeTarget "ChatRoomTests" */;
188-
buildPhases = (
189-
4F3EDB69199ED00F004C15D6 /* Sources */,
190-
4F3EDB6A199ED00F004C15D6 /* Frameworks */,
191-
4F3EDB6B199ED00F004C15D6 /* Resources */,
192-
);
193-
buildRules = (
194-
);
195-
dependencies = (
196-
4F3EDB73199ED00F004C15D6 /* PBXTargetDependency */,
197-
);
198-
name = ChatRoomTests;
199-
productName = ChatRoomTests;
200-
productReference = 4F3EDB6D199ED00F004C15D6 /* ChatRoomTests.xctest */;
201-
productType = "com.apple.product-type.bundle.unit-test";
202-
};
203136
/* End PBXNativeTarget section */
204137

205138
/* Begin PBXProject section */
@@ -208,11 +141,6 @@
208141
attributes = {
209142
LastUpgradeCheck = 0510;
210143
ORGANIZATIONNAME = "Slack Technologies, Inc.";
211-
TargetAttributes = {
212-
4F3EDB6C199ED00F004C15D6 = {
213-
TestTargetID = 4F3EDB48199ED00F004C15D6;
214-
};
215-
};
216144
};
217145
buildConfigurationList = 4F3EDB44199ED00F004C15D6 /* Build configuration list for PBXProject "ChatRoom" */;
218146
compatibilityVersion = "Xcode 3.2";
@@ -228,7 +156,6 @@
228156
projectRoot = "";
229157
targets = (
230158
4F3EDB48199ED00F004C15D6 /* ChatRoom */,
231-
4F3EDB6C199ED00F004C15D6 /* ChatRoomTests */,
232159
);
233160
};
234161
/* End PBXProject section */
@@ -243,14 +170,6 @@
243170
);
244171
runOnlyForDeploymentPostprocessing = 0;
245172
};
246-
4F3EDB6B199ED00F004C15D6 /* Resources */ = {
247-
isa = PBXResourcesBuildPhase;
248-
buildActionMask = 2147483647;
249-
files = (
250-
4F3EDB79199ED00F004C15D6 /* InfoPlist.strings in Resources */,
251-
);
252-
runOnlyForDeploymentPostprocessing = 0;
253-
};
254173
/* End PBXResourcesBuildPhase section */
255174

256175
/* Begin PBXShellScriptBuildPhase section */
@@ -298,24 +217,8 @@
298217
);
299218
runOnlyForDeploymentPostprocessing = 0;
300219
};
301-
4F3EDB69199ED00F004C15D6 /* Sources */ = {
302-
isa = PBXSourcesBuildPhase;
303-
buildActionMask = 2147483647;
304-
files = (
305-
4F3EDB7B199ED00F004C15D6 /* ChatRoomTests.m in Sources */,
306-
);
307-
runOnlyForDeploymentPostprocessing = 0;
308-
};
309220
/* End PBXSourcesBuildPhase section */
310221

311-
/* Begin PBXTargetDependency section */
312-
4F3EDB73199ED00F004C15D6 /* PBXTargetDependency */ = {
313-
isa = PBXTargetDependency;
314-
target = 4F3EDB48199ED00F004C15D6 /* ChatRoom */;
315-
targetProxy = 4F3EDB72199ED00F004C15D6 /* PBXContainerItemProxy */;
316-
};
317-
/* End PBXTargetDependency section */
318-
319222
/* Begin PBXVariantGroup section */
320223
4F3EDB55199ED00F004C15D6 /* InfoPlist.strings */ = {
321224
isa = PBXVariantGroup;
@@ -325,14 +228,6 @@
325228
name = InfoPlist.strings;
326229
sourceTree = "<group>";
327230
};
328-
4F3EDB77199ED00F004C15D6 /* InfoPlist.strings */ = {
329-
isa = PBXVariantGroup;
330-
children = (
331-
4F3EDB78199ED00F004C15D6 /* en */,
332-
);
333-
name = InfoPlist.strings;
334-
sourceTree = "<group>";
335-
};
336231
/* End PBXVariantGroup section */
337232

338233
/* Begin XCBuildConfiguration section */
@@ -436,46 +331,6 @@
436331
};
437332
name = Release;
438333
};
439-
4F3EDB82199ED00F004C15D6 /* Debug */ = {
440-
isa = XCBuildConfiguration;
441-
buildSettings = {
442-
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ChatRoom.app/ChatRoom";
443-
FRAMEWORK_SEARCH_PATHS = (
444-
"$(SDKROOT)/Developer/Library/Frameworks",
445-
"$(inherited)",
446-
"$(DEVELOPER_FRAMEWORKS_DIR)",
447-
);
448-
GCC_PRECOMPILE_PREFIX_HEADER = YES;
449-
GCC_PREFIX_HEADER = "ChatRoom/ChatRoom-Prefix.pch";
450-
GCC_PREPROCESSOR_DEFINITIONS = (
451-
"DEBUG=1",
452-
"$(inherited)",
453-
);
454-
INFOPLIST_FILE = "ChatRoomTests/ChatRoomTests-Info.plist";
455-
PRODUCT_NAME = "$(TARGET_NAME)";
456-
TEST_HOST = "$(BUNDLE_LOADER)";
457-
WRAPPER_EXTENSION = xctest;
458-
};
459-
name = Debug;
460-
};
461-
4F3EDB83199ED00F004C15D6 /* Release */ = {
462-
isa = XCBuildConfiguration;
463-
buildSettings = {
464-
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ChatRoom.app/ChatRoom";
465-
FRAMEWORK_SEARCH_PATHS = (
466-
"$(SDKROOT)/Developer/Library/Frameworks",
467-
"$(inherited)",
468-
"$(DEVELOPER_FRAMEWORKS_DIR)",
469-
);
470-
GCC_PRECOMPILE_PREFIX_HEADER = YES;
471-
GCC_PREFIX_HEADER = "ChatRoom/ChatRoom-Prefix.pch";
472-
INFOPLIST_FILE = "ChatRoomTests/ChatRoomTests-Info.plist";
473-
PRODUCT_NAME = "$(TARGET_NAME)";
474-
TEST_HOST = "$(BUNDLE_LOADER)";
475-
WRAPPER_EXTENSION = xctest;
476-
};
477-
name = Release;
478-
};
479334
/* End XCBuildConfiguration section */
480335

481336
/* Begin XCConfigurationList section */
@@ -497,15 +352,6 @@
497352
defaultConfigurationIsVisible = 0;
498353
defaultConfigurationName = Release;
499354
};
500-
4F3EDB81199ED00F004C15D6 /* Build configuration list for PBXNativeTarget "ChatRoomTests" */ = {
501-
isa = XCConfigurationList;
502-
buildConfigurations = (
503-
4F3EDB82199ED00F004C15D6 /* Debug */,
504-
4F3EDB83199ED00F004C15D6 /* Release */,
505-
);
506-
defaultConfigurationIsVisible = 0;
507-
defaultConfigurationName = Release;
508-
};
509355
/* End XCConfigurationList section */
510356
};
511357
rootObject = 4F3EDB41199ED00F004C15D6 /* Project object */;

‎Examples/ChatRoom/ChatRoom/ChatRoomViewController.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// Copyright (c) 2014 Slack Technologies, Inc. All rights reserved.
77
//
88

9-
#import "SCKChatViewController.h"
9+
#import "SLKTextViewController.h"
1010

11-
@interface ChatRoomViewController : SCKChatViewController
11+
@interface ChatRoomViewController : SLKTextViewController
1212

1313
@end

‎Examples/ChatRoom/ChatRoom/ChatRoomViewController.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,22 +81,22 @@ - (void)viewDidLoad
8181
[self.tableView registerClass:[ChatViewCell class] forCellReuseIdentifier:chatCellIdentifier];
8282
[self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:autoCompletionCellIdentifier];
8383

84-
self.chatToolbar.autoHideRightButton = YES;
85-
self.typeIndicatorView.canResignByTouch = YES;
84+
self.textInputbar.autoHideRightButton = YES;
85+
self.typingIndicatorView.canResignByTouch = YES;
8686

8787
self.textView.placeholder = NSLocalizedString(@"Message", nil);
8888
self.textView.placeholderColor = [UIColor lightGrayColor];
89-
self.chatToolbar.backgroundColor = [UIColor colorWithRed:240.0/255.0 green:240.0/255.0 blue:240.0/255.0 alpha:1.0];
89+
self.textInputbar.backgroundColor = [UIColor colorWithRed:240.0/255.0 green:240.0/255.0 blue:240.0/255.0 alpha:1.0];
9090
self.textView.layer.borderColor = [UIColor colorWithRed:217.0/255.0 green:217.0/255.0 blue:217.0/255.0 alpha:1.0].CGColor;
9191

9292
[self.leftButton setTintColor:[UIColor colorWithRed:154.0/255.0 green:159.0/255.0 blue:166.0/255.0 alpha:1.0]];
9393
[self.leftButton setImage:[UIImage imageNamed:@"icn_upload"] forState:UIControlStateNormal];
9494

9595
[self.rightButton setTitle:NSLocalizedString(@"Send", nil) forState:UIControlStateNormal];
9696

97-
[self.chatToolbar.editorTitle setTextColor:[UIColor darkGrayColor]];
98-
[self.chatToolbar.editortLeftButton setTintColor:[UIColor colorWithRed:0.0/255.0 green:122.0/255.0 blue:255.0/255.0 alpha:1.0]];
99-
[self.chatToolbar.editortRightButton setTintColor:[UIColor colorWithRed:0.0/255.0 green:122.0/255.0 blue:255.0/255.0 alpha:1.0]];
97+
[self.textInputbar.editorTitle setTextColor:[UIColor darkGrayColor]];
98+
[self.textInputbar.editortLeftButton setTintColor:[UIColor colorWithRed:0.0/255.0 green:122.0/255.0 blue:255.0/255.0 alpha:1.0]];
99+
[self.textInputbar.editortRightButton setTintColor:[UIColor colorWithRed:0.0/255.0 green:122.0/255.0 blue:255.0/255.0 alpha:1.0]];
100100

101101
[self registerPrefixesForAutoCompletion:@[@"@", @"#", @"/", @":"]];
102102
}
@@ -124,7 +124,7 @@ - (void)fillWithText:(id)sender
124124
- (void)simulateUserTyping:(id)sender
125125
{
126126
if (!self.isEditing && !self.isAutoCompleting) {
127-
[self.typeIndicatorView insertUsername:[LoremIpsum name]];
127+
[self.typingIndicatorView insertUsername:[LoremIpsum name]];
128128
}
129129
}
130130

@@ -183,7 +183,7 @@ - (void)didChangeReachability
183183
self.textView.backgroundColor = textViewColor;
184184

185185
self.rightButton.enabled = self.isReachable;
186-
self.chatToolbar.editortRightButton.enabled = self.isReachable;
186+
self.textInputbar.editortRightButton.enabled = self.isReachable;
187187
}
188188

189189

‎Examples/ChatRoom/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
platform :ios, "7.0"
22

3-
pod 'SlackChatKit', :path => '../../SlackChatKit.podspec'
3+
pod 'SlackTextViewController', :path => '../../SlackTextViewController.podspec'
44

55
pod 'LoremIpsum', '~> 1.0'

‎Examples/ChatRoom/Podfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
PODS:
22
- LoremIpsum (1.0.0)
3-
- SlackChatKit (1.0):
4-
- SlackChatKit/Additions
5-
- SlackChatKit/Additions
6-
- SlackChatKit/Additions (1.0):
7-
- SlackChatKit/Additions
3+
- SlackTextViewController (1.0):
4+
- SlackTextViewController/Additions
5+
- SlackTextViewController/Additions
6+
- SlackTextViewController/Additions (1.0):
7+
- SlackTextViewController/Additions
88

99
DEPENDENCIES:
1010
- LoremIpsum (~> 1.0)
11-
- SlackChatKit (from `../../SlackChatKit.podspec`)
11+
- SlackTextViewController (from `../../SlackTextViewController.podspec`)
1212

1313
EXTERNAL SOURCES:
14-
SlackChatKit:
15-
:path: ../../SlackChatKit.podspec
14+
SlackTextViewController:
15+
:path: ../../SlackTextViewController.podspec
1616

1717
SPEC CHECKSUMS:
1818
LoremIpsum: a4d378ecaffcb08c7e40cdba3fb935dc41b2272c
19-
SlackChatKit: 502b761818c3ff2d62af472427881ec67fbb25a6
19+
SlackTextViewController: 3d4e7e375ee46fec68678728311f8de76214a7c9
2020

2121
COCOAPODS: 0.33.1

‎Examples/ChatRoom/Pods/BuildHeaders/SlackChatKit/Additions/UIScrollView+ChatKitAdditions.h‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Examples/ChatRoom/Pods/BuildHeaders/SlackChatKit/Additions/UITextView+ChatKitAdditions.h‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Examples/ChatRoom/Pods/BuildHeaders/SlackChatKit/Additions/UIView+ChatKitAdditions.h‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Examples/ChatRoom/Pods/BuildHeaders/SlackChatKit/Classes/SCKChatToolbar.h‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Examples/ChatRoom/Pods/BuildHeaders/SlackChatKit/Classes/SCKChatViewController.h‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)