mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
07e667a95d
Eliminated the old WYPopoverController from the code, since it isn’t needed and isn’t compatible with theming. All popovers now use the modern UIPopoverPresentationController mechanism.
509 lines
No EOL
18 KiB
Objective-C
509 lines
No EOL
18 KiB
Objective-C
//
|
|
// AddSiteViewController.m
|
|
// NewsBlur
|
|
//
|
|
// Created by Samuel Clay on 10/31/10.
|
|
// Copyright 2010 NewsBlur. All rights reserved.
|
|
//
|
|
|
|
#import "AddSiteViewController.h"
|
|
#import "AddSiteAutocompleteCell.h"
|
|
#import "NewsBlurAppDelegate.h"
|
|
#import "NewsBlurViewController.h"
|
|
#import "ASIHTTPRequest.h"
|
|
#import "ASIFormDataRequest.h"
|
|
#import "NBContainerViewController.h"
|
|
#import "SBJson4.h"
|
|
#import "Base64.h"
|
|
|
|
@interface AddSiteViewController()
|
|
|
|
@property (nonatomic) NSString *activeTerm_;
|
|
@property (nonatomic, strong) NSMutableDictionary *searchResults_;
|
|
|
|
@end
|
|
|
|
@implementation AddSiteViewController
|
|
|
|
@synthesize appDelegate;
|
|
@synthesize inFolderInput;
|
|
@synthesize addFolderInput;
|
|
@synthesize siteAddressInput;
|
|
@synthesize addButton;
|
|
@synthesize cancelButton;
|
|
@synthesize folderPicker;
|
|
@synthesize siteTable;
|
|
@synthesize siteScrollView;
|
|
@synthesize jsonString;
|
|
@synthesize autocompleteResults;
|
|
@synthesize navBar;
|
|
@synthesize activityIndicator;
|
|
@synthesize siteActivityIndicator;
|
|
@synthesize addingLabel;
|
|
@synthesize errorLabel;
|
|
@synthesize activeTerm_;
|
|
@synthesize searchResults_;
|
|
@synthesize addFolderButton;
|
|
|
|
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
|
|
|
|
if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)viewDidLoad {
|
|
UIImageView *folderImage = [[UIImageView alloc]
|
|
initWithImage:[UIImage imageNamed:@"g_icn_folder.png"]];
|
|
folderImage.frame = CGRectMake(0, 0, 24, 16);
|
|
[folderImage setContentMode:UIViewContentModeRight];
|
|
[inFolderInput setLeftView:folderImage];
|
|
[inFolderInput setLeftViewMode:UITextFieldViewModeAlways];
|
|
|
|
UIImageView *folderImage2 = [[UIImageView alloc]
|
|
initWithImage:[UIImage imageNamed:@"g_icn_folder_rss.png"]];
|
|
folderImage2.frame = CGRectMake(0, 0, 24, 16);
|
|
[folderImage2 setContentMode:UIViewContentModeRight];
|
|
[addFolderInput setLeftView:folderImage2];
|
|
[addFolderInput setLeftViewMode:UITextFieldViewModeAlways];
|
|
|
|
UIImageView *urlImage = [[UIImageView alloc]
|
|
initWithImage:[UIImage imageNamed:@"world.png"]];
|
|
urlImage.frame = CGRectMake(0, 0, 24, 16);
|
|
[urlImage setContentMode:UIViewContentModeRight];
|
|
[siteAddressInput setLeftView:urlImage];
|
|
[siteAddressInput setLeftViewMode:UITextFieldViewModeAlways];
|
|
|
|
self.activeTerm_ = @"";
|
|
self.searchResults_ = [[NSMutableDictionary alloc] init];
|
|
|
|
self.folderPicker.delegate = self;
|
|
|
|
[super viewDidLoad];
|
|
}
|
|
|
|
- (void)viewWillAppear:(BOOL)animated {
|
|
[self.errorLabel setHidden:YES];
|
|
[self.addingLabel setHidden:YES];
|
|
[self.folderPicker setHidden:YES];
|
|
[self.siteScrollView setAlpha:0];
|
|
[self.activityIndicator stopAnimating];
|
|
|
|
self.view.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
|
|
self.siteTable.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
|
|
self.folderPicker.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
|
|
|
|
[super viewWillAppear:animated];
|
|
}
|
|
|
|
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
|
|
// Return YES for supported orientations
|
|
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
|
return YES;
|
|
} else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) {
|
|
return YES;
|
|
}
|
|
|
|
return NO;
|
|
}
|
|
|
|
- (void)viewDidAppear:(BOOL)animated {
|
|
[self.activityIndicator stopAnimating];
|
|
[super viewDidAppear:animated];
|
|
|
|
[self.inFolderInput becomeFirstResponder];
|
|
|
|
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
|
self.siteTable.hidden = NO;
|
|
self.siteScrollView.frame = CGRectMake(self.siteScrollView.frame.origin.x,
|
|
self.siteScrollView.frame.origin.y,
|
|
self.view.frame.size.width,
|
|
295);
|
|
}
|
|
}
|
|
|
|
|
|
- (void)didReceiveMemoryWarning {
|
|
// Releases the view if it doesn't have a superview.
|
|
[super didReceiveMemoryWarning];
|
|
|
|
// Release any cached data, images, etc that aren't in use.
|
|
}
|
|
|
|
|
|
- (IBAction)doCancelButton {
|
|
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
|
[self.appDelegate hidePopover];
|
|
} else {
|
|
[self.appDelegate hidePopoverAnimated:YES];
|
|
}
|
|
}
|
|
|
|
- (IBAction)doAddButton {
|
|
return [self addSite];
|
|
}
|
|
|
|
- (void)reload {
|
|
[inFolderInput setText:@"— Top Level —"];
|
|
[siteAddressInput setText:@""];
|
|
[addFolderInput setText:@""];
|
|
[folderPicker reloadAllComponents];
|
|
|
|
folderPicker.frame = CGRectMake(0, self.view.bounds.size.height,
|
|
folderPicker.frame.size.width,
|
|
folderPicker.frame.size.height);
|
|
}
|
|
|
|
#pragma mark -
|
|
#pragma mark Add Site
|
|
|
|
- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField {
|
|
[errorLabel setText:@""];
|
|
if (textField == inFolderInput && ![inFolderInput isFirstResponder]) {
|
|
[self showFolderPicker];
|
|
return NO;
|
|
} else if (textField == siteAddressInput) {
|
|
[self hideFolderPicker];
|
|
} else if (textField == addFolderInput) {
|
|
[self hideFolderPicker];
|
|
}
|
|
return YES;
|
|
}
|
|
|
|
- (BOOL)textFieldShouldReturn:(UITextField *)textField {
|
|
if (textField == inFolderInput) {
|
|
|
|
} else if (textField == siteAddressInput) {
|
|
if (siteAddressInput.returnKeyType == UIReturnKeySearch) {
|
|
[self checkSiteAddress];
|
|
} else {
|
|
[self addSite];
|
|
}
|
|
}
|
|
return YES;
|
|
}
|
|
|
|
- (IBAction)checkSiteAddress {
|
|
NSString *phrase = siteAddressInput.text;
|
|
|
|
if ([phrase length] == 0) {
|
|
[UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction
|
|
animations:^{
|
|
[siteScrollView setAlpha:0];
|
|
} completion:nil];
|
|
return;
|
|
}
|
|
|
|
if ([self.searchResults_ objectForKey:phrase]) {
|
|
self.autocompleteResults = [self.searchResults_ objectForKey:phrase];
|
|
[self reloadSearchResults];
|
|
return;
|
|
}
|
|
|
|
NSInteger periodLoc = [phrase rangeOfString:@"."].location;
|
|
if (periodLoc != NSNotFound && siteAddressInput.returnKeyType != UIReturnKeyDone) {
|
|
// URL
|
|
[siteAddressInput setReturnKeyType:UIReturnKeyDone];
|
|
[siteAddressInput resignFirstResponder];
|
|
[siteAddressInput becomeFirstResponder];
|
|
} else if (periodLoc == NSNotFound && siteAddressInput.returnKeyType != UIReturnKeySearch) {
|
|
// Search
|
|
[siteAddressInput setReturnKeyType:UIReturnKeySearch];
|
|
[siteAddressInput resignFirstResponder];
|
|
[siteAddressInput becomeFirstResponder];
|
|
}
|
|
|
|
[self.siteActivityIndicator startAnimating];
|
|
NSString *urlString = [NSString stringWithFormat:@"%@/rss_feeds/feed_autocomplete?term=%@&v=2",
|
|
NEWSBLUR_URL, [phrase stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
|
|
NSURL *url = [NSURL URLWithString:urlString];
|
|
ASIFormDataRequest *request = [ASIHTTPRequest requestWithURL:url];
|
|
[request setDelegate:self];
|
|
[request setDidFinishSelector:@selector(autocompleteSite:)];
|
|
[request startAsynchronous];
|
|
}
|
|
|
|
- (void)autocompleteSite:(ASIHTTPRequest *)request {
|
|
NSString *responseString = [request responseString];
|
|
NSData *responseData=[responseString dataUsingEncoding:NSUTF8StringEncoding];
|
|
NSError *error;
|
|
NSDictionary *results = [NSJSONSerialization
|
|
JSONObjectWithData:responseData
|
|
options:kNilOptions
|
|
error:&error];
|
|
|
|
|
|
NSString *query = [NSString stringWithFormat:@"%@", [results objectForKey:@"term"]];
|
|
NSString *phrase = siteAddressInput.text;
|
|
|
|
// cache the results
|
|
[self.searchResults_ setValue:[results objectForKey:@"feeds"] forKey:query];
|
|
|
|
if ([phrase isEqualToString:query]) {
|
|
self.autocompleteResults = [results objectForKey:@"feeds"];
|
|
[self reloadSearchResults];
|
|
}
|
|
|
|
// NSRange range = [query rangeOfString : activeTerm_];
|
|
// BOOL found = (range.location != NSNotFound);
|
|
}
|
|
|
|
- (void)reloadSearchResults {
|
|
if ([siteAddressInput.text length] > 0 && [autocompleteResults count] > 0) {
|
|
[UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction
|
|
animations:^{
|
|
[siteScrollView setAlpha:1];
|
|
} completion:nil];
|
|
} else {
|
|
[UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction
|
|
animations:^{
|
|
[siteScrollView setAlpha:0];
|
|
} completion:nil];
|
|
}
|
|
|
|
[self.siteActivityIndicator stopAnimating];
|
|
self.siteTable.hidden = NO;
|
|
[siteTable reloadData];
|
|
}
|
|
|
|
- (IBAction)addSite {
|
|
[self hideFolderPicker];
|
|
self.siteTable.hidden = YES;
|
|
[siteAddressInput resignFirstResponder];
|
|
[self.addingLabel setHidden:NO];
|
|
[self.addingLabel setText:@"Adding site..."];
|
|
[self.errorLabel setHidden:YES];
|
|
[self.activityIndicator startAnimating];
|
|
NSString *urlString = [NSString stringWithFormat:@"%@/reader/add_url",
|
|
NEWSBLUR_URL];
|
|
NSURL *url = [NSURL URLWithString:urlString];
|
|
ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:url];
|
|
NSString *parent_folder = [self extractParentFolder];
|
|
[request setPostValue:parent_folder forKey:@"folder"];
|
|
[request setPostValue:[siteAddressInput text] forKey:@"url"];
|
|
if (addFolderButton.selected && [addFolderInput.text length]) {
|
|
[request setPostValue:[addFolderInput text] forKey:@"new_folder"];
|
|
}
|
|
[request setDelegate:self];
|
|
[request setDidFinishSelector:@selector(requestFinished:)];
|
|
[request setDidFailSelector:@selector(requestFailed:)];
|
|
[request setTimeOutSeconds:30];
|
|
[request startAsynchronous];
|
|
}
|
|
|
|
|
|
- (void)requestFinished:(ASIHTTPRequest *)request {
|
|
[self.addingLabel setHidden:YES];
|
|
[self.activityIndicator stopAnimating];
|
|
NSString *responseString = [request responseString];
|
|
NSData *responseData = [responseString dataUsingEncoding:NSUTF8StringEncoding];
|
|
NSError *error;
|
|
NSDictionary *results = [NSJSONSerialization
|
|
JSONObjectWithData:responseData
|
|
options:kNilOptions
|
|
error:&error];
|
|
// int statusCode = [request responseStatusCode];
|
|
int code = [[results valueForKey:@"code"] intValue];
|
|
if (code == -1) {
|
|
[self.errorLabel setText:[results valueForKey:@"message"]];
|
|
[self.errorLabel setHidden:NO];
|
|
} else {
|
|
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
|
[self.appDelegate hidePopover];
|
|
} else {
|
|
[self.appDelegate hidePopoverAnimated:YES];
|
|
}
|
|
[self.appDelegate reloadFeedsView:NO];
|
|
}
|
|
|
|
}
|
|
|
|
- (NSString *)extractParentFolder {
|
|
NSString *parent_folder = [inFolderInput text];
|
|
NSInteger folder_loc = [parent_folder rangeOfString:@" - " options:NSBackwardsSearch].location;
|
|
if ([parent_folder length] && folder_loc != NSNotFound) {
|
|
parent_folder = [parent_folder substringFromIndex:(folder_loc + 3)];
|
|
}
|
|
NSInteger top_level_loc = [parent_folder rangeOfString:@" Top Level " options:NSBackwardsSearch].location;
|
|
if (parent_folder.length && top_level_loc != NSNotFound) {
|
|
parent_folder = @"";
|
|
}
|
|
return parent_folder;
|
|
}
|
|
|
|
#pragma mark -
|
|
#pragma mark Add Folder
|
|
|
|
- (IBAction)toggleAddFolder:(id)sender {
|
|
if (!addFolderButton.selected) {
|
|
addFolderButton.selected = YES;
|
|
[UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction
|
|
animations:^{
|
|
addFolderInput.alpha = 1;
|
|
self.siteScrollView.frame = CGRectMake(self.siteScrollView.frame.origin.x,
|
|
self.siteScrollView.frame.origin.y + 40,
|
|
self.view.frame.size.width,
|
|
self.siteScrollView.frame.size.height);
|
|
} completion:nil];
|
|
|
|
} else {
|
|
addFolderButton.selected = NO;
|
|
[UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction
|
|
animations:^{
|
|
addFolderInput.alpha = 0;
|
|
self.siteScrollView.frame = CGRectMake(self.siteScrollView.frame.origin.x,
|
|
self.siteScrollView.frame.origin.y - 40,
|
|
self.view.frame.size.width,
|
|
self.siteScrollView.frame.size.height);
|
|
} completion:nil];
|
|
}
|
|
}
|
|
|
|
- (void)requestFailed:(ASIHTTPRequest *)request {
|
|
[self.addingLabel setHidden:YES];
|
|
[self.errorLabel setHidden:NO];
|
|
[self.activityIndicator stopAnimating];
|
|
NSError *error = [request error];
|
|
NSLog(@"Error: %@", error);
|
|
[self.errorLabel setText:error.localizedDescription];
|
|
self.siteTable.hidden = YES;
|
|
}
|
|
|
|
#pragma mark -
|
|
#pragma mark Folder Picker
|
|
|
|
- (NSArray *)folders {
|
|
return _.without([appDelegate dictFoldersArray],
|
|
@[@"saved_stories",
|
|
@"read_stories",
|
|
@"river_blurblogs",
|
|
@"river_global",
|
|
@"everything"]);
|
|
}
|
|
|
|
- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView {
|
|
return 1;
|
|
}
|
|
|
|
- (NSInteger)pickerView:(UIPickerView *)pickerView
|
|
numberOfRowsInComponent:(NSInteger)component {
|
|
return [[self folders] count] + 1;
|
|
}
|
|
|
|
- (NSAttributedString *)pickerView:(UIPickerView *)pickerView
|
|
attributedTitleForRow:(NSInteger)row
|
|
forComponent:(NSInteger)component {
|
|
NSString *title = nil;
|
|
NSDictionary *attributes = @{NSForegroundColorAttributeName : UIColorFromRGB(NEWSBLUR_BLACK_COLOR)};
|
|
|
|
if (row == 0) {
|
|
title = @"— Top Level —";
|
|
} else {
|
|
title = [[self folders] objectAtIndex:row - 1];
|
|
}
|
|
|
|
return [[NSAttributedString alloc] initWithString:title attributes:attributes];
|
|
}
|
|
|
|
- (void)pickerView:(UIPickerView *)pickerView
|
|
didSelectRow:(NSInteger)row
|
|
inComponent:(NSInteger)component {
|
|
NSString *folder_title;
|
|
if (row == 0) {
|
|
folder_title = @"— Top Level —";
|
|
} else {
|
|
folder_title = [[self folders] objectAtIndex:row-1];
|
|
}
|
|
[inFolderInput setText:folder_title];
|
|
}
|
|
|
|
- (void)showFolderPicker {
|
|
if (![[self folders] count]) return;
|
|
|
|
[siteAddressInput resignFirstResponder];
|
|
[addFolderInput resignFirstResponder];
|
|
[inFolderInput setInputView:folderPicker];
|
|
[folderPicker selectRow:0 inComponent:0 animated:NO];
|
|
for (int i=0; i < [[self folders] count]; i++) {
|
|
if ([[[self folders] objectAtIndex:i] isEqualToString:inFolderInput.text]) {
|
|
[folderPicker selectRow:i+1 inComponent:0 animated:NO];
|
|
break;
|
|
}
|
|
}
|
|
if (folderPicker.frame.origin.y >= self.view.bounds.size.height) {
|
|
folderPicker.hidden = NO;
|
|
[UIView animateWithDuration:.35 animations:^{
|
|
folderPicker.frame = CGRectMake(0, self.view.bounds.size.height - folderPicker.frame.size.height, folderPicker.frame.size.width, folderPicker.frame.size.height);
|
|
}];
|
|
}
|
|
self.siteTable.hidden = YES;
|
|
}
|
|
|
|
- (void)hideFolderPicker {
|
|
[UIView animateWithDuration:.35 animations:^{
|
|
folderPicker.frame = CGRectMake(0, self.view.bounds.size.height, folderPicker.frame.size.width, folderPicker.frame.size.height);
|
|
}];
|
|
}
|
|
|
|
#pragma mark -
|
|
#pragma mark Autocomplete sites
|
|
|
|
|
|
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
|
|
return [autocompleteResults count];
|
|
}
|
|
|
|
- (UITableViewCell *)tableView:(UITableView *)tableView
|
|
cellForRowAtIndexPath:(NSIndexPath *)indexPath {
|
|
static NSString *AddSiteAutocompleteCellIdentifier = @"AddSiteAutocompleteCellIdentifier";
|
|
|
|
AddSiteAutocompleteCell *cell = (AddSiteAutocompleteCell *)[tableView dequeueReusableCellWithIdentifier:AddSiteAutocompleteCellIdentifier];
|
|
if (cell == nil) {
|
|
NSArray *nib = [[NSBundle mainBundle] loadNibNamed:@"AddSiteAutocompleteCell"
|
|
owner:self
|
|
options:nil];
|
|
for (id oneObject in nib) {
|
|
if ([oneObject isKindOfClass:[AddSiteAutocompleteCell class]]) {
|
|
cell = (AddSiteAutocompleteCell *)oneObject;
|
|
}
|
|
}
|
|
}
|
|
|
|
NSDictionary *result = [autocompleteResults objectAtIndex:indexPath.row];
|
|
int subs = [[result objectForKey:@"num_subscribers"] intValue];
|
|
NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
|
|
[numberFormatter setPositiveFormat:@"#,###"];
|
|
NSNumber *theScore = [NSNumber numberWithInt:subs];
|
|
NSString *favicon = [result objectForKey:@"favicon"];
|
|
UIImage *faviconImage;
|
|
if ((NSNull *)favicon != [NSNull null] && [favicon length] > 0) {
|
|
NSData *imageData = [NSData dataWithBase64EncodedString:favicon];
|
|
faviconImage = [UIImage imageWithData:imageData];
|
|
} else {
|
|
faviconImage = [UIImage imageNamed:@"world.png"];
|
|
}
|
|
|
|
cell.feedTitle.text = [result objectForKey:@"label"];
|
|
cell.feedTitle.textColor = UIColorFromRGB(NEWSBLUR_BLACK_COLOR);
|
|
cell.feedUrl.text = [result objectForKey:@"value"];
|
|
cell.feedUrl.textColor = UIColorFromFixedRGB(NEWSBLUR_LINK_COLOR);
|
|
cell.feedSubs.text = [[NSString stringWithFormat:@"%@ subscriber%@",
|
|
[NSString stringWithFormat:@"%@", [numberFormatter stringFromNumber:theScore]], subs == 1 ? @"" : @"s"] uppercaseString];
|
|
cell.feedSubs.textColor = UIColorFromRGB(0x808080);
|
|
cell.feedFavicon.image = faviconImage;
|
|
cell.backgroundColor = UIColorFromRGB(NEWSBLUR_WHITE_COLOR);
|
|
|
|
return cell;
|
|
}
|
|
|
|
- (void)tableView:(UITableView *)tableView
|
|
didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
|
|
NSDictionary *result = [autocompleteResults objectAtIndex:indexPath.row];
|
|
[self.siteAddressInput setText:[result objectForKey:@"value"]];
|
|
// [self addSite]; // Don't auto-add. Let user select folder.
|
|
[UIView animateWithDuration:.35 animations:^{
|
|
siteScrollView.alpha = 0;
|
|
}];
|
|
}
|
|
|
|
@end |