@@ -10,13 +10,13 @@ #import "Host.h" @interface FlameTouchAppDelegate : NSObject <UIApplicationDelegate> { - - UIWindow *window; - UINavigationController *navigationController; - - NSNetServiceBrowser *metaBrowser; - NSMutableArray *serviceBrowsers; - NSMutableArray *hosts; + + UIWindow *window; + UINavigationController *navigationController; + + NSNetServiceBrowser *metaBrowser; + NSMutableArray *serviceBrowsers; + NSMutableArray *hosts; } - (NSMutableArray*)hosts; Classes/FlameTouchAppDelegate.h @@ -22,114 +22,114 @@ @synthesize serviceBrowsers; - (void)applicationDidFinishLaunching:(UIApplication *)application { - - [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES]; - - self.serviceBrowsers = [[[NSMutableArray alloc] initWithCapacity: 40] autorelease]; - self.hosts = [[[NSMutableArray alloc] initWithCapacity: 20] autorelease]; - - // meta-discovery - metaBrowser = [[NSNetServiceBrowser alloc] init]; - [metaBrowser setDelegate:self]; - [metaBrowser searchForServicesOfType:@"_services._dns-sd._udp." inDomain:@""]; - - // Configure and show the window - [window addSubview:[navigationController view]]; - [window makeKeyAndVisible]; + + [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES]; + + self.serviceBrowsers = [[[NSMutableArray alloc] initWithCapacity: 40] autorelease]; + self.hosts = [[[NSMutableArray alloc] initWithCapacity: 20] autorelease]; + + // meta-discovery + metaBrowser = [[NSNetServiceBrowser alloc] init]; + [metaBrowser setDelegate:self]; + [metaBrowser searchForServicesOfType:@"_services._dns-sd._udp." inDomain:@""]; + + // Configure and show the window + [window addSubview:[navigationController view]]; + [window makeKeyAndVisible]; } - (void)netServiceBrowser:(NSNetServiceBrowser *)netServiceBrowser didNotSearch:(NSDictionary *)errorInfo { - NSLog(@"Did not search: %@", errorInfo); + NSLog(@"Did not search: %@", errorInfo); } - (void)netServiceBrowserWillSearch:(NSNetServiceBrowser *)netServiceBrowser { } - (void)netServiceBrowser:(NSNetServiceBrowser *)netServiceBrowser didFindService:(NSNetService *)service moreComing:(BOOL)moreServicesComing { - if ( [[service type] isEqualToString:@"_tcp.local."] || [[service type] isEqualToString:@"_udp.local."] ) { - // new meta-service - NSString *fullType; - if ( [[service type] isEqualToString:@"_tcp.local."] ) - fullType = [NSString stringWithFormat:@"%@._tcp", [service name] ]; - else - fullType = [NSString stringWithFormat:@"%@._udp", [service name] ]; - - // Create a new NSNetService browser looking for services of this type, - // and start it looking. We'll have quite a lot of browsers running at - // once by the end of this. - NSNetServiceBrowser *browser = [[NSNetServiceBrowser alloc] init]; - [browser setDelegate:self]; - [browser searchForServicesOfType:fullType inDomain:@""]; - [self.serviceBrowsers addObject:browser]; - [browser release]; - - } else { - // This case is coming from one of the browsers created in the other - // branch of the conditional, and represents an actual service running - // somewhere. Tell the service to resolve itself, we'll display it in - // the resolver callback. - [service retain]; // released in didResolveAddress / didNotResolve - [service setDelegate:self]; - [service resolve]; - } + if ( [[service type] isEqualToString:@"_tcp.local."] || [[service type] isEqualToString:@"_udp.local."] ) { + // new meta-service + NSString *fullType; + if ( [[service type] isEqualToString:@"_tcp.local."] ) + fullType = [NSString stringWithFormat:@"%@._tcp", [service name] ]; + else + fullType = [NSString stringWithFormat:@"%@._udp", [service name] ]; + + // Create a new NSNetService browser looking for services of this type, + // and start it looking. We'll have quite a lot of browsers running at + // once by the end of this. + NSNetServiceBrowser *browser = [[NSNetServiceBrowser alloc] init]; + [browser setDelegate:self]; + [browser searchForServicesOfType:fullType inDomain:@""]; + [self.serviceBrowsers addObject:browser]; + [browser release]; + + } else { + // This case is coming from one of the browsers created in the other + // branch of the conditional, and represents an actual service running + // somewhere. Tell the service to resolve itself, we'll display it in + // the resolver callback. + [service retain]; // released in didResolveAddress / didNotResolve + [service setDelegate:self]; + [service resolve]; + } } - (void)netServiceBrowser:(NSNetServiceBrowser *)netServiceBrowser didRemoveService:(NSNetService *)service moreComing:(BOOL)moreServicesComing { - NSMutableArray *toRemove = [[NSMutableArray alloc] init]; - for (Host* host in self.hosts) { - if ([host hasService:service]) { - [host removeService:service]; - if ([host serviceCount] == 0) { - [toRemove addObject:host]; - } - break; // found it - } + NSMutableArray *toRemove = [[NSMutableArray alloc] init]; + for (Host* host in self.hosts) { + if ([host hasService:service]) { + [host removeService:service]; + if ([host serviceCount] == 0) { + [toRemove addObject:host]; + } + break; // found it } - - // Can't mutate while iterating - for (Host *host in toRemove) { - NSLog(@"No services remaining on host %@, removing", host); - [self.hosts removeObject:host]; - } - [toRemove release]; + } + + // Can't mutate while iterating + for (Host *host in toRemove) { + NSLog(@"No services remaining on host %@, removing", host); + [self.hosts removeObject:host]; + } + [toRemove release]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"newServices" object:self]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"newServices" object:self]; } - (void)netServiceDidResolveAddress:(NSNetService *)service { - Host *thehost = nil; - struct sockaddr_in* sock = (struct sockaddr_in*)[((NSData*)[[service addresses] objectAtIndex:0]) bytes]; - NSString *ip = [NSString stringWithFormat:@"%s", inet_ntoa(sock->sin_addr)]; - - for (Host* host in self.hosts) { - if ( [host.hostname isEqualToString:[service hostName]] ) { - thehost = host; - } - } - if (thehost == nil) { - thehost = [[Host alloc] initWithHostname:[service hostName] ipAddress:ip]; - [self.hosts addObject: thehost]; - [self.hosts sortUsingSelector:@selector(compareByName:)]; - [thehost release]; + Host *thehost = nil; + struct sockaddr_in* sock = (struct sockaddr_in*)[((NSData*)[[service addresses] objectAtIndex:0]) bytes]; + NSString *ip = [NSString stringWithFormat:@"%s", inet_ntoa(sock->sin_addr)]; + + for (Host* host in self.hosts) { + if ( [host.hostname isEqualToString:[service hostName]] ) { + thehost = host; } - - [thehost addService:service]; - [service release]; // we retained this before resolving it - [[NSNotificationCenter defaultCenter] postNotificationName:@"newServices" object:self]; + } + if (thehost == nil) { + thehost = [[Host alloc] initWithHostname:[service hostName] ipAddress:ip]; + [self.hosts addObject: thehost]; + [self.hosts sortUsingSelector:@selector(compareByName:)]; + [thehost release]; + } + + [thehost addService:service]; + [service release]; // we retained this before resolving it + [[NSNotificationCenter defaultCenter] postNotificationName:@"newServices" object:self]; } - (void)netService:(NSNetService *)service didNotResolve:(NSDictionary *)errorDict { - NSLog(@"Did not resolve service %@: %@", service, errorDict); - //[service release]; // we retained this before resolving it + NSLog(@"Did not resolve service %@: %@", service, errorDict); + //[service release]; // we retained this before resolving it } - (void)dealloc { - [navigationController release]; - [window release]; - [metaBrowser release]; - [self.serviceBrowsers release]; - [self.hosts release]; - [super dealloc]; + [navigationController release]; + [window release]; + [metaBrowser release]; + [self.serviceBrowsers release]; + [self.hosts release]; + [super dealloc]; } @end Classes/FlameTouchAppDelegate.m @@ -10,10 +10,10 @@ @interface Host : NSObject { - NSString *hostname; - NSString *ip; - NSMutableArray *services; - + NSString *hostname; + NSString *ip; + NSMutableArray *services; + } @property (nonatomic, retain) NSString *hostname; Classes/Host.h @@ -16,54 +16,54 @@ @synthesize services; -(id)initWithHostname:(NSString*)hn ipAddress:(NSString*)ipAddress { - if ([super init] == nil) return nil; - self.hostname = hn; - self.ip = ipAddress; - self.services = [NSMutableArray arrayWithCapacity:10]; - return self; + if ([super init] == nil) return nil; + self.hostname = hn; + self.ip = ipAddress; + self.services = [NSMutableArray arrayWithCapacity:10]; + return self; } -(int)serviceCount { - return [self.services count]; + return [self.services count]; } -(NSString*)name { - // TODO - strip everything after the last apostrophe to get username - if ( [self.services count] > 0 ) - return [[self serviceAtIndex:0] name]; - return self.hostname; + // TODO - strip everything after the last apostrophe to get username + if ( [self.services count] > 0 ) + return [[self serviceAtIndex:0] name]; + return self.hostname; } -(NSNetService*)serviceAtIndex:(int)i { - return (NSNetService*)[self.services objectAtIndex:i]; + return (NSNetService*)[self.services objectAtIndex:i]; } -(BOOL)hasService:(NSNetService*)service { - return [self.services containsObject:service]; + return [self.services containsObject:service]; } -(void)addService:(NSNetService*)service { - // TODO - if we have more than one active interface, you'll tend to see - // services appearing twice. This is not going to happen in the Real World, - // as iPhones only have one interface, but it makes the siulator confuing - [self.services addObject:service]; - [self.services sortUsingSelector:@selector(compareByPriority:)]; + // TODO - if we have more than one active interface, you'll tend to see + // services appearing twice. This is not going to happen in the Real World, + // as iPhones only have one interface, but it makes the siulator confuing + [self.services addObject:service]; + [self.services sortUsingSelector:@selector(compareByPriority:)]; } -(void)removeService:(NSNetService*)service { - NSLog(@"removing %@ from %@", service, self.services); - [self.services removeObject:service]; + NSLog(@"removing %@ from %@", service, self.services); + [self.services removeObject:service]; } -(int)compareByName:(Host*)host { - return [[self name] localizedCaseInsensitiveCompare:[host name]]; + return [[self name] localizedCaseInsensitiveCompare:[host name]]; } -(void)dealloc { - [hostname release]; - [ip release]; - [services release]; - [super dealloc]; + [hostname release]; + [ip release]; + [services release]; + [super dealloc]; } @end Classes/Host.m @@ -11,50 +11,50 @@ @implementation NSNetService (MySortingMethods) -(int)compareByPriority:(NSNetService*)service { - - // should not be here. - NSArray *serviceOrder = [[[NSArray alloc]initWithObjects: - @"_presence._tcp.", // ichat 2 - @"_ichat._tcp.", - @"_ssh._tcp.", - @"_sftp._tcp.", - @"_afpovertcp._tcp.", - @"_hydra._tcp.", - @"_workstation._tcp.", - @"_ftp._tcp.", - @"_distcc._tcp.", - @"_iconquer._tcp.", - @"_raop._tcp.", - @"_airport._tcp.", - @"_printer._tcp.", - @"_ipp._tcp.", - @"_eppc._tcp.", - @"_smb._tcp.", - @"_clipboard._tcp.", - @"_teleport._tcp.", - @"_nfs._tcp.", - @"_omni-bookmark._tcp.", - @"_webdav._tcp.", - @"_dpap._tcp.", - @"_http._tcp.", - @"_daap._tcp.", - @"_dacp._tcp.", - @"_spike._tcp.", - @"_beep._tcp.", - @"_feed-sharing._tcp.", - @"_riousbprint._tcp.", - nil - ] autorelease]; - - int i1 = [serviceOrder indexOfObject:[self type]]; - int i2 = [serviceOrder indexOfObject:[service type]]; - - if (i1 < i2) - return NSOrderedAscending; - else if (i1 == i2) - return NSOrderedSame; - else - return NSOrderedDescending; + + // should not be here. + NSArray *serviceOrder = [[[NSArray alloc]initWithObjects: + @"_presence._tcp.", // ichat 2 + @"_ichat._tcp.", + @"_ssh._tcp.", + @"_sftp._tcp.", + @"_afpovertcp._tcp.", + @"_hydra._tcp.", + @"_workstation._tcp.", + @"_ftp._tcp.", + @"_distcc._tcp.", + @"_iconquer._tcp.", + @"_raop._tcp.", + @"_airport._tcp.", + @"_printer._tcp.", + @"_ipp._tcp.", + @"_eppc._tcp.", + @"_smb._tcp.", + @"_clipboard._tcp.", + @"_teleport._tcp.", + @"_nfs._tcp.", + @"_omni-bookmark._tcp.", + @"_webdav._tcp.", + @"_dpap._tcp.", + @"_http._tcp.", + @"_daap._tcp.", + @"_dacp._tcp.", + @"_spike._tcp.", + @"_beep._tcp.", + @"_feed-sharing._tcp.", + @"_riousbprint._tcp.", + nil + ] autorelease]; + + int i1 = [serviceOrder indexOfObject:[self type]]; + int i2 = [serviceOrder indexOfObject:[service type]]; + + if (i1 < i2) + return NSOrderedAscending; + else if (i1 == i2) + return NSOrderedSame; + else + return NSOrderedDescending; } @end Classes/NSNetService+Sortable.m @@ -15,77 +15,77 @@ @implementation RootViewController - (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newServices:) name:@"newServices" object:nil ]; - self.title = @"Servers"; + [super viewWillAppear:animated]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newServices:) name:@"newServices" object:nil ]; + self.title = @"Servers"; } -(void) newServices:(id)whatever { - [self.tableView reloadData]; + [self.tableView reloadData]; } - (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview - // Release anything that's not essential, such as cached data + [super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview + // Release anything that's not essential, such as cached data } #pragma mark Table view methods - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; + return 1; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - FlameTouchAppDelegate *delegate = (FlameTouchAppDelegate *)[[UIApplication sharedApplication] delegate]; - return [delegate.hosts count]; + FlameTouchAppDelegate *delegate = (FlameTouchAppDelegate *)[[UIApplication sharedApplication] delegate]; + return [delegate.hosts count]; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *CellIdentifier = @"HostCell"; - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease]; - - UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 0.0, 300.0, 25.0)]; - label.font = [UIFont systemFontOfSize:16.0]; - label.textAlignment = UITextAlignmentLeft; - label.textColor = [UIColor blackColor]; - label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; - label.tag = 1; - [cell.contentView addSubview:label]; - [label release]; - - label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 22.0, 300.0, 20.0)]; - label.font = [UIFont systemFontOfSize:12.0]; - label.textAlignment = UITextAlignmentLeft; - label.textColor = [UIColor grayColor]; - label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; - label.tag = 2; - [cell.contentView addSubview:label]; - [label release]; - - } + static NSString *CellIdentifier = @"HostCell"; + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease]; + + UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 0.0, 300.0, 25.0)]; + label.font = [UIFont systemFontOfSize:16.0]; + label.textAlignment = UITextAlignmentLeft; + label.textColor = [UIColor blackColor]; + label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; + label.tag = 1; + [cell.contentView addSubview:label]; + [label release]; + + label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 22.0, 300.0, 20.0)]; + label.font = [UIFont systemFontOfSize:12.0]; + label.textAlignment = UITextAlignmentLeft; + label.textColor = [UIColor grayColor]; + label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; + label.tag = 2; + [cell.contentView addSubview:label]; + [label release]; - FlameTouchAppDelegate *delegate = (FlameTouchAppDelegate *)[[UIApplication sharedApplication] delegate]; - Host *host = (Host*)[delegate.hosts objectAtIndex:indexPath.row]; - ((UILabel*)[cell viewWithTag:1]).text = [host name]; - ((UILabel*)[cell viewWithTag:2]).text = [NSString stringWithFormat:@"%@ (%@)", host.hostname, host.ip]; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - return cell; + } + + FlameTouchAppDelegate *delegate = (FlameTouchAppDelegate *)[[UIApplication sharedApplication] delegate]; + Host *host = (Host*)[delegate.hosts objectAtIndex:indexPath.row]; + ((UILabel*)[cell viewWithTag:1]).text = [host name]; + ((UILabel*)[cell viewWithTag:2]).text = [NSString stringWithFormat:@"%@ (%@)", host.hostname, host.ip]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // Navigation logic may go here. Create and push another view controller. - FlameTouchAppDelegate *delegate = (FlameTouchAppDelegate *)[[UIApplication sharedApplication] delegate]; - Host *host = (Host*)[delegate.hosts objectAtIndex:indexPath.row]; - - ServiceViewController *svc = [[ServiceViewController alloc] initWithHost:host]; - [self.navigationController pushViewController:svc animated:TRUE]; - [svc release]; + // Navigation logic may go here. Create and push another view controller. + FlameTouchAppDelegate *delegate = (FlameTouchAppDelegate *)[[UIApplication sharedApplication] delegate]; + Host *host = (Host*)[delegate.hosts objectAtIndex:indexPath.row]; + + ServiceViewController *svc = [[ServiceViewController alloc] initWithHost:host]; + [self.navigationController pushViewController:svc animated:TRUE]; + [svc release]; } - (void)dealloc { - [super dealloc]; + [super dealloc]; } Classes/RootViewController.m @@ -10,8 +10,8 @@ #import "Host.h" @interface ServiceViewController : UITableViewController { - Host *host; - NSDictionary *serviceNames; + Host *host; + NSDictionary *serviceNames; } - (id)initWithHost:(Host*)thehost; Classes/ServiceViewController.h @@ -11,153 +11,153 @@ @implementation ServiceViewController - + - (id)initWithHost:(Host*)thehost { - if ([super initWithStyle:UITableViewStylePlain] == nil) return nil; - - // this UTTERLY does not belong here. - serviceNames = [[NSDictionary alloc] initWithObjectsAndKeys: - @"iChat 2 presence", @"_presence._tcp.", - @"iChat 1 presence", @"_ichat._tcp.", - @"Remote login", @"_ssh._tcp.", - @"SFTP server", @"_sftp._tcp.", - @"Personal file sharing", @"_afpovertcp._tcp.", - @"SubEthaEdit document", @"_hydra._tcp.", - @"Workgroup Manager", @"_workstation._tcp.", - @"FTP server", @"_ftp._tcp.", - @"Xcode distributed compiler", @"_distcc._tcp.", - @"iConquer game server", @"_iconquer._tcp.", - @"AirTunes speaker", @"_raop._tcp.", - @"Airport base station", @"_airport._tcp.", - @"LPR printer sharing", @"_printer._tcp.", - @"Internet Printing Protocol", @"_ipp._tcp.", - @"Remote AppleEvents", @"_eppc._tcp.", - @"Windows file sharing", @"_smb._tcp.", - @"Shared clipboard", @"_clipboard._tcp.", - @"Teleport server", @"_teleport._tcp.", - @"NFS server", @"_nfs._tcp.", - @"OmniWeb shared bookmarks", @"_omni-bookmark._tcp.", - @"WebDav server", @"_webdav._tcp.", - @"iPhoto shared photos", @"_dpap._tcp.", - @"Web server", @"_http._tcp.", - @"iTunes shared music", @"_daap._tcp.", - @"iTunes remote control", @"_dacp._tcp.", - @"Spike shared clipboard", @"_spike._tcp.", - @"Xgrid distributed computing", @"_beep._tcp.", - @"NetNewsWire shared feed list", @"_feed-sharing._tcp.", - @"Airport Express printer sharing", @"_riousbprint._tcp.", - @"Safari Web page", @"_webbookmark._tcp.", - nil - ]; - - host = [thehost retain]; + if ([super initWithStyle:UITableViewStylePlain] == nil) return nil; + + // this UTTERLY does not belong here. + serviceNames = [[NSDictionary alloc] initWithObjectsAndKeys: + @"iChat 2 presence", @"_presence._tcp.", + @"iChat 1 presence", @"_ichat._tcp.", + @"Remote login", @"_ssh._tcp.", + @"SFTP server", @"_sftp._tcp.", + @"Personal file sharing", @"_afpovertcp._tcp.", + @"SubEthaEdit document", @"_hydra._tcp.", + @"Workgroup Manager", @"_workstation._tcp.", + @"FTP server", @"_ftp._tcp.", + @"Xcode distributed compiler", @"_distcc._tcp.", + @"iConquer game server", @"_iconquer._tcp.", + @"AirTunes speaker", @"_raop._tcp.", + @"Airport base station", @"_airport._tcp.", + @"LPR printer sharing", @"_printer._tcp.", + @"Internet Printing Protocol", @"_ipp._tcp.", + @"Remote AppleEvents", @"_eppc._tcp.", + @"Windows file sharing", @"_smb._tcp.", + @"Shared clipboard", @"_clipboard._tcp.", + @"Teleport server", @"_teleport._tcp.", + @"NFS server", @"_nfs._tcp.", + @"OmniWeb shared bookmarks", @"_omni-bookmark._tcp.", + @"WebDav server", @"_webdav._tcp.", + @"iPhoto shared photos", @"_dpap._tcp.", + @"Web server", @"_http._tcp.", + @"iTunes shared music", @"_daap._tcp.", + @"iTunes remote control", @"_dacp._tcp.", + @"Spike shared clipboard", @"_spike._tcp.", + @"Xgrid distributed computing", @"_beep._tcp.", + @"NetNewsWire shared feed list", @"_feed-sharing._tcp.", + @"Airport Express printer sharing", @"_riousbprint._tcp.", + @"Safari Web page", @"_webbookmark._tcp.", + nil + ]; + + host = [thehost retain]; + + UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, 600.0, 64.0)]; + + UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 0.0, 300.0, 25.0)]; + label.font = [UIFont systemFontOfSize:16.0]; + label.textAlignment = UITextAlignmentLeft; + label.textColor = [UIColor blackColor]; + label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; + label.text = [host name]; + [header addSubview:label]; + [label release]; + + label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 22.0, 300.0, 40.0)]; + label.font = [UIFont systemFontOfSize:12.0]; + label.textAlignment = UITextAlignmentLeft; + label.textColor = [UIColor grayColor]; + label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; + label.numberOfLines = 2; + // TODO - don't hard-code the service count here, it can change dynamically. + label.text = [NSString stringWithFormat:@"%@ (%@)\n%d services", host.hostname, host.ip, [host serviceCount]]; + [header addSubview:label]; + + [label release]; + + UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, header.frame.size.height - 1, 600, 1)]; + line.backgroundColor = [UIColor grayColor]; + [header addSubview:line]; + [line release]; + + self.tableView.tableHeaderView = header; + [header release]; + + self.tableView.delegate = self; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newServices:) name:@"newServices" object:nil ]; + self.title = [host name]; + + return self; +} - UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, 600.0, 64.0)]; +-(void) newServices:(id)whatever { + [self.tableView reloadData]; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return [host serviceCount]; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *CellIdentifier = @"ServiceCell"; + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; + if (cell == nil) { + cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease]; + UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 0.0, 300.0, 25.0)]; label.font = [UIFont systemFontOfSize:16.0]; label.textAlignment = UITextAlignmentLeft; label.textColor = [UIColor blackColor]; label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; - label.text = [host name]; - [header addSubview:label]; + label.tag = 1; + [cell.contentView addSubview:label]; [label release]; - label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 22.0, 300.0, 40.0)]; + label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 22.0, 300.0, 20.0)]; label.font = [UIFont systemFontOfSize:12.0]; label.textAlignment = UITextAlignmentLeft; label.textColor = [UIColor grayColor]; label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; - label.numberOfLines = 2; - // TODO - don't hard-code the service count here, it can change dynamically. - label.text = [NSString stringWithFormat:@"%@ (%@)\n%d services", host.hostname, host.ip, [host serviceCount]]; - [header addSubview:label]; - + label.tag = 2; + [cell.contentView addSubview:label]; [label release]; - - UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, header.frame.size.height - 1, 600, 1)]; - line.backgroundColor = [UIColor grayColor]; - [header addSubview:line]; - [line release]; - - self.tableView.tableHeaderView = header; - [header release]; - - self.tableView.delegate = self; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(newServices:) name:@"newServices" object:nil ]; - self.title = [host name]; - - return self; -} - --(void) newServices:(id)whatever { - [self.tableView reloadData]; -} - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [host serviceCount]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *CellIdentifier = @"ServiceCell"; - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease]; - - UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 0.0, 300.0, 25.0)]; - label.font = [UIFont systemFontOfSize:16.0]; - label.textAlignment = UITextAlignmentLeft; - label.textColor = [UIColor blackColor]; - label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; - label.tag = 1; - [cell.contentView addSubview:label]; - [label release]; - - label = [[UILabel alloc] initWithFrame:CGRectMake(5.0, 22.0, 300.0, 20.0)]; - label.font = [UIFont systemFontOfSize:12.0]; - label.textAlignment = UITextAlignmentLeft; - label.textColor = [UIColor grayColor]; - label.autoresizingMask = UIViewAutoresizingFlexibleRightMargin; - label.tag = 2; - [cell.contentView addSubview:label]; - [label release]; + } + + NSNetService *service = [host serviceAtIndex:indexPath.row]; + NSString *text = [serviceNames objectForKey:[service type]]; + if (text == nil) { + ((UILabel*)[cell viewWithTag:1]).text = [NSString stringWithFormat:@"%@:%i", [service type], [service port]]; + } else { + ((UILabel*)[cell viewWithTag:1]).text = [NSString stringWithFormat:@"%@ (%@:%i)", text, [service type], [service port]]; + } + ((UILabel*)[cell viewWithTag:2]).text = [service name]; + + NSURL *anURL = [NSURL URLWithString:[service name]]; + if (anURL && [service name]) { + if ([[service name] rangeOfString:@":"].location != NSNotFound) { + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; } - - NSNetService *service = [host serviceAtIndex:indexPath.row]; - NSString *text = [serviceNames objectForKey:[service type]]; - if (text == nil) { - ((UILabel*)[cell viewWithTag:1]).text = [NSString stringWithFormat:@"%@:%i", [service type], [service port]]; - } else { - ((UILabel*)[cell viewWithTag:1]).text = [NSString stringWithFormat:@"%@ (%@:%i)", text, [service type], [service port]]; - } - ((UILabel*)[cell viewWithTag:2]).text = [service name]; - - NSURL *anURL = [NSURL URLWithString:[service name]]; - if (anURL && [service name]) { - if ([[service name] rangeOfString:@":"].location != NSNotFound) { - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - } - } - - return cell; + } + + return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - UILabel * URLLabel = (UILabel*)[[tableView cellForRowAtIndexPath:indexPath] viewWithTag:2]; - if (URLLabel.text != nil) { - NSURL *theURL = [NSURL URLWithString:URLLabel.text]; - [[UIApplication sharedApplication] openURL:theURL]; - } + UILabel * URLLabel = (UILabel*)[[tableView cellForRowAtIndexPath:indexPath] viewWithTag:2]; + if (URLLabel.text != nil) { + NSURL *theURL = [NSURL URLWithString:URLLabel.text]; + [[UIApplication sharedApplication] openURL:theURL]; + } } - (void)dealloc { - [serviceNames release]; - [host release]; - [super dealloc]; + [serviceNames release]; + [host release]; + [super dealloc]; } Classes/ServiceViewController.m @@ -3,6 +3,6 @@ // #ifdef __OBJC__ - #import <Foundation/Foundation.h> - #import <UIKit/UIKit.h> +#import <Foundation/Foundation.h> +#import <UIKit/UIKit.h> #endif FlameTouch_Prefix.pch @@ -9,9 +9,9 @@ #import <UIKit/UIKit.h> int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, nil); - [pool release]; - return retVal; + + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + int retVal = UIApplicationMain(argc, argv, nil, nil); + [pool release]; + return retVal; } main.m 550cc5dabec64e573deb0b7445c726eb67376645 Tom Insam tom@jerakeen.org http://github.com/jerakeen/flametouch/commit/4a6eff0aa57619453ac32f76460d00be0dd90d9d 4a6eff0aa57619453ac32f76460d00be0dd90d9d 2009-06-26T04:01:55-07:00 2009-06-26T04:01:55-07:00 whitespace. 8ad1385eb0daeaca6d2061bb3e568dcc7ac93199 Tom Insam tom@jerakeen.org