chat.html @@ -9,21 +9,22 @@ #import <UIKit/UIKit.h> @class Conversation; +@class Message; @interface ConversationController : UIViewController { UINavigationController *navigation; - IBOutlet UITableView *display; + IBOutlet UIWebView *display; NSMutableArray *messages; Conversation *conversation; } @property(nonatomic, retain) UINavigationController *navigation; -@property(nonatomic, retain) UITableView *display; +@property(nonatomic, retain) UIWebView *display; - (ConversationController*)initWithConversation:(Conversation*)theConversation; -- (void)reloadMessages; +- (void)reloadMessages:(Message*)lastMessage; - (void)loadMoreMessages; @end Classes/Controllers/ConversationController.h @@ -30,17 +30,20 @@ - (void)listen { - //[[NSNotificationCenter defaultCenter] removeObserver:self]; - //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dataLoaded:) name:@"HomeListLoaded" object:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dataLoaded:) name:@"ConversationLoaded" object:nil]; } -/* + - (void)dataLoaded:(NSNotification*)sender { - if (bookmarkedConversations) - [bookmarkedConversations release]; - bookmarkedConversations = [(NSArray*)[sender.userInfo objectForKey:@"list"] retain]; - [display reloadData]; -}*/ + [display stringByEvaluatingJavaScriptFromString:@"Chat.clear();"]; + for (Message *message in messages) { + NSString *evalStr = [NSString stringWithFormat:@"Chat.message('%@', '%@');", [message.user.name stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], [message.messageHtml stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; + //NSLog(@"Eval: %@", evalStr); + [display stringByEvaluatingJavaScriptFromString:evalStr]; + //break; + } +} /* // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. @@ -65,12 +68,22 @@ self.navigationItem.title = conversation.name; - [self reloadMessages]; + NSString *content = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"chat" ofType:@"html"] encoding:NSUTF8StringEncoding error:nil]; + [display loadHTMLString:content baseURL:[NSURL URLWithString:@"http://localhost"]]; + + [self reloadMessages:nil]; +} + +- (void)reloadMessages:(Message*)lastMessage +{ + [[ConnectionManager sharedInstance] runJob:@selector(doGrabMessages:) onTarget:self withArgument:lastMessage]; } -- (void)reloadMessages +- (void)postNotification:(Message*)lastMessage { - [[ConnectionManager sharedInstance] runJob:@selector(doGrabMessages:) onTarget:self withArgument:nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"ConversationLoaded" + object:self + userInfo:[NSDictionary dictionaryWithObjectsAndKeys:lastMessage, @"lastMessage", nil]]; } - (void)doGrabMessages:(Message*)lastMessage @@ -86,69 +99,30 @@ messages = [[NSMutableArray arrayWithArray:theMessages] retain]; } - [display reloadData]; - } else { - // Disable more messages? - } -} - -- (void)loadMoreMessages -{ - Message *lastMessage = [messages lastObject]; - NSArray *theMessages = [conversation messagesSince:lastMessage]; - - if (messages) { - // NOTE: probably should insert dynamically into table - [messages addObjectsFromArray:theMessages]; - [display reloadData]; + // invoke notification in main thread + [self performSelectorOnMainThread:@selector(postNotification:) withObject:lastMessage waitUntilDone:NO]; + } else { // Disable more messages? } } -- (UITableViewCellAccessoryType)tableView:(UITableView *)stableView accessoryTypeForRowWithIndexPath:(NSIndexPath *)indexPath +- (void)webViewDidStartLoad:(UIWebView *)theWebView { - return UITableViewCellAccessoryNone; } -- (void)tableView:(UITableView *)stableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType { - // ... -} - - -NSString *kMCell = @"MCELL"; - -- (UITableViewCell *)tableView:(UITableView *)stableView cellForRowAtIndexPath:(NSIndexPath *)indexPath -{ - int row = indexPath.row; - - UITableViewCell *cell = [stableView dequeueReusableCellWithIdentifier:kMCell]; - - if (cell == nil) { - cell = [[UITableViewCell alloc] initWithFrame:CGRectNull]; + if ([[request.URL host] isEqual:@"localhost"]) { + return YES; + } else { + [[UIApplication sharedApplication] openURL:request.URL]; + return NO; } - - Message *message = [messages objectAtIndex:row]; - User *user = message.user; - cell.text = [NSString stringWithFormat:@"%@: %@", user.name, message.message]; - - return cell; -} - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)stableView -{ - return 1; -} - -- (NSString *)tableView:(UITableView *)stableView titleForHeaderInSection:(NSInteger)section -{ - return nil; } -- (NSInteger)tableView:(UITableView *)stableView numberOfRowsInSection:(NSInteger)section +- (void)webViewDidFinishLoad:(UIWebView *)theWebView { - return [messages count]; } /* Classes/Controllers/ConversationController.m @@ -36,25 +36,19 @@ <int key="NSvFlags">292</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUITableView" id="116006357"> + <object class="IBUIWebView" id="998323467"> <reference key="NSNextResponder" ref="191373211"/> <int key="NSvFlags">274</int> <string key="NSFrameSize">{320, 372}</string> <reference key="NSSuperview" ref="191373211"/> <object class="NSColor" key="IBUIBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MSAxIDEAA</bytes> </object> - <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClipsSubviews">YES</bool> - <bool key="IBUIClearsContextBeforeDrawing">NO</bool> - <bool key="IBUIBouncesZoom">NO</bool> - <int key="IBUISeparatorStyle">1</int> - <int key="IBUISectionIndexMinimumDisplayRowCount">0</int> - <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool> - <float key="IBUIRowHeight">4.400000e+01</float> - <float key="IBUISectionHeaderHeight">2.200000e+01</float> - <float key="IBUISectionFooterHeight">2.200000e+01</float> + <bool key="IBUIMultipleTouchEnabled">YES</bool> + <int key="IBUIDataDetectorTypes">1</int> + <bool key="IBUIDetectsPhoneNumbers">YES</bool> </object> </object> <string key="NSFrameSize">{320, 372}</string> @@ -78,14 +72,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">display</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="116006357"/> - </object> - <int key="connectionID">4</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> <string key="label">view</string> <reference key="source" ref="372490531"/> <reference key="destination" ref="191373211"/> @@ -94,19 +80,19 @@ </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">dataSource</string> - <reference key="source" ref="116006357"/> - <reference key="destination" ref="372490531"/> + <string key="label">display</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="998323467"/> </object> - <int key="connectionID">6</int> + <int key="connectionID">9</int> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> <string key="label">delegate</string> - <reference key="source" ref="116006357"/> + <reference key="source" ref="998323467"/> <reference key="destination" ref="372490531"/> </object> - <int key="connectionID">7</int> + <int key="connectionID">11</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -125,7 +111,7 @@ <reference key="object" ref="191373211"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="116006357"/> + <reference ref="998323467"/> </object> <reference key="parent" ref="568575992"/> </object> @@ -141,8 +127,8 @@ <reference key="parent" ref="568575992"/> </object> <object class="IBObjectRecord"> - <int key="objectID">3</int> - <reference key="object" ref="116006357"/> + <int key="objectID">8</int> + <reference key="object" ref="998323467"/> <reference key="parent" ref="191373211"/> </object> </object> @@ -155,7 +141,7 @@ <string>-2.CustomClassName</string> <string>1.IBEditorWindowLastContentRect</string> <string>1.IBPluginDependency</string> - <string>3.IBPluginDependency</string> + <string>8.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -186,7 +172,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">7</int> + <int key="maxID">11</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -196,7 +182,7 @@ <string key="superclassName">UIViewController</string> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">display</string> - <string key="NS.object.0">UITableView</string> + <string key="NS.object.0">UIWebView</string> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> Classes/Conversation.xib @@ -13,6 +13,7 @@ @interface Message : NSObject { NSString *messageId; NSString *message; + NSString *messageHtml; NSString *userId; // string so we can lookup in hash easily! } @@ -20,6 +21,7 @@ @property(nonatomic, copy) NSString *messageId; @property(nonatomic, copy) NSString *message; +@property(nonatomic, copy) NSString *messageHtml; @property(nonatomic, retain) NSString *userId; @end Classes/Models/Message.h @@ -12,6 +12,7 @@ @synthesize messageId; @synthesize message; +@synthesize messageHtml; @synthesize userId; @dynamic user; @@ -42,6 +43,7 @@ - (void)dealloc { [messageId release]; [message release]; + [messageHtml release]; [userId release]; [super dealloc]; Classes/Models/Message.m @@ -27,7 +27,7 @@ @dynamic token; @synthesize auth; -//#define USE_ECHOWAVES +#define USE_ECHOWAVES #ifdef USE_ECHOWAVES // ew.com @@ -122,7 +122,7 @@ @"http://www.echowaves.com/oauth/request_token", @"AUTHTOKENURL", @"http://www.echowaves.com/oauth/authorize", @"AUTHURL", @"http://www.echowaves.com/oauth/access_token", @"ACCESSTOKENURL", - @"http://www.echowaves.com/oauth/authorize/echochat", @"CALLBACKURL", nil]]; + @"http://echowaves.com/oauth/authorize/echochat", @"CALLBACKURL", nil]]; #else @"http://localhost:3000/oauth/request_token", @"AUTHTOKENURL", @"http://localhost:3000/oauth/authorize", @"AUTHURL", Classes/echochatAppDelegate.m @@ -69,6 +69,7 @@ 32817E810FF817BC00568251 /* OAToken_KeychainExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 32817E610FF817BC00568251 /* OAToken_KeychainExtensions.m */; }; 32B552C910009944006E42A4 /* Conversation.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32B552C810009944006E42A4 /* Conversation.xib */; }; 32B5536F1000AD38006E42A4 /* ConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 32B5536E1000AD38006E42A4 /* ConnectionManager.m */; }; + 32B554D51000DC48006E42A4 /* chat.html in Resources */ = {isa = PBXBuildFile; fileRef = 32B554D41000DC48006E42A4 /* chat.html */; }; 32CD757C0F7A2A5300B46E71 /* SettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32CD757B0F7A2A5300B46E71 /* SettingsController.m */; }; 32CD75CE0F7A2FCA00B46E71 /* EditCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 32CD75CD0F7A2FCA00B46E71 /* EditCell.m */; }; 32CD76F40F7A437500B46E71 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32CD76F00F7A437500B46E71 /* MainWindow.xib */; }; @@ -209,6 +210,7 @@ 32B552C810009944006E42A4 /* Conversation.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Conversation.xib; sourceTree = "<group>"; }; 32B5536D1000AD38006E42A4 /* ConnectionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConnectionManager.h; sourceTree = "<group>"; }; 32B5536E1000AD38006E42A4 /* ConnectionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConnectionManager.m; sourceTree = "<group>"; }; + 32B554D41000DC48006E42A4 /* chat.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = chat.html; sourceTree = "<group>"; }; 32CD757A0F7A2A5300B46E71 /* SettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SettingsController.h; path = ../SettingsController.h; sourceTree = "<group>"; }; 32CD757B0F7A2A5300B46E71 /* SettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SettingsController.m; path = ../SettingsController.m; sourceTree = "<group>"; }; 32CD75CC0F7A2FCA00B46E71 /* EditCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditCell.h; sourceTree = "<group>"; }; @@ -284,6 +286,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 32B554D41000DC48006E42A4 /* chat.html */, CAE1E5220F79867200182BE9 /* icon.png */, 8D1107310486CEB800E47090 /* Info.plist */, 325A53790FF8CE090049D26C /* OpenAuthLogin.xib */, @@ -580,6 +583,7 @@ 32CD76F50F7A437500B46E71 /* SettingsController.xib in Resources */, 325A537A0FF8CE090049D26C /* OpenAuthLogin.xib in Resources */, 32B552C910009944006E42A4 /* Conversation.xib in Resources */, + 32B554D51000DC48006E42A4 /* chat.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; echochat.xcodeproj/project.pbxproj 6352135653f7545b585a73f635670ce7fae53280 jamesu jamesu@gmail.com http://github.com/jamesu/echochat/commit/099236e6e43ec2436c1e21ca225c5355134a83c9 099236e6e43ec2436c1e21ca225c5355134a83c9 2009-07-05T06:53:10-07:00 2009-07-05T06:53:10-07:00 Changed message list to a more sensible UIWebView f746aaf2b296f016a7396a84a9259df6239dbbb5 jamesu jamesu@gmail.com