public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing bug around missing story comment when editing and the story share view is not yet initialized.

Browse source
This commit is contained in:
Samuel Clay 2013-03-02 21:27:29 -08:00
parent 51079d7ce3
commit 7987d25f8c
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/ios/Classes/NewsBlurAppDelegate.m
View file

@ -335,6 +335,7 @@
setUsername:(NSString *)username
setReplyId:(NSString *)replyId {
[self.shareViewController setCommentType:type];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[self.masterContainerViewController transitionToShareView];
} else {
@ -343,9 +344,10 @@
initWithRootViewController:self.shareViewController];
self.shareNavigationController = shareNav;
}
[self.shareViewController setSiteInfo:type setUserId:userId setUsername:username setReplyId:replyId];
[self.navigationController presentModalViewController:self.shareNavigationController animated:YES];
}
[self.shareViewController setSiteInfo:type setUserId:userId setUsername:username setReplyId:replyId];
}

1
media/ios/Classes/ShareViewController.h
View file

@ -25,6 +25,7 @@
@property (nonatomic) NSString* currentType;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *keyboardHeight;
- (void)setCommentType:(NSString *)type;
- (void)setSiteInfo:(NSString *)type setUserId:(NSString *)userId setUsername:(NSString *)username setReplyId:(NSString *)commentIndex;
- (void)clearComments;
- (IBAction)doCancelButton:(id)sender;

15
media/ios/Classes/ShareViewController.m
View file

@ -139,10 +139,12 @@
stOffset = self.storyTitle.frame.origin.y + self.storyTitle.frame.size.height;
stHeight = self.storyTitle.frame.size.height;
}
NSLog(@"Share type: %@", self.currentType);
BOOL showingShareButtons = [self.currentType isEqualToString:@"share"] ||
[self.currentType isEqualToString:@"edit-share"];
self.commentField.frame = CGRectMake(20, stOffset + 4,
v.width - 20*2,
v.height - k - bH - bP*2 - 12 - stHeight);
v.height - k - (showingShareButtons ? bH + bP*2 : 6) - 12 - stHeight);
CGPoint o = self.commentField.frame.origin;
CGSize c = self.commentField.frame.size;
self.twitterButton.frame = CGRectMake(v.width - 20 - bW*3 - bP*2, o.y + c.height + bP, bW, bH);
@ -180,13 +182,17 @@
}
}
- (void)setCommentType:(NSString *)type {
self.currentType = type;
}
- (void)setSiteInfo:(NSString *)type
setUserId:(NSString *)userId
setUsername:(NSString *)username
setReplyId:(NSString *)replyId {
NSLog(@"SetSiteInfo: %@", type);
[self.submitButton setStyle:UIBarButtonItemStyleDone];
if ([type isEqualToString: @"edit-reply"]) {
self.currentType = nil;
[submitButton setTitle:@"Save your reply"];
facebookButton.hidden = YES;
twitterButton.hidden = YES;
@ -219,10 +225,8 @@
if (![self.currentType isEqualToString:@"share"] &&
![self.currentType isEqualToString:@"reply"]) {
self.commentField.text = @"";
self.currentType = type;
}
} else if ([type isEqualToString: @"edit-share"]) {
self.currentType = nil;
facebookButton.hidden = NO;
twitterButton.hidden = NO;
appdotnetButton.hidden = NO;
@ -248,7 +252,6 @@
if (![self.currentType isEqualToString:@"share"] &&
![self.currentType isEqualToString:@"reply"]) {
self.commentField.text = @"";
self.currentType = type;
}
}
}