cleaning up sharing

This commit is contained in:
Roy Yang 2012-08-03 00:13:56 -07:00
parent a027f99c2a
commit dd09eb7857
9 changed files with 37 additions and 40 deletions

BIN
dump.rdb Normal file

Binary file not shown.

View file

@ -37,11 +37,13 @@
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
self.toolbar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
self.interactionsModule.hidden = NO;
self.activitiesModule.hidden = YES;
self.interactionsModule.hidden = YES;
self.activitiesModule.hidden = NO;
self.feedbackWebView.hidden = YES;
self.feedbackWebView.delegate = self;
self.segmentedButton.selectedSegmentIndex = 1;
self.topToolbar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
// preload feedback

View file

@ -545,12 +545,16 @@
[self addChildViewController:self.shareNavigationController];
[self.view insertSubview:self.shareNavigationController.view aboveSubview:self.storyNavigationController.view];
[self.shareNavigationController didMoveToParentViewController:self];
self.shareViewController.view.frame = CGRectZero;
self.shareNavigationController.view.frame = CGRectMake(self.storyNavigationController.view.frame.origin.x,
vb.size.height,
self.storyDetailViewController.view.frame.size.width,
NB_DEFAULT_SHARE_HEIGHT);
self.shareViewController.view.frame = CGRectMake(0,
0,
self.shareNavigationController.view.frame.size.width,
self.shareNavigationController.view.frame.size.height - 44);
[self.shareViewController.commentField becomeFirstResponder];
}

View file

@ -313,6 +313,7 @@
}
[self.followButton setTitle:@"Following" forState:UIControlStateNormal];
[appDelegate reloadFeedsView:NO];
}
@ -333,6 +334,7 @@
NSLog(@"results %@", results);
[self.followButton setTitle:@"Follow" forState:UIControlStateNormal];
[appDelegate reloadFeedsView:NO];
}
- (void)requestFailed:(ASIHTTPRequest *)request

View file

@ -36,6 +36,15 @@
- (void)viewDidLoad
{
UIBarButtonItem *cancel = [[UIBarButtonItem alloc] initWithTitle:@"Cancel" style:UIBarButtonSystemItemCancel target:self action:@selector(doCancelButton:)];
self.navigationItem.leftBarButtonItem = cancel;
UIBarButtonItem *submit = [[UIBarButtonItem alloc] initWithTitle:@"Post" style:UIBarButtonSystemItemDone target:self action:@selector(doShareThisStory:)];
self.submitButton = submit;
self.navigationItem.rightBarButtonItem = submit;
// Do any additional setup after loading the view from its nib.
commentField.layer.borderWidth = 1.0f;
commentField.layer.cornerRadius = 8;

View file

@ -38,8 +38,8 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUITextView" id="993868796">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{84, 11}, {579, 54}}</string>
<int key="NSvFlags">303</int>
<string key="NSFrame">{{86, 11}, {532, 54}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@ -69,7 +69,7 @@
<object class="IBUIButton" id="161540210">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{41, 41}, {27, 27}}</string>
<string key="NSFrame">{{29, 43}, {27, 27}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="993868796"/>
@ -117,7 +117,7 @@
<object class="IBUIButton" id="505763753">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{41, 11}, {27, 27}}</string>
<string key="NSFrame">{{29, 11}, {27, 27}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="161540210"/>
@ -242,9 +242,9 @@
<int key="objectID">2</int>
<reference key="object" ref="766721923"/>
<array class="NSMutableArray" key="children">
<reference ref="505763753"/>
<reference ref="993868796"/>
<reference ref="161540210"/>
<reference ref="505763753"/>
</array>
<reference key="parent" ref="0"/>
</object>

View file

@ -445,7 +445,7 @@
"</div>"
"<div class=\"NB-story-comment-content\">%@"
"<div style='clear:both'>"
"<div style=\"clear:both\">"
" <div class=\"NB-story-comment-reply-button NB-button\">"
" <div class=\"NB-story-comment-reply-button-wrapper\">"
" <a href=\"http://ios.newsblur.com/reply/%@/%@\">Reply</a>"

View file

@ -12,11 +12,11 @@
green:((float)((rgbValue & 0xFF00) >> 8))/255.0 \
blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
#define BACKGROUND_REFRESH_SECONDS -5
// #define BACKGROUND_REFRESH_SECONDS -10*60
// #define BACKGROUND_REFRESH_SECONDS -5
#define BACKGROUND_REFRESH_SECONDS -10*60
// #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host"]
// #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
#define NEWSBLUR_ORANGE 0xAE5D15

File diff suppressed because one or more lines are too long