From a14cc19fb021a74be4c2d756eab040c95b3a487e Mon Sep 17 00:00:00 2001 From: matt handler Date: Fri, 22 Apr 2011 17:31:11 -0400 Subject: just some small cleanup, moved the navbar image thing to main app delegate, --- Classes/PicCastAppDelegate.m | 15 ++ Classes/TopicsViewController.m | 308 +++++++++++++------------------------- PicCast.xcodeproj/handler.mode1v3 | 20 ++- PicCast.xcodeproj/handler.pbxuser | 193 ++++++++++++++++++++---- 4 files changed, 296 insertions(+), 240 deletions(-) diff --git a/Classes/PicCastAppDelegate.m b/Classes/PicCastAppDelegate.m index baa06df..ab242ec 100644 --- a/Classes/PicCastAppDelegate.m +++ b/Classes/PicCastAppDelegate.m @@ -10,6 +10,21 @@ #import +@implementation UINavigationBar (CustomImage) +- (void)drawRect:(CGRect)rect { + //NSLog(@"titlebar: %@", self.barStyle); + if (self.barStyle == UIBarStyleDefault) { + UIImage *image = [UIImage imageNamed: @"titleBarBackground.png"]; + [image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; + } + else { + UIImage *image = [UIImage imageNamed: @"titleBarBackgroundBlack.png"]; + [image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; + } + //[super drawRect:rect]; +} +@end + @implementation PicCastAppDelegate @synthesize window; diff --git a/Classes/TopicsViewController.m b/Classes/TopicsViewController.m index 51edcba..8bd4531 100644 --- a/Classes/TopicsViewController.m +++ b/Classes/TopicsViewController.m @@ -17,22 +17,6 @@ #import "HJManagedImageV.h" #import "SourcesEditViewController.h" - -@implementation UINavigationBar (CustomImage) -- (void)drawRect:(CGRect)rect { - //NSLog(@"titlebar: %@", self.barStyle); - if (self.barStyle == UIBarStyleDefault) { - UIImage *image = [UIImage imageNamed: @"titleBarBackground.png"]; - [image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; - } - else { - UIImage *image = [UIImage imageNamed: @"titleBarBackgroundBlack.png"]; - [image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; - } - //[super drawRect:rect]; -} -@end - @implementation TopicsViewController @synthesize topics, parser, tableView; @@ -65,25 +49,6 @@ [self startParsing]; } -//- (UINavigationController *)topicsNavigationController { -// if (topicsNavigationController == nil) { -// topicsNavigationController = [[UINavigationController alloc] initWithRootViewController:self.picDumpViewController]; -// } -// return topicsNavigationController; -//} -// -//- (PicDumpViewController *)picDumpViewController { -// if (picDumpViewController == nil) { -// picDumpViewController = [[PicDumpViewController alloc] initWithNibName:@"PicDumpViewController" bundle:nil]; -// } -// return picDumpViewController; -//} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - // Return the number of rows in the section. - return [topics count]; -} - - (void) sourcesEditViewControllerDidFinish:(SourcesEditViewController *)controller { [self dismissModalViewControllerAnimated:YES]; @@ -107,6 +72,82 @@ return photoViewController; } +#pragma mark - +#pragma mark View lifecycle + +/* +- (void)viewDidLoad { + [super viewDidLoad]; + + // Uncomment the following line to display an Edit button in the navigation bar for this view controller. + // self.navigationItem.rightBarButtonItem = self.editButtonItem; +} +*/ + +/* +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; +} +*/ +/* +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; +} +*/ +/* +- (void)viewWillDisappear:(BOOL)animated { + [super viewWillDisappear:animated]; +} +*/ +/* +- (void)viewDidDisappear:(BOOL)animated { + [super viewDidDisappear:animated]; +} +*/ +/* +// Override to allow orientations other than the default portrait orientation. +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + // Return YES for supported orientations. + return (interfaceOrientation == UIInterfaceOrientationPortrait); +} +*/ + + +#pragma mark - +#pragma mark Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + // Return the number of sections. + return 2; +} + +#pragma mark - +#pragma mark Table view delegate + +//- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { +// // Navigation logic may go here. Create and push another view controller. +// /* +// <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; +// // ... +// // Pass the selected object to the new view controller. +// [self.navigationController pushViewController:detailViewController animated:YES]; +// [detailViewController release]; +// */ +//} + + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + // Return the number of rows in the section. + return [topics count]; +} + +- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { + if (section == 0) + return @"Today"; + else + return @"Yesterday"; +} + - (void)setSelected:(BOOL)selected animated:(BOOL)animated { [super setSelected:selected animated:animated]; @@ -121,31 +162,13 @@ } } -- (void)startParsing { - NSLog(@"startParsing"); - //self.navigationItem.rightBarButtonItem.enabled = NO; - // Reset the title - //self.title = NSLocalizedString(@"Getting Recent Picdumps...", @"Loading"); - // Allocate the array for song storage, or empty the results of previous parses - if (topics == nil) { - self.topics = [NSMutableArray array]; - } else { - [topics removeAllObjects]; - [self.tableView reloadData]; - } - // Create the parser, set its delegate, and start it. - self.parser = [[[AcidCowFeedburnerParser alloc] init] autorelease]; - parser.delegate = self; - [parser start]; -} - //- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath //{ // return 100; //} - (UITableViewCell *)tableView:(UITableView *)tv cellForRowAtIndexPath:(NSIndexPath *)indexPath { - + static NSString *kCellIdentifier = @"TopicTableViewCell"; TopicTableViewCell *cell = (TopicTableViewCell *)[self.tableView dequeueReusableCellWithIdentifier:kCellIdentifier]; @@ -168,7 +191,7 @@ mi.tag = 999; [cell addSubview:micon]; [cell addSubview:mi]; - + } else { //Get a reference to the managed image view that was already in the recycled cell, and clear it @@ -177,44 +200,30 @@ [micon clear]; [mi clear]; } - + //cell.useDarkBackground = (indexPath.row % 2 == 0); cell.title = [[topics objectAtIndex:indexPath.row] title]; cell.picCount = [NSString stringWithFormat:@"%@", [[topics objectAtIndex:indexPath.row] picCount]]; - //cell.iconUrl = [[topics objectAtIndex:indexPath.row] iconUrl]; - -// CGRect frame; -// frame.size.width=94; frame.size.height=94; -// frame.origin.x=3; frame.origin.y=3; -// AsyncImageView* asyncImage = [[[AsyncImageView alloc] -// initWithFrame:frame] autorelease]; -// asyncImage.tag = 999; -// NSURL* url = [imageDownload -// thumbnailURLAtIndex:indexPath.row]; + micon.url = [NSURL URLWithString:@"http://www.acidcow.com/favicon.ico"]; mi.url = [NSURL URLWithString:[[topics objectAtIndex:indexPath.row] iconUrl]]; mi.squareCropped = true; - //tell the object manager to manage the managed image view, - //this causes the cached image to display, or the image to be loaded, cached, and displayed [objMan manage:mi]; [objMan manage:micon]; -// [asyncImage loadImageFromURL:url]; - -// [cell.contentView addSubview:asyncImage]; return cell; } - (void)tableView:(UITableView *)table didSelectRowAtIndexPath:(NSIndexPath *)indexPath { -// self.picDumpViewController.topic = [topics objectAtIndex:indexPath.row]; + // self.picDumpViewController.topic = [topics objectAtIndex:indexPath.row]; self.navigationItem.backBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"back" - style:UIBarButtonItemStyleBordered - target:nil - action:nil]; -// [self.navigationController pushViewController:picDumpViewController animated:YES]; -// + style:UIBarButtonItemStyleBordered + target:nil + action:nil]; + // [self.navigationController pushViewController:picDumpViewController animated:YES]; + // photoViewController = [[[PhotoViewController alloc] init] autorelease]; photoViewController.topic = [topics objectAtIndex:indexPath.row]; [self.navigationController pushViewController:photoViewController animated:YES]; @@ -223,6 +232,24 @@ #pragma mark Implementation +- (void)startParsing { + NSLog(@"startParsing"); + //self.navigationItem.rightBarButtonItem.enabled = NO; + // Reset the title + //self.title = NSLocalizedString(@"Getting Recent Picdumps...", @"Loading"); + // Allocate the array for song storage, or empty the results of previous parses + if (topics == nil) { + self.topics = [NSMutableArray array]; + } else { + [topics removeAllObjects]; + [self.tableView reloadData]; + } + // Create the parser, set its delegate, and start it. + self.parser = [[[AcidCowFeedburnerParser alloc] init] autorelease]; + parser.delegate = self; + [parser start]; +} + - (void)parserDidEndParsingData:(XMLParser *)parser { //self.title = [NSString stringWithFormat:NSLocalizedString(@"Recent Picdumps (%d)", @"Recent"), [topics count]]; [self.tableView reloadData]; @@ -248,133 +275,6 @@ // handle errors as appropriate to your application... } -#pragma mark - -#pragma mark View lifecycle - -/* -- (void)viewDidLoad { - [super viewDidLoad]; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; -} -*/ - -/* -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; -} -*/ -/* -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} -*/ -/* -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; -} -*/ -/* -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; -} -*/ -/* -// Override to allow orientations other than the default portrait orientation. -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations. - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} -*/ - - -#pragma mark - -#pragma mark Table view data source - -//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { -// // Return the number of sections. -// return <#number of sections#>; -//} -// -// -//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { -// // Return the number of rows in the section. -// return <#number of rows in section#>; -//} - - -// Customize the appearance of table view cells. -//- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { -// -// static NSString *CellIdentifier = @"Cell"; -// -// UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; -// if (cell == nil) { -// cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; -// } -// -// // Configure the cell... -// -// return cell; -//} - - -/* -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the specified item to be editable. - return YES; -} -*/ - - -/* -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { - - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source. - [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade]; - } - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view. - } -} -*/ - - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath { -} -*/ - - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath { - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - - -#pragma mark - -#pragma mark Table view delegate - -//- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { -// // Navigation logic may go here. Create and push another view controller. -// /* -// <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; -// // ... -// // Pass the selected object to the new view controller. -// [self.navigationController pushViewController:detailViewController animated:YES]; -// [detailViewController release]; -// */ -//} - - #pragma mark - #pragma mark Memory management diff --git a/PicCast.xcodeproj/handler.mode1v3 b/PicCast.xcodeproj/handler.mode1v3 index 4cdeec7..3c79e35 100644 --- a/PicCast.xcodeproj/handler.mode1v3 +++ b/PicCast.xcodeproj/handler.mode1v3 @@ -266,7 +266,6 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 4ECFB853135FD22C007FAB8D - 4ED6DB10135A192700BEF0B7 29B97323FDCFA39411CA2CEA 1C37FBAC04509CD000000102 1CC0EA4004350EF90041110B @@ -274,8 +273,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 26 - 16 + 24 3 0 @@ -318,7 +316,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - HJMOHandler.m + TopicsViewController.m PBXSplitModuleInNavigatorKey Split0 @@ -326,11 +324,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - HJMOHandler.m + TopicsViewController.m _historyCapacity 0 bookmark - 4E8CFE361362046700B810C6 + 4E8CFE5313622A7900B810C6 history 4E68286F1359595F001EB808 @@ -350,10 +348,8 @@ 4ECFB8F2135FE28C007FAB8D 4EBFCB481360E786005AC5CC 4EBFCB791360F428005AC5CC - 4EBFCB7A1360F428005AC5CC 4EBFCBD11360FA86005AC5CC 4EBFCBE51360FD85005AC5CC - 4E067D381361413100D43FE0 4E067D391361413100D43FE0 4E067D3A1361413100D43FE0 4E067D3B1361413100D43FE0 @@ -365,10 +361,12 @@ 4E8CFE0B1361FCE200B810C6 4E8CFE0C1361FCE200B810C6 4E8CFE211361FEEF00B810C6 - 4E8CFE2B1361FFAD00B810C6 4E8CFE301362039700B810C6 4E8CFE311362039700B810C6 - 4E8CFE351362046700B810C6 + 4E8CFE3D136217F800B810C6 + 4E8CFE3E136217F800B810C6 + 4E8CFE4913622A3600B810C6 + 4E8CFE4A13622A3600B810C6 SplitCount @@ -566,7 +564,7 @@ 5 WindowOrderList - 4E8CFE371362046700B810C6 + 4E8CFE5413622A7900B810C6 1C530D57069F1CE1000CFCEE 4E8CFDA41361EF4E00B810C6 4E8CFDA51361EF4E00B810C6 diff --git a/PicCast.xcodeproj/handler.pbxuser b/PicCast.xcodeproj/handler.pbxuser index e833cbd..7ca1039 100644 --- a/PicCast.xcodeproj/handler.pbxuser +++ b/PicCast.xcodeproj/handler.pbxuser @@ -9,9 +9,9 @@ }; 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 1781}}"; - sepNavSelRange = "{1088, 146}"; - sepNavVisRange = "{347, 1279}"; + sepNavIntBoundsRect = "{{0, 0}, {1965, 1937}}"; + sepNavSelRange = "{764, 0}"; + sepNavVisRange = "{2008, 2104}"; }; }; 1D6058900D05DD3D006BFB54 /* PicCast */ = { @@ -185,6 +185,19 @@ 4E8CFE321362039700B810C6 /* PBXTextBookmark */ = 4E8CFE321362039700B810C6 /* PBXTextBookmark */; 4E8CFE351362046700B810C6 /* PBXTextBookmark */ = 4E8CFE351362046700B810C6 /* PBXTextBookmark */; 4E8CFE361362046700B810C6 /* PBXTextBookmark */ = 4E8CFE361362046700B810C6 /* PBXTextBookmark */; + 4E8CFE3A136207C900B810C6 /* PBXTextBookmark */ = 4E8CFE3A136207C900B810C6 /* PBXTextBookmark */; + 4E8CFE3D136217F800B810C6 /* PBXTextBookmark */ = 4E8CFE3D136217F800B810C6 /* PBXTextBookmark */; + 4E8CFE3E136217F800B810C6 /* PBXTextBookmark */ = 4E8CFE3E136217F800B810C6 /* PBXTextBookmark */; + 4E8CFE3F136217F800B810C6 /* PBXTextBookmark */ = 4E8CFE3F136217F800B810C6 /* PBXTextBookmark */; + 4E8CFE40136217F800B810C6 /* PBXTextBookmark */ = 4E8CFE40136217F800B810C6 /* PBXTextBookmark */; + 4E8CFE43136229DD00B810C6 /* PBXTextBookmark */ = 4E8CFE43136229DD00B810C6 /* PBXTextBookmark */; + 4E8CFE44136229DD00B810C6 /* PBXTextBookmark */ = 4E8CFE44136229DD00B810C6 /* PBXTextBookmark */; + 4E8CFE45136229DD00B810C6 /* PBXTextBookmark */ = 4E8CFE45136229DD00B810C6 /* PBXTextBookmark */; + 4E8CFE4913622A3600B810C6 /* PBXTextBookmark */ = 4E8CFE4913622A3600B810C6 /* PBXTextBookmark */; + 4E8CFE4A13622A3600B810C6 /* PBXTextBookmark */ = 4E8CFE4A13622A3600B810C6 /* PBXTextBookmark */; + 4E8CFE4B13622A3600B810C6 /* PBXTextBookmark */ = 4E8CFE4B13622A3600B810C6 /* PBXTextBookmark */; + 4E8CFE4F13622A5D00B810C6 /* PBXTextBookmark */ = 4E8CFE4F13622A5D00B810C6 /* PBXTextBookmark */; + 4E8CFE5313622A7900B810C6 /* PBXTextBookmark */ = 4E8CFE5313622A7900B810C6 /* PBXTextBookmark */; 4EA96020135CF43B009243EE = 4EA96020135CF43B009243EE /* PBXTextBookmark */; 4EA96027135CF455009243EE = 4EA96027135CF455009243EE /* PBXTextBookmark */; 4EBFCB481360E786005AC5CC = 4EBFCB481360E786005AC5CC /* PBXTextBookmark */; @@ -216,7 +229,7 @@ fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; name = "PicCastAppDelegate.m: 37"; rLen = 146; - rLoc = 1088; + rLoc = 1629; rType = 0; vrLen = 1279; vrLoc = 347; @@ -256,7 +269,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 61"; rLen = 0; - rLoc = 2295; + rLoc = 1753; rType = 0; vrLen = 1105; vrLoc = 4367; @@ -266,7 +279,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 194"; rLen = 0; - rLoc = 6881; + rLoc = 2676; rType = 0; vrLen = 1295; vrLoc = 6246; @@ -331,18 +344,18 @@ }; 4E6827E713594115001EB808 /* TopicsViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {915, 494}}"; - sepNavSelRange = "{781, 0}"; - sepNavVisRange = "{0, 1239}"; + sepNavIntBoundsRect = "{{0, 0}, {915, 600}}"; + sepNavSelRange = "{1082, 0}"; + sepNavVisRange = "{0, 1328}"; sepNavWindowFrame = "{{15, 323}, {1196, 550}}"; }; }; 4E6827E813594115001EB808 /* TopicsViewController.m */ = { uiCtxt = { - sepNavFolds = "{\n c = (\n {\n l = \"number of sections\";\n r = \"{10627, 22}\";\n s = 1;\n },\n {\n l = \"number of rows in section\";\n r = \"{10818, 29}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{12984, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{13035, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{13085, 12}\";\n s = 1;\n }\n );\n r = \"{0, 13891}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {936, 5226}}"; - sepNavSelRange = "{6949, 0}"; - sepNavVisRange = "{6045, 2028}"; + sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{4018, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{4069, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{4119, 12}\";\n s = 1;\n }\n );\n r = \"{0, 10217}\";\n s = 0;\n}"; + sepNavIntBoundsRect = "{{0, 0}, {964, 4186}}"; + sepNavSelRange = "{4586, 0}"; + sepNavVisRange = "{3723, 1446}"; sepNavWindowFrame = "{{15, 323}, {1196, 550}}"; }; }; @@ -434,7 +447,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 194"; rLen = 0; - rLoc = 6881; + rLoc = 2676; rType = 0; vrLen = 1278; vrLoc = 6263; @@ -456,7 +469,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 194"; rLen = 0; - rLoc = 6881; + rLoc = 2676; rType = 0; vrLen = 1278; vrLoc = 6263; @@ -632,7 +645,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 194"; rLen = 0; - rLoc = 6881; + rLoc = 2676; rType = 0; vrLen = 1349; vrLoc = 947; @@ -931,7 +944,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 200"; rLen = 0; - rLoc = 7233; + rLoc = 2676; rType = 0; vrLen = 1176; vrLoc = 6282; @@ -1075,7 +1088,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 200"; rLen = 0; - rLoc = 7233; + rLoc = 2676; rType = 0; vrLen = 2041; vrLoc = 6045; @@ -1097,7 +1110,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 200"; rLen = 0; - rLoc = 7233; + rLoc = 2676; rType = 0; vrLen = 2028; vrLoc = 6045; @@ -1159,7 +1172,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 200"; rLen = 0; - rLoc = 7233; + rLoc = 2676; rType = 0; vrLen = 2028; vrLoc = 6045; @@ -1169,7 +1182,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 194"; rLen = 0; - rLoc = 6949; + rLoc = 2676; rType = 0; vrLen = 2028; vrLoc = 6045; @@ -1191,7 +1204,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 194"; rLen = 0; - rLoc = 6949; + rLoc = 2676; rType = 0; vrLen = 2028; vrLoc = 6045; @@ -1266,6 +1279,136 @@ vrLen = 1894; vrLoc = 9307; }; + 4E8CFE3A136207C900B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; + name = "HJMOHandler.m: 354"; + rLen = 0; + rLoc = 10212; + rType = 0; + vrLen = 1973; + vrLoc = 9307; + }; + 4E8CFE3D136217F800B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; + name = "HJMOHandler.m: 354"; + rLen = 0; + rLoc = 10212; + rType = 0; + vrLen = 1874; + vrLoc = 9375; + }; + 4E8CFE3E136217F800B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E713594115001EB808 /* TopicsViewController.h */; + name = "TopicsViewController.h: 32"; + rLen = 0; + rLoc = 1082; + rType = 0; + vrLen = 1328; + vrLoc = 0; + }; + 4E8CFE3F136217F800B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 194"; + rLen = 0; + rLoc = 2676; + rType = 0; + vrLen = 1978; + vrLoc = 781; + }; + 4E8CFE40136217F800B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 88"; + rLen = 0; + rLoc = 2676; + rType = 0; + vrLen = 1742; + vrLoc = 2170; + }; + 4E8CFE43136229DD00B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 18"; + rLen = 0; + rLoc = 440; + rType = 0; + vrLen = 1953; + vrLoc = 149; + }; + 4E8CFE44136229DD00B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 37"; + rLen = 146; + rLoc = 1629; + rType = 0; + vrLen = 1721; + vrLoc = 225; + }; + 4E8CFE45136229DD00B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 26"; + rLen = 0; + rLoc = 764; + rType = 0; + vrLen = 1524; + vrLoc = 3; + }; + 4E8CFE4913622A3600B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* PicCastAppDelegate.m */; + name = "PicCastAppDelegate.m: 26"; + rLen = 0; + rLoc = 764; + rType = 0; + vrLen = 2104; + vrLoc = 2008; + }; + 4E8CFE4A13622A3600B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 18"; + rLen = 0; + rLoc = 440; + rType = 0; + vrLen = 1953; + vrLoc = 149; + }; + 4E8CFE4B13622A3600B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 148"; + rLen = 0; + rLoc = 4693; + rType = 0; + vrLen = 1535; + vrLoc = 3618; + }; + 4E8CFE4F13622A5D00B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 121"; + rLen = 0; + rLoc = 3773; + rType = 0; + vrLen = 1471; + vrLoc = 3654; + }; + 4E8CFE5313622A7900B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 145"; + rLen = 0; + rLoc = 4643; + rType = 0; + vrLen = 1503; + vrLoc = 3723; + }; 4EA95FC9135CE8C3009243EE /* PhotoSource.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {903, 2509}}"; @@ -1346,7 +1489,7 @@ fRef = 4E6827E713594115001EB808 /* TopicsViewController.h */; name = "TopicsViewController.h: 27"; rLen = 0; - rLoc = 781; + rLoc = 808; rType = 0; vrLen = 1239; vrLoc = 0; @@ -1503,9 +1646,9 @@ }; 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1048, 4888}}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 4862}}"; sepNavSelRange = "{10212, 0}"; - sepNavVisRange = "{9307, 1894}"; + sepNavVisRange = "{9375, 1905}"; }; }; 4ED6DB1C135A194A00BEF0B7 /* HJMOHandler.h */ = { -- cgit v1.2.3