From af836c03ec9bf1bcaf2aa0543f9ee27f9d35ec01 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 11 Nov 2010 23:48:27 -0500 Subject: [PATCH] Adding login and logout, and storing session information in iPhone app. --- apps/reader/views.py | 8 +- .../iphone/Classes/FeedDetailViewController.m | 2 +- media/iphone/Classes/LoginViewController.h | 2 +- media/iphone/Classes/LoginViewController.m | 43 +- media/iphone/Classes/NewsBlurAppDelegate.h | 2 + media/iphone/Classes/NewsBlurAppDelegate.m | 26 +- media/iphone/Classes/NewsBlurViewController.h | 12 +- media/iphone/Classes/NewsBlurViewController.m | 62 +- .../Classes/StoryDetailViewController.h | 2 +- media/iphone/MainWindow.xib | 595 +++++++++- .../iphone/NewsBlur.xcodeproj/conesus.mode1v3 | 245 ++-- .../iphone/NewsBlur.xcodeproj/conesus.pbxuser | 1004 +++++++++++++---- .../iphone/NewsBlur.xcodeproj/project.pbxproj | 863 +++++++++++++- media/iphone/NewsBlurViewController.xib | 631 ++++++++++- 14 files changed, 2985 insertions(+), 512 deletions(-) diff --git a/apps/reader/views.py b/apps/reader/views.py index eda24dab7..bcb38d222 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -112,7 +112,10 @@ def logout(request): from django.contrib.auth import logout logout(request) - return HttpResponseRedirect(reverse('index')) + if request.GET.get('api'): + return HttpResponse(json.encode(dict(code=1)), mimetype='application/json') + else: + return HttpResponseRedirect(reverse('index')) @json.json_view def load_feeds(request): @@ -165,6 +168,7 @@ def load_feeds(request): data = dict(feeds=feeds, folders=json.decode(folders.folders)) return data +@ajax_login_required @json.json_view def load_feeds_iphone(request): user = get_user(request) @@ -195,7 +199,7 @@ def load_feeds_iphone(request): def make_feeds_folder(items, parent_folder="", depth=0): for item in items: - if isinstance(item, int): + if isinstance(item, int) and item in feeds: feed = feeds[item] if not parent_folder: parent_folder = ' ' diff --git a/media/iphone/Classes/FeedDetailViewController.m b/media/iphone/Classes/FeedDetailViewController.m index c6f5b4819..be0092ca9 100644 --- a/media/iphone/Classes/FeedDetailViewController.m +++ b/media/iphone/Classes/FeedDetailViewController.m @@ -69,7 +69,7 @@ - (void)fetchFeedDetail { if ([appDelegate.activeFeed objectForKey:@"id"] != nil) { - NSString *theFeedDetailURL = [[NSString alloc] initWithFormat:@"http://www.newsblur.com/reader/load_single_feed/?feed_id=%@", + NSString *theFeedDetailURL = [[NSString alloc] initWithFormat:@"http://nb.local.host:8000/reader/load_single_feed/?feed_id=%@", [appDelegate.activeFeed objectForKey:@"id"]]; //NSLog(@"Url: %@", theFeedDetailURL); NSURL *urlFeedDetail = [NSURL URLWithString:theFeedDetailURL]; diff --git a/media/iphone/Classes/LoginViewController.h b/media/iphone/Classes/LoginViewController.h index 11f0ee354..fe4d4e6b3 100644 --- a/media/iphone/Classes/LoginViewController.h +++ b/media/iphone/Classes/LoginViewController.h @@ -20,7 +20,7 @@ - (void)checkPassword; -@property (nonatomic, retain) NewsBlurAppDelegate *appDelegate; +@property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate; @property (nonatomic, retain) IBOutlet UITextField *usernameTextField; @property (nonatomic, retain) IBOutlet UITextField *passwordTextField; @property (nonatomic, retain) NSMutableData * jsonString; diff --git a/media/iphone/Classes/LoginViewController.m b/media/iphone/Classes/LoginViewController.m index 0a529f2bd..9bddadd73 100644 --- a/media/iphone/Classes/LoginViewController.m +++ b/media/iphone/Classes/LoginViewController.m @@ -50,6 +50,8 @@ - (void)checkPassword { NSLog(@"appdelegate:: %@", [self appDelegate]); NSString *url = @"http://nb.local.host:8000/reader/login"; + [[NSHTTPCookieStorage sharedHTTPCookieStorage] + setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways]; TTURLRequest *theRequest = [[TTURLRequest alloc] initWithURL:url delegate:self]; [theRequest setHttpMethod:@"POST"]; [theRequest.parameters setValue:[usernameTextField text] forKey:@"login-username"]; @@ -85,47 +87,6 @@ } -- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response -{ - [jsonString setLength:0]; -} - -- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data -{ - [jsonString appendData:data]; -} - -- (void)connectionDidFinishLoading:(NSURLConnection *)connection { - NSString *jsonS = [[NSString alloc] - initWithData:jsonString - encoding:NSUTF8StringEncoding]; - NSDictionary *results = [[NSDictionary alloc] - initWithDictionary:[jsonS JSONValue]]; - NSLog(@"Results: %@", results); - - [self dismissModalViewControllerAnimated:YES]; - [jsonString release]; - [jsonS release]; - [results release]; -} - -- (void)connection:(NSURLConnection *)connection - didFailWithError:(NSError *)error -{ - // release the connection, and the data object - [connection release]; - // receivedData is declared as a method instance elsewhere - [jsonString release]; - - [passwordTextField becomeFirstResponder]; - - // inform the user - NSLog(@"Connection failed! Error - %@ %@", - [error localizedDescription], - [[error userInfo] objectForKey:NSErrorFailingURLStringKey]); -} - - - (void)didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; diff --git a/media/iphone/Classes/NewsBlurAppDelegate.h b/media/iphone/Classes/NewsBlurAppDelegate.h index b3b975298..f3d8fa922 100644 --- a/media/iphone/Classes/NewsBlurAppDelegate.h +++ b/media/iphone/Classes/NewsBlurAppDelegate.h @@ -40,11 +40,13 @@ @property (readwrite, retain) NSDictionary * activeStory; @property (readwrite) BOOL isLoggedIn; +- (void)showLogin; - (void)loadFeedDetailView; - (void)loadStoryDetailView; - (void)reloadFeedsView; - (void)hideNavigationBar:(BOOL)animated; - (void)showNavigationBar:(BOOL)animated; +- (void)setTitle:(NSString *)title; @end diff --git a/media/iphone/Classes/NewsBlurAppDelegate.m b/media/iphone/Classes/NewsBlurAppDelegate.m index 3badbb139..be45927f0 100644 --- a/media/iphone/Classes/NewsBlurAppDelegate.m +++ b/media/iphone/Classes/NewsBlurAppDelegate.m @@ -27,14 +27,12 @@ @synthesize isLoggedIn; - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - UINavigationController *navController = self.navigationController; - NSLog(@"storyDetailViewController: %@", storyDetailViewController); navigationController.viewControllers = [NSArray arrayWithObject:feedsViewController]; [window addSubview:navigationController.view]; [window makeKeyAndVisible]; - NSLog(@"loginViewController: %@", loginViewController); - [navController presentModalViewController:loginViewController animated:YES]; + + [feedsViewController fetchFeedList]; return YES; } @@ -63,16 +61,23 @@ #pragma mark - #pragma mark Views +- (void)showLogin { + UINavigationController *navController = self.navigationController; + [navController presentModalViewController:loginViewController animated:YES]; + [navController release]; +} + - (void)reloadFeedsView { NSLog(@"Reloading feeds list"); + [self setTitle:@"NewsBlur"]; [loginViewController dismissModalViewControllerAnimated:YES]; [feedsViewController fetchFeedList]; } - (void)loadFeedDetailView { UINavigationController *navController = self.navigationController; - [navController pushViewController:feedDetailViewController animated:YES]; + [self setTitle:[activeFeed objectForKey:@"feed_title"]]; NSLog(@"Released feedDetailViewController"); } @@ -81,6 +86,17 @@ [navController pushViewController:storyDetailViewController animated:YES]; } +- (void)setTitle:(NSString *)title { + UILabel *label = [[UILabel alloc] init]; + [label setFont:[UIFont boldSystemFontOfSize:16.0]]; + [label setBackgroundColor:[UIColor clearColor]]; + [label setTextColor:[UIColor whiteColor]]; + [label setText:title]; + [label sizeToFit]; + [navigationController.navigationBar.topItem setTitleView:label]; + navigationController.navigationBar.backItem.title = @"All"; + [label release]; +} @end diff --git a/media/iphone/Classes/NewsBlurViewController.h b/media/iphone/Classes/NewsBlurViewController.h index 9f2f0c52d..ff98ab0d2 100644 --- a/media/iphone/Classes/NewsBlurViewController.h +++ b/media/iphone/Classes/NewsBlurViewController.h @@ -19,18 +19,22 @@ NSDictionary * dictFolders; NSMutableArray * dictFoldersArray; - UITableView * viewTableFeedTitles; - UIToolbar * feedViewToolbar; - UISlider * feedScoreSlider; + IBOutlet UITableView * viewTableFeedTitles; + IBOutlet UIToolbar * feedViewToolbar; + IBOutlet UISlider * feedScoreSlider; + IBOutlet UIBarButtonItem * logoutButton; + } --(void)fetchFeedList; +- (void)fetchFeedList; +- (IBAction)doLogoutButton; @property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate; @property (nonatomic, retain) IBOutlet UITableView *viewTableFeedTitles; @property (nonatomic, retain) IBOutlet UIToolbar *feedViewToolbar; @property (nonatomic, retain) IBOutlet UISlider * feedScoreSlider; +@property (nonatomic, retain) IBOutlet UIBarButtonItem * logoutButton; @property (nonatomic, retain) NSMutableArray *feedTitleList; @property (nonatomic, retain) NSMutableArray *dictFoldersArray; @property (nonatomic, retain) NSDictionary *dictFolders; diff --git a/media/iphone/Classes/NewsBlurViewController.m b/media/iphone/Classes/NewsBlurViewController.m index bf76786e9..c53aa002d 100644 --- a/media/iphone/Classes/NewsBlurViewController.m +++ b/media/iphone/Classes/NewsBlurViewController.m @@ -9,6 +9,7 @@ #import "NewsBlurViewController.h" #import "NewsBlurAppDelegate.h" #import "JSON.h" +#import "Three20/Three20.h" @implementation NewsBlurViewController @@ -17,6 +18,7 @@ @synthesize viewTableFeedTitles; @synthesize feedViewToolbar; @synthesize feedScoreSlider; +@synthesize logoutButton; @synthesize feedTitleList; @synthesize dictFolders; @@ -37,6 +39,7 @@ self.feedTitleList = [[NSMutableArray alloc] init]; self.dictFolders = [[NSDictionary alloc] init]; self.dictFoldersArray = [[NSMutableArray alloc] init]; + self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Logout" style:UIBarButtonItemStylePlain target:nil action:nil]; [appDelegate hideNavigationBar:NO]; [super viewDidLoad]; } @@ -104,7 +107,7 @@ NSString *jsonString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; NSDictionary *results = [[NSDictionary alloc] initWithDictionary:[jsonString JSONValue]]; self.dictFolders = [results objectForKey:@"flat_folders"]; - + NSLog(@"Received Feeds: %@", dictFolders); NSSortDescriptor *sortDescriptor; sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"feed_title" ascending:YES] autorelease]; @@ -129,6 +132,54 @@ [jsonString release]; } +- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { + NSLog(@"didReceiveResponse"); + NSHTTPURLResponse* httpResponse = (NSHTTPURLResponse*)response; + int responseStatusCode = [httpResponse statusCode]; + if (responseStatusCode == 403) { + [appDelegate showLogin]; + } +} + +- (void)connection:(NSURLConnection *)connection + didFailWithError:(NSError *)error +{ + + // inform the user + NSLog(@"Connection failed! Error - %@ %@", + [error localizedDescription], + [[error userInfo] objectForKey:NSErrorFailingURLStringKey]); +} + + +- (IBAction)doLogoutButton { + NSLog(@"Logout"); + NSString *url = @"http://nb.local.host:8000/reader/logout?api=1"; + [[NSHTTPCookieStorage sharedHTTPCookieStorage] + setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways]; + TTURLRequest *theRequest = [[TTURLRequest alloc] initWithURL:url delegate:self]; + [theRequest.parameters setValue:@"1" forKey:@"api"]; + theRequest.response = [[[TTURLDataResponse alloc] init] autorelease]; + [theRequest send]; + + [theRequest release]; + +} + +- (void)requestDidStartLoad:(TTURLRequest*)request { + NSLog(@"Starting"); +} + +- (void)requestDidFinishLoad:(TTURLRequest *)request { + [appDelegate reloadFeedsView]; +} + +- (void)request:(TTURLRequest *)request didFailLoadWithError:(NSError *)error { + NSLog(@"Error: %@", error); + NSLog(@"%@", error ); + +} + #pragma mark - #pragma mark Table View - Feed List @@ -206,15 +257,6 @@ } //NSLog(@"App Delegate: %@", self.appDelegate); - UILabel *label = [[UILabel alloc] init]; - [label setFont:[UIFont boldSystemFontOfSize:16.0]]; - [label setBackgroundColor:[UIColor clearColor]]; - [label setTextColor:[UIColor whiteColor]]; - [label setText:[appDelegate.activeFeed objectForKey:@"feed_title"]]; - [label sizeToFit]; - [appDelegate.navigationController.navigationBar.topItem setTitleView:label]; - appDelegate.navigationController.navigationBar.backItem.title = @"All"; - [label release]; appDelegate.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.8]; [appDelegate loadFeedDetailView]; diff --git a/media/iphone/Classes/StoryDetailViewController.h b/media/iphone/Classes/StoryDetailViewController.h index 85abd231e..a7026977e 100644 --- a/media/iphone/Classes/StoryDetailViewController.h +++ b/media/iphone/Classes/StoryDetailViewController.h @@ -18,6 +18,6 @@ } @property (nonatomic, retain) IBOutlet UIWebView *webView; -@property (nonatomic, retain) NewsBlurAppDelegate *appDelegate; +@property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate; @end diff --git a/media/iphone/MainWindow.xib b/media/iphone/MainWindow.xib index 32dbb19e7..26bff3b51 100644 --- a/media/iphone/MainWindow.xib +++ b/media/iphone/MainWindow.xib @@ -1,20 +1,18 @@ - 784 - 10F569 - 740 - 1038.29 + 1024 + 10H574 + 804 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 62 + 123 YES - - YES @@ -33,22 +31,53 @@ YES IBFilesOwner + IBCocoaTouchFramework IBFirstResponder + IBCocoaTouchFramework + + + IBCocoaTouchFramework - NewsBlurViewController + + NO + + + 1 + + IBCocoaTouchFramework + NO FeedDetailViewController + + 1 + + IBCocoaTouchFramework + NO StoryDetailViewController + + 1 + + IBCocoaTouchFramework + NO + + + LoginViewController + + + 1 + + IBCocoaTouchFramework + NO @@ -61,9 +90,15 @@ NO NO + IBCocoaTouchFramework + + 1 + + IBCocoaTouchFramework + NO 256 @@ -71,18 +106,25 @@ NO YES YES + IBCocoaTouchFramework - + YES Title + IBCocoaTouchFramework NewsBlurViewController NO + + 1 + + IBCocoaTouchFramework + NO @@ -146,14 +188,6 @@ 93 - - - appDelegate - - - - 94 - delegate @@ -162,6 +196,30 @@ 101 + + + loginViewController + + + + 103 + + + + appDelegate + + + + 104 + + + + appDelegate + + + + 105 + @@ -241,6 +299,11 @@ + + 102 + + + @@ -252,6 +315,9 @@ 10.CustomClassName 10.IBEditorWindowLastContentRect 10.IBPluginDependency + 102.CustomClassName + 102.IBEditorWindowLastContentRect + 102.IBPluginDependency 12.IBEditorWindowLastContentRect 12.IBPluginDependency 3.CustomClassName @@ -276,6 +342,9 @@ NewsBlurViewController {{759, 376}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin + LoginViewController + {{1104, 466}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin {{1238, 390}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin NewsBlurAppDelegate @@ -286,11 +355,11 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin FeedDetailViewController - {{733, 327}, {320, 480}} + {{810, 43}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin StoryDetailViewController - {{396, 332}, {320, 480}} + {{735, 332}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -310,7 +379,7 @@ - 101 + 106 @@ -335,11 +404,87 @@ UITableView + + YES + + YES + appDelegate + feedScoreSlider + feedViewToolbar + storyTitlesTable + + + YES + + appDelegate + NewsBlurAppDelegate + + + feedScoreSlider + UISlider + + + feedViewToolbar + UIToolbar + + + storyTitlesTable + UITableView + + + IBProjectSource Classes/FeedDetailViewController.h + + LoginViewController + UIViewController + + YES + + YES + appDelegate + passwordTextField + usernameTextField + + + YES + NewsBlurAppDelegate + UITextField + UITextField + + + + YES + + YES + appDelegate + passwordTextField + usernameTextField + + + YES + + appDelegate + NewsBlurAppDelegate + + + passwordTextField + UITextField + + + usernameTextField + UITextField + + + + + IBProjectSource + Classes/LoginViewController.h + + NSObject @@ -363,6 +508,7 @@ YES feedDetailViewController feedsViewController + loginViewController navigationController storyDetailViewController window @@ -371,11 +517,51 @@ YES FeedDetailViewController NewsBlurViewController + LoginViewController UINavigationController StoryDetailViewController UIWindow + + YES + + YES + feedDetailViewController + feedsViewController + loginViewController + navigationController + storyDetailViewController + window + + + YES + + feedDetailViewController + FeedDetailViewController + + + feedsViewController + NewsBlurViewController + + + loginViewController + LoginViewController + + + navigationController + UINavigationController + + + storyDetailViewController + StoryDetailViewController + + + window + UIWindow + + + IBProjectSource Classes/NewsBlurAppDelegate.h @@ -392,6 +578,17 @@ NewsBlurViewController UIViewController + + doLogoutButton + id + + + doLogoutButton + + doLogoutButton + id + + YES @@ -399,6 +596,7 @@ appDelegate feedScoreSlider feedViewToolbar + logoutButton viewTableFeedTitles @@ -406,9 +604,44 @@ NewsBlurAppDelegate UISlider UIToolbar + UIBarButtonItem UITableView + + YES + + YES + appDelegate + feedScoreSlider + feedViewToolbar + logoutButton + viewTableFeedTitles + + + YES + + appDelegate + NewsBlurAppDelegate + + + feedScoreSlider + UISlider + + + feedViewToolbar + UIToolbar + + + logoutButton + UIBarButtonItem + + + viewTableFeedTitles + UITableView + + + IBProjectSource Classes/NewsBlurViewController.h @@ -418,8 +651,36 @@ StoryDetailViewController UIViewController - appDelegate - NewsBlurAppDelegate + YES + + YES + appDelegate + webView + + + YES + NewsBlurAppDelegate + UIWebView + + + + YES + + YES + appDelegate + webView + + + YES + + appDelegate + NewsBlurAppDelegate + + + webView + UIWebView + + IBProjectSource @@ -427,8 +688,296 @@ + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIApplication + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIApplication.h + + + + UIBarButtonItem + UIBarItem + + IBFrameworkSource + UIKit.framework/Headers/UIBarButtonItem.h + + + + UIBarItem + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIBarItem.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UINavigationBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UINavigationBar.h + + + + UINavigationController + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UINavigationItem + NSObject + + + + UIResponder + NSObject + + + + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UISlider + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UISlider.h + + + + UITableView + UIScrollView + + IBFrameworkSource + UIKit.framework/Headers/UITableView.h + + + + UITextField + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIToolbar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIToolbar.h + + + + UIView + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + UIWebView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIWebView.h + + + + UIWindow + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIWindow.h + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -436,6 +985,6 @@ YES NewsBlur.xcodeproj 3 - 3.1 + 123 diff --git a/media/iphone/NewsBlur.xcodeproj/conesus.mode1v3 b/media/iphone/NewsBlur.xcodeproj/conesus.mode1v3 index 350338b9a..12bdac95d 100644 --- a/media/iphone/NewsBlur.xcodeproj/conesus.mode1v3 +++ b/media/iphone/NewsBlur.xcodeproj/conesus.mode1v3 @@ -200,10 +200,7 @@ XCObserverAutoDisconnectKey XCObserverDefintionKey - - PBXStatusErrorsKey - 0 - + XCObserverFactoryKey XCPerspectivesSpecificationIdentifier XCObserverGUIDKey @@ -215,103 +212,11 @@ XCObserverTriggerKey awakenModuleWithObserver: XCObserverValidationKey - - PBXStatusErrorsKey - 2 - - - - XCObserverAutoDisconnectKey - - XCObserverDefintionKey - - PBXStatusWarningsKey - 0 - - XCObserverFactoryKey - XCPerspectivesSpecificationIdentifier - XCObserverGUIDKey - XCObserverProjectIdentifier - XCObserverNotificationKey - PBXStatusBuildStateMessageNotification - XCObserverTargetKey - XCMainBuildResultsModuleGUID - XCObserverTriggerKey - awakenModuleWithObserver: - XCObserverValidationKey - - PBXStatusWarningsKey - 2 - - - - XCObserverAutoDisconnectKey - - XCObserverDefintionKey - - PBXStatusAnalyzerResultsKey - 0 - - XCObserverFactoryKey - XCPerspectivesSpecificationIdentifier - XCObserverGUIDKey - XCObserverProjectIdentifier - XCObserverNotificationKey - PBXStatusBuildStateMessageNotification - XCObserverTargetKey - XCMainBuildResultsModuleGUID - XCObserverTriggerKey - awakenModuleWithObserver: - XCObserverValidationKey - - PBXStatusAnalyzerResultsKey - 2 - + OpenEditors - - - Content - - PBXProjectModuleGUID - 7816BDDE128C4494008ED38C - PBXProjectModuleLabel - NewsBlurAppDelegate.h - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 7816BDDF128C4494008ED38C - PBXProjectModuleLabel - NewsBlurAppDelegate.h - _historyCapacity - 0 - bookmark - 78D09B65128CCA46009B016D - history - - 78D09B3C128CB5B4009B016D - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {750, 461}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 90 350 750 502 0 0 1440 878 - - - + PerspectiveWidths 705 @@ -380,7 +285,6 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 - 29B97317FDCFA39411CA2CEA 29B97323FDCFA39411CA2CEA 1C37FBAC04509CD000000102 1C37FABC05509CD000000102 @@ -388,13 +292,13 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 19 + 15 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {277, 708}} + {{0, 0}, {277, 1033}} PBXTopSmartGroupGIDs @@ -406,14 +310,14 @@ GeometryConfiguration Frame - {{0, 0}, {294, 726}} + {{0, 0}, {294, 1051}} GroupTreeTableConfiguration MainColumn 277 RubberWindowFrame - 377 111 1034 767 0 0 1440 878 + 513 86 1075 1092 0 0 1920 1178 Module PBXSmartGroupTreeModule @@ -431,7 +335,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - LoginViewController.m + NewsBlurViewController.m PBXSplitModuleInNavigatorKey Split0 @@ -439,34 +343,58 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - LoginViewController.m + NewsBlurViewController.m _historyCapacity 0 bookmark - 78D09B64128CCA46009B016D + 784DDD27128CFE6600AE08E0 history 7842EB9911CFFC1B0066CF9D - 7842EB9A11CFFC1B0066CF9D 7843F5AA11EEC0AA00675F64 7843F5AB11EEC0AA00675F64 7843F5AC11EEC0AA00675F64 7843F5AD11EEC0AA00675F64 7843F5AE11EEC0AA00675F64 - 784B514C127E44C3008F90EA - 784B514D127E44C3008F90EA - 7816BCCF128B7D7D008ED38C 7816BE07128C4651008ED38C - 78D09B32128CB59B009B016D - 78D09B5B128CCA46009B016D - 78D09B5C128CCA46009B016D - 78D09B5D128CCA46009B016D - 78D09B5E128CCA46009B016D - 78D09B5F128CCA46009B016D - 78D09B60128CCA46009B016D - 78D09B61128CCA46009B016D - 78D09B62128CCA46009B016D - 78D09B63128CCA46009B016D + 782D83C5128CD39B009B6727 + 784DDBD8128CE3B100AE08E0 + 784DDBD9128CE3B100AE08E0 + 784DDBDA128CE3B100AE08E0 + 784DDBDC128CE3B100AE08E0 + 784DDBF0128CE7B400AE08E0 + 784DDBF2128CE7B400AE08E0 + 784DDBF4128CE7B400AE08E0 + 784DDBF6128CE7B400AE08E0 + 784DDBF8128CE7B400AE08E0 + 784DDBFA128CE7B400AE08E0 + 784DDBFC128CE7B400AE08E0 + 784DDBFE128CE7B400AE08E0 + 784DDC00128CE7B400AE08E0 + 784DDC02128CE7B400AE08E0 + 784DDC04128CE7B400AE08E0 + 784DDC06128CE7B400AE08E0 + 784DDC08128CE7B400AE08E0 + 784DDC0A128CE7B400AE08E0 + 784DDC0C128CE7B400AE08E0 + 784DDC0E128CE7B400AE08E0 + 784DDC10128CE7B400AE08E0 + 784DDC12128CE7B400AE08E0 + 784DDC14128CE7B400AE08E0 + 784DDC16128CE7B400AE08E0 + 784DDC18128CE7B400AE08E0 + 784DDC1A128CE7B400AE08E0 + 784DDC1B128CE7B400AE08E0 + 784DDC1C128CE7B400AE08E0 + 784DDC1D128CE7B400AE08E0 + 784DDC22128CE97100AE08E0 + 784DDC2E128CEA7300AE08E0 + 784DDC4B128CEE1C00AE08E0 + 784DDC4C128CEE1C00AE08E0 + 784DDCF2128CFA6F00AE08E0 + 784DDD08128CFBEE00AE08E0 + 784DDD09128CFBEE00AE08E0 + 784DDD0A128CFBEE00AE08E0 SplitCount @@ -478,14 +406,14 @@ GeometryConfiguration Frame - {{0, 0}, {735, 549}} + {{0, 0}, {776, 860}} RubberWindowFrame - 377 111 1034 767 0 0 1440 878 + 513 86 1075 1092 0 0 1920 1178 Module PBXNavigatorGroup Proportion - 549pt + 860pt ContentConfiguration @@ -498,18 +426,18 @@ GeometryConfiguration Frame - {{0, 554}, {735, 172}} + {{0, 865}, {776, 186}} RubberWindowFrame - 377 111 1034 767 0 0 1440 878 + 513 86 1075 1092 0 0 1920 1178 Module XCDetailModule Proportion - 172pt + 186pt Proportion - 735pt + 776pt Name @@ -524,9 +452,9 @@ TableOfContents - 78D09B45128CB5BF009B016D + 784DDCB3128CF11300AE08E0 1CE0B1FE06471DED0097A5F4 - 78D09B46128CB5BF009B016D + 784DDCB4128CF11300AE08E0 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -661,7 +589,7 @@ StatusbarIsVisible TimeStamp - 311216710.60232002 + 311230054.29636103 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -678,14 +606,15 @@ 5 WindowOrderList - 1C78EAAD065D492600B07095 + 784DDD1A128CFD2A00AE08E0 + 784DDD1B128CFD2A00AE08E0 1CD10A99069EF8BA00B06720 788997AE11C9C87C00041675 - 7816BDDE128C4494008ED38C - /Users/conesus/newsblur/media/iphone/NewsBlur.xcodeproj + /Users/conesus/Projects/newsblur/media/iphone/NewsBlur.xcodeproj + 1C78EAAD065D492600B07095 WindowString - 377 111 1034 767 0 0 1440 878 + 513 86 1075 1092 0 0 1920 1178 WindowToolsV3 @@ -715,7 +644,7 @@ Frame {{0, 0}, {897, 251}} RubberWindowFrame - 289 275 897 533 0 0 1440 878 + 544 502 897 533 0 0 1920 1178 Module PBXNavigatorGroup @@ -734,14 +663,14 @@ XCBuildResultsTrigger_Collapse 1020 XCBuildResultsTrigger_Open - 1013 + 1010 GeometryConfiguration Frame {{0, 256}, {897, 236}} RubberWindowFrame - 289 275 897 533 0 0 1440 878 + 544 502 897 533 0 0 1920 1178 Module PBXBuildResultsModule @@ -764,7 +693,7 @@ TableOfContents 788997AE11C9C87C00041675 - 78D09B48128CB5BF009B016D + 784DDCB1128CF10D00AE08E0 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -773,7 +702,7 @@ WindowContentMinSize 486 300 WindowString - 289 275 897 533 0 0 1440 878 + 544 502 897 533 0 0 1920 1178 WindowToolGUID 788997AE11C9C87C00041675 WindowToolIsVisible @@ -808,8 +737,8 @@ yes sizes - {{0, 0}, {648, 362}} - {{648, 0}, {647, 362}} + {{0, 0}, {648, 339}} + {{0, 339}, {648, 340}} VerticalSplitView @@ -824,8 +753,8 @@ yes sizes - {{0, 0}, {1295, 362}} - {{0, 362}, {1295, 317}} + {{0, 0}, {648, 679}} + {{648, 0}, {647, 679}} @@ -857,15 +786,15 @@ Value 85 Summary - 330 + 331 Frame - {{648, 0}, {647, 362}} + {{0, 339}, {648, 340}} RubberWindowFrame - 137 125 1295 720 0 0 1440 878 + 591 328 1295 720 0 0 1920 1178 RubberWindowFrame - 137 125 1295 720 0 0 1440 878 + 591 328 1295 720 0 0 1920 1178 Module PBXDebugSessionModule @@ -888,18 +817,18 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 78D09B4E128CB5DD009B016D + 784DDCDE128CF94900AE08E0 1C162984064C10D400B95A72 - 78D09B4F128CB5DD009B016D - 78D09B50128CB5DD009B016D - 78D09B51128CB5DD009B016D - 78D09B52128CB5DD009B016D - 78D09B53128CB5DD009B016D + 784DDCDF128CF94900AE08E0 + 784DDCE0128CF94900AE08E0 + 784DDCE1128CF94900AE08E0 + 784DDCE2128CF94900AE08E0 + 784DDCE3128CF94900AE08E0 ToolbarConfiguration xcode.toolbar.config.debugV3 WindowString - 137 125 1295 720 0 0 1440 878 + 591 328 1295 720 0 0 1920 1178 WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible @@ -1027,7 +956,7 @@ Frame {{0, 0}, {744, 532}} RubberWindowFrame - 337 135 744 573 0 0 1440 878 + 569 230 744 573 0 0 1920 1178 Module PBXDebugCLIModule @@ -1050,17 +979,17 @@ TableOfContents 1C78EAAD065D492600B07095 - 78D09B54128CB5DD009B016D + 784DDCE4128CF94900AE08E0 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - 337 135 744 573 0 0 1440 878 + 569 230 744 573 0 0 1920 1178 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/media/iphone/NewsBlur.xcodeproj/conesus.pbxuser b/media/iphone/NewsBlur.xcodeproj/conesus.pbxuser index ee38a6a74..38af702fa 100644 --- a/media/iphone/NewsBlur.xcodeproj/conesus.pbxuser +++ b/media/iphone/NewsBlur.xcodeproj/conesus.pbxuser @@ -2,17 +2,17 @@ { 1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {703, 663}}"; - sepNavSelRange = "{1465, 0}"; - sepNavVisRange = "{289, 1369}"; - sepNavWindowFrame = "{{90, 294}, {750, 558}}"; + sepNavIntBoundsRect = "{{0, 0}, {727, 824}}"; + sepNavSelRange = "{1706, 0}"; + sepNavVisRange = "{0, 1713}"; + sepNavWindowFrame = "{{153, 570}, {750, 558}}"; }; }; 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 1144}}"; - sepNavSelRange = "{1101, 19}"; - sepNavVisRange = "{42, 1302}"; + sepNavIntBoundsRect = "{{0, 0}, {727, 1352}}"; + sepNavSelRange = "{1644, 9}"; + sepNavVisRange = "{280, 1768}"; sepNavWindowFrame = "{{97, 294}, {750, 558}}"; }; }; @@ -24,24 +24,24 @@ }; 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 532}}"; - sepNavSelRange = "{181, 11}"; - sepNavVisRange = "{0, 1049}"; + sepNavIntBoundsRect = "{{0, 0}, {727, 820}}"; + sepNavSelRange = "{683, 0}"; + sepNavVisRange = "{0, 1226}"; sepNavWindowFrame = "{{74, 315}, {750, 558}}"; }; }; 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {732, 2990}}"; - sepNavSelRange = "{6719, 18}"; - sepNavVisRange = "{6204, 544}"; + sepNavIntBoundsRect = "{{0, 0}, {727, 3523}}"; + sepNavSelRange = "{2863, 0}"; + sepNavVisRange = "{2353, 2159}"; sepNavWindowFrame = "{{78, 315}, {750, 558}}"; }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeBuildConfigurationName = Debug; activeExecutable = 7889979911C9C3D100041675 /* NewsBlur */; - activeSDKPreference = iphonesimulator3.2; + activeSDKPreference = iphonesimulator4.1; activeTarget = 1D6058900D05DD3D006BFB54 /* NewsBlur */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* NewsBlur */, @@ -96,7 +96,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 496, + 537, 20, 48, 43, @@ -135,34 +135,84 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 311211447; - PBXWorkspaceStateSaveDate = 311211447; + PBXPerProjectTemplateStateSaveDate = 311226629; + PBXWorkspaceStateSaveDate = 311226629; }; perUserProjectItems = { - 7816BCCF128B7D7D008ED38C /* PBXTextBookmark */ = 7816BCCF128B7D7D008ED38C /* PBXTextBookmark */; - 7816BE07128C4651008ED38C /* PBXTextBookmark */ = 7816BE07128C4651008ED38C /* PBXTextBookmark */; - 7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */ = 7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */; - 7842EB9A11CFFC1B0066CF9D /* PlistBookmark */ = 7842EB9A11CFFC1B0066CF9D /* PlistBookmark */; - 7843F5AA11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AA11EEC0AA00675F64 /* PBXTextBookmark */; - 7843F5AB11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AB11EEC0AA00675F64 /* PBXTextBookmark */; - 7843F5AC11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AC11EEC0AA00675F64 /* PBXTextBookmark */; - 7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */; - 7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */; - 784B514C127E44C3008F90EA /* PBXTextBookmark */ = 784B514C127E44C3008F90EA /* PBXTextBookmark */; - 784B514D127E44C3008F90EA /* PBXTextBookmark */ = 784B514D127E44C3008F90EA /* PBXTextBookmark */; - 78D09B32128CB59B009B016D /* PBXTextBookmark */ = 78D09B32128CB59B009B016D /* PBXTextBookmark */; - 78D09B3C128CB5B4009B016D /* PBXTextBookmark */ = 78D09B3C128CB5B4009B016D /* PBXTextBookmark */; - 78D09B5B128CCA46009B016D /* PBXTextBookmark */ = 78D09B5B128CCA46009B016D /* PBXTextBookmark */; - 78D09B5C128CCA46009B016D /* PBXTextBookmark */ = 78D09B5C128CCA46009B016D /* PBXTextBookmark */; - 78D09B5D128CCA46009B016D /* PBXTextBookmark */ = 78D09B5D128CCA46009B016D /* PBXTextBookmark */; - 78D09B5E128CCA46009B016D /* PBXTextBookmark */ = 78D09B5E128CCA46009B016D /* PBXTextBookmark */; - 78D09B5F128CCA46009B016D /* PBXTextBookmark */ = 78D09B5F128CCA46009B016D /* PBXTextBookmark */; - 78D09B60128CCA46009B016D /* PBXTextBookmark */ = 78D09B60128CCA46009B016D /* PBXTextBookmark */; - 78D09B61128CCA46009B016D /* PBXTextBookmark */ = 78D09B61128CCA46009B016D /* PBXTextBookmark */; - 78D09B62128CCA46009B016D /* PBXTextBookmark */ = 78D09B62128CCA46009B016D /* PBXTextBookmark */; - 78D09B63128CCA46009B016D /* PBXTextBookmark */ = 78D09B63128CCA46009B016D /* PBXTextBookmark */; - 78D09B64128CCA46009B016D /* PBXTextBookmark */ = 78D09B64128CCA46009B016D /* PBXTextBookmark */; - 78D09B65128CCA46009B016D /* PBXTextBookmark */ = 78D09B65128CCA46009B016D /* PBXTextBookmark */; + 7816BE07128C4651008ED38C = 7816BE07128C4651008ED38C /* PBXTextBookmark */; + 782D83C5128CD39B009B6727 = 782D83C5128CD39B009B6727 /* PBXTextBookmark */; + 7842EB9911CFFC1B0066CF9D = 7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */; + 7843F5AA11EEC0AA00675F64 = 7843F5AA11EEC0AA00675F64 /* PBXTextBookmark */; + 7843F5AB11EEC0AA00675F64 = 7843F5AB11EEC0AA00675F64 /* PBXTextBookmark */; + 7843F5AC11EEC0AA00675F64 = 7843F5AC11EEC0AA00675F64 /* PBXTextBookmark */; + 7843F5AD11EEC0AA00675F64 = 7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */; + 7843F5AE11EEC0AA00675F64 = 7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */; + 784DDBD8128CE3B100AE08E0 = 784DDBD8128CE3B100AE08E0 /* PBXTextBookmark */; + 784DDBD9128CE3B100AE08E0 = 784DDBD9128CE3B100AE08E0 /* PBXTextBookmark */; + 784DDBDA128CE3B100AE08E0 = 784DDBDA128CE3B100AE08E0 /* PBXTextBookmark */; + 784DDBDC128CE3B100AE08E0 = 784DDBDC128CE3B100AE08E0 /* PBXTextBookmark */; + 784DDBDE128CE3B100AE08E0 = 784DDBDE128CE3B100AE08E0 /* PBXTextBookmark */; + 784DDBF0128CE7B400AE08E0 = 784DDBF0128CE7B400AE08E0 /* PBXTextBookmark */; + 784DDBF2128CE7B400AE08E0 = 784DDBF2128CE7B400AE08E0 /* PBXBookmark */; + 784DDBF4128CE7B400AE08E0 = 784DDBF4128CE7B400AE08E0 /* PBXBookmark */; + 784DDBF6128CE7B400AE08E0 = 784DDBF6128CE7B400AE08E0 /* PBXBookmark */; + 784DDBF8128CE7B400AE08E0 = 784DDBF8128CE7B400AE08E0 /* PBXBookmark */; + 784DDBFA128CE7B400AE08E0 = 784DDBFA128CE7B400AE08E0 /* PBXBookmark */; + 784DDBFC128CE7B400AE08E0 = 784DDBFC128CE7B400AE08E0 /* PBXBookmark */; + 784DDBFE128CE7B400AE08E0 = 784DDBFE128CE7B400AE08E0 /* PBXBookmark */; + 784DDC00128CE7B400AE08E0 = 784DDC00128CE7B400AE08E0 /* PBXBookmark */; + 784DDC02128CE7B400AE08E0 = 784DDC02128CE7B400AE08E0 /* PBXTextBookmark */; + 784DDC04128CE7B400AE08E0 = 784DDC04128CE7B400AE08E0 /* PBXBookmark */; + 784DDC06128CE7B400AE08E0 = 784DDC06128CE7B400AE08E0 /* PBXBookmark */; + 784DDC08128CE7B400AE08E0 = 784DDC08128CE7B400AE08E0 /* PBXBookmark */; + 784DDC0A128CE7B400AE08E0 = 784DDC0A128CE7B400AE08E0 /* PBXBookmark */; + 784DDC0C128CE7B400AE08E0 = 784DDC0C128CE7B400AE08E0 /* PBXBookmark */; + 784DDC0E128CE7B400AE08E0 = 784DDC0E128CE7B400AE08E0 /* PBXBookmark */; + 784DDC10128CE7B400AE08E0 = 784DDC10128CE7B400AE08E0 /* PBXBookmark */; + 784DDC12128CE7B400AE08E0 = 784DDC12128CE7B400AE08E0 /* PBXBookmark */; + 784DDC14128CE7B400AE08E0 = 784DDC14128CE7B400AE08E0 /* PBXBookmark */; + 784DDC16128CE7B400AE08E0 = 784DDC16128CE7B400AE08E0 /* PBXBookmark */; + 784DDC18128CE7B400AE08E0 = 784DDC18128CE7B400AE08E0 /* PBXBookmark */; + 784DDC1A128CE7B400AE08E0 = 784DDC1A128CE7B400AE08E0 /* PBXBookmark */; + 784DDC1B128CE7B400AE08E0 = 784DDC1B128CE7B400AE08E0 /* PBXBookmark */; + 784DDC1C128CE7B400AE08E0 = 784DDC1C128CE7B400AE08E0 /* PBXBookmark */; + 784DDC1D128CE7B400AE08E0 = 784DDC1D128CE7B400AE08E0 /* PBXBookmark */; + 784DDC22128CE97100AE08E0 = 784DDC22128CE97100AE08E0 /* PlistBookmark */; + 784DDC2E128CEA7300AE08E0 = 784DDC2E128CEA7300AE08E0 /* PBXTextBookmark */; + 784DDC4B128CEE1C00AE08E0 = 784DDC4B128CEE1C00AE08E0 /* PBXTextBookmark */; + 784DDC4C128CEE1C00AE08E0 = 784DDC4C128CEE1C00AE08E0 /* PBXTextBookmark */; + 784DDC61128CEFDD00AE08E0 = 784DDC61128CEFDD00AE08E0 /* PBXTextBookmark */; + 784DDC78128CF10100AE08E0 = 784DDC78128CF10100AE08E0 /* PBXTextBookmark */; + 784DDC79128CF10100AE08E0 = 784DDC79128CF10100AE08E0 /* PBXTextBookmark */; + 784DDC7A128CF10100AE08E0 = 784DDC7A128CF10100AE08E0 /* PBXTextBookmark */; + 784DDCB2128CF11300AE08E0 /* PBXTextBookmark */ = 784DDCB2128CF11300AE08E0 /* PBXTextBookmark */; + 784DDCE5128CF94900AE08E0 /* PBXTextBookmark */ = 784DDCE5128CF94900AE08E0 /* PBXTextBookmark */; + 784DDCE6128CF94900AE08E0 /* PBXTextBookmark */ = 784DDCE6128CF94900AE08E0 /* PBXTextBookmark */; + 784DDCE7128CF94900AE08E0 /* PBXTextBookmark */ = 784DDCE7128CF94900AE08E0 /* PBXTextBookmark */; + 784DDCEC128CF9B300AE08E0 /* PBXTextBookmark */ = 784DDCEC128CF9B300AE08E0 /* PBXTextBookmark */; + 784DDCED128CF9B300AE08E0 /* PBXTextBookmark */ = 784DDCED128CF9B300AE08E0 /* PBXTextBookmark */; + 784DDCEE128CF9B300AE08E0 /* PBXTextBookmark */ = 784DDCEE128CF9B300AE08E0 /* PBXTextBookmark */; + 784DDCF2128CFA6F00AE08E0 /* PBXTextBookmark */ = 784DDCF2128CFA6F00AE08E0 /* PBXTextBookmark */; + 784DDCF3128CFA6F00AE08E0 /* PBXTextBookmark */ = 784DDCF3128CFA6F00AE08E0 /* PBXTextBookmark */; + 784DDCF8128CFB2B00AE08E0 /* PBXTextBookmark */ = 784DDCF8128CFB2B00AE08E0 /* PBXTextBookmark */; + 784DDCF9128CFB2B00AE08E0 /* PBXTextBookmark */ = 784DDCF9128CFB2B00AE08E0 /* PBXTextBookmark */; + 784DDCFA128CFB2B00AE08E0 /* PBXTextBookmark */ = 784DDCFA128CFB2B00AE08E0 /* PBXTextBookmark */; + 784DDCFD128CFB5800AE08E0 /* PBXTextBookmark */ = 784DDCFD128CFB5800AE08E0 /* PBXTextBookmark */; + 784DDCFE128CFB5800AE08E0 /* PBXTextBookmark */ = 784DDCFE128CFB5800AE08E0 /* PBXTextBookmark */; + 784DDCFF128CFB5800AE08E0 /* PBXTextBookmark */ = 784DDCFF128CFB5800AE08E0 /* PBXTextBookmark */; + 784DDD02128CFB7600AE08E0 /* PBXTextBookmark */ = 784DDD02128CFB7600AE08E0 /* PBXTextBookmark */; + 784DDD05128CFB9000AE08E0 /* PBXTextBookmark */ = 784DDD05128CFB9000AE08E0 /* PBXTextBookmark */; + 784DDD08128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD08128CFBEE00AE08E0 /* PBXTextBookmark */; + 784DDD09128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD09128CFBEE00AE08E0 /* PBXTextBookmark */; + 784DDD0A128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD0A128CFBEE00AE08E0 /* PBXTextBookmark */; + 784DDD0B128CFBEE00AE08E0 /* PBXTextBookmark */ = 784DDD0B128CFBEE00AE08E0 /* PBXTextBookmark */; + 784DDD0E128CFC8A00AE08E0 /* PBXTextBookmark */ = 784DDD0E128CFC8A00AE08E0 /* PBXTextBookmark */; + 784DDD13128CFCA100AE08E0 /* PBXTextBookmark */ = 784DDD13128CFCA100AE08E0 /* PBXTextBookmark */; + 784DDD16128CFCB300AE08E0 /* PBXTextBookmark */ = 784DDD16128CFCB300AE08E0 /* PBXTextBookmark */; + 784DDD18128CFD2A00AE08E0 /* PBXTextBookmark */ = 784DDD18128CFD2A00AE08E0 /* PBXTextBookmark */; + 784DDD1D128CFD3B00AE08E0 /* PBXTextBookmark */ = 784DDD1D128CFD3B00AE08E0 /* PBXTextBookmark */; + 784DDD22128CFD6C00AE08E0 /* PBXTextBookmark */ = 784DDD22128CFD6C00AE08E0 /* PBXTextBookmark */; + 784DDD27128CFE6600AE08E0 /* PBXTextBookmark */ = 784DDD27128CFE6600AE08E0 /* PBXTextBookmark */; }; sourceControlManager = 788997A911C9C3F000041675 /* Source Control */; userBuildSettings = { @@ -170,45 +220,17 @@ }; 29B97316FDCFA39411CA2CEA /* main.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 532}}"; + sepNavIntBoundsRect = "{{0, 0}, {686, 527}}"; sepNavSelRange = "{262, 0}"; sepNavVisRange = "{0, 361}"; }; }; 32CA4F630368D1EE00C91783 /* NewsBlur_Prefix.pch */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {643, 618}}"; + sepNavIntBoundsRect = "{{0, 0}, {703, 445}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 185}"; - }; - }; - 7816BCC1128B7D4A008ED38C /* FeedDetailViewController.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = FeedDetailViewController.m; - path = /Users/conesus/newsblur/media/iphone/Classes/FeedDetailViewController.m; - sourceTree = ""; - }; - 7816BCCF128B7D7D008ED38C /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 787A0CD811CE65330056422D /* FeedDetailViewController.h */; - name = "FeedDetailViewController.h: 34"; - rLen = 58; - rLoc = 876; - rType = 0; - vrLen = 941; - vrLoc = 0; - }; - 7816BDF4128C458B008ED38C /* NewsBlurViewController.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = NewsBlurViewController.m; - path = /Users/conesus/newsblur/media/iphone/Classes/NewsBlurViewController.m; - sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 3055}}"; - sepNavSelRange = "{175, 0}"; - sepNavVisRange = "{0, 972}"; + sepNavWindowFrame = "{{75, 615}, {750, 558}}"; }; }; 7816BE07128C4651008ED38C /* PBXTextBookmark */ = { @@ -228,6 +250,16 @@ path = /Users/conesus/code/three20/Build/Products/three20/Three20Network/TTURLRequestDelegate.h; sourceTree = ""; }; + 782D83C5128CD39B009B6727 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 29B97316FDCFA39411CA2CEA /* main.m */; + name = "main.m: 14"; + rLen = 0; + rLoc = 262; + rType = 0; + vrLen = 361; + vrLoc = 0; + }; 7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 32CA4F630368D1EE00C91783 /* NewsBlur_Prefix.pch */; @@ -238,34 +270,23 @@ vrLen = 185; vrLoc = 0; }; - 7842EB9A11CFFC1B0066CF9D /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* NewsBlur-Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - ); - name = "/Users/conesus/newsblur/media/iphone/NewsBlur-Info.plist"; - rLen = 0; - rLoc = 9223372036854775808; - }; 7842ECF511D44A530066CF9D /* StoryDetailViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 532}}"; - sepNavSelRange = "{410, 64}"; - sepNavVisRange = "{0, 481}"; + sepNavIntBoundsRect = "{{0, 0}, {686, 499}}"; + sepNavSelRange = "{450, 0}"; + sepNavVisRange = "{0, 490}"; }; }; 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 1001}}"; + sepNavIntBoundsRect = "{{0, 0}, {686, 1014}}"; sepNavSelRange = "{292, 0}"; - sepNavVisRange = "{0, 1391}"; + sepNavVisRange = "{0, 1264}"; }; }; 7843F50311EEB1A000675F64 /* FeedDetailTableCell.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 571}}"; + sepNavIntBoundsRect = "{{0, 0}, {686, 499}}"; sepNavSelRange = "{440, 11}"; sepNavVisRange = "{0, 592}"; }; @@ -274,7 +295,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {686, 585}}"; sepNavSelRange = "{765, 11}"; - sepNavVisRange = "{3, 875}"; + sepNavVisRange = "{0, 871}"; }; }; 7843F5AA11EEC0AA00675F64 /* PBXTextBookmark */ = { @@ -329,21 +350,41 @@ }; 784B50EA127E3F68008F90EA /* LoginViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 532}}"; - sepNavSelRange = "{323, 0}"; - sepNavVisRange = "{0, 689}"; + sepNavIntBoundsRect = "{{0, 0}, {686, 499}}"; + sepNavSelRange = "{458, 0}"; + sepNavVisRange = "{0, 698}"; sepNavWindowFrame = "{{72, 315}, {750, 558}}"; }; }; 784B50EB127E3F68008F90EA /* LoginViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 2054}}"; - sepNavSelRange = "{327, 0}"; - sepNavVisRange = "{0, 999}"; + sepNavIntBoundsRect = "{{0, 0}, {727, 1469}}"; + sepNavSelRange = "{2807, 0}"; + sepNavVisRange = "{1190, 2086}"; sepNavWindowFrame = "{{72, 315}, {750, 558}}"; }; }; - 784B514C127E44C3008F90EA /* PBXTextBookmark */ = { + 784DDBD8128CE3B100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */; + name = "StoryDetailViewController.m: 15"; + rLen = 0; + rLoc = 292; + rType = 0; + vrLen = 1264; + vrLoc = 0; + }; + 784DDBD9128CE3B100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 7842ECF511D44A530066CF9D /* StoryDetailViewController.h */; + name = "StoryDetailViewController.h: 21"; + rLen = 0; + rLoc = 450; + rType = 0; + vrLen = 490; + vrLoc = 0; + }; + 784DDBDA128CE3B100AE08E0 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7843F50311EEB1A000675F64 /* FeedDetailTableCell.h */; name = "FeedDetailTableCell.h: 20"; @@ -353,28 +394,651 @@ vrLen = 592; vrLoc = 0; }; - 784B514D127E44C3008F90EA /* PBXTextBookmark */ = { + 784DDBDC128CE3B100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 784B50EA127E3F68008F90EA /* LoginViewController.h */; + name = "LoginViewController.h: 23"; + rLen = 0; + rLoc = 458; + rType = 0; + vrLen = 698; + vrLoc = 0; + }; + 784DDBDE128CE3B100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */; + name = "LoginViewController.m: 54"; + rLen = 0; + rLoc = 1440; + rType = 0; + vrLen = 911; + vrLoc = 0; + }; + 784DDBF0128CE7B400AE08E0 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 7843F50411EEB1A000675F64 /* FeedDetailTableCell.m */; name = "FeedDetailTableCell.m: 37"; rLen = 11; rLoc = 765; rType = 0; - vrLen = 875; - vrLoc = 3; + vrLen = 871; + vrLoc = 0; + }; + 784DDBF2128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDBF3128CE7B400AE08E0 /* backIcon.png */; + }; + 784DDBF3128CE7B400AE08E0 /* backIcon.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = backIcon.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/backIcon.png; + sourceTree = ""; + }; + 784DDBF4128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDBF5128CE7B400AE08E0 /* backIcon@2x.png */; + }; + 784DDBF5128CE7B400AE08E0 /* backIcon@2x.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = "backIcon@2x.png"; + path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/backIcon@2x.png"; + sourceTree = ""; + }; + 784DDBF6128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDBF7128CE7B400AE08E0 /* blueArrow@2x.png */; + }; + 784DDBF7128CE7B400AE08E0 /* blueArrow@2x.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = "blueArrow@2x.png"; + path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/blueArrow@2x.png"; + sourceTree = ""; + }; + 784DDBF8128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDBF9128CE7B400AE08E0 /* closeButton.png */; + }; + 784DDBF9128CE7B400AE08E0 /* closeButton.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = closeButton.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/closeButton.png; + sourceTree = ""; + }; + 784DDBFA128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDBFB128CE7B400AE08E0 /* empty.png */; + }; + 784DDBFB128CE7B400AE08E0 /* empty.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = empty.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/empty.png; + sourceTree = ""; + }; + 784DDBFC128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDBFD128CE7B400AE08E0 /* error.png */; + }; + 784DDBFD128CE7B400AE08E0 /* error.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = error.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/error.png; + sourceTree = ""; + }; + 784DDBFE128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDBFF128CE7B400AE08E0 /* forwardIcon.png */; + }; + 784DDBFF128CE7B400AE08E0 /* forwardIcon.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = forwardIcon.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/forwardIcon.png; + sourceTree = ""; + }; + 784DDC00128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC01128CE7B400AE08E0 /* forwardIcon@2x.png */; + }; + 784DDC01128CE7B400AE08E0 /* forwardIcon@2x.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = "forwardIcon@2x.png"; + path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/forwardIcon@2x.png"; + sourceTree = ""; + }; + 784DDC02128CE7B400AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 784DDC03128CE7B400AE08E0 /* Localizable.strings */; + name = "Localizable.strings: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 475; + vrLoc = 0; + }; + 784DDC03128CE7B400AE08E0 /* Localizable.strings */ = { + isa = PBXFileReference; + lastKnownFileType = text.plist.strings; + name = Localizable.strings; + path = /Users/conesus/Projects/three20/src/Three20.bundle/ja.lproj/Localizable.strings; + sourceTree = ""; + }; + 784DDC04128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC05128CE7B400AE08E0 /* nextIcon.png */; + }; + 784DDC05128CE7B400AE08E0 /* nextIcon.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = nextIcon.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/nextIcon.png; + sourceTree = ""; + }; + 784DDC06128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC07128CE7B400AE08E0 /* nextIcon@2x.png */; + }; + 784DDC07128CE7B400AE08E0 /* nextIcon@2x.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = "nextIcon@2x.png"; + path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/nextIcon@2x.png"; + sourceTree = ""; + }; + 784DDC08128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC09128CE7B400AE08E0 /* overflowLeft.png */; + }; + 784DDC09128CE7B400AE08E0 /* overflowLeft.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = overflowLeft.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/overflowLeft.png; + sourceTree = ""; + }; + 784DDC0A128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC0B128CE7B400AE08E0 /* overflowRight.png */; + }; + 784DDC0B128CE7B400AE08E0 /* overflowRight.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = overflowRight.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/overflowRight.png; + sourceTree = ""; + }; + 784DDC0C128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC0D128CE7B400AE08E0 /* photoDefault.png */; + }; + 784DDC0D128CE7B400AE08E0 /* photoDefault.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = photoDefault.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/photoDefault.png; + sourceTree = ""; + }; + 784DDC0E128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC0F128CE7B400AE08E0 /* previousIcon.png */; + }; + 784DDC0F128CE7B400AE08E0 /* previousIcon.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = previousIcon.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/previousIcon.png; + sourceTree = ""; + }; + 784DDC10128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC11128CE7B400AE08E0 /* previousIcon@2x.png */; + }; + 784DDC11128CE7B400AE08E0 /* previousIcon@2x.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = "previousIcon@2x.png"; + path = "/Users/conesus/Projects/three20/src/Three20.bundle/images/previousIcon@2x.png"; + sourceTree = ""; + }; + 784DDC12128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC13128CE7B400AE08E0 /* searchIcon.png */; + }; + 784DDC13128CE7B400AE08E0 /* searchIcon.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = searchIcon.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/searchIcon.png; + sourceTree = ""; + }; + 784DDC14128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC15128CE7B400AE08E0 /* whiteArrow.png */; + }; + 784DDC15128CE7B400AE08E0 /* whiteArrow.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = whiteArrow.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/whiteArrow.png; + sourceTree = ""; + }; + 784DDC16128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC17128CE7B400AE08E0 /* blackArrow.png */; + }; + 784DDC17128CE7B400AE08E0 /* blackArrow.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = blackArrow.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/blackArrow.png; + sourceTree = ""; + }; + 784DDC18128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 784DDC19128CE7B400AE08E0 /* blueArrow.png */; + }; + 784DDC19128CE7B400AE08E0 /* blueArrow.png */ = { + isa = PBXFileReference; + lastKnownFileType = image.png; + name = blueArrow.png; + path = /Users/conesus/Projects/three20/src/Three20.bundle/images/blueArrow.png; + sourceTree = ""; + }; + 784DDC1A128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 7843F50B11EEB4EE00675F64 /* bullet_blue.png */; + }; + 784DDC1B128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 7843F50C11EEB4EE00675F64 /* bullet_orange.png */; + }; + 784DDC1C128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 7843F50D11EEB4EE00675F64 /* bullet_red.png */; + }; + 784DDC1D128CE7B400AE08E0 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 7843F50E11EEB4EE00675F64 /* bullet_yellow.png */; + }; + 784DDC22128CE97100AE08E0 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* NewsBlur-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + ); + name = "/Users/conesus/Projects/newsblur/media/iphone/NewsBlur-Info.plist"; + rLen = 0; + rLoc = 9223372036854775808; + }; + 784DDC2E128CEA7300AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */; + name = "NewsBlurAppDelegate.h: 50"; + rLen = 0; + rLoc = 1706; + rType = 0; + vrLen = 1713; + vrLoc = 0; + }; + 784DDC4B128CEE1C00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 787A0CD911CE65330056422D /* FeedDetailViewController.m */; + name = "FeedDetailViewController.m: 18"; + rLen = 15; + rLoc = 367; + rType = 0; + vrLen = 1494; + vrLoc = 0; + }; + 784DDC4C128CEE1C00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 787A0CD811CE65330056422D /* FeedDetailViewController.h */; + name = "FeedDetailViewController.h: 31"; + rLen = 0; + rLoc = 755; + rType = 0; + vrLen = 941; + vrLoc = 0; + }; + 784DDC61128CEFDD00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */; + name = "NewsBlurAppDelegate.m: 64"; + rLen = 9; + rLoc = 1644; + rType = 0; + vrLen = 1806; + vrLoc = 242; + }; + 784DDC78128CF10100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 148"; + rLen = 14; + rLoc = 4524; + rType = 0; + vrLen = 1878; + vrLoc = 3301; + }; + 784DDC79128CF10100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; + name = "NewsBlurViewController.h: 30"; + rLen = 14; + rLoc = 669; + rType = 0; + vrLen = 1185; + vrLoc = 0; + }; + 784DDC7A128CF10100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; + name = "NewsBlurViewController.h: 27"; + rLen = 0; + rLoc = 625; + rType = 0; + vrLen = 1219; + vrLoc = 0; + }; + 784DDCB2128CF11300AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; + name = "NewsBlurViewController.h: 26"; + rLen = 0; + rLoc = 625; + rType = 0; + vrLen = 1190; + vrLoc = 0; + }; + 784DDCE5128CF94900AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; + name = "NewsBlurViewController.h: 31"; + rLen = 0; + rLoc = 683; + rType = 0; + vrLen = 1237; + vrLoc = 0; + }; + 784DDCE6128CF94900AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 146"; + rLen = 12; + rLoc = 4526; + rType = 0; + vrLen = 1804; + vrLoc = 3342; + }; + 784DDCE7128CF94900AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 146"; + rLen = 0; + rLoc = 4538; + rType = 0; + vrLen = 1790; + vrLoc = 3342; + }; + 784DDCEC128CF9B300AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 146"; + rLen = 0; + rLoc = 4538; + rType = 0; + vrLen = 1804; + vrLoc = 3342; + }; + 784DDCED128CF9B300AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; + name = "NewsBlurViewController.h: 31"; + rLen = 0; + rLoc = 683; + rType = 0; + vrLen = 1237; + vrLoc = 0; + }; + 784DDCEE128CF9B300AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; + name = "NewsBlurViewController.h: 31"; + rLen = 0; + rLoc = 683; + rType = 0; + vrLen = 1226; + vrLoc = 0; + }; + 784DDCF2128CFA6F00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; + name = "NewsBlurViewController.h: 31"; + rLen = 0; + rLoc = 683; + rType = 0; + vrLen = 1226; + vrLoc = 0; + }; + 784DDCF3128CFA6F00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 58"; + rLen = 17; + rLoc = 1544; + rType = 0; + vrLen = 1586; + vrLoc = 0; + }; + 784DDCF8128CFB2B00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */; + name = "LoginViewController.m: 52"; + rLen = 729; + rLoc = 1267; + rType = 0; + vrLen = 2398; + vrLoc = 1083; + }; + 784DDCF9128CFB2B00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 63"; + rLen = 0; + rLoc = 1636; + rType = 0; + vrLen = 2158; + vrLoc = 1456; + }; + 784DDCFA128CFB2B00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 152"; + rLen = 0; + rLoc = 4827; + rType = 0; + vrLen = 1802; + vrLoc = 3416; + }; + 784DDCFD128CFB5800AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */; + name = "LoginViewController.m: 10"; + rLen = 28; + rLoc = 202; + rType = 0; + vrLen = 1998; + vrLoc = 0; + }; + 784DDCFE128CFB5800AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 12"; + rLen = 0; + rLoc = 234; + rType = 0; + vrLen = 1596; + vrLoc = 0; + }; + 784DDCFF128CFB5800AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 12"; + rLen = 0; + rLoc = 252; + rType = 0; + vrLen = 1611; + vrLoc = 0; + }; + 784DDD02128CFB7600AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 149"; + rLen = 0; + rLoc = 4624; + rType = 0; + vrLen = 1817; + vrLoc = 3542; + }; + 784DDD05128CFB9000AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 158"; + rLen = 0; + rLoc = 5008; + rType = 0; + vrLen = 1833; + vrLoc = 3542; + }; + 784DDD08128CFBEE00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */; + name = "NewsBlurAppDelegate.m: 64"; + rLen = 9; + rLoc = 1644; + rType = 0; + vrLen = 1768; + vrLoc = 280; + }; + 784DDD09128CFBEE00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */; + name = "LoginViewController.m: 89"; + rLen = 0; + rLoc = 2807; + rType = 0; + vrLen = 2086; + vrLoc = 1190; + }; + 784DDD0A128CFBEE00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 158"; + rLen = 0; + rLoc = 5008; + rType = 0; + vrLen = 1885; + vrLoc = 3545; + }; + 784DDD0B128CFBEE00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 167"; + rLen = 0; + rLoc = 5181; + rType = 0; + vrLen = 1685; + vrLoc = 3882; + }; + 784DDD0E128CFC8A00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 138"; + rLen = 0; + rLoc = 4239; + rType = 0; + vrLen = 2372; + vrLoc = 2564; + }; + 784DDD13128CFCA100AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 134"; + rLen = 0; + rLoc = 4239; + rType = 0; + vrLen = 2215; + vrLoc = 2564; + }; + 784DDD16128CFCB300AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 136"; + rLen = 0; + rLoc = 4054; + rType = 0; + vrLen = 2398; + vrLoc = 2564; + }; + 784DDD18128CFD2A00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 139"; + rLen = 0; + rLoc = 4172; + rType = 0; + vrLen = 2398; + vrLoc = 2564; + }; + 784DDD1D128CFD3B00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 139"; + rLen = 0; + rLoc = 4172; + rType = 0; + vrLen = 2398; + vrLoc = 2564; + }; + 784DDD22128CFD6C00AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 141"; + rLen = 0; + rLoc = 4236; + rType = 0; + vrLen = 2317; + vrLoc = 2564; + }; + 784DDD27128CFE6600AE08E0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; + name = "NewsBlurViewController.m: 106"; + rLen = 0; + rLoc = 2863; + rType = 0; + vrLen = 2159; + vrLoc = 2353; }; 787A0CD811CE65330056422D /* FeedDetailViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {686, 542}}"; - sepNavSelRange = "{876, 58}"; + sepNavIntBoundsRect = "{{0, 0}, {727, 847}}"; + sepNavSelRange = "{755, 0}"; sepNavVisRange = "{0, 941}"; }; }; 787A0CD911CE65330056422D /* FeedDetailViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {732, 2392}}"; - sepNavSelRange = "{2871, 9}"; - sepNavVisRange = "{2554, 704}"; + sepNavIntBoundsRect = "{{0, 0}, {727, 2366}}"; + sepNavSelRange = "{367, 15}"; + sepNavVisRange = "{0, 1494}"; sepNavWindowFrame = "{{69, 315}, {750, 558}}"; }; }; @@ -445,136 +1109,6 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 78D09B32128CB59B009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7816BCC1128B7D4A008ED38C /* FeedDetailViewController.m */; - name = "FeedDetailViewController.m: 101"; - rLen = 0; - rLoc = 2885; - rType = 0; - vrLen = 1372; - vrLoc = 2884; - }; - 78D09B3C128CB5B4009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */; - name = "NewsBlurAppDelegate.h: 41"; - rLen = 0; - rLoc = 1465; - rType = 0; - vrLen = 1368; - vrLoc = 290; - }; - 78D09B5B128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 29B97316FDCFA39411CA2CEA /* main.m */; - name = "main.m: 14"; - rLen = 0; - rLoc = 262; - rType = 0; - vrLen = 361; - vrLoc = 0; - }; - 78D09B5C128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */; - name = "StoryDetailViewController.m: 15"; - rLen = 0; - rLoc = 292; - rType = 0; - vrLen = 1391; - vrLoc = 0; - }; - 78D09B5D128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7842ECF511D44A530066CF9D /* StoryDetailViewController.h */; - name = "StoryDetailViewController.h: 20"; - rLen = 64; - rLoc = 410; - rType = 0; - vrLen = 481; - vrLoc = 0; - }; - 78D09B5E128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */; - name = "NewsBlurAppDelegate.h: 33"; - rLen = 19; - rLoc = 984; - rType = 0; - vrLen = 1484; - vrLoc = 0; - }; - 78D09B5F128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */; - name = "NewsBlurViewController.h: 11"; - rLen = 11; - rLoc = 181; - rType = 0; - vrLen = 1049; - vrLoc = 0; - }; - 78D09B60128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 7816BDF4128C458B008ED38C /* NewsBlurViewController.m */; - name = "NewsBlurViewController.m: 9"; - rLen = 0; - rLoc = 175; - rType = 0; - vrLen = 972; - vrLoc = 0; - }; - 78D09B61128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */; - name = "NewsBlurAppDelegate.m: 36"; - rLen = 19; - rLoc = 1101; - rType = 0; - vrLen = 1302; - vrLoc = 42; - }; - 78D09B62128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 784B50EA127E3F68008F90EA /* LoginViewController.h */; - name = "LoginViewController.h: 16"; - rLen = 0; - rLoc = 323; - rType = 0; - vrLen = 689; - vrLoc = 0; - }; - 78D09B63128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */; - name = "LoginViewController.m: 14"; - rLen = 0; - rLoc = 284; - rType = 0; - vrLen = 999; - vrLoc = 0; - }; - 78D09B64128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 784B50EB127E3F68008F90EA /* LoginViewController.m */; - name = "LoginViewController.m: 17"; - rLen = 0; - rLoc = 327; - rType = 0; - vrLen = 999; - vrLoc = 0; - }; - 78D09B65128CCA46009B016D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */; - name = "NewsBlurAppDelegate.h: 41"; - rLen = 0; - rLoc = 1465; - rType = 0; - vrLen = 1369; - vrLoc = 289; - }; 78FC34EA11CA94900055C312 /* JSON.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1143, 780}}"; diff --git a/media/iphone/NewsBlur.xcodeproj/project.pbxproj b/media/iphone/NewsBlur.xcodeproj/project.pbxproj index af60a467f..889ca7b97 100755 --- a/media/iphone/NewsBlur.xcodeproj/project.pbxproj +++ b/media/iphone/NewsBlur.xcodeproj/project.pbxproj @@ -15,6 +15,14 @@ 2899E5220DE3E06400AC0155 /* NewsBlurViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2899E5210DE3E06400AC0155 /* NewsBlurViewController.xib */; }; 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 28D7ACF80DDB3853001CB0EB /* NewsBlurViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */; }; + 782D832A128CCB62009B6727 /* libThree20.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D8299128CCB48009B6727 /* libThree20.a */; }; + 782D832F128CCB65009B6727 /* libThree20Core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D82C2128CCB55009B6727 /* libThree20Core.a */; }; + 782D8333128CCB69009B6727 /* libThree20Network.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D82D4128CCB55009B6727 /* libThree20Network.a */; }; + 782D8335128CCB6A009B6727 /* libThree20Style.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D82E6128CCB55009B6727 /* libThree20Style.a */; }; + 782D8338128CCB6D009B6727 /* libThree20UI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D831C128CCB55009B6727 /* libThree20UI.a */; }; + 782D833B128CCB6E009B6727 /* libThree20UICommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D82F8128CCB55009B6727 /* libThree20UICommon.a */; }; + 782D833E128CCB71009B6727 /* libThree20UINavigator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 782D830A128CCB55009B6727 /* libThree20UINavigator.a */; }; + 782D8379128CCBAE009B6727 /* Three20.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 782D8378128CCBAE009B6727 /* Three20.bundle */; }; 7842ECF811D44A530066CF9D /* StoryDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */; }; 7842ECF911D44A540066CF9D /* StoryDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7842ECF711D44A530066CF9D /* StoryDetailViewController.xib */; }; 7843F4E911EEABDC00675F64 /* FeedDetailTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7843F4E811EEABDC00675F64 /* FeedDetailTableCell.xib */; }; @@ -36,6 +44,352 @@ 78FC34FC11CA94900055C312 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FC34F611CA94900055C312 /* SBJsonWriter.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 782D8298128CCB48009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2; + remoteInfo = Three20; + }; + 782D829A128CCB48009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A55DE126521740032D0BE; + remoteInfo = "Three20-Xcode3.2.5"; + }; + 782D829C128CCB48009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FE8F171265E968001E0674; + remoteInfo = "Three20-Xcode3.2.2"; + }; + 782D829E128CCB48009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB9E6C6210B6A8F800DE563C; + remoteInfo = Three20UnitTests; + }; + 782D82A0128CCB48009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A55FB126521740032D0BE; + remoteInfo = "Three20UnitTests-Xcode3.2.5"; + }; + 782D82A2128CCB48009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FE8F371265E968001E0674; + remoteInfo = "Three20UnitTests-Xcode3.2.2"; + }; + 782D82C1128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2; + remoteInfo = Three20Core; + }; + 782D82C3128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6650CAA21262F6E2003FF804; + remoteInfo = "Three20Core-Xcode3.2.5"; + }; + 782D82C5128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66C2E0FC1262F748006DF55A; + remoteInfo = "Three20Core-Xcode3.2.2"; + }; + 782D82C7128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB9E6C6210B6A8F800DE563C; + remoteInfo = Three20CoreUnitTests; + }; + 782D82C9128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 664961641262EE5000C2C80E; + remoteInfo = "Three20CoreUnitTests-Xcode3.2.5"; + }; + 782D82CB128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66F9A63C1262ED9F0059C2AE; + remoteInfo = "Three20CoreUnitTests-Xcode3.2.2"; + }; + 782D82D3128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2; + remoteInfo = Three20Network; + }; + 782D82D5128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81EF12630516005851C2; + remoteInfo = "Three20Network-Xcode3.2.5"; + }; + 782D82D7128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D821612630527005851C2; + remoteInfo = "Three20Network-Xcode3.2.2"; + }; + 782D82D9128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB9E6C6210B6A8F800DE563C; + remoteInfo = Three20NetworkUnitTests; + }; + 782D82DB128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81B2126304EB005851C2; + remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5"; + }; + 782D82DD128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81C7126304F3005851C2; + remoteInfo = "Three20NetworkUnitTests-Xcode3.2.2"; + }; + 782D82E5128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2; + remoteInfo = Three20Style; + }; + 782D82E7128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66C16BE912639E2700A7825A; + remoteInfo = "Three20Style-Xcode3.2.5"; + }; + 782D82E9128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66846C7812639EE5001D2CF9; + remoteInfo = "Three20Style-Xcode3.2.2"; + }; + 782D82EB128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB9E6C6210B6A8F800DE563C; + remoteInfo = Three20StyleUnitTests; + }; + 782D82ED128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66C16C0112639E4500A7825A; + remoteInfo = "Three20StyleUnitTests-Xcode3.2.5"; + }; + 782D82EF128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66846C9612639F29001D2CF9; + remoteInfo = "Three20StyleUnitTests-Xcode3.2.2"; + }; + 782D82F7128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2; + remoteInfo = Three20UICommon; + }; + 782D82F9128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A53761264D54B0032D0BE; + remoteInfo = "Three20UICommon-Xcode3.2.5"; + }; + 782D82FB128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A53E61264D6550032D0BE; + remoteInfo = "Three20UICommon-Xcode3.2.2"; + }; + 782D82FD128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB9E6C6210B6A8F800DE563C; + remoteInfo = Three20UICommonUnitTests; + }; + 782D82FF128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A53891264D54B0032D0BE; + remoteInfo = "Three20UICommonUnitTests-Xcode3.2.5"; + }; + 782D8301128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A53F81264D6550032D0BE; + remoteInfo = "Three20UICommonUnitTests-Xcode3.2.2"; + }; + 782D8309128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2; + remoteInfo = Three20UINavigator; + }; + 782D830B128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A54521264DAF70032D0BE; + remoteInfo = "Three20UINavigator-Xcode3.2.5"; + }; + 782D830D128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FE8BFA1264DBC3001E0674; + remoteInfo = "Three20UINavigator-Xcode3.2.2"; + }; + 782D830F128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB9E6C6210B6A8F800DE563C; + remoteInfo = Three20UINavigatorUnitTests; + }; + 782D8311128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 665A54681264DAF70032D0BE; + remoteInfo = "Three20UINavigatorUnitTests-Xcode3.2.5"; + }; + 782D8313128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FE8C0F1264DBC3001E0674; + remoteInfo = "Three20UINavigatorUnitTests-Xcode3.2.2"; + }; + 782D831B128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2; + remoteInfo = Three20UI; + }; + 782D831D128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FC2BC81264E3A400F56B19; + remoteInfo = "Three20UI-Xcode3.2.5"; + }; + 782D831F128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FE8DDE1264E960001E0674; + remoteInfo = "Three20UI-Xcode3.2.2"; + }; + 782D8321128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB9E6C6210B6A8F800DE563C; + remoteInfo = Three20UIUnitTests; + }; + 782D8323128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FC2BE61264E3A500F56B19; + remoteInfo = "Three20UIUnitTests-Xcode3.2.5"; + }; + 782D8325128CCB55009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 66FE8DFB1264E960001E0674; + remoteInfo = "Three20UIUnitTests-Xcode3.2.2"; + }; + 782D8347128CCB8C009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20UINavigator; + }; + 782D834D128CCB8C009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20; + }; + 782D8353128CCB8C009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20Core; + }; + 782D8359128CCB8C009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20Style; + }; + 782D835F128CCB8C009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20UICommon; + }; + 782D8365128CCB8C009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20UI; + }; + 782D836B128CCB8C009B6727 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20Network; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewsBlurAppDelegate.h; sourceTree = ""; }; @@ -49,6 +403,14 @@ 28D7ACF70DDB3853001CB0EB /* NewsBlurViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = NewsBlurViewController.m; sourceTree = ""; tabWidth = 4; usesTabs = 1; wrapsLines = 1; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* NewsBlur_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewsBlur_Prefix.pch; sourceTree = ""; }; + 782D8269128CCB47009B6727 /* Three20.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20.xcodeproj; path = ../../../three20/src/Three20/Three20.xcodeproj; sourceTree = SOURCE_ROOT; }; + 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Core.xcodeproj; path = ../../../three20/src/Three20Core/Three20Core.xcodeproj; sourceTree = SOURCE_ROOT; }; + 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Network.xcodeproj; path = ../../../three20/src/Three20Network/Three20Network.xcodeproj; sourceTree = SOURCE_ROOT; }; + 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Style.xcodeproj; path = ../../../three20/src/Three20Style/Three20Style.xcodeproj; sourceTree = SOURCE_ROOT; }; + 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UICommon.xcodeproj; path = ../../../three20/src/Three20UICommon/Three20UICommon.xcodeproj; sourceTree = SOURCE_ROOT; }; + 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UINavigator.xcodeproj; path = ../../../three20/src/Three20UINavigator/Three20UINavigator.xcodeproj; sourceTree = SOURCE_ROOT; }; + 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UI.xcodeproj; path = ../../../three20/src/Three20UI/Three20UI.xcodeproj; sourceTree = SOURCE_ROOT; }; + 782D8378128CCBAE009B6727 /* Three20.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Three20.bundle; path = ../../../three20/src/Three20.bundle; sourceTree = SOURCE_ROOT; }; 7842ECF511D44A530066CF9D /* StoryDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StoryDetailViewController.h; sourceTree = ""; }; 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoryDetailViewController.m; sourceTree = ""; }; 7842ECF711D44A530066CF9D /* StoryDetailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StoryDetailViewController.xib; sourceTree = ""; }; @@ -91,6 +453,13 @@ 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, 788EF356127E5BC80088EDC5 /* QuartzCore.framework in Frameworks */, + 782D832A128CCB62009B6727 /* libThree20.a in Frameworks */, + 782D832F128CCB65009B6727 /* libThree20Core.a in Frameworks */, + 782D8333128CCB69009B6727 /* libThree20Network.a in Frameworks */, + 782D8335128CCB6A009B6727 /* libThree20Style.a in Frameworks */, + 782D8338128CCB6D009B6727 /* libThree20UI.a in Frameworks */, + 782D833B128CCB6E009B6727 /* libThree20UICommon.a in Frameworks */, + 782D833E128CCB71009B6727 /* libThree20UINavigator.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -154,6 +523,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 782D8378128CCBAE009B6727 /* Three20.bundle */, 7843F50B11EEB4EE00675F64 /* bullet_blue.png */, 7843F50C11EEB4EE00675F64 /* bullet_orange.png */, 7843F50D11EEB4EE00675F64 /* bullet_red.png */, @@ -166,6 +536,13 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */, + 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */, + 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */, + 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */, + 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */, + 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */, + 782D8269128CCB47009B6727 /* Three20.xcodeproj */, 78FC34E911CA94900055C312 /* JSON */, 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, 1D30AB110D05D00D00671497 /* Foundation.framework */, @@ -175,6 +552,97 @@ name = Frameworks; sourceTree = ""; }; + 782D826A128CCB47009B6727 /* Products */ = { + isa = PBXGroup; + children = ( + 782D8299128CCB48009B6727 /* libThree20.a */, + 782D829B128CCB48009B6727 /* libThree20-Xcode3.2.5.a */, + 782D829D128CCB48009B6727 /* libThree20-Xcode3.2.2.a */, + 782D829F128CCB48009B6727 /* Three20UnitTests.octest */, + 782D82A1128CCB48009B6727 /* Three20UnitTests-Xcode3.2.5.octest */, + 782D82A3128CCB48009B6727 /* Three20UnitTests-Xcode3.2.2.octest */, + ); + name = Products; + sourceTree = ""; + }; + 782D82AA128CCB55009B6727 /* Products */ = { + isa = PBXGroup; + children = ( + 782D82C2128CCB55009B6727 /* libThree20Core.a */, + 782D82C4128CCB55009B6727 /* libThree20Core-Xcode3.2.5.a */, + 782D82C6128CCB55009B6727 /* libThree20Core-Xcode3.2.2.a */, + 782D82C8128CCB55009B6727 /* CoreUnitTests.octest */, + 782D82CA128CCB55009B6727 /* CoreUnitTests-Xcode3.2.5.octest */, + 782D82CC128CCB55009B6727 /* CoreUnitTests-Xcode3.2.2.octest */, + ); + name = Products; + sourceTree = ""; + }; + 782D82AD128CCB55009B6727 /* Products */ = { + isa = PBXGroup; + children = ( + 782D82D4128CCB55009B6727 /* libThree20Network.a */, + 782D82D6128CCB55009B6727 /* libThree20Network-Xcode3.2.5.a */, + 782D82D8128CCB55009B6727 /* libThree20Network-Xcode3.2.2.a */, + 782D82DA128CCB55009B6727 /* NetworkUnitTests.octest */, + 782D82DC128CCB55009B6727 /* NetworkUnitTests-Xcode3.2.5.octest */, + 782D82DE128CCB55009B6727 /* NetworkUnitTests-Xcode3.2.2.octest */, + ); + name = Products; + sourceTree = ""; + }; + 782D82B0128CCB55009B6727 /* Products */ = { + isa = PBXGroup; + children = ( + 782D82E6128CCB55009B6727 /* libThree20Style.a */, + 782D82E8128CCB55009B6727 /* libThree20Style-Xcode3.2.5.a */, + 782D82EA128CCB55009B6727 /* libThree20Style-Xcode3.2.2.a */, + 782D82EC128CCB55009B6727 /* StyleUnitTests.octest */, + 782D82EE128CCB55009B6727 /* StyleUnitTests-Xcode3.2.5.octest */, + 782D82F0128CCB55009B6727 /* StyleUnitTests-Xcode3.2.2.octest */, + ); + name = Products; + sourceTree = ""; + }; + 782D82B3128CCB55009B6727 /* Products */ = { + isa = PBXGroup; + children = ( + 782D82F8128CCB55009B6727 /* libThree20UICommon.a */, + 782D82FA128CCB55009B6727 /* libThree20UICommon-Xcode3.2.5.a */, + 782D82FC128CCB55009B6727 /* libThree20UICommon-Xcode3.2.2.a */, + 782D82FE128CCB55009B6727 /* UICommonUnitTests.octest */, + 782D8300128CCB55009B6727 /* UICommonUnitTests-Xcode3.2.5.octest */, + 782D8302128CCB55009B6727 /* UICommonUnitTests-Xcode3.2.2.octest */, + ); + name = Products; + sourceTree = ""; + }; + 782D82B6128CCB55009B6727 /* Products */ = { + isa = PBXGroup; + children = ( + 782D830A128CCB55009B6727 /* libThree20UINavigator.a */, + 782D830C128CCB55009B6727 /* libThree20UINavigator-Xcode3.2.5.a */, + 782D830E128CCB55009B6727 /* libThree20UINavigator-Xcode3.2.2.a */, + 782D8310128CCB55009B6727 /* UINavigatorUnitTests.octest */, + 782D8312128CCB55009B6727 /* UINavigatorUnitTests-Xcode3.2.5.octest */, + 782D8314128CCB55009B6727 /* UINavigatorUnitTests-Xcode3.2.2.octest */, + ); + name = Products; + sourceTree = ""; + }; + 782D82B9128CCB55009B6727 /* Products */ = { + isa = PBXGroup; + children = ( + 782D831C128CCB55009B6727 /* libThree20UI.a */, + 782D831E128CCB55009B6727 /* libThree20UI-Xcode3.2.5.a */, + 782D8320128CCB55009B6727 /* libThree20UI-Xcode3.2.2.a */, + 782D8322128CCB55009B6727 /* UIUnitTests.octest */, + 782D8324128CCB55009B6727 /* UIUnitTests-Xcode3.2.5.octest */, + 782D8326128CCB55009B6727 /* UIUnitTests-Xcode3.2.2.octest */, + ); + name = Products; + sourceTree = ""; + }; 78FC34E911CA94900055C312 /* JSON */ = { isa = PBXGroup; children = ( @@ -210,6 +678,13 @@ buildRules = ( ); dependencies = ( + 782D8348128CCB8C009B6727 /* PBXTargetDependency */, + 782D834E128CCB8C009B6727 /* PBXTargetDependency */, + 782D8354128CCB8C009B6727 /* PBXTargetDependency */, + 782D835A128CCB8C009B6727 /* PBXTargetDependency */, + 782D8360128CCB8C009B6727 /* PBXTargetDependency */, + 782D8366128CCB8C009B6727 /* PBXTargetDependency */, + 782D836C128CCB8C009B6727 /* PBXTargetDependency */, ); name = NewsBlur; productName = NewsBlur; @@ -236,6 +711,36 @@ ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 782D826A128CCB47009B6727 /* Products */; + ProjectRef = 782D8269128CCB47009B6727 /* Three20.xcodeproj */; + }, + { + ProductGroup = 782D82AA128CCB55009B6727 /* Products */; + ProjectRef = 782D82A9128CCB55009B6727 /* Three20Core.xcodeproj */; + }, + { + ProductGroup = 782D82AD128CCB55009B6727 /* Products */; + ProjectRef = 782D82AC128CCB55009B6727 /* Three20Network.xcodeproj */; + }, + { + ProductGroup = 782D82B0128CCB55009B6727 /* Products */; + ProjectRef = 782D82AF128CCB55009B6727 /* Three20Style.xcodeproj */; + }, + { + ProductGroup = 782D82B9128CCB55009B6727 /* Products */; + ProjectRef = 782D82B8128CCB55009B6727 /* Three20UI.xcodeproj */; + }, + { + ProductGroup = 782D82B3128CCB55009B6727 /* Products */; + ProjectRef = 782D82B2128CCB55009B6727 /* Three20UICommon.xcodeproj */; + }, + { + ProductGroup = 782D82B6128CCB55009B6727 /* Products */; + ProjectRef = 782D82B5128CCB55009B6727 /* Three20UINavigator.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 1D6058900D05DD3D006BFB54 /* NewsBlur */, @@ -243,6 +748,303 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 782D8299128CCB48009B6727 /* libThree20.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libThree20.a; + remoteRef = 782D8298128CCB48009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D829B128CCB48009B6727 /* libThree20-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20-Xcode3.2.5.a"; + remoteRef = 782D829A128CCB48009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D829D128CCB48009B6727 /* libThree20-Xcode3.2.2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20-Xcode3.2.2.a"; + remoteRef = 782D829C128CCB48009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D829F128CCB48009B6727 /* Three20UnitTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Three20UnitTests.octest; + remoteRef = 782D829E128CCB48009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82A1128CCB48009B6727 /* Three20UnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Three20UnitTests-Xcode3.2.5.octest"; + remoteRef = 782D82A0128CCB48009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82A3128CCB48009B6727 /* Three20UnitTests-Xcode3.2.2.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Three20UnitTests-Xcode3.2.2.octest"; + remoteRef = 782D82A2128CCB48009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82C2128CCB55009B6727 /* libThree20Core.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libThree20Core.a; + remoteRef = 782D82C1128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82C4128CCB55009B6727 /* libThree20Core-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Core-Xcode3.2.5.a"; + remoteRef = 782D82C3128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82C6128CCB55009B6727 /* libThree20Core-Xcode3.2.2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Core-Xcode3.2.2.a"; + remoteRef = 782D82C5128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82C8128CCB55009B6727 /* CoreUnitTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = CoreUnitTests.octest; + remoteRef = 782D82C7128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82CA128CCB55009B6727 /* CoreUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "CoreUnitTests-Xcode3.2.5.octest"; + remoteRef = 782D82C9128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82CC128CCB55009B6727 /* CoreUnitTests-Xcode3.2.2.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "CoreUnitTests-Xcode3.2.2.octest"; + remoteRef = 782D82CB128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82D4128CCB55009B6727 /* libThree20Network.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libThree20Network.a; + remoteRef = 782D82D3128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82D6128CCB55009B6727 /* libThree20Network-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Network-Xcode3.2.5.a"; + remoteRef = 782D82D5128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82D8128CCB55009B6727 /* libThree20Network-Xcode3.2.2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Network-Xcode3.2.2.a"; + remoteRef = 782D82D7128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82DA128CCB55009B6727 /* NetworkUnitTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = NetworkUnitTests.octest; + remoteRef = 782D82D9128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82DC128CCB55009B6727 /* NetworkUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "NetworkUnitTests-Xcode3.2.5.octest"; + remoteRef = 782D82DB128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82DE128CCB55009B6727 /* NetworkUnitTests-Xcode3.2.2.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "NetworkUnitTests-Xcode3.2.2.octest"; + remoteRef = 782D82DD128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82E6128CCB55009B6727 /* libThree20Style.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libThree20Style.a; + remoteRef = 782D82E5128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82E8128CCB55009B6727 /* libThree20Style-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Style-Xcode3.2.5.a"; + remoteRef = 782D82E7128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82EA128CCB55009B6727 /* libThree20Style-Xcode3.2.2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Style-Xcode3.2.2.a"; + remoteRef = 782D82E9128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82EC128CCB55009B6727 /* StyleUnitTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = StyleUnitTests.octest; + remoteRef = 782D82EB128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82EE128CCB55009B6727 /* StyleUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "StyleUnitTests-Xcode3.2.5.octest"; + remoteRef = 782D82ED128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82F0128CCB55009B6727 /* StyleUnitTests-Xcode3.2.2.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "StyleUnitTests-Xcode3.2.2.octest"; + remoteRef = 782D82EF128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82F8128CCB55009B6727 /* libThree20UICommon.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libThree20UICommon.a; + remoteRef = 782D82F7128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82FA128CCB55009B6727 /* libThree20UICommon-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20UICommon-Xcode3.2.5.a"; + remoteRef = 782D82F9128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82FC128CCB55009B6727 /* libThree20UICommon-Xcode3.2.2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20UICommon-Xcode3.2.2.a"; + remoteRef = 782D82FB128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D82FE128CCB55009B6727 /* UICommonUnitTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = UICommonUnitTests.octest; + remoteRef = 782D82FD128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8300128CCB55009B6727 /* UICommonUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "UICommonUnitTests-Xcode3.2.5.octest"; + remoteRef = 782D82FF128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8302128CCB55009B6727 /* UICommonUnitTests-Xcode3.2.2.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "UICommonUnitTests-Xcode3.2.2.octest"; + remoteRef = 782D8301128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D830A128CCB55009B6727 /* libThree20UINavigator.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libThree20UINavigator.a; + remoteRef = 782D8309128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D830C128CCB55009B6727 /* libThree20UINavigator-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20UINavigator-Xcode3.2.5.a"; + remoteRef = 782D830B128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D830E128CCB55009B6727 /* libThree20UINavigator-Xcode3.2.2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20UINavigator-Xcode3.2.2.a"; + remoteRef = 782D830D128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8310128CCB55009B6727 /* UINavigatorUnitTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = UINavigatorUnitTests.octest; + remoteRef = 782D830F128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8312128CCB55009B6727 /* UINavigatorUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "UINavigatorUnitTests-Xcode3.2.5.octest"; + remoteRef = 782D8311128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8314128CCB55009B6727 /* UINavigatorUnitTests-Xcode3.2.2.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "UINavigatorUnitTests-Xcode3.2.2.octest"; + remoteRef = 782D8313128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D831C128CCB55009B6727 /* libThree20UI.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libThree20UI.a; + remoteRef = 782D831B128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D831E128CCB55009B6727 /* libThree20UI-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20UI-Xcode3.2.5.a"; + remoteRef = 782D831D128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8320128CCB55009B6727 /* libThree20UI-Xcode3.2.2.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20UI-Xcode3.2.2.a"; + remoteRef = 782D831F128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8322128CCB55009B6727 /* UIUnitTests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = UIUnitTests.octest; + remoteRef = 782D8321128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8324128CCB55009B6727 /* UIUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "UIUnitTests-Xcode3.2.5.octest"; + remoteRef = 782D8323128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 782D8326128CCB55009B6727 /* UIUnitTests-Xcode3.2.2.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "UIUnitTests-Xcode3.2.2.octest"; + remoteRef = 782D8325128CCB55009B6727 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 1D60588D0D05DD3D006BFB54 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -258,6 +1060,7 @@ 7843F51111EEB4EE00675F64 /* bullet_red.png in Resources */, 7843F51211EEB4EE00675F64 /* bullet_yellow.png in Resources */, 784B50E5127E3A6A008F90EA /* LoginViewController.xib in Resources */, + 782D8379128CCBAE009B6727 /* Three20.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -286,33 +1089,59 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 782D8348128CCB8C009B6727 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20UINavigator; + targetProxy = 782D8347128CCB8C009B6727 /* PBXContainerItemProxy */; + }; + 782D834E128CCB8C009B6727 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20; + targetProxy = 782D834D128CCB8C009B6727 /* PBXContainerItemProxy */; + }; + 782D8354128CCB8C009B6727 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20Core; + targetProxy = 782D8353128CCB8C009B6727 /* PBXContainerItemProxy */; + }; + 782D835A128CCB8C009B6727 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20Style; + targetProxy = 782D8359128CCB8C009B6727 /* PBXContainerItemProxy */; + }; + 782D8360128CCB8C009B6727 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20UICommon; + targetProxy = 782D835F128CCB8C009B6727 /* PBXContainerItemProxy */; + }; + 782D8366128CCB8C009B6727 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20UI; + targetProxy = 782D8365128CCB8C009B6727 /* PBXContainerItemProxy */; + }; + 782D836C128CCB8C009B6727 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20Network; + targetProxy = 782D836B128CCB8C009B6727 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; + ALWAYS_SEARCH_USER_PATHS = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = NewsBlur_Prefix.pch; - HEADER_SEARCH_PATHS = ../../../code/three20/Build/Products/three20; + HEADER_SEARCH_PATHS = "~/Projects/three20/Build/Products/three20"; INFOPLIST_FILE = "NewsBlur-Info.plist"; OTHER_LDFLAGS = ( - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20UICommon.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20UINavigator.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20Core.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20UI.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20Network.a", - "-force_load", - "../../../code/three20/Build/Products/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/libThree20Style.a", + "-all_load", + "-ObjC", ); PRODUCT_NAME = NewsBlur; }; @@ -363,7 +1192,7 @@ ); PREBINDING = NO; RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = iphonesimulator3.2; + SDKROOT = iphonesimulator4.1; }; name = Debug; }; diff --git a/media/iphone/NewsBlurViewController.xib b/media/iphone/NewsBlurViewController.xib index d8ed94c84..2c0fa2b6e 100644 --- a/media/iphone/NewsBlurViewController.xib +++ b/media/iphone/NewsBlurViewController.xib @@ -1,18 +1,18 @@ - 784 - 10F569 - 740 - 1038.29 + 1024 + 10H574 + 804 + 1038.35 461.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 62 + 123 YES - + YES @@ -31,9 +31,11 @@ YES IBFilesOwner + IBCocoaTouchFramework IBFirstResponder + IBCocoaTouchFramework @@ -43,9 +45,42 @@ 274 - {{-6, 0}, {326, 416}} + {{-6, 44}, {326, 372}} + + 10 + + 549453824 + {84, 1} + + YES + + YES + + + + TU0AKgAAAVjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ +y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ +xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ +xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ +xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ +xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P8ADQEAAAMAAAABAFQAAAEB +AAMAAAABAAEAAAECAAMAAAAEAAAB+gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAAEAAAEXAAQAAAABAAABUAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA + + + + + + 3 + MCAwAA + + + groupTableViewBackgroundColor + YES + IBCocoaTouchFramework NO NO 1 @@ -69,6 +104,7 @@ NO YES YES + IBCocoaTouchFramework 0 0 -1 @@ -82,23 +118,49 @@ MC4yMjcwMjkxMjggMC4zNjIxMzU3NzY0IDAuNDU2NTIxNzM5MQA NO + IBCocoaTouchFramework 1 YES + IBCocoaTouchFramework 5 + IBCocoaTouchFramework - + 1 MC4yMjcwMjkxMjggMC4zNjIxMzU3NzY0IDAuNDU2NTIxNzM5MQA + + + 290 + {320, 44} + + IBCocoaTouchFramework + 1 + + + YES + + + Title + + Logout + IBCocoaTouchFramework + 1 + + + IBCocoaTouchFramework + + + {320, 460} @@ -111,6 +173,7 @@ NO + IBCocoaTouchFramework @@ -156,13 +219,29 @@ 37 + + + doLogoutButton + + + + 47 + + + + logoutButton + + + + 48 + view - + - 38 + 49 @@ -190,8 +269,9 @@ YES - + + @@ -232,6 +312,29 @@ + + 41 + + + YES + + + + + + 42 + + + YES + + + + + + 43 + + + @@ -243,10 +346,15 @@ 11.IBPluginDependency 23.IBPluginDependency 25.IBPluginDependency + 41.IBPluginDependency + 41.IBViewBoundsToFrameTransform + 42.IBPluginDependency + 43.IBPluginDependency 6.IBEditorWindowLastContentRect 6.IBPluginDependency 6.IBViewEditorWindowController.showingLayoutRectangles 8.IBPluginDependency + 8.IBViewBoundsToFrameTransform YES @@ -255,10 +363,19 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{742, 324}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAAAAAAAAwqoAAA + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{1538, 575}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAADAwAAAw88AAA + @@ -277,7 +394,7 @@ - 40 + 49 @@ -302,11 +419,87 @@ UITableView + + YES + + YES + appDelegate + feedScoreSlider + feedViewToolbar + storyTitlesTable + + + YES + + appDelegate + NewsBlurAppDelegate + + + feedScoreSlider + UISlider + + + feedViewToolbar + UIToolbar + + + storyTitlesTable + UITableView + + + IBProjectSource Classes/FeedDetailViewController.h + + LoginViewController + UIViewController + + YES + + YES + appDelegate + passwordTextField + usernameTextField + + + YES + NewsBlurAppDelegate + UITextField + UITextField + + + + YES + + YES + appDelegate + passwordTextField + usernameTextField + + + YES + + appDelegate + NewsBlurAppDelegate + + + passwordTextField + UITextField + + + usernameTextField + UITextField + + + + + IBProjectSource + Classes/LoginViewController.h + + NSObject @@ -330,17 +523,60 @@ YES feedDetailViewController feedsViewController + loginViewController navigationController + storyDetailViewController window YES FeedDetailViewController NewsBlurViewController + LoginViewController UINavigationController + StoryDetailViewController UIWindow + + YES + + YES + feedDetailViewController + feedsViewController + loginViewController + navigationController + storyDetailViewController + window + + + YES + + feedDetailViewController + FeedDetailViewController + + + feedsViewController + NewsBlurViewController + + + loginViewController + LoginViewController + + + navigationController + UINavigationController + + + storyDetailViewController + StoryDetailViewController + + + window + UIWindow + + + IBProjectSource Classes/NewsBlurAppDelegate.h @@ -349,6 +585,17 @@ NewsBlurViewController UIViewController + + doLogoutButton: + id + + + doLogoutButton: + + doLogoutButton: + id + + YES @@ -356,6 +603,7 @@ appDelegate feedScoreSlider feedViewToolbar + logoutButton viewTableFeedTitles @@ -363,17 +611,372 @@ NewsBlurAppDelegate UISlider UIToolbar + UIBarButtonItem UITableView + + YES + + YES + appDelegate + feedScoreSlider + feedViewToolbar + logoutButton + viewTableFeedTitles + + + YES + + appDelegate + NewsBlurAppDelegate + + + feedScoreSlider + UISlider + + + feedViewToolbar + UIToolbar + + + logoutButton + UIBarButtonItem + + + viewTableFeedTitles + UITableView + + + IBProjectSource Classes/NewsBlurViewController.h + + StoryDetailViewController + UIViewController + + YES + + YES + appDelegate + webView + + + YES + NewsBlurAppDelegate + UIWebView + + + + YES + + YES + appDelegate + webView + + + YES + + appDelegate + NewsBlurAppDelegate + + + webView + UIWebView + + + + + IBProjectSource + Classes/StoryDetailViewController.h + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIBarButtonItem + UIBarItem + + IBFrameworkSource + UIKit.framework/Headers/UIBarButtonItem.h + + + + UIBarItem + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIBarItem.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UINavigationBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UINavigationBar.h + + + + UINavigationController + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UINavigationItem + NSObject + + + + UIResponder + NSObject + + + + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UISlider + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UISlider.h + + + + UITableView + UIScrollView + + IBFrameworkSource + UIKit.framework/Headers/UITableView.h + + + + UITextField + UIControl + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIToolbar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIToolbar.h + + + + UIView + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + UIWebView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIWebView.h + + + + UIWindow + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIWindow.h + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -381,6 +984,6 @@ YES NewsBlur.xcodeproj 3 - 3.1 + 123