adding in mark as read for social

This commit is contained in:
Roy Yang 2012-06-29 12:54:52 -07:00
parent dfcc1eb4eb
commit c38fa6265e
8 changed files with 507 additions and 85 deletions

View file

@ -51,6 +51,8 @@
}
- (void)viewWillAppear:(BOOL)animated {
NSLog(@"appDelegate.activeFeed is %@", appDelegate.activeFeed);
self.pageFinished = NO;
[MBProgressHUD hideHUDForView:self.view animated:YES];

View file

@ -65,10 +65,10 @@
<int key="IBUISystemItemIdentifier">5</int>
</object>
<object class="IBUIBarButtonItem" id="960859036">
<string key="IBUITitle">Cancel</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIStyle">2</int>
<reference key="IBUIToolbar" ref="274633584"/>
<int key="IBUISystemItemIdentifier">1</int>
</object>
</array>
</object>
@ -78,7 +78,6 @@
<string key="NSFrame">{{0, 44}, {320, 416}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@ -176,8 +175,8 @@
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children">
<reference ref="274633584"/>
<reference ref="401087926"/>
<reference ref="274633584"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -380,6 +379,28 @@
<string key="minorKey">./Classes/BaseViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FeedDashboardViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="toolbar">UIToolbar</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FeedDashboardViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FeedDetailViewController</string>
<string key="superclassName">BaseViewController</string>
@ -463,7 +484,6 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="menuTableView">UITableView</string>
<string key="tableView">UITableView</string>
<string key="toolbar">UIToolbar</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -475,10 +495,6 @@
<string key="name">menuTableView</string>
<string key="candidateClassName">UITableView</string>
</object>
<object class="IBToOneOutletInfo" key="tableView">
<string key="name">tableView</string>
<string key="candidateClassName">UITableView</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
@ -522,6 +538,7 @@
<string key="addSitesView">UIView</string>
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="googleReaderButton">UIButton</string>
<string key="logo">UIImageView</string>
<string key="nextButton">UIBarButtonItem</string>
<string key="toolbar">UIToolbar</string>
<string key="toolbarTitle">UIButton</string>
@ -548,6 +565,10 @@
<string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="logo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="nextButton">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -589,6 +610,8 @@
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="fontSizeSegment">UISegmentedControl</string>
<string key="fontStyleSegment">UISegmentedControl</string>
<string key="largeFontSizeLabel">UILabel</string>
<string key="smallFontSizeLabel">UILabel</string>
</dictionary>
@ -597,6 +620,14 @@
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="fontSizeSegment">
<string key="name">fontSizeSegment</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo" key="fontStyleSegment">
<string key="name">fontStyleSegment</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo" key="largeFontSizeLabel">
<string key="name">largeFontSizeLabel</string>
<string key="candidateClassName">UILabel</string>
@ -770,6 +801,57 @@
<string key="minorKey">./Classes/LoginViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MGSplitViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="showMasterPopover:">id</string>
<string key="toggleMasterBeforeDetail:">id</string>
<string key="toggleMasterView:">id</string>
<string key="toggleSplitOrientation:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="showMasterPopover:">
<string key="name">showMasterPopover:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="toggleMasterBeforeDetail:">
<string key="name">toggleMasterBeforeDetail:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="toggleMasterView:">
<string key="name">toggleMasterView:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="toggleSplitOrientation:">
<string key="name">toggleSplitOrientation:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="delegate">id</string>
<string key="detailViewController">UIViewController</string>
<string key="masterViewController">UIViewController</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="delegate">
<string key="name">delegate</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo" key="detailViewController">
<string key="name">detailViewController</string>
<string key="candidateClassName">UIViewController</string>
</object>
<object class="IBToOneOutletInfo" key="masterViewController">
<string key="name">masterViewController</string>
<string key="candidateClassName">UIViewController</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MGSplitViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MoveSiteViewController</string>
<string key="superclassName">UIViewController</string>
@ -866,6 +948,7 @@
<string key="superclassName">BaseViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="addSiteViewController">AddSiteViewController</string>
<string key="feedDashboardViewController">FeedDashboardViewController</string>
<string key="feedDetailViewController">FeedDetailViewController</string>
<string key="feedsMenuViewController">FeedsMenuViewController</string>
<string key="feedsViewController">NewsBlurViewController</string>
@ -876,7 +959,8 @@
<string key="moveSiteViewController">MoveSiteViewController</string>
<string key="navigationController">UINavigationController</string>
<string key="originalStoryViewController">OriginalStoryViewController</string>
<string key="splitStoryController">UISplitViewController</string>
<string key="shareViewController">ShareViewController</string>
<string key="splitStoryController">MGSplitViewController</string>
<string key="splitStoryDetailNavigationController">UINavigationController</string>
<string key="splitStoryDetailViewController">SplitStoryDetailViewController</string>
<string key="storyDetailViewController">StoryDetailViewController</string>
@ -887,6 +971,10 @@
<string key="name">addSiteViewController</string>
<string key="candidateClassName">AddSiteViewController</string>
</object>
<object class="IBToOneOutletInfo" key="feedDashboardViewController">
<string key="name">feedDashboardViewController</string>
<string key="candidateClassName">FeedDashboardViewController</string>
</object>
<object class="IBToOneOutletInfo" key="feedDetailViewController">
<string key="name">feedDetailViewController</string>
<string key="candidateClassName">FeedDetailViewController</string>
@ -927,9 +1015,13 @@
<string key="name">originalStoryViewController</string>
<string key="candidateClassName">OriginalStoryViewController</string>
</object>
<object class="IBToOneOutletInfo" key="shareViewController">
<string key="name">shareViewController</string>
<string key="candidateClassName">ShareViewController</string>
</object>
<object class="IBToOneOutletInfo" key="splitStoryController">
<string key="name">splitStoryController</string>
<string key="candidateClassName">UISplitViewController</string>
<string key="candidateClassName">MGSplitViewController</string>
</object>
<object class="IBToOneOutletInfo" key="splitStoryDetailNavigationController">
<string key="name">splitStoryDetailNavigationController</string>
@ -960,8 +1052,9 @@
<string key="doSwitchSitesUnread">id</string>
<string key="sectionTapped:">UIButton</string>
<string key="sectionUntapped:">UIButton</string>
<string key="sectionUntappedOutside:">UIButton</string>
<string key="selectIntelligence">id</string>
<string key="showMenuButton">id</string>
<string key="showMenuButton:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="doSwitchSitesUnread">
@ -976,12 +1069,16 @@
<string key="name">sectionUntapped:</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBActionInfo" key="sectionUntappedOutside:">
<string key="name">sectionUntappedOutside:</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBActionInfo" key="selectIntelligence">
<string key="name">selectIntelligence</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showMenuButton">
<string key="name">showMenuButton</string>
<object class="IBActionInfo" key="showMenuButton:">
<string key="name">showMenuButton:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
@ -1116,19 +1213,88 @@
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SplitStoryDetailViewController</string>
<string key="className">ShareViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">appDelegate</string>
<string key="NS.object.0">NewsBlurAppDelegate</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">appDelegate</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<dictionary class="NSMutableDictionary" key="actions">
<string key="doCancelButton:">id</string>
<string key="doReplyToComment:">id</string>
<string key="doShareThisStory:">id</string>
<string key="doToggleButton:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="doCancelButton:">
<string key="name">doCancelButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="doReplyToComment:">
<string key="name">doReplyToComment:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="doShareThisStory:">
<string key="name">doShareThisStory:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="doToggleButton:">
<string key="name">doToggleButton:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="commentField">UITextView</string>
<string key="facebookButton">UIButton</string>
<string key="submitButton">UIBarButtonItem</string>
<string key="toolbarTitle">UIBarButtonItem</string>
<string key="twitterButton">UIButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="commentField">
<string key="name">commentField</string>
<string key="candidateClassName">UITextView</string>
</object>
<object class="IBToOneOutletInfo" key="facebookButton">
<string key="name">facebookButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="submitButton">
<string key="name">submitButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="toolbarTitle">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="twitterButton">
<string key="name">twitterButton</string>
<string key="candidateClassName">UIButton</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ShareViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SplitStoryDetailViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="splitController">MGSplitViewController</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="splitController">
<string key="name">splitController</string>
<string key="candidateClassName">MGSplitViewController</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/SplitStoryDetailViewController.h</string>
@ -1138,11 +1304,16 @@
<string key="className">StoryDetailViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="doNextStory">id</string>
<string key="doNextUnreadStory">id</string>
<string key="doPreviousStory">id</string>
<string key="toggleFontSize:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="doNextStory">
<string key="name">doNextStory</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="doNextUnreadStory">
<string key="name">doNextUnreadStory</string>
<string key="candidateClassName">id</string>
@ -1161,6 +1332,7 @@
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="buttonAction">UIBarButtonItem</string>
<string key="buttonNext">UIBarButtonItem</string>
<string key="buttonNextStory">UIBarButtonItem</string>
<string key="buttonPrevious">UIBarButtonItem</string>
<string key="feedTitleGradient">UIView</string>
<string key="popoverController">UIPopoverController</string>
@ -1185,6 +1357,10 @@
<string key="name">buttonNext</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="buttonNextStory">
<string key="name">buttonNextStory</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="buttonPrevious">
<string key="name">buttonPrevious</string>
<string key="candidateClassName">UIBarButtonItem</string>

View file

@ -701,11 +701,24 @@
id feedId = [self.activeStory objectForKey:@"story_feed_id"];
NSString *feedIdStr = [NSString stringWithFormat:@"%@",feedId];
int activeIndex = [[activeFeedStoryLocations objectAtIndex:activeLocation] intValue];
NSDictionary *feed = [self.dictFeeds objectForKey:feedIdStr];
NSDictionary *story = [activeFeedStories objectAtIndex:activeIndex];
if (self.activeFeed != feed) {
self.activeFeed = feed;
NSDictionary *feed;
if (self.isSocialView) {
feed = [self.dictActiveFeeds objectForKey:feedIdStr];
if (!feed) {
feed = [self.dictFeeds objectForKey:feedIdStr];
}
} else {
feed = [self.dictFeeds objectForKey:feedIdStr];
}
NSDictionary *story = [activeFeedStories objectAtIndex:activeIndex];
// if (self.activeFeed != feed) {
// self.activeFeed = feed;
// }
NSLog(@"feed is %@", feed);
NSLog(@"story is %@", story);
[self.recentlyReadStories addObject:[NSNumber numberWithInt:activeLocation]];
[self markStoryRead:story feed:feed];

View file

@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
@class NewsBlurAppDelegate;
@class ASIHTTPRequest;
@interface StoryDetailViewController : UIViewController <UIPopoverControllerDelegate> {
NewsBlurAppDelegate *appDelegate;
@ -48,7 +49,8 @@
- (void)changeWebViewWidth:(int)width;
- (void)refreshComments;
- (void)markedAsRead;
- (void)finishMarkAsRead:(ASIHTTPRequest *)request;
- (void)requestFailed:(ASIHTTPRequest *)request;
- (void)setActiveStory;
- (IBAction)toggleFontSize:(id)sender;
- (void)setFontStyle:(NSString *)fontStyle;

View file

@ -15,6 +15,7 @@
#import "ASIFormDataRequest.h"
#import "Base64.h"
#import "Utilities.h"
#import "JSON.h"
@implementation StoryDetailViewController
@ -534,25 +535,59 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
- (void)markStoryAsRead {
if ([[appDelegate.activeStory objectForKey:@"read_status"] intValue] != 1) {
NSLog(@"appDelegate.activeStory %@", appDelegate.activeStory);
[appDelegate markActiveStoryRead];
NSString *urlString = [NSString stringWithFormat:@"http://%@/reader/mark_story_as_read",
NEWSBLUR_URL];
NSString *urlString;
if (appDelegate.isSocialView) {
urlString = [NSString stringWithFormat:@"http://%@/reader/mark_social_stories_as_read",
NEWSBLUR_URL];
} else {
urlString = [NSString stringWithFormat:@"http://%@/reader/mark_story_as_read",
NEWSBLUR_URL];
}
NSURL *url = [NSURL URLWithString:urlString];
ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:url];
[request setPostValue:[appDelegate.activeStory
objectForKey:@"id"]
forKey:@"story_id"];
[request setPostValue:[appDelegate.activeStory
objectForKey:@"story_feed_id"]
forKey:@"feed_id"];
[request setDidFinishSelector:@selector(markedAsRead)];
[request setDidFailSelector:@selector(markedAsRead)];
if (appDelegate.isSocialView) {
NSString *usersFeedStoriesStr = [NSString stringWithFormat:@"{\"%@\":{\"%@\":[\"%@\"]}}",
[appDelegate.activeStory objectForKey:@"social_user_id"],
[appDelegate.activeStory objectForKey:@"story_feed_id"],
[appDelegate.activeStory objectForKey:@"id"]];
NSLog(@"usersFeedStoriesStr is %@", usersFeedStoriesStr);
[request setPostValue:usersFeedStoriesStr forKey:@"users_feeds_stories"];
} else {
[request setPostValue:[appDelegate.activeStory
objectForKey:@"id"]
forKey:@"story_id"];
[request setPostValue:[appDelegate.activeStory
objectForKey:@"story_feed_id"]
forKey:@"feed_id"];
}
[request setDidFinishSelector:@selector(finishMarkAsRead:)];
[request setDidFailSelector:@selector(finishedWithError:)];
[request setDelegate:self];
[request startAsynchronous];
}
}
- (void)requestFailed:(ASIHTTPRequest *)request {
NSLog(@"Error in mark as read is %@", [request error]);
}
- (void)finishMarkAsRead:(ASIHTTPRequest *)request {
NSString *responseString = [request responseString];
NSDictionary *results = [[NSDictionary alloc]
initWithDictionary:[responseString JSONValue]];
NSLog(@"results in mark as read is %@", results);
[results release];
}
- (void)refreshComments {
NSString *commentsString = [self getComments];
NSString *jsString = [[NSString alloc] initWithFormat:@
@ -563,9 +598,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
}
- (void)markedAsRead {
}
- (IBAction)doNextUnreadStory {
int nextIndex = [appDelegate indexOfNextUnreadStory];

View file

@ -48,10 +48,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUILabel" id="750430533">
<reference key="NSNextResponder" ref="994014136"/>
<int key="NSvFlags">291</int>
<string key="NSFrame">{{172, 44}, {119, 15}}</string>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{266, 44}, {184, 15}}</string>
<reference key="NSSuperview" ref="994014136"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor" id="932003208">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -90,7 +91,7 @@
<object class="IBUILabel" id="417683225">
<reference key="NSNextResponder" ref="994014136"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{20, 7}, {271, 34}}</string>
<string key="NSFrame">{{20, 7}, {431, 34}}</string>
<reference key="NSSuperview" ref="994014136"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="194816084"/>
@ -131,7 +132,7 @@
<object class="IBUILabel" id="194816084">
<reference key="NSNextResponder" ref="994014136"/>
<int key="NSvFlags">294</int>
<string key="NSFrame">{{20, 44}, {150, 15}}</string>
<string key="NSFrame">{{20, 44}, {235, 15}}</string>
<reference key="NSSuperview" ref="994014136"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="750430533"/>
@ -170,7 +171,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<string key="NSFrameSize">{300, 63}</string>
<string key="NSFrameSize">{460, 63}</string>
<reference key="NSSuperview" ref="749780469"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="523799572"/>
@ -185,7 +186,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<string key="NSFrameSize">{320, 64}</string>
<string key="NSFrameSize">{480, 64}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="994014136"/>
@ -196,7 +197,7 @@
<string key="IBUIReuseIdentifier">FeedDetailCellIdentifier</string>
</object>
<object class="IBUITableViewCell" id="183700415">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -208,16 +209,20 @@
<object class="IBUIView" id="111782255">
<reference key="NSNextResponder" ref="247257992"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, -1}, {320, 20}}</string>
<string key="NSFrame">{{0, -1}, {481, 20}}</string>
<reference key="NSSuperview" ref="247257992"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1001310564"/>
<string key="NSReuseIdentifierKey">_NS:196</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUILabel" id="607536273">
<reference key="NSNextResponder" ref="247257992"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{172, 59}, {119, 15}}</string>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{330, 64}, {119, 15}}</string>
<reference key="NSSuperview" ref="247257992"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<reference key="IBUIBackgroundColor" ref="932003208"/>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
@ -243,9 +248,10 @@
</object>
<object class="IBUILabel" id="753396836">
<reference key="NSNextResponder" ref="247257992"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 22}, {271, 34}}</string>
<int key="NSvFlags">294</int>
<string key="NSFrame">{{20, 22}, {429, 34}}</string>
<reference key="NSSuperview" ref="247257992"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="450494992"/>
<reference key="IBUIBackgroundColor" ref="932003208"/>
<bool key="IBUIClipsSubviews">YES</bool>
@ -274,6 +280,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 59}, {150, 15}}</string>
<reference key="NSSuperview" ref="247257992"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="607536273"/>
<reference key="IBUIBackgroundColor" ref="573631124"/>
<bool key="IBUIClipsSubviews">YES</bool>
@ -300,14 +307,16 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{2, 31}, {16, 16}}</string>
<reference key="NSSuperview" ref="247257992"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="753396836"/>
<bool key="IBUIAutoresizesSubviews">NO</bool>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<string key="NSFrameSize">{300, 91}</string>
<string key="NSFrameSize">{460, 91}</string>
<reference key="NSSuperview" ref="183700415"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="111782255"/>
<reference key="IBUIBackgroundColor" ref="692566874"/>
<bool key="IBUIOpaque">NO</bool>
@ -317,7 +326,9 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
<string key="NSFrameSize">{320, 92}</string>
<string key="NSFrameSize">{480, 92}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="247257992"/>
<reference key="IBUIBackgroundColor" ref="932003208"/>
<int key="IBUITag">1</int>
@ -433,8 +444,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="194816084"/>
<reference ref="417683225"/>
<reference ref="750430533"/>
<reference ref="523799572"/>
<reference ref="750430533"/>
</object>
<reference key="parent" ref="0"/>
</object>
@ -464,10 +475,10 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1001310564"/>
<reference ref="607536273"/>
<reference ref="753396836"/>
<reference ref="450494992"/>
<reference ref="111782255"/>
<reference ref="607536273"/>
</object>
<reference key="parent" ref="0"/>
</object>

