From 1cf42fddd2cd94a533055f249b1e8785ecf4f27e Mon Sep 17 00:00:00 2001 From: Roy Yang Date: Thu, 9 Aug 2012 11:06:38 -0700 Subject: [PATCH] add sites tweaks --- media/ios/Classes/FeedDetailTableCell.m | 1 + media/ios/Classes/FindSitesViewController.m | 35 ++++++--------------- media/ios/Classes/Utilities.m | 2 +- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/media/ios/Classes/FeedDetailTableCell.m b/media/ios/Classes/FeedDetailTableCell.m index 4f8d002e8..18cf01000 100644 --- a/media/ios/Classes/FeedDetailTableCell.m +++ b/media/ios/Classes/FeedDetailTableCell.m @@ -31,6 +31,7 @@ static UIFont *indicatorFont = nil; @synthesize feedColorBarTopBorder; @synthesize hasAlpha; + #define leftMargin 39 #define rightMargin 18 diff --git a/media/ios/Classes/FindSitesViewController.m b/media/ios/Classes/FindSitesViewController.m index 24cd304e4..70fd1b3ba 100644 --- a/media/ios/Classes/FindSitesViewController.m +++ b/media/ios/Classes/FindSitesViewController.m @@ -47,8 +47,9 @@ return self; } -- (void)viewDidLoad -{ +- (void)viewDidLoad { + + self.sitesTable.separatorStyle = UITableViewCellSeparatorStyleNone; // loading indicator UIActivityIndicatorView *loader = [[UIActivityIndicatorView alloc] @@ -171,21 +172,9 @@ // int statusCode = [request responseStatusCode]; self.sites = [results objectForKey:@"feeds"]; - - for (int i = 0; i < self.sites.count; i++) { - NSString *feedId = [[self.sites objectAtIndex:i] objectForKey:@"id"]; - NSString *favicon = [[self.sites objectAtIndex:i] objectForKey:@"favicon"]; - if ((NSNull *)favicon != [NSNull null] && [favicon length] > 0) { - NSData *imageData = [NSData dataWithBase64EncodedString:favicon]; - UIImage *faviconImage = [UIImage imageWithData:imageData]; - [Utilities saveImage:faviconImage feedId:feedId]; - } - } [self.sitesTable reloadData]; - - NSString *originalSearchTerm = [NSString stringWithFormat:@"%@", [results objectForKey:@"term"]]; if ([self.searchTerm_ isEqualToString:originalSearchTerm]) { [self.loadingIndicator_ stopAnimating]; @@ -281,9 +270,13 @@ cell.feedColorBarTopBorder = UIColorFromRGB(colorBorder); // favicon - NSString *feedIdStr = [NSString stringWithFormat:@"%@", [site valueForKey:@"id"]]; - cell.siteFavicon = [Utilities getImage:feedIdStr]; + NSString *faviconStr = [NSString stringWithFormat:@"%@", [site valueForKey:@"favicon"]]; + NSData *imageData = [NSData dataWithBase64EncodedString:faviconStr]; + UIImage *faviconImage = [UIImage imageWithData:imageData]; + + cell.siteFavicon = faviconImage; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + return cell; } } @@ -336,15 +329,7 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [self.sitesSearchBar resignFirstResponder]; [appDelegate.modalNavigationController pushViewController:appDelegate.addSiteViewController animated:YES]; -} - -- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { -// NSInteger currentRow = indexPath.row; -// int row = currentRow; -// [self.sitesSearchBar resignFirstResponder]; - -// [appDelegate.modalNavigationController pushViewController:appDelegate.userProfileViewController animated:YES]; -// [appDelegate.userProfileViewController getUserProfile]; + } @end diff --git a/media/ios/Classes/Utilities.m b/media/ios/Classes/Utilities.m index cff333ee5..c9bc4e27e 100644 --- a/media/ios/Classes/Utilities.m +++ b/media/ios/Classes/Utilities.m @@ -41,7 +41,7 @@ static NSMutableDictionary *imageCache; } // Save image to memory-based cache, for performance when reading. -// NSLog(@"Saving %@", [imageCache allKeys]); + NSLog(@"Saving %@", [imageCache allKeys]); if (image) { [imageCache setObject:image forKey:filename]; } else {