diff --git a/media/ios/Classes/FindSitesViewController.h b/media/ios/Classes/FindSitesViewController.h new file mode 100644 index 000000000..505b95303 --- /dev/null +++ b/media/ios/Classes/FindSitesViewController.h @@ -0,0 +1,34 @@ +// +// findSitesViewController.h +// NewsBlur +// +// Created by Roy Yang on 7/31/12. +// Copyright (c) 2012 NewsBlur. All rights reserved. +// + +#import + +@class NewsBlurAppDelegate; +@class ASIHTTPRequest; + +@interface FindSitesViewController : UIViewController + { + NewsBlurAppDelegate *appDelegate; + UISearchBar *sitesSearchBar; + UITableView *sitesTable; + + NSArray *sites; +} + +@property (nonatomic) IBOutlet NewsBlurAppDelegate *appDelegate; +@property (nonatomic) IBOutlet UISearchBar *sitesSearchBar; +@property (nonatomic) IBOutlet UITableView *sitesTable; +@property (nonatomic) NSArray *sites; + + +- (void)doCancelButton; +- (void)loadSitesList:(NSString *)query; +- (void)requestFinished:(ASIHTTPRequest *)request; +- (void)requestFailed:(ASIHTTPRequest *)request; + +@end diff --git a/media/ios/Classes/FindSitesViewController.m b/media/ios/Classes/FindSitesViewController.m new file mode 100644 index 000000000..22336bb1c --- /dev/null +++ b/media/ios/Classes/FindSitesViewController.m @@ -0,0 +1,263 @@ +// +// FriendsListViewController.m +// NewsBlur +// +// Created by Roy Yang on 7/1/12. +// Copyright (c) 2012 NewsBlur. All rights reserved. +// + +#import "NewsBlurAppDelegate.h" +#import "ASIHTTPRequest.h" +#import "FindSitesViewController.h" +#import "MBProgressHUD.h" + +#define FIND_SITES_ROW_HEIGHT 80; + +@implementation UINavigationController (DelegateAutomaticDismissKeyboard) +- (BOOL)disablesAutomaticKeyboardDismissal { + return [self.topViewController disablesAutomaticKeyboardDismissal]; +} +@end + +@interface FindSitesViewController() + +@property (readwrite) BOOL inSearch_; + +@end + +@implementation FindSitesViewController + +@synthesize appDelegate; +@synthesize sitesSearchBar; +@synthesize sitesTable; +@synthesize sites; +@synthesize inSearch_; + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + + self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate]; + + self.navigationItem.title = @"Find Sites"; + UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithTitle: @"Done" + style: UIBarButtonSystemItemCancel + target: self + action: @selector(doCancelButton)]; + [self.navigationItem setRightBarButtonItem:cancelButton]; + + self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9]; + + self.sitesTable.rowHeight = FIND_SITES_ROW_HEIGHT; + +} + +- (void)viewDidUnload +{ + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; + + self.appDelegate = nil; + self.sitesSearchBar = nil; + self.sitesTable = nil; + self.sites = nil; + +} + +- (void)viewWillAppear:(BOOL)animated { + [self.sitesSearchBar becomeFirstResponder]; +} + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return YES; +} + +- (void)doCancelButton { + [appDelegate.modalNavigationController dismissModalViewControllerAnimated:YES]; +} + +#pragma mark - UISearchBar delegate methods + +- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText { + +} + +- (void)searchBarTextDidEndEditing:(UISearchBar *)theSearchBar { + [theSearchBar resignFirstResponder]; +} + +- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar { + [searchBar resignFirstResponder]; + if (searchBar.text.length == 0) { + self.sites = nil; + self.inSearch_ = NO; + [self.sitesTable reloadData]; + } else { + self.inSearch_ = YES; + [self loadSitesList:searchBar.text]; + } +} + +- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar { + searchBar.text = nil; +} + +- (void)loadSitesList:(NSString *)query { + [MBProgressHUD hideHUDForView:self.view animated:YES]; + MBProgressHUD *HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; + HUD.labelText = @"Searching..."; + + NSString *urlString = [NSString stringWithFormat:@"http://%@/rss_feeds/feed_autocomplete?term=%@&limit=10", + NEWSBLUR_URL, [query stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; + + NSURL *url = [NSURL URLWithString:urlString]; + + ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:url]; + [request setDelegate:self]; + [request setDidFinishSelector:@selector(requestFinished:)]; + [request setDidFailSelector:@selector(requestFailed:)]; + [request startAsynchronous]; +} + +- (void)requestFinished:(ASIHTTPRequest *)request { + [MBProgressHUD hideHUDForView:self.view animated:YES]; + if (self.inSearch_) { + NSString *responseString = [request responseString]; + NSData *responseData= [responseString dataUsingEncoding:NSUTF8StringEncoding]; + NSError *error; + NSArray *results = [NSJSONSerialization + JSONObjectWithData:responseData + options:kNilOptions + error:&error]; + // int statusCode = [request responseStatusCode]; + + self.sites = results; + + [self.sitesTable reloadData]; + } + +} + +- (void)requestFailed:(ASIHTTPRequest *)request { + [MBProgressHUD hideHUDForView:self.view animated:YES]; + NSError *error = [request error]; + NSLog(@"Error: %@", error); +} + +- (BOOL)disablesAutomaticKeyboardDismissal { + return NO; +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 1; +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { + return FIND_SITES_ROW_HEIGHT; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + if (self.inSearch_){ + int siteCount = [self.sites count]; + return siteCount; + } else { + return 0; + } +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + CGRect vb = self.view.bounds; + + static NSString *CellIdentifier = @"ProfileBadgeCellIdentifier"; + UITableViewCell *cell = [tableView + dequeueReusableCellWithIdentifier:CellIdentifier]; + + if (cell == nil) { + cell = [[UITableViewCell alloc] + initWithStyle:UITableViewCellStyleSubtitle + reuseIdentifier:nil]; + } else { + [[[cell contentView] subviews] makeObjectsPerformSelector: @selector(removeFromSuperview)]; + } + + + if (self.inSearch_){ + int sitesCount = [self.sites count]; + + if (sitesCount) { + if (sitesCount > indexPath.row) { + cell.detailTextLabel.text = [NSString stringWithFormat:@"%@", [[self.sites objectAtIndex:indexPath.row] objectForKey:@"value"]]; + cell.textLabel.text = [NSString stringWithFormat:@"%@", [[self.sites objectAtIndex:indexPath.row] objectForKey:@"label"]]; + cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton; + } + } else { + // add a NO FRIENDS TO SUGGEST message on either the first or second row depending on iphone/ipad + int row = 0; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + row = 1; + } + + if (indexPath.row == row) { + UILabel *msg = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, vb.size.width, 140)]; + [cell.contentView addSubview:msg]; + msg.text = @"No results."; + msg.textColor = UIColorFromRGB(0x7a7a7a); + if (vb.size.width > 320) { + msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 20.0]; + } else { + msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 14.0]; + } + msg.textAlignment = UITextAlignmentCenter; + } + + } + + } else { + + int row = 0; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + row = 1; + } + + if (indexPath.row == row) { + UILabel *msg = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, vb.size.width, 140)]; + [cell.contentView addSubview:msg]; + msg.text = @"Search for sites above"; + msg.textColor = UIColorFromRGB(0x7a7a7a); + if (vb.size.width > 320) { + msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 20.0]; + } else { + msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 14.0]; + } + msg.textAlignment = UITextAlignmentCenter; + } + } + + cell.selectionStyle = UITableViewCellSelectionStyleNone; + return cell; +} + +- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { + [self.sitesSearchBar resignFirstResponder]; +} + +- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath { + NSInteger currentRow = indexPath.row; + int row = currentRow; + [self.sitesSearchBar resignFirstResponder]; + +// [appDelegate.modalNavigationController pushViewController:appDelegate.userProfileViewController animated:YES]; +// [appDelegate.userProfileViewController getUserProfile]; +} + +@end diff --git a/media/ios/Classes/FindSitesViewController.xib b/media/ios/Classes/FindSitesViewController.xib new file mode 100644 index 000000000..86c836be4 --- /dev/null +++ b/media/ios/Classes/FindSitesViewController.xib @@ -0,0 +1,1674 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBUITableView + IBUIView + IBUISearchBar + IBProxyObject + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + + + + 274 + {{0, 44}, {320, 416}} + + + _NS:9 + + 3 + MQA + + YES + IBCocoaTouchFramework + YES + 1 + 0 + YES + 44 + 22 + 22 + + + + 290 + {320, 44} + + + + _NS:9 + 3 + IBCocoaTouchFramework + Find sites by URL or name + + IBCocoaTouchFramework + + + + {{0, 20}, {320, 460}} + + + + + 3 + MQA + + 2 + + + + IBCocoaTouchFramework + + + + + + + view + + + + 3 + + + + sitesTable + + + + 6 + + + + sitesSearchBar + + + + 7 + + + + delegate + + + + 8 + + + + dataSource + + + + 9 + + + + delegate + + + + 10 + + + + + + 0 + + + + + + 1 + + + + + + + + + -1 + + + File's Owner + + + -2 + + + + + 4 + + + + + 5 + + + + + + + FindSitesViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 10 + + + + + ActivityModule + UIView + + IBProjectSource + ./Classes/ActivityModule.h + + + + AddSiteViewController + UIViewController + + id + id + id + id + id + id + + + + addFolder + id + + + addSite + id + + + checkSiteAddress + id + + + doAddButton + id + + + doCancelButton + id + + + selectAddTypeSignup + id + + + + UIActivityIndicatorView + UIBarButtonItem + UITextField + UISegmentedControl + UILabel + NewsBlurAppDelegate + UIBarButtonItem + UILabel + UIPickerView + UITextField + UINavigationBar + UIActivityIndicatorView + UITextField + UIScrollView + UITableView + + + + activityIndicator + UIActivityIndicatorView + + + addButton + UIBarButtonItem + + + addFolderInput + UITextField + + + addTypeControl + UISegmentedControl + + + addingLabel + UILabel + + + appDelegate + NewsBlurAppDelegate + + + cancelButton + UIBarButtonItem + + + errorLabel + UILabel + + + folderPicker + UIPickerView + + + inFolderInput + UITextField + + + navBar + UINavigationBar + + + siteActivityIndicator + UIActivityIndicatorView + + + siteAddressInput + UITextField + + + siteScrollView + UIScrollView + + + siteTable + UITableView + + + + IBProjectSource + ./Classes/AddSiteViewController.h + + + + BaseViewController + UIViewController + + IBProjectSource + ./Classes/BaseViewController.h + + + + DashboardViewController + UIViewController + + id + id + + + + doLogout: + id + + + tapSegmentedButton: + id + + + + ActivityModule + NewsBlurAppDelegate + UIWebView + InteractionsModule + UISegmentedControl + UIToolbar + UIToolbar + + + + activitiesModule + ActivityModule + + + appDelegate + NewsBlurAppDelegate + + + feedbackWebView + UIWebView + + + interactionsModule + InteractionsModule + + + segmentedButton + UISegmentedControl + + + toolbar + UIToolbar + + + topToolbar + UIToolbar + + + + IBProjectSource + ./Classes/DashboardViewController.h + + + + FeedDetailViewController + BaseViewController + + id + id + id + + + + doOpenMarkReadActionSheet: + id + + + doOpenSettingsActionSheet + id + + + selectIntelligence + id + + + + NewsBlurAppDelegate + UIBarButtonItem + UISlider + UIToolbar + UISegmentedControl + UIBarButtonItem + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + feedMarkReadButton + UIBarButtonItem + + + feedScoreSlider + UISlider + + + feedViewToolbar + UIToolbar + + + intelligenceControl + UISegmentedControl + + + settingsButton + UIBarButtonItem + + + storyTitlesTable + UITableView + + + + IBProjectSource + ./Classes/FeedDetailViewController.h + + + + FeedsMenuViewController + UIViewController + + NewsBlurAppDelegate + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + menuTableView + UITableView + + + + IBProjectSource + ./Classes/FeedsMenuViewController.h + + + + FindSitesViewController + UIViewController + + NewsBlurAppDelegate + UISearchBar + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + sitesSearchBar + UISearchBar + + + sitesTable + UITableView + + + + IBProjectSource + ./Classes/FindSitesViewController.h + + + + FirstTimeUserAddFriendsViewController + UIViewController + + id + id + id + id + + + + tapCategoryButton: + id + + + tapGoogleReaderButton + id + + + tapNewsBlurButton: + id + + + tapNextButton + id + + + + UIView + UIView + UIView + NewsBlurAppDelegate + UIButton + UIImageView + UIBarButtonItem + UIBarButtonItem + UIToolbar + UIButton + UIView + + + + addFriendsView + UIView + + + addNewsBlurView + UIView + + + addSitesView + UIView + + + appDelegate + NewsBlurAppDelegate + + + googleReaderButton + UIButton + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + previousButton + UIBarButtonItem + + + toolbar + UIToolbar + + + toolbarTitle + UIButton + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/FirstTimeUserAddFriendsViewController.h + + + + FirstTimeUserAddNewsBlurViewController + UIViewController + + id + id + id + id + + + + tapCategoryButton: + id + + + tapGoogleReaderButton + id + + + tapNewsBlurButton: + id + + + tapNextButton + id + + + + UIView + UIView + UIView + NewsBlurAppDelegate + UIButton + UIImageView + UIBarButtonItem + UIBarButtonItem + UIToolbar + UIButton + UIView + + + + addFriendsView + UIView + + + addNewsBlurView + UIView + + + addSitesView + UIView + + + appDelegate + NewsBlurAppDelegate + + + googleReaderButton + UIButton + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + previousButton + UIBarButtonItem + + + toolbar + UIToolbar + + + toolbarTitle + UIButton + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/FirstTimeUserAddNewsBlurViewController.h + + + + FirstTimeUserAddSitesViewController + UIViewController + + id + id + id + id + + + + tapCategoryButton: + id + + + tapGoogleReaderButton + id + + + tapNewsBlurButton: + id + + + tapNextButton + id + + + + UIView + UIView + UIView + NewsBlurAppDelegate + UIButton + UIImageView + UIBarButtonItem + UIBarButtonItem + UIToolbar + UIButton + UIView + + + + addFriendsView + UIView + + + addNewsBlurView + UIView + + + addSitesView + UIView + + + appDelegate + NewsBlurAppDelegate + + + googleReaderButton + UIButton + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + previousButton + UIBarButtonItem + + + toolbar + UIToolbar + + + toolbarTitle + UIButton + + + welcomeView + UIView + + + + IBProjectSource + ./Classes/FirstTimeUserAddSitesViewController.h + + + + FirstTimeUserViewController + UIViewController + + tapNextButton + id + + + tapNextButton + + tapNextButton + id + + + + NewsBlurAppDelegate + UIImageView + UIBarButtonItem + + + + appDelegate + NewsBlurAppDelegate + + + logo + UIImageView + + + nextButton + UIBarButtonItem + + + + IBProjectSource + ./Classes/FirstTimeUserViewController.h + + + + FontSettingsViewController + UIViewController + + id + id + + + + changeFontSize: + id + + + changeFontStyle: + id + + + + NewsBlurAppDelegate + UISegmentedControl + UISegmentedControl + UILabel + UILabel + + + + appDelegate + NewsBlurAppDelegate + + + fontSizeSegment + UISegmentedControl + + + fontStyleSegment + UISegmentedControl + + + largeFontSizeLabel + UILabel + + + smallFontSizeLabel + UILabel + + + + IBProjectSource + ./Classes/FontSettingsViewController.h + + + + FriendsListViewController + UIViewController + + NewsBlurAppDelegate + UISearchBar + UITableView + + + + appDelegate + NewsBlurAppDelegate + + + friendSearchBar + UISearchBar + + + friendsTable + UITableView + + + + IBProjectSource + ./Classes/FriendsListViewController.h + + + + GoogleReaderViewController + UIViewController + + tapCancelButton: + id + + + tapCancelButton: + + tapCancelButton: + id + + + + NewsBlurAppDelegate + UIWebView + + + + appDelegate + NewsBlurAppDelegate + + + webView + UIWebView + + + + IBProjectSource + ./Classes/GoogleReaderViewController.h + + + + InteractionsModule + UIView + + IBProjectSource + ./Classes/InteractionsModule.h + + + + LoginViewController + UIViewController + + id + id + id + id + id + + + + selectLogin + id + + + selectLoginSignup + id + + + selectSignUp + id + + + tapLoginButton + id + + + tapSignUpButton + id + + + + NewsBlurAppDelegate + UITextField + UILabel + UILabel + UIView + UISegmentedControl + UITextField + UILabel + UILabel + UIButton + UIButton + UITextField + UITextField + UIView + UITextField + UILabel + UILabel + + + + appDelegate + NewsBlurAppDelegate + + + emailInput + UITextField + + + emailLabel + UILabel + + + errorLabel + UILabel + + + logInView + UIView + + + loginControl + UISegmentedControl + + + passwordInput + UITextField + + + passwordLabel + UILabel + + + passwordOptionalLabel + UILabel + + + selectLoginButton + UIButton + + + selectSignUpButton + UIButton + + + signUpPasswordInput + UITextField + + + signUpUsernameInput + UITextField + + + signUpView + UIView + + + usernameInput + UITextField + + + usernameLabel + UILabel + + + usernameOrEmailLabel + UILabel + + + + IBProjectSource + ./Classes/LoginViewController.h + + + + MoveSiteViewController + UIViewController + + id + id + id + id + + + + doCancelButton + id + + + doMoveButton + id + + + moveFolder + id + + + moveSite + id + + + + UIActivityIndicatorView + NewsBlurAppDelegate + UIBarButtonItem + UILabel + UIPickerView + UITextField + UIBarButtonItem + UILabel + UINavigationBar + UILabel + UITextField + + + + activityIndicator + UIActivityIndicatorView + + + appDelegate + NewsBlurAppDelegate + + + cancelButton + UIBarButtonItem + + + errorLabel + UILabel + + + folderPicker + UIPickerView + + + fromFolderInput + UITextField + + + moveButton + UIBarButtonItem + + + movingLabel + UILabel + + + navBar + UINavigationBar + + + titleLabel + UILabel + + + toFolderInput + UITextField + + + + IBProjectSource + ./Classes/MoveSiteViewController.h + + + + NBContainerViewController + UIViewController + + appDelegate + NewsBlurAppDelegate + + + appDelegate + + appDelegate + NewsBlurAppDelegate + + + + IBProjectSource + ./Classes/NBContainerViewController.h + + + + NewsBlurAppDelegate + BaseViewController + + AddSiteViewController + DashboardViewController + FeedDashboardViewController + FeedDetailViewController + FeedsMenuViewController + NewsBlurViewController + FindSitesViewController + FirstTimeUserAddFriendsViewController + FirstTimeUserAddNewsBlurViewController + FirstTimeUserAddSitesViewController + FirstTimeUserViewController + FontSettingsViewController + FriendsListViewController + UINavigationController + GoogleReaderViewController + LoginViewController + NBContainerViewController + MoveSiteViewController + UINavigationController + OriginalStoryViewController + ShareViewController + StoryDetailViewController + UserProfileViewController + UIWindow + + + + addSiteViewController + AddSiteViewController + + + dashboardViewController + DashboardViewController + + + feedDashboardViewController + FeedDashboardViewController + + + feedDetailViewController + FeedDetailViewController + + + feedsMenuViewController + FeedsMenuViewController + + + feedsViewController + NewsBlurViewController + + + findSitesViewController + FindSitesViewController + + + firstTimeUserAddFriendsViewController + FirstTimeUserAddFriendsViewController + + + firstTimeUserAddNewsBlurViewController + FirstTimeUserAddNewsBlurViewController + + + firstTimeUserAddSitesViewController + FirstTimeUserAddSitesViewController + + + firstTimeUserViewController + FirstTimeUserViewController + + + fontSettingsViewController + FontSettingsViewController + + + friendsListViewController + FriendsListViewController + + + ftuxNavigationController + UINavigationController + + + googleReaderViewController + GoogleReaderViewController + + + loginViewController + LoginViewController + + + masterContainerViewController + NBContainerViewController + + + moveSiteViewController + MoveSiteViewController + + + navigationController + UINavigationController + + + originalStoryViewController + OriginalStoryViewController + + + shareViewController + ShareViewController + + + storyDetailViewController + StoryDetailViewController + + + userProfileViewController + UserProfileViewController + + + window + UIWindow + + + + IBProjectSource + ./Classes/NewsBlurAppDelegate.h + + + + NewsBlurViewController + BaseViewController + + UIButton + UIButton + UIButton + id + id + + + + sectionTapped: + UIButton + + + sectionUntapped: + UIButton + + + sectionUntappedOutside: + UIButton + + + selectIntelligence + id + + + tapAddSite: + id + + + + NewsBlurAppDelegate + UISlider + UITableView + UIToolbar + UIBarButtonItem + UIView + UISegmentedControl + + + + appDelegate + NewsBlurAppDelegate + + + feedScoreSlider + UISlider + + + feedTitlesTable + UITableView + + + feedViewToolbar + UIToolbar + + + homeButton + UIBarButtonItem + + + innerView + UIView + + + intelligenceControl + UISegmentedControl + + + + IBProjectSource + ./Classes/NewsBlurViewController.h + + + + OriginalStoryViewController + BaseViewController + + id + id + id + + + + doCloseOriginalStoryViewController + id + + + doOpenActionSheet + id + + + loadAddress: + id + + + + NewsBlurAppDelegate + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UILabel + UITextField + UIBarButtonItem + UIToolbar + UIWebView + + + + appDelegate + NewsBlurAppDelegate + + + back + UIBarButtonItem + + + closeButton + UIBarButtonItem + + + forward + UIBarButtonItem + + + pageAction + UIBarButtonItem + + + pageTitle + UILabel + + + pageUrl + UITextField + + + refresh + UIBarButtonItem + + + toolbar + UIToolbar + + + webView + UIWebView + + + + IBProjectSource + ./Classes/OriginalStoryViewController.h + + + + ShareViewController + UIViewController + + id + id + id + id + + + + doCancelButton: + id + + + doReplyToComment: + id + + + doShareThisStory: + id + + + doToggleButton: + id + + + + NewsBlurAppDelegate + UITextView + UIButton + UIBarButtonItem + UIBarButtonItem + UIButton + + + + appDelegate + NewsBlurAppDelegate + + + commentField + UITextView + + + facebookButton + UIButton + + + submitButton + UIBarButtonItem + + + toolbarTitle + UIBarButtonItem + + + twitterButton + UIButton + + + + IBProjectSource + ./Classes/ShareViewController.h + + + + StoryDetailViewController + UIViewController + + id + id + id + id + id + id + + + + doNextStory + id + + + doNextUnreadStory + id + + + doPreviousStory + id + + + showOriginalSubview: + id + + + tapProgressBar: + id + + + toggleFontSize: + id + + + + UIBarButtonItem + NewsBlurAppDelegate + UIToolbar + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIView + UIBarButtonItem + UIView + UIBarButtonItem + UIProgressView + UIView + UIToolbar + UIWebView + + + + activity + UIBarButtonItem + + + appDelegate + NewsBlurAppDelegate + + + bottomPlaceholderToolbar + UIToolbar + + + buttonAction + UIBarButtonItem + + + buttonNext + UIBarButtonItem + + + buttonNextStory + UIBarButtonItem + + + buttonPrevious + UIBarButtonItem + + + feedTitleGradient + UIView + + + fontSettingsButton + UIBarButtonItem + + + innerView + UIView + + + originalStoryButton + UIBarButtonItem + + + progressView + UIProgressView + + + progressViewContainer + UIView + + + toolbar + UIToolbar + + + webView + UIWebView + + + + IBProjectSource + ./Classes/StoryDetailViewController.h + + + + UserProfileViewController + UIViewController + + IBProjectSource + ./Classes/UserProfileViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 1181 + + diff --git a/media/ios/Classes/FriendsListViewController.m b/media/ios/Classes/FriendsListViewController.m index 004bf5adf..7a847f09d 100644 --- a/media/ios/Classes/FriendsListViewController.m +++ b/media/ios/Classes/FriendsListViewController.m @@ -11,6 +11,7 @@ #import "UserProfileViewController.h" #import "ASIHTTPRequest.h" #import "ProfileBadge.h" +#import "MBProgressHUD.h" @implementation UINavigationController (DelegateAutomaticDismissKeyboard) - (BOOL)disablesAutomaticKeyboardDismissal { @@ -87,7 +88,7 @@ } - (void)doCancelButton { - [appDelegate.findFriendsNavigationController dismissModalViewControllerAnimated:YES]; + [appDelegate.modalNavigationController dismissModalViewControllerAnimated:YES]; } #pragma mark - UISearchBar delegate methods @@ -115,7 +116,7 @@ searchBar.text = nil; } -- (void)loadFriendsList:(NSString *)query { +- (void)loadFriendsList:(NSString *)query { NSString *urlString = [NSString stringWithFormat:@"http://%@/social/find_friends?query=%@&limit=10", NEWSBLUR_URL, query]; @@ -382,8 +383,8 @@ viewForHeaderInSection:(NSInteger)section { int row = currentRow; appDelegate.activeUserProfileId = [[self.userProfiles objectAtIndex:row] objectForKey:@"user_id"]; [self.friendSearchBar resignFirstResponder]; - NSLog(@"appDelegate.findFriendsNavigationController is %@", appDelegate.findFriendsNavigationController); - [appDelegate.findFriendsNavigationController pushViewController:appDelegate.userProfileViewController animated:YES]; + NSLog(@"appDelegate.modalNavigationController is %@", appDelegate.modalNavigationController); + [appDelegate.modalNavigationController pushViewController:appDelegate.userProfileViewController animated:YES]; [appDelegate.userProfileViewController getUserProfile]; } diff --git a/media/ios/Classes/NBContainerViewController.m b/media/ios/Classes/NBContainerViewController.m index 1a8ccb333..095c626ba 100644 --- a/media/ios/Classes/NBContainerViewController.m +++ b/media/ios/Classes/NBContainerViewController.m @@ -210,7 +210,7 @@ [popoverController dismissPopoverAnimated:YES]; popoverController = nil; } - [appDelegate.findFriendsNavigationController dismissModalViewControllerAnimated:YES]; + [appDelegate.modalNavigationController dismissModalViewControllerAnimated:YES]; } diff --git a/media/ios/Classes/NewsBlurAppDelegate.h b/media/ios/Classes/NewsBlurAppDelegate.h index 3036c31a0..79f1a9130 100644 --- a/media/ios/Classes/NewsBlurAppDelegate.h +++ b/media/ios/Classes/NewsBlurAppDelegate.h @@ -37,13 +37,14 @@ @class OriginalStoryViewController; @class UserProfileViewController; @class NBContainerViewController; +@class FindSitesViewController; @interface NewsBlurAppDelegate : BaseViewController { UIWindow *window; UINavigationController *ftuxNavigationController; UINavigationController *navigationController; - UINavigationController *findFriendsNavigationController; + UINavigationController *modalNavigationController; UINavigationController *userProfileNavigationController; NBContainerViewController *masterContainerViewController; @@ -65,6 +66,7 @@ ShareViewController *shareViewController; LoginViewController *loginViewController; AddSiteViewController *addSiteViewController; + FindSitesViewController *findSitesViewController; MoveSiteViewController *moveSiteViewController; OriginalStoryViewController *originalStoryViewController; UserProfileViewController *userProfileViewController; @@ -112,7 +114,7 @@ @property (nonatomic) IBOutlet UIWindow *window; @property (nonatomic) IBOutlet UINavigationController *ftuxNavigationController; @property (nonatomic) IBOutlet UINavigationController *navigationController; -@property (nonatomic) UINavigationController *findFriendsNavigationController; +@property (nonatomic) UINavigationController *modalNavigationController; @property (nonatomic) UINavigationController *userProfileNavigationController; @property (nonatomic) IBOutlet NBContainerViewController *masterContainerViewController; @property (nonatomic) IBOutlet DashboardViewController *dashboardViewController; @@ -125,6 +127,7 @@ @property (nonatomic) IBOutlet StoryDetailViewController *storyDetailViewController; @property (nonatomic) IBOutlet LoginViewController *loginViewController; @property (nonatomic) IBOutlet AddSiteViewController *addSiteViewController; +@property (nonatomic) IBOutlet FindSitesViewController *findSitesViewController; @property (nonatomic) IBOutlet MoveSiteViewController *moveSiteViewController; @property (nonatomic) IBOutlet OriginalStoryViewController *originalStoryViewController; @property (nonatomic) IBOutlet ShareViewController *shareViewController; diff --git a/media/ios/Classes/NewsBlurAppDelegate.m b/media/ios/Classes/NewsBlurAppDelegate.m index b21c5f590..33070f014 100644 --- a/media/ios/Classes/NewsBlurAppDelegate.m +++ b/media/ios/Classes/NewsBlurAppDelegate.m @@ -18,12 +18,14 @@ #import "GoogleReaderViewController.h" #import "LoginViewController.h" #import "AddSiteViewController.h" +#import "FindSitesViewController.h" #import "MoveSiteViewController.h" #import "OriginalStoryViewController.h" #import "ShareViewController.h" #import "UserProfileViewController.h" #import "NBContainerViewController.h" #import "AFJSONRequestOperation.h" +#import "findSitesViewController.h" #import "MBProgressHUD.h" #import "Utilities.h" @@ -35,7 +37,7 @@ @synthesize ftuxNavigationController; @synthesize navigationController; -@synthesize findFriendsNavigationController; +@synthesize modalNavigationController; @synthesize userProfileNavigationController; @synthesize masterContainerViewController; @synthesize googleReaderViewController; @@ -50,6 +52,7 @@ @synthesize shareViewController; @synthesize loginViewController; @synthesize addSiteViewController; +@synthesize findSitesViewController; @synthesize moveSiteViewController; @synthesize originalStoryViewController; @synthesize userProfileViewController; @@ -139,15 +142,19 @@ #pragma mark FeedsView - (void)showAddSiteModal { - UINavigationController *navController = self.navigationController; - [navController dismissModalViewControllerAnimated:NO]; + FindSitesViewController *sitesVC = [[FindSitesViewController alloc] init]; + self.findSitesViewController = sitesVC; + + UINavigationController *sitesNav = [[UINavigationController alloc] initWithRootViewController:sitesVC]; + self.modalNavigationController = sitesNav; + self.modalNavigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - addSiteViewController.modalPresentationStyle = UIModalPresentationFormSheet; + self.modalNavigationController.modalPresentationStyle = UIModalPresentationFormSheet; + [masterContainerViewController presentModalViewController:modalNavigationController animated:YES]; + } else { + [navigationController presentModalViewController:modalNavigationController animated:YES]; } - - [navController presentModalViewController:addSiteViewController animated:YES]; - [addSiteViewController reload]; } #pragma mark - @@ -210,14 +217,14 @@ UINavigationController *friendsNav = [[UINavigationController alloc] initWithRootViewController:friendsListViewController]; self.friendsListViewController = friendsBVC; - self.findFriendsNavigationController = friendsNav; - self.findFriendsNavigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9]; + self.modalNavigationController = friendsNav; + self.modalNavigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - self.findFriendsNavigationController.modalPresentationStyle = UIModalPresentationFormSheet; - [masterContainerViewController presentModalViewController:findFriendsNavigationController animated:YES]; + self.modalNavigationController.modalPresentationStyle = UIModalPresentationFormSheet; + [masterContainerViewController presentModalViewController:modalNavigationController animated:YES]; } else { - [navigationController presentModalViewController:findFriendsNavigationController animated:YES]; + [navigationController presentModalViewController:modalNavigationController animated:YES]; } [self.friendsListViewController loadSuggestedFriendsList]; } diff --git a/media/ios/Classes/UserProfileViewController.m b/media/ios/Classes/UserProfileViewController.m index 1012a2118..1446e7d60 100644 --- a/media/ios/Classes/UserProfileViewController.m +++ b/media/ios/Classes/UserProfileViewController.m @@ -84,7 +84,7 @@ } - (void)doCancelButton { - [appDelegate.findFriendsNavigationController dismissModalViewControllerAnimated:NO]; + [appDelegate.modalNavigationController dismissModalViewControllerAnimated:NO]; } - (void)getUserProfile { diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index 54294c945..17f91c74e 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj @@ -84,6 +84,8 @@ 43A4BAE815C866FA00F3B8D4 /* popoverBg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BAD915C866FA00F3B8D4 /* popoverBg@2x.png */; }; 43A4BAE915C866FA00F3B8D4 /* popoverBgSimple.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BADA15C866FA00F3B8D4 /* popoverBgSimple.png */; }; 43A4BAEB15C893E300F3B8D4 /* FriendsListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BAEA15C893E300F3B8D4 /* FriendsListViewController.xib */; }; + 43A4BAF315C89BF600F3B8D4 /* FindSitesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4BAF115C89BF600F3B8D4 /* FindSitesViewController.m */; }; + 43A4BAF415C89BF600F3B8D4 /* FindSitesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BAF215C89BF600F3B8D4 /* FindSitesViewController.xib */; }; 43A4C3D715B00966008787B5 /* ABTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4C3BA15B00966008787B5 /* ABTableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 43A4C3D815B00966008787B5 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4C3BC15B00966008787B5 /* Base64.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 43A4C3DA15B00966008787B5 /* GTMNString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4C3C015B00966008787B5 /* GTMNString+HTML.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -426,6 +428,9 @@ 43A4BAD915C866FA00F3B8D4 /* popoverBg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "popoverBg@2x.png"; sourceTree = ""; }; 43A4BADA15C866FA00F3B8D4 /* popoverBgSimple.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = popoverBgSimple.png; sourceTree = ""; }; 43A4BAEA15C893E300F3B8D4 /* FriendsListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FriendsListViewController.xib; sourceTree = ""; }; + 43A4BAF015C89BF600F3B8D4 /* FindSitesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindSitesViewController.h; sourceTree = ""; }; + 43A4BAF115C89BF600F3B8D4 /* FindSitesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FindSitesViewController.m; sourceTree = ""; }; + 43A4BAF215C89BF600F3B8D4 /* FindSitesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FindSitesViewController.xib; sourceTree = ""; }; 43A4C3B915B00966008787B5 /* ABTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ABTableViewCell.h; path = "Other Sources/ABTableViewCell.h"; sourceTree = ""; }; 43A4C3BA15B00966008787B5 /* ABTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ABTableViewCell.m; path = "Other Sources/ABTableViewCell.m"; sourceTree = ""; }; 43A4C3BB15B00966008787B5 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Base64.h; path = "Other Sources/Base64.h"; sourceTree = ""; }; @@ -953,6 +958,9 @@ 43F6A79C15B0CDC60092EE91 /* ActivityCell.m */, 4383DCD415BB8B87007E6611 /* SmallActivityCell.h */, 4383DCD515BB8B88007E6611 /* SmallActivityCell.m */, + 43A4BAF015C89BF600F3B8D4 /* FindSitesViewController.h */, + 43A4BAF115C89BF600F3B8D4 /* FindSitesViewController.m */, + 43A4BAF215C89BF600F3B8D4 /* FindSitesViewController.xib */, ); name = Social; sourceTree = ""; @@ -1920,6 +1928,7 @@ 43A4BAE815C866FA00F3B8D4 /* popoverBg@2x.png in Resources */, 43A4BAE915C866FA00F3B8D4 /* popoverBgSimple.png in Resources */, 43A4BAEB15C893E300F3B8D4 /* FriendsListViewController.xib in Resources */, + 43A4BAF415C89BF600F3B8D4 /* FindSitesViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2061,6 +2070,7 @@ 43A4BAC915C8663600F3B8D4 /* WEPopoverContainerView.m in Sources */, 43A4BACA15C8663600F3B8D4 /* WEPopoverController.m in Sources */, 43A4BACB15C8663600F3B8D4 /* WETouchableView.m in Sources */, + 43A4BAF315C89BF600F3B8D4 /* FindSitesViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/media/ios/Resources-iPad/Classes/AddSiteViewController~ipad.xib b/media/ios/Resources-iPad/Classes/AddSiteViewController~ipad.xib index c0d53567a..961bb8b4c 100644 --- a/media/ios/Resources-iPad/Classes/AddSiteViewController~ipad.xib +++ b/media/ios/Resources-iPad/Classes/AddSiteViewController~ipad.xib @@ -1,7 +1,7 @@ - 1280 + 1296 11E53 2182 1138.47 @@ -47,9 +47,8 @@ 290 - {{-1, 0}, {321, 44}} + {{-1, 0}, {541, 44}} - _NS:240 IBIPadFramework @@ -79,7 +78,6 @@ 292 {{-1, 44}, {541, 576}} - _NS:541 NO @@ -92,9 +90,8 @@ 292 - {{19, 101}, {280, 31}} + {{151, 96}, {280, 31}} - _NS:294 NO @@ -136,9 +133,8 @@ 292 - {{19, 151}, {280, 31}} + {{19, 148}, {280, 31}} - _NS:294 NO @@ -169,7 +165,6 @@ -2147483356 {{24, 107}, {20, 20}} - _NS:824 @@ -185,7 +180,6 @@ -2147483356 {{0, 187}, {320, 50}} - _NS:311 NO @@ -211,7 +205,6 @@ -2147483356 {{86, 203}, {20, 20}} - _NS:824 NO @@ -222,7 +215,6 @@ -2147483356 {{20, 187}, {280, 50}} - _NS:311 NO @@ -247,9 +239,8 @@ 298 - {{0, 241}, {320, 216}} + {{0, 399}, {540, 216}} - _NS:624 IBIPadFramework @@ -264,7 +255,6 @@ 274 {320, 221} - _NS:392 1 @@ -282,9 +272,8 @@ 22 - {{0, 244}, {319, 216}} + {{0, 404}, {319, 216}} - _NS:174 @@ -301,9 +290,8 @@ 6 - {320, 460} + {540, 620} - 10 @@ -4697,8 +4685,20 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE scrollViewTexturedBackgroundColor - IBUISimulatedFreeformSizeMetricsSentinel - Freeform + IBUIModalFormSheetSimulatedSizeMetrics + + YES + + + + + + {540, 620} + {540, 620} + + + IBIPadFramework + Form Sheet IBIPadFramework @@ -4915,15 +4915,15 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - - + + @@ -5041,1209 +5041,13 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 67 - - - - AddSiteViewController - UIViewController - - id - id - id - id - id - id - - - - addFolder - id - - - addSite - id - - - checkSiteAddress - id - - - doAddButton - id - - - doCancelButton - id - - - selectAddTypeSignup - id - - - - UIActivityIndicatorView - UIBarButtonItem - UITextField - UISegmentedControl - UILabel - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UINavigationBar - UIActivityIndicatorView - UITextField - UIScrollView - UITableView - - - - activityIndicator - UIActivityIndicatorView - - - addButton - UIBarButtonItem - - - addFolderInput - UITextField - - - addTypeControl - UISegmentedControl - - - addingLabel - UILabel - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - inFolderInput - UITextField - - - navBar - UINavigationBar - - - siteActivityIndicator - UIActivityIndicatorView - - - siteAddressInput - UITextField - - - siteScrollView - UIScrollView - - - siteTable - UITableView - - - - IBProjectSource - ./Classes/AddSiteViewController.h - - - - BaseViewController - UIViewController - - IBProjectSource - ./Classes/BaseViewController.h - - - - DashboardViewController - UIViewController - - doLogout: - id - - - doLogout: - - doLogout: - id - - - - NewsBlurAppDelegate - UIToolbar - - - - appDelegate - NewsBlurAppDelegate - - - bottomToolbar - UIToolbar - - - - IBProjectSource - ./Classes/DashboardViewController.h - - - - FeedDashboardViewController - UIViewController - - NewsBlurAppDelegate - UIToolbar - - - - appDelegate - NewsBlurAppDelegate - - - toolbar - UIToolbar - - - - IBProjectSource - ./Classes/FeedDashboardViewController.h - - - - FeedDetailViewController - BaseViewController - - id - id - id - - - - doOpenMarkReadActionSheet: - id - - - doOpenSettingsActionSheet - id - - - selectIntelligence - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UISlider - UIToolbar - UISegmentedControl - UIBarButtonItem - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - feedMarkReadButton - UIBarButtonItem - - - feedScoreSlider - UISlider - - - feedViewToolbar - UIToolbar - - - intelligenceControl - UISegmentedControl - - - settingsButton - UIBarButtonItem - - - storyTitlesTable - UITableView - - - - IBProjectSource - ./Classes/FeedDetailViewController.h - - - - FeedsMenuViewController - UIViewController - - tapCancelButton: - UIBarButtonItem - - - tapCancelButton: - - tapCancelButton: - UIBarButtonItem - - - - NewsBlurAppDelegate - UITableView - UIToolbar - - - - appDelegate - NewsBlurAppDelegate - - - menuTableView - UITableView - - - toolbar - UIToolbar - - - - IBProjectSource - ./Classes/FeedsMenuViewController.h - - - - FirstTimeUserViewController - UIViewController - - id - id - id - id - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - - UIView - UIView - UIView - NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIToolbar - UIButton - UIView - - - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - - - appDelegate - NewsBlurAppDelegate - - - googleReaderButton - UIButton - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/FirstTimeUserViewController.h - - - - FontSettingsViewController - UIViewController - - id - id - - - - changeFontSize: - id - - - changeFontStyle: - id - - - - NewsBlurAppDelegate - UISegmentedControl - UISegmentedControl - UILabel - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - fontSizeSegment - UISegmentedControl - - - fontStyleSegment - UISegmentedControl - - - largeFontSizeLabel - UILabel - - - smallFontSizeLabel - UILabel - - - - IBProjectSource - ./Classes/FontSettingsViewController.h - - - - FriendsListViewController - UIViewController - - NewsBlurAppDelegate - UITableView - UISearchBar - UISearchDisplayController - - - - appDelegate - NewsBlurAppDelegate - - - friendsTable - UITableView - - - searchBar - UISearchBar - - - searchDisplayController - UISearchDisplayController - - - - IBProjectSource - ./Classes/FriendsListViewController.h - - - - GoogleReaderViewController - UIViewController - - tapCancelButton: - id - - - tapCancelButton: - - tapCancelButton: - id - - - - NewsBlurAppDelegate - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - webView - UIWebView - - - - IBProjectSource - ./Classes/GoogleReaderViewController.h - - - - LoginViewController - UIViewController - - id - id - id - id - id - - - - selectLogin - id - - - selectLoginSignup - id - - - selectSignUp - id - - - tapLoginButton - id - - - tapSignUpButton - id - - - - NewsBlurAppDelegate - UITextField - UILabel - UILabel - UIView - UISegmentedControl - UITextField - UILabel - UILabel - UIButton - UIButton - UITextField - UITextField - UIView - UITextField - UILabel - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - emailInput - UITextField - - - emailLabel - UILabel - - - errorLabel - UILabel - - - logInView - UIView - - - loginControl - UISegmentedControl - - - passwordInput - UITextField - - - passwordLabel - UILabel - - - passwordOptionalLabel - UILabel - - - selectLoginButton - UIButton - - - selectSignUpButton - UIButton - - - signUpPasswordInput - UITextField - - - signUpUsernameInput - UITextField - - - signUpView - UIView - - - usernameInput - UITextField - - - usernameLabel - UILabel - - - usernameOrEmailLabel - UILabel - - - - IBProjectSource - ./Classes/LoginViewController.h - - - - MGSplitViewController - UIViewController - - id - id - id - id - - - - showMasterPopover: - id - - - toggleMasterBeforeDetail: - id - - - toggleMasterView: - id - - - toggleSplitOrientation: - id - - - - id - UIViewController - UIViewController - - - - delegate - id - - - detailViewController - UIViewController - - - masterViewController - UIViewController - - - - IBProjectSource - ./Classes/MGSplitViewController.h - - - - MoveSiteViewController - UIViewController - - id - id - id - id - - - - doCancelButton - id - - - doMoveButton - id - - - moveFolder - id - - - moveSite - id - - - - UIActivityIndicatorView - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UIBarButtonItem - UILabel - UINavigationBar - UILabel - UITextField - - - - activityIndicator - UIActivityIndicatorView - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - fromFolderInput - UITextField - - - moveButton - UIBarButtonItem - - - movingLabel - UILabel - - - navBar - UINavigationBar - - - titleLabel - UILabel - - - toFolderInput - UITextField - - - - IBProjectSource - ./Classes/MoveSiteViewController.h - - - - NewsBlurAppDelegate - BaseViewController - - AddSiteViewController - DashboardViewController - FeedDashboardViewController - FeedDetailViewController - FeedsMenuViewController - NewsBlurViewController - UINavigationController - FirstTimeUserViewController - FontSettingsViewController - FriendsListViewController - GoogleReaderViewController - LoginViewController - MoveSiteViewController - UINavigationController - OriginalStoryViewController - ShareViewController - MGSplitViewController - UINavigationController - StoryDetailViewController - UserProfileViewController - UIWindow - - - - addSiteViewController - AddSiteViewController - - - dashboardViewController - DashboardViewController - - - feedDashboardViewController - FeedDashboardViewController - - - feedDetailViewController - FeedDetailViewController - - - feedsMenuViewController - FeedsMenuViewController - - - feedsViewController - NewsBlurViewController - - - findFriendsNavigationController - UINavigationController - - - firstTimeUserViewController - FirstTimeUserViewController - - - fontSettingsViewController - FontSettingsViewController - - - friendsListViewController - FriendsListViewController - - - googleReaderViewController - GoogleReaderViewController - - - loginViewController - LoginViewController - - - moveSiteViewController - MoveSiteViewController - - - navigationController - UINavigationController - - - originalStoryViewController - OriginalStoryViewController - - - shareViewController - ShareViewController - - - splitStoryController - MGSplitViewController - - - splitStoryDetailNavigationController - UINavigationController - - - storyDetailViewController - StoryDetailViewController - - - userProfileViewController - UserProfileViewController - - - window - UIWindow - - - - IBProjectSource - ./Classes/NewsBlurAppDelegate.h - - - - NewsBlurViewController - BaseViewController - - UIButton - UIButton - UIButton - id - id - - - - sectionTapped: - UIButton - - - sectionUntapped: - UIButton - - - sectionUntappedOutside: - UIButton - - - selectIntelligence - id - - - showMenuButton: - id - - - - NewsBlurAppDelegate - UISlider - UITableView - UIToolbar - UIBarButtonItem - UISegmentedControl - UIPopoverController - - - - appDelegate - NewsBlurAppDelegate - - - feedScoreSlider - UISlider - - - feedTitlesTable - UITableView - - - feedViewToolbar - UIToolbar - - - homeButton - UIBarButtonItem - - - intelligenceControl - UISegmentedControl - - - popoverController - UIPopoverController - - - - IBProjectSource - ./Classes/NewsBlurViewController.h - - - - OriginalStoryViewController - BaseViewController - - id - id - id - - - - doCloseOriginalStoryViewController - id - - - doOpenActionSheet - id - - - loadAddress: - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UILabel - UITextField - UIBarButtonItem - UIToolbar - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - back - UIBarButtonItem - - - closeButton - UIBarButtonItem - - - forward - UIBarButtonItem - - - pageAction - UIBarButtonItem - - - pageTitle - UILabel - - - pageUrl - UITextField - - - refresh - UIBarButtonItem - - - toolbar - UIToolbar - - - webView - UIWebView - - - - IBProjectSource - ./Classes/OriginalStoryViewController.h - - - - ShareViewController - UIViewController - - id - id - id - id - - - - doCancelButton: - id - - - doReplyToComment: - id - - - doShareThisStory: - id - - - doToggleButton: - id - - - - NewsBlurAppDelegate - UITextView - UIButton - UIBarButtonItem - UIBarButtonItem - UIButton - - - - appDelegate - NewsBlurAppDelegate - - - commentField - UITextView - - - facebookButton - UIButton - - - submitButton - UIBarButtonItem - - - toolbarTitle - UIBarButtonItem - - - twitterButton - UIButton - - - - IBProjectSource - ./Classes/ShareViewController.h - - - - StoryDetailViewController - UIViewController - - id - id - id - id - - - - doNextStory - id - - - doNextUnreadStory - id - - - doPreviousStory - id - - - toggleFontSize: - id - - - - UIBarButtonItem - NewsBlurAppDelegate - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIView - UIProgressView - UIBarButtonItem - UIToolbar - UIWebView - - - - activity - UIBarButtonItem - - - appDelegate - NewsBlurAppDelegate - - - buttonAction - UIBarButtonItem - - - buttonNext - UIBarButtonItem - - - buttonNextStory - UIBarButtonItem - - - buttonPrevious - UIBarButtonItem - - - feedTitleGradient - UIView - - - progressView - UIProgressView - - - toggleViewButton - UIBarButtonItem - - - toolbar - UIToolbar - - - webView - UIWebView - - - - IBProjectSource - ./Classes/StoryDetailViewController.h - - - - UserProfileViewController - UIViewController - - IBProjectSource - ./Classes/UserProfileViewController.h - - - - + 0 IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/media/ios/Resources-iPad/MainWindow~ipad.xib b/media/ios/Resources-iPad/MainWindow~ipad.xib index 5270bf6a4..6dde437eb 100644 --- a/media/ios/Resources-iPad/MainWindow~ipad.xib +++ b/media/ios/Resources-iPad/MainWindow~ipad.xib @@ -47,6 +47,7 @@ {768, 1024} + 1 MSAxIDEAA @@ -268,8 +269,7 @@ IBIPadFramework NO - - FindFriends + 2 @@ -279,18 +279,6 @@ IBIPadFramework NO - - - 256 - {0, 0} - _NS:15 - YES - YES - IBIPadFramework - - - YES - Main @@ -458,14 +446,6 @@ 185 - - - findFriendsNavigationController - - - - 226 - friendsListViewController @@ -522,6 +502,14 @@ 266 + + + findSitesViewController + + + + 270 + appDelegate @@ -674,6 +662,14 @@ 267 + + + appDelegate + + + + 269 + @@ -808,20 +804,6 @@ - - 222 - - - YES - - - - - - 223 - - - 235 @@ -852,6 +834,11 @@ + + 268 + + + @@ -897,8 +884,6 @@ 176.IBPluginDependency 201.CustomClassName 201.IBPluginDependency - 222.IBPluginDependency - 223.IBPluginDependency 235.CustomClassName 235.IBPluginDependency 238.CustomClassName @@ -911,6 +896,8 @@ 253.IBPluginDependency 264.CustomClassName 264.IBPluginDependency + 268.CustomClassName + 268.IBPluginDependency 3.CustomClassName 3.IBPluginDependency 51.CustomClassName @@ -982,8 +969,6 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin FriendsListViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin UserProfileViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin DashboardViewController @@ -996,6 +981,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin NBContainerViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin + FindSitesViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin NewsBlurAppDelegate com.apple.InterfaceBuilder.IBCocoaTouchPlugin FeedDetailViewController @@ -1024,7 +1011,7 @@ - 267 + 270 @@ -1460,30 +1447,17 @@ FeedsMenuViewController UIViewController - - tapCancelButton: - UIBarButtonItem - - - tapCancelButton: - - tapCancelButton: - UIBarButtonItem - - YES YES appDelegate menuTableView - toolbar YES NewsBlurAppDelegate UITableView - UIToolbar @@ -1492,7 +1466,6 @@ YES appDelegate menuTableView - toolbar YES @@ -1504,10 +1477,6 @@ menuTableView UITableView - - toolbar - UIToolbar - @@ -1515,6 +1484,53 @@ ./Classes/FeedsMenuViewController.h + + FindSitesViewController + UIViewController + + YES + + YES + appDelegate + sitesSearchBar + sitesTable + + + YES + NewsBlurAppDelegate + UISearchBar + UITableView + + + + YES + + YES + appDelegate + sitesSearchBar + sitesTable + + + YES + + appDelegate + NewsBlurAppDelegate + + + sitesSearchBar + UISearchBar + + + sitesTable + UITableView + + + + + IBProjectSource + ./Classes/FindSitesViewController.h + + FirstTimeUserAddFriendsViewController UIViewController @@ -2115,20 +2131,20 @@ FriendsListViewController - UITableViewController + UIViewController YES YES appDelegate - searchBar - searchDisplayController + friendSearchBar + friendsTable YES NewsBlurAppDelegate UISearchBar - UISearchDisplayController + UITableView @@ -2136,8 +2152,8 @@ YES appDelegate - searchBar - searchDisplayController + friendSearchBar + friendsTable YES @@ -2146,12 +2162,12 @@ NewsBlurAppDelegate - searchBar + friendSearchBar UISearchBar - searchDisplayController - UISearchDisplayController + friendsTable + UITableView @@ -2598,6 +2614,7 @@ feedDetailViewController feedsMenuViewController feedsViewController + findSitesViewController firstTimeUserAddFriendsViewController firstTimeUserAddNewsBlurViewController firstTimeUserAddSitesViewController @@ -2624,6 +2641,7 @@ FeedDetailViewController FeedsMenuViewController NewsBlurViewController + FindSitesViewController FirstTimeUserAddFriendsViewController FirstTimeUserAddNewsBlurViewController FirstTimeUserAddSitesViewController @@ -2653,6 +2671,7 @@ feedDetailViewController feedsMenuViewController feedsViewController + findSitesViewController firstTimeUserAddFriendsViewController firstTimeUserAddNewsBlurViewController firstTimeUserAddSitesViewController @@ -2697,6 +2716,10 @@ feedsViewController NewsBlurViewController + + findSitesViewController + FindSitesViewController + firstTimeUserAddFriendsViewController FirstTimeUserAddFriendsViewController @@ -2783,7 +2806,7 @@ sectionUntapped: sectionUntappedOutside: selectIntelligence - showMenuButton: + tapAddSite: YES @@ -2802,7 +2825,7 @@ sectionUntapped: sectionUntappedOutside: selectIntelligence - showMenuButton: + tapAddSite: YES @@ -2823,7 +2846,7 @@ id - showMenuButton: + tapAddSite: id diff --git a/media/ios/Resources-iPhone/MainWindow.xib b/media/ios/Resources-iPhone/MainWindow.xib index d74d3f684..1e916d38d 100644 --- a/media/ios/Resources-iPhone/MainWindow.xib +++ b/media/ios/Resources-iPhone/MainWindow.xib @@ -135,7 +135,7 @@ IBCocoaTouchFramework NO - + 1 @@ -144,7 +144,16 @@ IBCocoaTouchFramework NO - + + + + 1 + 1 + + IBCocoaTouchFramework + NO + + 1 @@ -312,7 +321,7 @@ friendsListViewController - + 135 @@ -320,10 +329,18 @@ userProfileViewController - + 142 + + + findSitesViewController + + + + 144 + appDelegate @@ -399,11 +416,19 @@ appDelegate - + 136 + + + appDelegate + + + + 145 + @@ -520,12 +545,17 @@ 134 - + 141 - + + + + + 143 + @@ -557,6 +587,8 @@ 134.IBPluginDependency 141.CustomClassName 141.IBPluginDependency + 143.CustomClassName + 143.IBPluginDependency 3.CustomClassName 3.IBPluginDependency 39.IBPluginDependency @@ -594,6 +626,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UserProfileViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin + FindSitesViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin NewsBlurAppDelegate com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -619,7 +653,7 @@ - 142 + 145 @@ -1092,6 +1126,53 @@ ./Classes/FeedsMenuViewController.h + + FindSitesViewController + UIViewController + + YES + + YES + appDelegate + sitesSearchBar + sitesTable + + + YES + NewsBlurAppDelegate + UISearchBar + UITableView + + + + YES + + YES + appDelegate + sitesSearchBar + sitesTable + + + YES + + appDelegate + NewsBlurAppDelegate + + + sitesSearchBar + UISearchBar + + + sitesTable + UITableView + + + + + IBProjectSource + ./Classes/FindSitesViewController.h + + FirstTimeUserAddFriendsViewController UIViewController @@ -1692,20 +1773,20 @@ FriendsListViewController - UITableViewController + UIViewController YES YES appDelegate - searchBar - searchDisplayController + friendSearchBar + friendsTable YES NewsBlurAppDelegate UISearchBar - UISearchDisplayController + UITableView @@ -1713,8 +1794,8 @@ YES appDelegate - searchBar - searchDisplayController + friendSearchBar + friendsTable YES @@ -1723,12 +1804,12 @@ NewsBlurAppDelegate - searchBar + friendSearchBar UISearchBar - searchDisplayController - UISearchDisplayController + friendsTable + UITableView @@ -2175,6 +2256,7 @@ feedDetailViewController feedsMenuViewController feedsViewController + findSitesViewController firstTimeUserAddFriendsViewController firstTimeUserAddNewsBlurViewController firstTimeUserAddSitesViewController @@ -2201,6 +2283,7 @@ FeedDetailViewController FeedsMenuViewController NewsBlurViewController + FindSitesViewController FirstTimeUserAddFriendsViewController FirstTimeUserAddNewsBlurViewController FirstTimeUserAddSitesViewController @@ -2230,6 +2313,7 @@ feedDetailViewController feedsMenuViewController feedsViewController + findSitesViewController firstTimeUserAddFriendsViewController firstTimeUserAddNewsBlurViewController firstTimeUserAddSitesViewController @@ -2274,6 +2358,10 @@ feedsViewController NewsBlurViewController + + findSitesViewController + FindSitesViewController + firstTimeUserAddFriendsViewController FirstTimeUserAddFriendsViewController @@ -2360,6 +2448,7 @@ sectionUntapped: sectionUntappedOutside: selectIntelligence + tapAddSite: YES @@ -2367,6 +2456,7 @@ UIButton UIButton id + id @@ -2377,6 +2467,7 @@ sectionUntapped: sectionUntappedOutside: selectIntelligence + tapAddSite: YES @@ -2396,6 +2487,10 @@ selectIntelligence id + + tapAddSite: + id +