aboutsummaryrefslogtreecommitdiffstats
path: root/iPhone
diff options
context:
space:
mode:
authorTeddy Wing2012-09-29 16:15:01 -0400
committerTeddy Wing2012-09-29 16:15:01 -0400
commit033f9053ada0a7f2a9ef7e6652746cd3cbb8f300 (patch)
treeee0a8c2127d189098e18e0078418359d40e41759 /iPhone
parentd02256dc49356e6dc1769cc0fb4737a7f013cbed (diff)
downloadbabblr-iOS-033f9053ada0a7f2a9ef7e6652746cd3cbb8f300.tar.bz2
Integrated multi-line SMS-style text box for chat pane. Added a tableView for chat messages.
Diffstat (limited to 'iPhone')
-rw-r--r--iPhone/AppDelegate_iPhone.m5
1 files changed, 4 insertions, 1 deletions
diff --git a/iPhone/AppDelegate_iPhone.m b/iPhone/AppDelegate_iPhone.m
index 566b8cd..31a23e4 100644
--- a/iPhone/AppDelegate_iPhone.m
+++ b/iPhone/AppDelegate_iPhone.m
@@ -8,6 +8,7 @@
#import "AppDelegate_iPhone.h"
#import "RootViewController.h"
+#import "ChatViewController.h"
@implementation AppDelegate_iPhone
@@ -21,7 +22,9 @@
// Override point for customization after application launch.
RootViewController *rootVC = [[RootViewController alloc] initWithNibName:@"RootViewController" bundle:nil];
- [window setRootViewController:rootVC];
+ ChatViewController *chatVC = [[ChatViewController alloc] init];
+// [window setRootViewController:rootVC];
+ [window addSubview:chatVC.view];
[window makeKeyAndVisible];