View file

@ -153,6 +153,15 @@
<reference key="IBUIToolbar" ref="895374018"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<object class="IBUIBarButtonItem" id="934474311">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">settings_icon.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIStyle">1</int>
<reference key="IBUIToolbar" ref="895374018"/>
</object>
</object>
<reference key="IBUITintColor" ref="131787584"/>
</object>
@ -213,6 +222,14 @@
</object>
<int key="connectionID">68</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">homeButton</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="934474311"/>
</object>
<int key="connectionID">83</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
@ -245,6 +262,14 @@
</object>
<int key="connectionID">70</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">showMenuButton:</string>
<reference key="source" ref="934474311"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">84</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -296,6 +321,7 @@
<reference ref="537490750"/>
<reference ref="240724681"/>
<reference ref="607206668"/>
<reference ref="934474311"/>
</object>
<reference key="parent" ref="774585933"/>
</object>
@ -328,6 +354,11 @@
<reference key="object" ref="607206668"/>
<reference key="parent" ref="895374018"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">82</int>
<reference key="object" ref="934474311"/>
<reference key="parent" ref="895374018"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -346,6 +377,7 @@
<string>63.IBPluginDependency</string>
<string>79.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>82.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -361,6 +393,7 @@
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -375,7 +408,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">81</int>
<int key="maxID">84</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1275,6 +1308,99 @@
<string key="minorKey">./Classes/LoginViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MGSplitViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>showMasterPopover:</string>
<string>toggleMasterBeforeDetail:</string>
<string>toggleMasterView:</string>
<string>toggleSplitOrientation:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>showMasterPopover:</string>
<string>toggleMasterBeforeDetail:</string>
<string>toggleMasterView:</string>
<string>toggleSplitOrientation:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">showMasterPopover:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleMasterBeforeDetail:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleMasterView:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleSplitOrientation:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>delegate</string>
<string>detailViewController</string>
<string>masterViewController</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>UIViewController</string>
<string>UIViewController</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>delegate</string>
<string>detailViewController</string>
<string>masterViewController</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">delegate</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">detailViewController</string>
<string key="candidateClassName">UIViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">masterViewController</string>
<string key="candidateClassName">UIViewController</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MGSplitViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MoveSiteViewController</string>
<string key="superclassName">UIViewController</string>
@ -1465,7 +1591,7 @@
<string>UINavigationController</string>
<string>OriginalStoryViewController</string>
<string>ShareViewController</string>
<string>UISplitViewController</string>
<string>MGSplitViewController</string>
<string>UINavigationController</string>
<string>SplitStoryDetailViewController</string>
<string>StoryDetailViewController</string>
@ -1551,7 +1677,7 @@
</object>
<object class="IBToOneOutletInfo">
<string key="name">splitStoryController</string>
<string key="candidateClassName">UISplitViewController</string>
<string key="candidateClassName">MGSplitViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">splitStoryDetailNavigationController</string>
@ -1588,7 +1714,7 @@
<string>sectionUntapped:</string>
<string>sectionUntappedOutside:</string>
<string>selectIntelligence</string>
<string>showMenuButton</string>
<string>showMenuButton:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1609,7 +1735,7 @@
<string>sectionUntapped:</string>
<string>sectionUntappedOutside:</string>
<string>selectIntelligence</string>
<string>showMenuButton</string>
<string>showMenuButton:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1634,7 +1760,7 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">showMenuButton</string>
<string key="name">showMenuButton:</string>
<string key="candidateClassName">id</string>
</object>
</object>
@ -1909,8 +2035,6 @@
<string>appDelegate</string>
<string>commentField</string>
<string>facebookButton</string>
<string>siteFavicon</string>
<string>siteInformation</string>
<string>submitButton</string>
<string>toolbarTitle</string>
<string>twitterButton</string>
@ -1920,8 +2044,6 @@
<string>NewsBlurAppDelegate</string>
<string>UITextView</string>
<string>UIButton</string>
<string>UIImageView</string>
<string>UILabel</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIButton</string>
@ -1934,8 +2056,6 @@
<string>appDelegate</string>
<string>commentField</string>
<string>facebookButton</string>
<string>siteFavicon</string>
<string>siteInformation</string>
<string>submitButton</string>
<string>toolbarTitle</string>
<string>twitterButton</string>
@ -1954,14 +2074,6 @@
<string key="name">facebookButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">siteFavicon</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">siteInformation</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">submitButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -1985,14 +2097,35 @@
<string key="className">SplitStoryDetailViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">appDelegate</string>
<string key="NS.object.0">NewsBlurAppDelegate</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>splitController</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>MGSplitViewController</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">appDelegate</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>splitController</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">splitController</string>
<string key="candidateClassName">MGSplitViewController</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -2007,6 +2140,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doNextStory</string>
<string>doNextUnreadStory</string>
<string>doPreviousStory</string>
<string>toggleFontSize:</string>
@ -2016,18 +2150,24 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doNextStory</string>
<string>doNextUnreadStory</string>
<string>doPreviousStory</string>
<string>toggleFontSize:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doNextStory</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doNextUnreadStory</string>
<string key="candidateClassName">id</string>
@ -2050,6 +2190,7 @@
<string>appDelegate</string>
<string>buttonAction</string>
<string>buttonNext</string>
<string>buttonNextStory</string>
<string>buttonPrevious</string>
<string>feedTitleGradient</string>
<string>popoverController</string>
@ -2064,6 +2205,7 @@
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIView</string>
<string>UIPopoverController</string>
<string>UIProgressView</string>
@ -2079,6 +2221,7 @@
<string>appDelegate</string>
<string>buttonAction</string>
<string>buttonNext</string>
<string>buttonNextStory</string>
<string>buttonPrevious</string>
<string>feedTitleGradient</string>
<string>popoverController</string>
@ -2104,6 +2247,10 @@
<string key="name">buttonNext</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">buttonNextStory</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">buttonPrevious</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -2150,8 +2297,17 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">16-List.png</string>
<string key="NS.object.0">{16, 16}</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>16-List.png</string>
<string>settings_icon.png</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{16, 16}</string>
<string>{19, 20}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>

