Classes/Conversation.xib @@ -12,14 +12,14 @@ @interface ConversationController : UIViewController { UINavigationController *navigation; - UITableView *table; + IBOutlet UITableView *display; NSMutableArray *messages; Conversation *conversation; } @property(nonatomic, retain) UINavigationController *navigation; -@property(nonatomic, retain) UITableView *table; +@property(nonatomic, retain) UITableView *display; - (ConversationController*)initWithConversation:(Conversation*)theConversation; Classes/Controllers/ConversationController.h @@ -14,11 +14,12 @@ @implementation ConversationController @synthesize navigation; +@synthesize display; - (ConversationController*)initWithConversation:(Conversation*)theConversation { - if (self = [super initWithNib:@"Conversation"]) { + if (self = [super initWithNibName:@"Conversation" bundle:nil]) { conversation = [theConversation retain]; messages = nil; } @@ -47,6 +48,8 @@ - (void)viewDidLoad { [super viewDidLoad]; + self.navigationItem.title = conversation.name; + [self reloadMessages]; } @@ -57,7 +60,7 @@ if (latestMessages) { [messages release]; messages = [[NSArray arrayWithArray:messages] retain]; - [table reloadData]; + [display reloadData]; } } @@ -69,7 +72,7 @@ if (messages) { // NOTE: probably should insert dynamically into table [messages addObjectsFromArray:theMessages]; - [table reloadData]; + [display reloadData]; } else { // Disable more messages? } @@ -144,7 +147,7 @@ NSString *kMCell = @"MCELL"; // Release any retained subviews of the main view. // e.g. self.myOutlet = nil; - self.table = nil; + self.display = nil; } Classes/Controllers/ConversationController.m @@ -8,6 +8,7 @@ #import "HomeController.h" #import "EchoCommon.h" +#import "echochatAppDelegate.h" @implementation HomeController @@ -73,6 +74,12 @@ - (void)tableView:(UITableView *)stableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { // enter convo + int section = indexPath.section; + if (section == 0) { + // TODO: push conversation search + } else if (section == 1) { + [(echochatAppDelegate*)[[UIApplication sharedApplication] delegate] pushConversation:[bookmarkedConversations objectAtIndex:indexPath.row]]; + } } Classes/Controllers/HomeController.m @@ -23,7 +23,7 @@ return self; } -- (NSString*)getRemoteElementName ++ (NSString*)getRemoteElementName { return @"conversation"; } Classes/Models/Message.m @@ -171,7 +171,7 @@ - (void)pushConversation:(Conversation*)theConversation { - ConversationController *conversation = [[ConversationController alloc] initWithConversation:conversation]; + ConversationController *conversation = [[ConversationController alloc] initWithConversation:theConversation]; conversation.navigation = navigationController; [navigationController pushViewController:conversation animated:YES]; [conversation release]; Classes/echochatAppDelegate.m @@ -67,6 +67,7 @@ 32817E7E0FF817BC00568251 /* OAServiceTicket.m in Sources */ = {isa = PBXBuildFile; fileRef = 32817E5B0FF817BC00568251 /* OAServiceTicket.m */; }; 32817E800FF817BC00568251 /* OAToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 32817E5F0FF817BC00568251 /* OAToken.m */; }; 32817E810FF817BC00568251 /* OAToken_KeychainExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 32817E610FF817BC00568251 /* OAToken_KeychainExtensions.m */; }; + 32B552C910009944006E42A4 /* Conversation.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32B552C810009944006E42A4 /* Conversation.xib */; }; 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 */; }; @@ -204,6 +205,7 @@ 32817E610FF817BC00568251 /* OAToken_KeychainExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAToken_KeychainExtensions.m; sourceTree = "<group>"; }; 32817E640FF817BC00568251 /* OAuthConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAuthConsumer.h; sourceTree = "<group>"; }; 32817E650FF817BC00568251 /* OAuthConsumer_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAuthConsumer_Prefix.pch; sourceTree = "<group>"; }; + 32B552C810009944006E42A4 /* Conversation.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Conversation.xib; sourceTree = "<group>"; }; 32CD757A0F7A2A5300B46E71 /* SettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsController.h; sourceTree = "<group>"; }; 32CD757B0F7A2A5300B46E71 /* SettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsController.m; sourceTree = "<group>"; }; 32CD75CC0F7A2FCA00B46E71 /* EditCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditCell.h; sourceTree = "<group>"; }; @@ -512,6 +514,7 @@ children = ( 32CD76F00F7A437500B46E71 /* MainWindow.xib */, 32CD76F10F7A437500B46E71 /* SettingsController.xib */, + 32B552C810009944006E42A4 /* Conversation.xib */, ); name = Views; sourceTree = "<group>"; @@ -571,6 +574,7 @@ 32CD76F40F7A437500B46E71 /* MainWindow.xib in Resources */, 32CD76F50F7A437500B46E71 /* SettingsController.xib in Resources */, 325A537A0FF8CE090049D26C /* OpenAuthLogin.xib in Resources */, + 32B552C910009944006E42A4 /* Conversation.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; echochat.xcodeproj/project.pbxproj fafc34a2a041f4e24a66b23801ab567171675a3e jamesu jamesu@gmail.com http://github.com/jamesu/echochat/commit/32c47641a008a5c659158f305b9e0d2dbf5b3334 32c47641a008a5c659158f305b9e0d2dbf5b3334 2009-07-05T01:34:41-07:00 2009-07-05T01:34:41-07:00 Preliminary conversation message display 4cd833668bd6d32ae82b7e24a830243b38ebc40a jamesu jamesu@gmail.com