@@ -14,6 +14,9 @@ @interface ConversationController : UIViewController { UINavigationController *navigation; IBOutlet UIWebView *display; + IBOutlet UITextField *input; + + NSTimer *pollTimer; NSMutableArray *messages; Conversation *conversation; @@ -21,6 +24,7 @@ @property(nonatomic, retain) UINavigationController *navigation; @property(nonatomic, retain) UIWebView *display; +@property(nonatomic, retain) UITextField *input; - (ConversationController*)initWithConversation:(Conversation*)theConversation; Classes/Controllers/ConversationController.h @@ -9,10 +9,17 @@ #import "ConversationController.h" #import "EchoCommon.h" +// the amount of vertical shift upwards keep the text field in view as the keyboard appears +#define kOFFSET_FOR_KEYBOARD 50.0 + +// the duration of the animation for the view shift +#define kVerticalOffsetAnimationDuration 0.30 + @implementation ConversationController @synthesize navigation; @synthesize display; +@synthesize input; - (ConversationController*)initWithConversation:(Conversation*)theConversation @@ -43,6 +50,9 @@ [display stringByEvaluatingJavaScriptFromString:evalStr]; //break; } + + if (!pollTimer) + pollTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(pollMessages:) userInfo:nil repeats:YES]; } /* @@ -74,6 +84,28 @@ [self reloadMessages:nil]; } +- (void)viewWillAppear:(BOOL)animated +{ + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardShown:) + name:UIKeyboardWillShowNotification + object:self.view.window]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardHidden:) + name:UIKeyboardWillHideNotification + object:self.view.window]; + [self.navigation setToolbarHidden:YES animated:animated]; +} + +- (void)viewWillDisappear:(BOOL)animated +{ + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil]; +} + +- (void)pollMessages:(id)sender +{ + [self reloadMessages:nil];//[messages lastObject]]; +} + - (void)reloadMessages:(Message*)lastMessage { [[ConnectionManager sharedInstance] runJob:@selector(doGrabMessages:) onTarget:self withArgument:lastMessage]; @@ -125,6 +157,62 @@ { } +- (void)textFieldDidBeginEditing:(UITextField *)theTextField +{ + return; +} + +- (BOOL)textFieldShouldReturn:(UITextField *)textField +{ + [conversation sendMessage:textField.text from:nil]; + [textField resignFirstResponder]; + textField.text = @""; + return NO; +} + +- (void)keyboardShown:(NSNotification *)notification +{ + CGRect keyboardBounds = CGRectZero; + [[notification.userInfo objectForKey:UIKeyboardBoundsUserInfoKey] getValue:&keyboardBounds]; + + [UIView beginAnimations:nil context:NULL]; + [UIView setAnimationDuration:0.3]; + + CGFloat delta = keyboardBounds.size.height; + + CGRect frame = input.frame; + frame.origin.y -= delta; + input.frame = frame; + + frame = display.frame; + frame.origin.y -= delta; + display.frame = frame; + + [UIView commitAnimations]; +} + +- (void)keyboardHidden:(NSNotification *)notification +{ + CGRect keyboardBounds = CGRectZero; + [[notification.userInfo objectForKey:UIKeyboardBoundsUserInfoKey] getValue:&keyboardBounds]; + + [UIView beginAnimations:nil context:NULL]; + [UIView setAnimationDuration:0.3]; + + CGFloat delta = keyboardBounds.size.height; + + CGRect frame = input.frame; + frame.origin.y += delta; + input.frame = frame; + + frame = display.frame; + frame.origin.y += delta; + display.frame = frame; + + [UIView commitAnimations]; +} + + /* // Override to allow orientations other than the default portrait orientation. - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { @@ -145,10 +233,14 @@ // e.g. self.myOutlet = nil; self.display = nil; + self.input = nil; } - (void)dealloc { + if (pollTimer) + [pollTimer invalidate]; + [conversation release]; [navigation release]; Classes/Controllers/ConversationController.m @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> + <integer value="22"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -39,7 +39,7 @@ <object class="IBUIWebView" id="998323467"> <reference key="NSNextResponder" ref="191373211"/> <int key="NSvFlags">274</int> - <string key="NSFrameSize">{320, 372}</string> + <string key="NSFrameSize">{320, 377}</string> <reference key="NSSuperview" ref="191373211"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">1</int> @@ -50,21 +50,45 @@ <int key="IBUIDataDetectorTypes">1</int> <bool key="IBUIDetectsPhoneNumbers">YES</bool> </object> + <object class="IBUITextField" id="26192067"> + <reference key="NSNextResponder" ref="191373211"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{0, 380}, {320, 31}}</string> + <reference key="NSSuperview" ref="191373211"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <int key="IBUIContentVerticalAlignment">0</int> + <string key="IBUIText"/> + <int key="IBUIBorderStyle">3</int> + <string key="IBUIPlaceholder"/> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + <object class="NSColorSpace" key="NSCustomColorSpace" id="936486930"> + <int key="NSID">2</int> + </object> + </object> + <bool key="IBUIClearsOnBeginEditing">YES</bool> + <bool key="IBUIAdjustsFontSizeToFit">YES</bool> + <float key="IBUIMinimumFontSize">1.700000e+01</float> + <object class="IBUITextInputTraits" key="IBUITextInputTraits"> + <int key="IBUIReturnKeyType">7</int> + <bool key="IBUIEnablesReturnKeyAutomatically">YES</bool> + </object> + <int key="IBUIClearButtonMode">1</int> + </object> </object> - <string key="NSFrameSize">{320, 372}</string> + <string key="NSFrameSize">{320, 416}</string> <reference key="NSSuperview"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MQA</bytes> - <object class="NSColorSpace" key="NSCustomColorSpace"> - <int key="NSID">2</int> - </object> + <reference key="NSCustomColorSpace" ref="936486930"/> </object> <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics"> <bool key="IBUIPrompted">NO</bool> </object> - <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -94,6 +118,22 @@ </object> <int key="connectionID">11</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="26192067"/> + <reference key="destination" ref="372490531"/> + </object> + <int key="connectionID">23</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">input</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="26192067"/> + </object> + <int key="connectionID">24</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -112,6 +152,7 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="998323467"/> + <reference ref="26192067"/> </object> <reference key="parent" ref="568575992"/> </object> @@ -131,6 +172,11 @@ <reference key="object" ref="998323467"/> <reference key="parent" ref="191373211"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">22</int> + <reference key="object" ref="26192067"/> + <reference key="parent" ref="191373211"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -141,6 +187,7 @@ <string>-2.CustomClassName</string> <string>1.IBEditorWindowLastContentRect</string> <string>1.IBPluginDependency</string> + <string>22.IBPluginDependency</string> <string>8.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -150,6 +197,7 @@ <string>{{354, 376}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -172,7 +220,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">11</int> + <int key="maxID">24</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -181,8 +229,17 @@ <string key="className">ConversationController</string> <string key="superclassName">UIViewController</string> <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">display</string> - <string key="NS.object.0">UIWebView</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>display</string> + <string>input</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>UIWebView</string> + <string>UITextField</string> + </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> Classes/Conversation.xib @@ -54,7 +54,7 @@ Message *message = [[Message alloc] init]; message.user = theUser; message.message = theContent; - [message createRemoteAtPath:[NSString stringWithFormat:@"http://localhost:3000/%@/messages", [self getRemoteElementPath:conversationId]] withResponse:nil]; + [message createRemoteAtPath:[NSString stringWithFormat:@"http://localhost:3000/conversations/%@/messages.xml", conversationId] withResponse:nil]; [message autorelease]; return message; Classes/Models/Conversation.m @@ -31,7 +31,9 @@ - (void)setUser:(User*)theUser { - userId = [User setCached:theUser]; + if (userId) + [userId release]; + userId = theUser ? [[User setCached:theUser] retain] : nil; } - (User*)user Classes/Models/Message.m @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="127"/> + <integer value="131"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -87,6 +87,10 @@ </object> <object class="NSMutableArray" key="IBUIToolbarItems"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBUIBarButtonItem" id="261616983"> + <reference key="IBUIToolbar"/> + <int key="IBUISystemItemIdentifier">5</int> + </object> <object class="IBUIBarButtonItem" id="81744163"> <int key="IBUIStyle">1</int> <reference key="IBUIToolbar"/> @@ -155,6 +159,14 @@ </object> <int key="connectionID">135</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">presentSettings:</string> + <reference key="source" ref="81744163"/> + <reference key="destination" ref="664661524"/> + </object> + <int key="connectionID">138</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -210,6 +222,7 @@ <reference ref="287032986"/> <reference ref="1067068812"/> <reference ref="81744163"/> + <reference ref="261616983"/> </object> <reference key="parent" ref="780634670"/> </object> @@ -238,6 +251,11 @@ <reference key="object" ref="81744163"/> <reference key="parent" ref="215864631"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">137</int> + <reference key="object" ref="261616983"/> + <reference key="parent" ref="215864631"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -254,6 +272,7 @@ <string>129.IBPluginDependency</string> <string>131.IBPluginDependency</string> <string>136.IBPluginDependency</string> + <string>137.IBPluginDependency</string> <string>2.IBAttributePlaceholdersKey</string> <string>2.IBEditorWindowLastContentRect</string> <string>2.IBPluginDependency</string> @@ -264,7 +283,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>UIApplication</string> <string>UIResponder</string> - <string>{{445, 311}, {320, 480}}</string> + <string>{{416, 311}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>HomeController</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> @@ -272,6 +291,7 @@ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -307,7 +327,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">136</int> + <int key="maxID">138</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -369,6 +389,10 @@ <object class="IBPartialClassDescription"> <string key="className">echochatAppDelegate</string> <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">presentSettings:</string> + <string key="NS.object.0">id</string> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> Classes/Views/MainWindow.xib @@ -32,7 +32,7 @@ @property (nonatomic, retain) OAConsumer *auth; - (bool)isSetup; -- (void)presentSettings; +- (IBAction)presentSettings:(id)sender; - (void)startAuth; - (void)pushConversation:(Conversation*)theConversation; Classes/echochatAppDelegate.h @@ -69,7 +69,7 @@ } if (![self isSetup]) - [self presentSettings]; + [self presentSettings:nil]; else [self attemptConnection]; } @@ -100,11 +100,11 @@ } - (bool)isSetup -{//return YES; +{ return !(token == nil); } -- (void)presentSettings +- (void)presentSettings:(id)sender { SettingsController *settings = [[SettingsController alloc] initWithNibName:@"SettingsController" bundle:nil]; [navigationController presentModalViewController:settings animated:YES]; @@ -146,12 +146,12 @@ - (void)failedAuthenticationWithError:(NSError*)theError { //[authController presentInController:tabBarController animated:NO]; - [self presentSettings]; + [self presentSettings:nil]; } - (void)requestTicketFailed:(OAServiceTicket *)ticket withError:(NSError *)error { - [self presentSettings]; + [self presentSettings:nil]; } - (void)setToken:(OAToken*)aValue { Classes/echochatAppDelegate.m @@ -3,6 +3,14 @@ <title>EchoChat</title> <style> + .message:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + .user { font-weight: bold; float: left; @@ -22,6 +30,7 @@ var Chat = { var list = document.getElementById('messageList'); var el = document.createElement('div'); + el.className = "message"; el.innerHTML = "<div class=\"user\">" + decodeURI(username) + "</div><div class=\"content\">" + decodeURI(content) + "</div>"; list.appendChild(el); } @@ -39,8 +48,7 @@ var Chat = { <script type="text/javascript"> Chat.clear(); -Chat.message('test', 'Test'); -Chat.message('test', 'Woo'); +Chat.message('Loading...', ''); </script> chat.html e2a8e96f5e8be5da4c8d3bde788c33b0c2e0ef32 jamesu jamesu@gmail.com http://github.com/jamesu/echochat/commit/79e0102caa4a4d8e62a9a95a4403b4718066fbf7 79e0102caa4a4d8e62a9a95a4403b4718066fbf7 2009-07-05T13:44:18-07:00 2009-07-05T13:44:18-07:00 Added preliminary support for posting messages and a crude update poller - Man, it's ugly! 6029d5f7ef235fddd344732f398c2a1226d3c343 jamesu jamesu@gmail.com