View file

@ -4458,7 +4458,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<object class="IBUIProgressView" id="484194819">
<reference key="NSNextResponder" ref="155973878"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{132, 17}, {56, 11}}</string>
<string key="NSFrame">{{112, 17}, {56, 11}}</string>
<reference key="NSSuperview" ref="155973878"/>
<reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
@ -4514,6 +4514,15 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<float key="IBUIWidth">20</float>
<reference key="IBUIToolbar" ref="155973878"/>
</object>
<object class="IBUIBarButtonItem" id="157083779">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">06-arrow-south.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIStyle">1</int>
<reference key="IBUIToolbar" ref="155973878"/>
</object>
<object class="IBUIBarButtonItem" id="1065495688">
<string key="IBUITitle">Next unread</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -4626,6 +4635,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
</object>
<int key="connectionID">58</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">doNextStory</string>
<reference key="source" ref="157083779"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">74</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -4671,6 +4688,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference ref="284060761"/>
<reference ref="672699755"/>
<reference ref="766697033"/>
<reference ref="157083779"/>
</object>
<reference key="parent" ref="191373211"/>
</object>
@ -4723,6 +4741,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="object" ref="506862915"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">73</int>
<reference key="object" ref="157083779"/>
<reference key="parent" ref="155973878"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -4744,6 +4767,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>48.IBPluginDependency</string>
<string>63.IBPluginDependency</string>
<string>64.IBPluginDependency</string>
<string>73.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -4762,6 +4786,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -4776,7 +4801,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">71</int>
<int key="maxID">74</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -6664,6 +6689,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">06-arrow-south.png</string>
<string key="NS.object.0">{10, 12}</string>
</object>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>