mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
semi final changes before launch
This commit is contained in:
Roy Yang
parent
b024c0365e
commit
e1a279f855
17 changed files with 273 additions and 381 deletions
|
|
@ -82,7 +82,8 @@
|
|||
|
||||
if ([category isEqualToString:@"follow"] ||
|
||||
[category isEqualToString:@"comment_reply"] ||
|
||||
[category isEqualToString:@"comment_like"]) {
|
||||
[category isEqualToString:@"comment_like"] ||
|
||||
[category isEqualToString:@"signup"]) {
|
||||
// this is for the rare instance when the with_user doesn't return anything
|
||||
if ([[activity objectForKey:@"with_user"] class] == [NSNull class]) {
|
||||
self.faviconView.frame = CGRectZero;
|
||||
|
|
@ -110,7 +111,7 @@
|
|||
|
||||
if ([category isEqualToString:@"follow"]) {
|
||||
withUserUsername = [[activity objectForKey:@"with_user"] objectForKey:@"username"];
|
||||
txt = [NSString stringWithFormat:@"%@ followed %@.", username, withUserUsername];
|
||||
txt = [NSString stringWithFormat:@"%@ followed %@.", username, withUserUsername];
|
||||
} else if ([category isEqualToString:@"comment_reply"]) {
|
||||
withUserUsername = [[activity objectForKey:@"with_user"] objectForKey:@"username"];
|
||||
txt = [NSString stringWithFormat:@"%@ replied to %@: \n%@", username, withUserUsername, comment];
|
||||
|
|
@ -128,6 +129,8 @@
|
|||
txt = [NSString stringWithFormat:@"You saved \"%@\".", content];
|
||||
} else if ([category isEqualToString:@"feedsub"]) {
|
||||
txt = [NSString stringWithFormat:@"You subscribed to %@.", content];
|
||||
} else if ([category isEqualToString:@"signup"]) {
|
||||
txt = [NSString stringWithFormat:@"You signed up for NewsBlur.", content];
|
||||
}
|
||||
|
||||
NSString *txtWithTime = [NSString stringWithFormat:@"%@\n%@", txt, time];
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate];
|
||||
NSString *urlString = [NSString stringWithFormat:@
|
||||
"http://%@/social/activities?user_id=%@&page=%i&limit=10"
|
||||
"&category=star&category=feedsub&category=follow&category=comment_reply&category=comment_like&category=sharedstory",
|
||||
"&category=signup&category=star&category=feedsub&category=follow&category=comment_reply&category=comment_like&category=sharedstory",
|
||||
NEWSBLUR_URL,
|
||||
[appDelegate.dictUserProfile objectForKey:@"user_id"],
|
||||
page];
|
||||
|
|
@ -210,7 +210,8 @@
|
|||
NSString *category = [activitiy objectForKey:@"category"];
|
||||
if ([category isEqualToString:@"follow"]) {
|
||||
cell.accessoryType = UITableViewCellAccessoryNone;
|
||||
} else if ([category isEqualToString:@"star"]){
|
||||
} else if ([category isEqualToString:@"star"] ||
|
||||
[category isEqualToString:@"signup"]){
|
||||
cell.accessoryType = UITableViewCellAccessoryNone;
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
} else {
|
||||
|
|
@ -251,14 +252,19 @@
|
|||
NSString *feedIdStr = [NSString stringWithFormat:@"%@", [[activity objectForKey:@"with_user"] objectForKey:@"id"]];
|
||||
NSString *contentIdStr = [NSString stringWithFormat:@"%@", [activity objectForKey:@"content_id"]];
|
||||
[appDelegate loadTryFeedDetailView:feedIdStr withStory:contentIdStr isSocial:YES withUser:[activity objectForKey:@"with_user"] showFindingStory:YES];
|
||||
appDelegate.tryFeedCategory = category;
|
||||
} else if ([category isEqualToString:@"sharedstory"]) {
|
||||
NSString *feedIdStr = [NSString stringWithFormat:@"%@", [appDelegate.dictUserProfile objectForKey:@"id"]];
|
||||
NSString *contentIdStr = [NSString stringWithFormat:@"%@", [activity objectForKey:@"content_id"]];
|
||||
[appDelegate loadTryFeedDetailView:feedIdStr withStory:contentIdStr isSocial:YES withUser:[activity objectForKey:@"with_user"] showFindingStory:YES];
|
||||
appDelegate.tryFeedCategory = category;
|
||||
|
||||
} else if ([category isEqualToString:@"feedsub"]) {
|
||||
NSString *feedIdStr = [NSString stringWithFormat:@"%@", [activity objectForKey:@"feed_id"]];
|
||||
NSString *contentIdStr = nil;
|
||||
[appDelegate loadTryFeedDetailView:feedIdStr withStory:contentIdStr isSocial:NO withUser:[activity objectForKey:@"with_user"] showFindingStory:NO];
|
||||
appDelegate.tryFeedCategory = category;
|
||||
|
||||
}
|
||||
|
||||
// have the selected cell deselect
|
||||
|
|
|
|||
|
|
@ -140,8 +140,6 @@
|
|||
BOOL facebookSync = [[[[results objectForKey:@"services"] objectForKey:@"facebook"] objectForKey:@"syncing"] boolValue];
|
||||
BOOL twitterSync = [[[[results objectForKey:@"services"] objectForKey:@"twitter"] objectForKey:@"syncing"] boolValue];
|
||||
|
||||
|
||||
|
||||
if (![[[[results objectForKey:@"services"] objectForKey:@"facebook"] objectForKey:@"facebook_uid"] isKindOfClass:[NSNull class]]) {
|
||||
[self finishFacebookConnect];
|
||||
} else {
|
||||
|
|
@ -161,8 +159,9 @@
|
|||
|
||||
- (void)finishFacebookConnect {
|
||||
[self.facebookActivityIndicator stopAnimating];
|
||||
|
||||
self.friendsLabel.textColor = UIColorFromRGB(0x333333);
|
||||
self.facebookButton.selected = YES;
|
||||
self.friendsLabel.text = @"You have successfully connected to Facebook.";
|
||||
UIImage *checkmark = [UIImage imageNamed:@"258-checkmark"];
|
||||
UIImageView *checkmarkView = [[UIImageView alloc] initWithImage:checkmark];
|
||||
checkmarkView.frame = CGRectMake(self.facebookButton.frame.origin.x + self.facebookButton.frame.size.width - 24,
|
||||
|
|
@ -175,6 +174,8 @@
|
|||
|
||||
- (void)finishTwitterConnect {
|
||||
[self.twitterActivityIndicator stopAnimating];
|
||||
self.friendsLabel.textColor = UIColorFromRGB(0x333333);
|
||||
self.friendsLabel.text = @"You have successfully connected to Twitter.";
|
||||
|
||||
self.twitterButton.selected = YES;
|
||||
UIImage *checkmark = [UIImage imageNamed:@"258-checkmark"];
|
||||
|
|
@ -240,6 +241,7 @@
|
|||
|
||||
- (void)changeMessaging:(NSString *)msg {
|
||||
self.friendsLabel.text = msg;
|
||||
self.friendsLabel.textColor = [UIColor redColor];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<string key="NSFrameSize">{540, 540}</string>
|
||||
<reference key="NSSuperview" ref="874391841"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="406293652"/>
|
||||
<reference key="NSNextKeyView" ref="736025522"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
<int key="IBUIContentMode">4</int>
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
<string key="NSFrame">{{70, 49}, {400, 100}}</string>
|
||||
<reference key="NSSuperview" ref="874391841"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="425746832"/>
|
||||
<reference key="NSNextKeyView" ref="406293652"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
|
|
@ -79,6 +79,7 @@
|
|||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MQA</bytes>
|
||||
</object>
|
||||
<string key="IBUIShadowOffset">{0, 1}</string>
|
||||
<int key="IBUIBaselineAdjustment">0</int>
|
||||
<float key="IBUIMinimumFontSize">10</float>
|
||||
<int key="IBUINumberOfLines">5</int>
|
||||
|
|
@ -96,7 +97,7 @@
|
|||
<object class="IBUILabel" id="961208593">
|
||||
<reference key="NSNextResponder" ref="874391841"/>
|
||||
<int key="NSvFlags">303</int>
|
||||
<string key="NSFrame">{{70, 421}, {400, 106}}</string>
|
||||
<string key="NSFrame">{{121, 421}, {298, 106}}</string>
|
||||
<reference key="NSSuperview" ref="874391841"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="436803934"/>
|
||||
|
|
@ -275,7 +276,7 @@
|
|||
<string key="NSFrame">{{0, 44}, {540, 540}}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="736025522"/>
|
||||
<reference key="NSNextKeyView" ref="425746832"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
|
|
@ -400,9 +401,9 @@
|
|||
<reference ref="886247703"/>
|
||||
<reference ref="406293652"/>
|
||||
<reference ref="43930813"/>
|
||||
<reference ref="961208593"/>
|
||||
<reference ref="436803934"/>
|
||||
<reference ref="736025522"/>
|
||||
<reference ref="961208593"/>
|
||||
</array>
|
||||
<reference key="parent" ref="0"/>
|
||||
</object>
|
||||
|
|
@ -897,7 +898,7 @@
|
|||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="outlets">
|
||||
<string key="appDelegate">NewsBlurAppDelegate</string>
|
||||
<string key="instructionsLabel">UIButton</string>
|
||||
<string key="instructionsLabel">UILabel</string>
|
||||
<string key="nextButton">UIBarButtonItem</string>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
|
|
@ -907,7 +908,7 @@
|
|||
</object>
|
||||
<object class="IBToOneOutletInfo" key="instructionsLabel">
|
||||
<string key="name">instructionsLabel</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo" key="nextButton">
|
||||
<string key="name">nextButton</string>
|
||||
|
|
@ -922,32 +923,26 @@
|
|||
<object class="IBPartialClassDescription">
|
||||
<string key="className">FirstTimeUserAddSitesViewController</string>
|
||||
<string key="superclassName">UIViewController</string>
|
||||
<dictionary class="NSMutableDictionary" key="actions">
|
||||
<string key="tapCategoryButton:">id</string>
|
||||
<string key="tapGoogleReaderButton">id</string>
|
||||
<string key="tapNextButton">id</string>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="actionInfosByName">
|
||||
<object class="IBActionInfo" key="tapCategoryButton:">
|
||||
<string key="name">tapCategoryButton:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo" key="tapGoogleReaderButton">
|
||||
<string key="name">tapGoogleReaderButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo" key="tapNextButton">
|
||||
<object class="NSMutableDictionary" key="actions">
|
||||
<string key="NS.key.0">tapNextButton</string>
|
||||
<string key="NS.object.0">id</string>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
<string key="NS.key.0">tapNextButton</string>
|
||||
<object class="IBActionInfo" key="NS.object.0">
|
||||
<string key="name">tapNextButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
</dictionary>
|
||||
</object>
|
||||
<dictionary class="NSMutableDictionary" key="outlets">
|
||||
<string key="activityIndicator">UIActivityIndicatorView</string>
|
||||
<string key="appDelegate">NewsBlurAppDelegate</string>
|
||||
<string key="categoriesTable">UITableView</string>
|
||||
<string key="googleReaderButton">UIButton</string>
|
||||
<string key="googleReaderButtonWrapper">UIView</string>
|
||||
<string key="instructionLabel">UILabel</string>
|
||||
<string key="nextButton">UIBarButtonItem</string>
|
||||
<string key="scrollView">UIScrollView</string>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
<object class="IBToOneOutletInfo" key="activityIndicator">
|
||||
|
|
@ -958,6 +953,10 @@
|
|||
<string key="name">appDelegate</string>
|
||||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo" key="categoriesTable">
|
||||
<string key="name">categoriesTable</string>
|
||||
<string key="candidateClassName">UITableView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo" key="googleReaderButton">
|
||||
<string key="name">googleReaderButton</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
|
|
@ -974,6 +973,10 @@
|
|||
<string key="name">nextButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo" key="scrollView">
|
||||
<string key="name">scrollView</string>
|
||||
<string key="candidateClassName">UIScrollView</string>
|
||||
</object>
|
||||
</dictionary>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
|
|
@ -1517,6 +1520,7 @@
|
|||
<string key="homeButton">UIBarButtonItem</string>
|
||||
<string key="innerView">UIView</string>
|
||||
<string key="intelligenceControl">UISegmentedControl</string>
|
||||
<string key="noFocusMessage">UIView</string>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
<object class="IBToOneOutletInfo" key="appDelegate">
|
||||
|
|
@ -1547,6 +1551,10 @@
|
|||
<string key="name">intelligenceControl</string>
|
||||
<string key="candidateClassName">UISegmentedControl</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo" key="noFocusMessage">
|
||||
<string key="name">noFocusMessage</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
</dictionary>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
// Do any additional setup after loading the view from its nib.
|
||||
|
||||
|
||||
UIBarButtonItem *next = [[UIBarButtonItem alloc] initWithTitle:@"Start Enjoying" style:UIBarButtonSystemItemDone target:self action:@selector(tapNextButton)];
|
||||
UIBarButtonItem *next = [[UIBarButtonItem alloc] initWithTitle:@"Start reading" style:UIBarButtonSystemItemDone target:self action:@selector(tapNextButton)];
|
||||
self.nextButton = next;
|
||||
self.navigationItem.rightBarButtonItem = next;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
<string key="NSFrameSize">{540, 576}</string>
|
||||
<reference key="NSSuperview" ref="874391841"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="754909752"/>
|
||||
<reference key="NSNextKeyView" ref="804223306"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
<int key="IBUIContentMode">4</int>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
<string key="NSFrame">{{70, 86}, {400, 100}}</string>
|
||||
<reference key="NSSuperview" ref="874391841"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="641072983"/>
|
||||
<reference key="NSNextKeyView" ref="754909752"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
|
|
@ -77,6 +77,7 @@
|
|||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MQA</bytes>
|
||||
</object>
|
||||
<string key="IBUIShadowOffset">{0, 1}</string>
|
||||
<int key="IBUIBaselineAdjustment">0</int>
|
||||
<float key="IBUIMinimumFontSize">10</float>
|
||||
<int key="IBUINumberOfLines">7</int>
|
||||
|
|
@ -139,7 +140,6 @@
|
|||
<string key="NSFrame">{{178, 300}, {184, 34}}</string>
|
||||
<reference key="NSSuperview" ref="874391841"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<bool key="IBUIOpaque">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
<string key="NSFrame">{{0, 44}, {540, 576}}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="804223306"/>
|
||||
<reference key="NSNextKeyView" ref="641072983"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
|
|
@ -1345,6 +1345,7 @@
|
|||
<string key="homeButton">UIBarButtonItem</string>
|
||||
<string key="innerView">UIView</string>
|
||||
<string key="intelligenceControl">UISegmentedControl</string>
|
||||
<string key="noFocusMessage">UIView</string>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
<object class="IBToOneOutletInfo" key="appDelegate">
|
||||
|
|
@ -1375,6 +1376,10 @@
|
|||
<string key="name">intelligenceControl</string>
|
||||
<string key="candidateClassName">UISegmentedControl</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo" key="noFocusMessage">
|
||||
<string key="name">noFocusMessage</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
</dictionary>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
UIActivityIndicatorView *activityView = [[UIActivityIndicatorView alloc]
|
||||
initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
|
||||
activityView.frame = CGRectMake(75, 7, 20, 20.0);
|
||||
activityView.frame = CGRectMake(68, 7, 20, 20.0);
|
||||
self.activityIndicator = activityView;
|
||||
}
|
||||
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
[self.categoriesTable reloadData];
|
||||
[self.scrollView setContentSize:CGSizeMake(self.view.frame.size.width, self.tableViewHeight + 100)];
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
||||
self.categoriesTable.frame = CGRectMake((self.view.frame.size.width - 320)/2, 60, self.categoriesTable.frame.size.width, self.tableViewHeight);
|
||||
self.categoriesTable.frame = CGRectMake((self.view.frame.size.width - 300)/2, 60, self.categoriesTable.frame.size.width, self.tableViewHeight);
|
||||
} else {
|
||||
self.categoriesTable.frame = CGRectMake(10, 60, self.categoriesTable.frame.size.width, self.tableViewHeight);
|
||||
}
|
||||
|
|
@ -162,6 +162,7 @@
|
|||
|
||||
self.nextButton.enabled = YES;
|
||||
[self.googleReaderButton setTitle:@"Importing sites..." forState:UIControlStateNormal];
|
||||
self.instructionLabel.textColor = UIColorFromRGB(0x333333);
|
||||
self.googleReaderButton.userInteractionEnabled = NO;
|
||||
self.instructionLabel.text = @"This might take a minute. Feel free to continue...";
|
||||
[self.googleReaderButton addSubview:self.activityIndicator];
|
||||
|
|
@ -179,6 +180,7 @@
|
|||
|
||||
- (void)importFromGoogleReaderFailed:(NSString *)error {
|
||||
[self.googleReaderButton setTitle:@"Retry Google Reader" forState:UIControlStateNormal];
|
||||
self.instructionLabel.textColor = [UIColor redColor];
|
||||
self.instructionLabel.text = error;
|
||||
}
|
||||
|
||||
|
|
@ -198,7 +200,7 @@
|
|||
}
|
||||
|
||||
- (void)updateSites {
|
||||
self.instructionLabel.text = @"And just like that, we're done! Add more categories or tap Next step...";
|
||||
self.instructionLabel.text = @"And just like that, we're done!\nAdd more categories or move on...";
|
||||
NSString *msg = [NSString stringWithFormat:@"Imported %i site%@",
|
||||
self.importedFeedCount_,
|
||||
self.importedFeedCount_ == 1 ? @"" : @"s"];
|
||||
|
|
@ -324,8 +326,11 @@ viewForHeaderInSection:(NSInteger)section {
|
|||
UIButton *headerBtn = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
headerBtn.tag = section + 1000;
|
||||
[headerBtn setBackgroundImage:buttonImage forState:UIControlStateNormal];
|
||||
headerBtn.titleLabel.font = [UIFont systemFontOfSize:13];
|
||||
headerBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:14];
|
||||
|
||||
headerBtn.frame = CGRectMake(0, 20.0, 300, 34.0);
|
||||
headerBtn.titleLabel.shadowColor = UIColorFromRGB(0x1E5BDB);
|
||||
headerBtn.titleLabel.shadowOffset = CGSizeMake(0, 1);
|
||||
NSString *categoryTitle;
|
||||
if (section == 0) {
|
||||
categoryTitle = @"Google Reader";
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
<float key="IBUISectionHeaderHeight">10</float>
|
||||
<float key="IBUISectionFooterHeight">10</float>
|
||||
</object>
|
||||
<object class="IBUILabel" id="849964160">
|
||||
<object class="IBUILabel" id="482977125">
|
||||
<reference key="NSNextResponder" ref="75178207"/>
|
||||
<int key="NSvFlags">303</int>
|
||||
<string key="NSFrame">{{70, 12}, {400, 60}}</string>
|
||||
|
|
@ -102,6 +102,11 @@
|
|||
<bytes key="NSRGB">MCAwIDAAA</bytes>
|
||||
</object>
|
||||
<nil key="IBUIHighlightedColor"/>
|
||||
<object class="NSColor" key="IBUIShadowColor">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MQA</bytes>
|
||||
</object>
|
||||
<string key="IBUIShadowOffset">{0, 1}</string>
|
||||
<int key="IBUIBaselineAdjustment">0</int>
|
||||
<float key="IBUIMinimumFontSize">10</float>
|
||||
<int key="IBUINumberOfLines">2</int>
|
||||
|
|
@ -120,7 +125,7 @@
|
|||
<string key="NSFrameSize">{540, 540}</string>
|
||||
<reference key="NSSuperview" ref="874391841"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="849964160"/>
|
||||
<reference key="NSNextKeyView" ref="482977125"/>
|
||||
<string key="NSReuseIdentifierKey">_NS:9</string>
|
||||
<bool key="IBUIClipsSubviews">YES</bool>
|
||||
<bool key="IBUIMultipleTouchEnabled">YES</bool>
|
||||
|
|
@ -179,7 +184,7 @@
|
|||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">instructionLabel</string>
|
||||
<reference key="source" ref="841351856"/>
|
||||
<reference key="destination" ref="849964160"/>
|
||||
<reference key="destination" ref="482977125"/>
|
||||
</object>
|
||||
<int key="connectionID">171</int>
|
||||
</object>
|
||||
|
|
@ -222,7 +227,7 @@
|
|||
<reference key="object" ref="75178207"/>
|
||||
<array class="NSMutableArray" key="children">
|
||||
<reference ref="1020189204"/>
|
||||
<reference ref="849964160"/>
|
||||
<reference ref="482977125"/>
|
||||
</array>
|
||||
<reference key="parent" ref="874391841"/>
|
||||
</object>
|
||||
|
|
@ -233,7 +238,7 @@
|
|||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">170</int>
|
||||
<reference key="object" ref="849964160"/>
|
||||
<reference key="object" ref="482977125"/>
|
||||
<reference key="parent" ref="75178207"/>
|
||||
</object>
|
||||
</array>
|
||||
|
|
@ -1287,6 +1292,7 @@
|
|||
<string key="homeButton">UIBarButtonItem</string>
|
||||
<string key="innerView">UIView</string>
|
||||
<string key="intelligenceControl">UISegmentedControl</string>
|
||||
<string key="noFocusMessage">UIView</string>
|
||||
</dictionary>
|
||||
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
<object class="IBToOneOutletInfo" key="appDelegate">
|
||||
|
|
@ -1317,6 +1323,10 @@
|
|||
<string key="name">intelligenceControl</string>
|
||||
<string key="candidateClassName">UISegmentedControl</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo" key="noFocusMessage">
|
||||
<string key="name">noFocusMessage</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
</dictionary>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#import "AddSiteViewController.h"
|
||||
|
||||
#define NB_DEFAULT_MASTER_WIDTH 270
|
||||
#define NB_DEFAULT_STORY_TITLE_HEIGHT 760
|
||||
#define NB_DEFAULT_STORY_TITLE_HEIGHT 1004
|
||||
#define NB_DEFAULT_SLIDER_INTERVAL 0.35
|
||||
#define NB_DEFAULT_SLIDER_INTERVAL_OUT 0.35
|
||||
#define NB_DEFAULT_SHARE_HEIGHT 144
|
||||
|
|
@ -72,8 +72,6 @@
|
|||
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
|
||||
if (self) {
|
||||
// Custom initialization
|
||||
|
||||
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
|
@ -121,7 +119,7 @@
|
|||
self.storyTitlesOnLeft = NO;
|
||||
} else {
|
||||
self.storyTitlesYCoordinate = NB_DEFAULT_STORY_TITLE_HEIGHT;
|
||||
self.storyTitlesOnLeft = NO;
|
||||
self.storyTitlesOnLeft = YES;
|
||||
}
|
||||
|
||||
// set up story titles stub
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@
|
|||
|
||||
- (void)loadTryFeedDetailView:(NSString *)feedId withStory:(NSString *)contentId isSocial:(BOOL)social withUser:(NSDictionary *)user showFindingStory:(BOOL)showHUD {
|
||||
if (showHUD) {
|
||||
[self.storyDetailViewController showFindingStoryHUD];
|
||||
[self.storyDetailViewController showShareHUD:@"Loading story"];
|
||||
}
|
||||
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@
|
|||
@property (nonatomic) IBOutlet UISegmentedControl * intelligenceControl;
|
||||
@property (nonatomic, retain) WEPopoverController *popoverController;
|
||||
@property (nonatomic) NSIndexPath *currentRowAtIndexPath;
|
||||
@property (strong, nonatomic) IBOutlet UIView *noFocusMessage;
|
||||
@property (strong, nonatomic) IBOutlet UIBarButtonItem *toolbarLeftMargin;
|
||||
|
||||
- (void)returnToApp;
|
||||
- (void)fetchFeedList:(BOOL)showLoader;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@
|
|||
@synthesize imageCache;
|
||||
@synthesize popoverController;
|
||||
@synthesize currentRowAtIndexPath;
|
||||
@synthesize noFocusMessage;
|
||||
@synthesize toolbarLeftMargin;
|
||||
@synthesize hasNoSites;
|
||||
@synthesize updatedDictFeeds_;
|
||||
@synthesize updatedDictSocialFeeds_;
|
||||
|
|
@ -83,9 +85,11 @@
|
|||
imageCache = [[NSCache alloc] init];
|
||||
[imageCache setDelegate:self];
|
||||
|
||||
[self.intelligenceControl setWidth:45 forSegmentAtIndex:0];
|
||||
[self.intelligenceControl setWidth:70 forSegmentAtIndex:1];
|
||||
[self.intelligenceControl setWidth:65 forSegmentAtIndex:2];
|
||||
[self.intelligenceControl setWidth:50 forSegmentAtIndex:0];
|
||||
[self.intelligenceControl setWidth:68 forSegmentAtIndex:1];
|
||||
[self.intelligenceControl setWidth:62 forSegmentAtIndex:2];
|
||||
self.intelligenceControl.hidden = YES;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -170,6 +174,7 @@
|
|||
|
||||
[super viewDidAppear:animated];
|
||||
[self performSelector:@selector(fadeSelectedCell) withObject:self afterDelay:0.6];
|
||||
self.navigationController.navigationBar.backItem.title = @"All Sites";
|
||||
}
|
||||
|
||||
- (void)fadeSelectedCell {
|
||||
|
|
@ -220,6 +225,8 @@
|
|||
}
|
||||
|
||||
- (void)viewDidUnload {
|
||||
[self setToolbarLeftMargin:nil];
|
||||
[self setNoFocusMessage:nil];
|
||||
[self setInnerView:nil];
|
||||
// Release any retained subviews of the main view.
|
||||
// e.g. self.myOutlet = nil;
|
||||
|
|
@ -472,6 +479,31 @@
|
|||
[appDelegate showFirstTimeUser];
|
||||
return;
|
||||
}
|
||||
|
||||
BOOL hasFocusStory = NO;
|
||||
for (id feedId in appDelegate.dictFeeds) {
|
||||
NSDictionary *feed = [appDelegate.dictFeeds objectForKey:feedId];
|
||||
if ([[feed objectForKey:@"ps"] intValue] > 0) {
|
||||
hasFocusStory = YES;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasFocusStory) {
|
||||
[self.intelligenceControl removeSegmentAtIndex:2 animated:NO];
|
||||
[self.intelligenceControl setWidth:90 forSegmentAtIndex:0];
|
||||
[self.intelligenceControl setWidth:90 forSegmentAtIndex:1];
|
||||
} else {
|
||||
UIImage *green = [UIImage imageNamed:@"green_focus.png"];
|
||||
if (self.intelligenceControl.numberOfSegments == 2) {
|
||||
[self.intelligenceControl insertSegmentWithImage:green atIndex:2 animated:NO];
|
||||
[self.intelligenceControl setWidth:50 forSegmentAtIndex:0];
|
||||
[self.intelligenceControl setWidth:68 forSegmentAtIndex:1];
|
||||
[self.intelligenceControl setWidth:62 forSegmentAtIndex:2];
|
||||
}
|
||||
}
|
||||
|
||||
self.intelligenceControl.hidden = NO;
|
||||
}
|
||||
|
||||
- (void)showUserProfile {
|
||||
|
|
@ -638,6 +670,7 @@
|
|||
|
||||
return cell;
|
||||
}
|
||||
|
||||
|
||||
NSDictionary *feed;
|
||||
|
||||
|
|
@ -1005,6 +1038,7 @@
|
|||
}
|
||||
|
||||
[hud hide:YES afterDelay:0.75];
|
||||
|
||||
// [self.feedTitlesTable reloadData];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@
|
|||
# pragma mark Share Story
|
||||
|
||||
- (IBAction)doShareThisStory:(id)sender {
|
||||
[appDelegate.storyDetailViewController showShareHUD];
|
||||
[appDelegate.storyDetailViewController showShareHUD:@"Sharing"];
|
||||
NSString *urlString = [NSString stringWithFormat:@"http://%@/social/share_story",
|
||||
NEWSBLUR_URL];
|
||||
|
||||
|
|
@ -279,7 +279,7 @@
|
|||
# pragma mark Reply to Story
|
||||
|
||||
- (IBAction)doReplyToComment:(id)sender {
|
||||
[appDelegate.storyDetailViewController showShareHUD];
|
||||
[appDelegate.storyDetailViewController showShareHUD:@"Replying"];
|
||||
NSString *comments = commentField.text;
|
||||
if ([comments length] == 0) {
|
||||
return;
|
||||
|
|
@ -308,7 +308,7 @@
|
|||
[request setDidFailSelector:@selector(requestFailed:)];
|
||||
[request startAsynchronous];
|
||||
[appDelegate hideShareView:YES];
|
||||
[appDelegate.storyDetailViewController showShareHUD];
|
||||
[appDelegate.storyDetailViewController showShareHUD:@"Replying"];
|
||||
}
|
||||
|
||||
- (void)finishAddReply:(ASIHTTPRequest *)request {
|
||||
|
|
|
|||
|
|
@ -70,9 +70,7 @@
|
|||
- (void)initStory;
|
||||
- (void)clearStory;
|
||||
|
||||
- (void)showShareHUD;
|
||||
- (void)showFollowingHUD;
|
||||
- (void)showFindingStoryHUD;
|
||||
- (void)showShareHUD:(NSString *)msg;
|
||||
- (void)refreshComments:(NSString *)replyId;
|
||||
- (void)finishMarkAsRead:(ASIHTTPRequest *)request;
|
||||
- (void)finishLikeComment:(ASIHTTPRequest *)request;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@
|
|||
|
||||
// back button
|
||||
UIBarButtonItem *backButton = [[UIBarButtonItem alloc]
|
||||
initWithTitle:@"Back" style:UIBarButtonItemStyleBordered target:self action:@selector(transitionFromFeedDetail)];
|
||||
initWithTitle:@"All Sites" style:UIBarButtonItemStyleBordered target:self action:@selector(transitionFromFeedDetail)];
|
||||
self.buttonBack = backButton;
|
||||
|
||||
// loading indicator
|
||||
|
|
@ -1162,7 +1162,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
|
|||
}
|
||||
|
||||
- (void)toggleLikeComment:(BOOL)likeComment {
|
||||
[self showShareHUD];
|
||||
[self showShareHUD:@"Favoriting"];
|
||||
NSString *urlString;
|
||||
if (likeComment) {
|
||||
urlString = [NSString stringWithFormat:@"http://%@/social/like_comment",
|
||||
|
|
@ -1241,7 +1241,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
|
|||
# pragma mark Subscribing to blurblog
|
||||
|
||||
- (void)subscribeToBlurblog {
|
||||
[self showFollowingHUD];
|
||||
[self showShareHUD:@"Following"];
|
||||
NSString *urlString = [NSString stringWithFormat:@"http://%@/social/follow",
|
||||
NEWSBLUR_URL];
|
||||
|
||||
|
|
@ -1270,24 +1270,10 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
|
|||
// [appDelegate.feedDetailViewController fetchFeedDetail:1 withCallback:nil];
|
||||
}
|
||||
|
||||
- (void)showShareHUD {
|
||||
- (void)showShareHUD:(NSString *)msg {
|
||||
[MBProgressHUD hideHUDForView:self.view animated:NO];
|
||||
self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
|
||||
self.storyHUD.labelText = @"Sharing";
|
||||
self.storyHUD.margin = 20.0f;
|
||||
}
|
||||
|
||||
- (void)showFollowingHUD {
|
||||
[MBProgressHUD hideHUDForView:self.view animated:NO];
|
||||
self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
|
||||
self.storyHUD.labelText = @"Following";
|
||||
self.storyHUD.margin = 20.0f;
|
||||
}
|
||||
|
||||
- (void)showFindingStoryHUD {
|
||||
[MBProgressHUD hideHUDForView:self.view animated:NO];
|
||||
self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
|
||||
self.storyHUD.labelText = @"Loading Story";
|
||||
self.storyHUD.labelText = msg;
|
||||
self.storyHUD.margin = 20.0f;
|
||||
self.noStorySelectedLabel.hidden = YES;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@
|
|||
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
||||
1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = NewsBlurAppDelegate.h; path = Classes/NewsBlurAppDelegate.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = NewsBlurAppDelegate.m; path = Classes/NewsBlurAppDelegate.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
|
||||
1D6058910D05DD3D006BFB54 /* NewsBlur Pro.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NewsBlur Pro.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
1D6058910D05DD3D006BFB54 /* NewsBlur.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NewsBlur.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
|
||||
288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
|
||||
28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewsBlurViewController.h; sourceTree = "<group>"; };
|
||||
|
|
@ -931,7 +931,7 @@
|
|||
19C28FACFE9D520D11CA2CBB /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
1D6058910D05DD3D006BFB54 /* NewsBlur Pro.app */,
|
||||
1D6058910D05DD3D006BFB54 /* NewsBlur.app */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -1851,7 +1851,7 @@
|
|||
);
|
||||
name = NewsBlur;
|
||||
productName = NewsBlur;
|
||||
productReference = 1D6058910D05DD3D006BFB54 /* NewsBlur Pro.app */;
|
||||
productReference = 1D6058910D05DD3D006BFB54 /* NewsBlur.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
|
@ -2282,7 +2282,7 @@
|
|||
"-all_load",
|
||||
"-ObjC",
|
||||
);
|
||||
PRODUCT_NAME = "NewsBlur Pro";
|
||||
PRODUCT_NAME = NewsBlur;
|
||||
PROVISIONING_PROFILE = "";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
|
|
@ -2319,7 +2319,7 @@
|
|||
"-ObjC",
|
||||
"-all_load",
|
||||
);
|
||||
PRODUCT_NAME = "NewsBlur Pro";
|
||||
PRODUCT_NAME = NewsBlur;
|
||||
PROVISIONING_PROFILE = "";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
|
|
|
|||
|
|
@ -92,10 +92,9 @@
|
|||
<object class="IBUISegmentedControl" id="117639116">
|
||||
<reference key="NSNextResponder" ref="895374018"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{70, 8}, {180, 30}}</string>
|
||||
<string key="NSFrame">{{61, 8}, {180, 30}}</string>
|
||||
<reference key="NSSuperview" ref="895374018"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBSegmentControlStyle">2</int>
|
||||
<int key="IBNumberOfSegments">3</int>
|
||||
|
|
@ -163,6 +162,11 @@
|
|||
<reference key="IBUIToolbar" ref="895374018"/>
|
||||
<int key="IBUISystemItemIdentifier">5</int>
|
||||
</object>
|
||||
<object class="IBUIBarButtonItem" id="403674562">
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<reference key="IBUIToolbar" ref="895374018"/>
|
||||
<int key="IBUISystemItemIdentifier">5</int>
|
||||
</object>
|
||||
<object class="IBUIBarButtonItem" id="537490750">
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<reference key="IBUICustomView" ref="117639116"/>
|
||||
|
|
@ -309,8 +313,8 @@
|
|||
<reference key="object" ref="774585933"/>
|
||||
<object class="NSMutableArray" key="children">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference ref="684340155"/>
|
||||
<reference ref="895374018"/>
|
||||
<reference ref="684340155"/>
|
||||
</object>
|
||||
<reference key="parent" ref="0"/>
|
||||
</object>
|
||||
|
|
@ -337,6 +341,7 @@
|
|||
<reference ref="934474311"/>
|
||||
<reference ref="607206668"/>
|
||||
<reference ref="537490750"/>
|
||||
<reference ref="403674562"/>
|
||||
<reference ref="825550419"/>
|
||||
</object>
|
||||
<reference key="parent" ref="774585933"/>
|
||||
|
|
@ -360,16 +365,21 @@
|
|||
</object>
|
||||
<reference key="parent" ref="895374018"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">25</int>
|
||||
<reference key="object" ref="825550419"/>
|
||||
<reference key="parent" ref="895374018"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">55</int>
|
||||
<reference key="object" ref="117639116"/>
|
||||
<reference key="parent" ref="537490750"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">104</int>
|
||||
<reference key="object" ref="403674562"/>
|
||||
<reference key="parent" ref="895374018"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">105</int>
|
||||
<reference key="object" ref="825550419"/>
|
||||
<reference key="parent" ref="895374018"/>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="flattenedProperties">
|
||||
|
|
@ -380,8 +390,9 @@
|
|||
<string>-1.IBPluginDependency</string>
|
||||
<string>-2.CustomClassName</string>
|
||||
<string>-2.IBPluginDependency</string>
|
||||
<string>104.IBPluginDependency</string>
|
||||
<string>105.IBPluginDependency</string>
|
||||
<string>11.IBPluginDependency</string>
|
||||
<string>25.IBPluginDependency</string>
|
||||
<string>55.IBPluginDependency</string>
|
||||
<string>55.IUISegmentedControlInspectorSelectedSegmentMetadataKey</string>
|
||||
<string>56.IBPluginDependency</string>
|
||||
|
|
@ -400,6 +411,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>
|
||||
<integer value="2"/>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
|
|
@ -421,7 +433,7 @@
|
|||
<reference key="dict.values" ref="0"/>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">95</int>
|
||||
<int key="maxID">105</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
|
|
@ -948,10 +960,10 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>tapCategoryButton:</string>
|
||||
<string>tapGoogleReaderButton</string>
|
||||
<string>tapNewsBlurButton:</string>
|
||||
<string>tapFacebookButton</string>
|
||||
<string>tapNextButton</string>
|
||||
<string>tapTwitterButton</string>
|
||||
<string>toggleAutoFollowFriends:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -965,124 +977,96 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>tapCategoryButton:</string>
|
||||
<string>tapGoogleReaderButton</string>
|
||||
<string>tapNewsBlurButton:</string>
|
||||
<string>tapFacebookButton</string>
|
||||
<string>tapNextButton</string>
|
||||
<string>tapTwitterButton</string>
|
||||
<string>toggleAutoFollowFriends:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapCategoryButton:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapGoogleReaderButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapNewsBlurButton:</string>
|
||||
<string key="name">tapFacebookButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapNextButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapTwitterButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">toggleAutoFollowFriends:</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>addFriendsView</string>
|
||||
<string>addNewsBlurView</string>
|
||||
<string>addSitesView</string>
|
||||
<string>appDelegate</string>
|
||||
<string>googleReaderButton</string>
|
||||
<string>logo</string>
|
||||
<string>facebookActivityIndicator</string>
|
||||
<string>facebookButton</string>
|
||||
<string>friendsLabel</string>
|
||||
<string>nextButton</string>
|
||||
<string>previousButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>welcomeView</string>
|
||||
<string>twitterActivityIndicator</string>
|
||||
<string>twitterButton</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UIActivityIndicatorView</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIImageView</string>
|
||||
<string>UILabel</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIToolbar</string>
|
||||
<string>UIActivityIndicatorView</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIView</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>addFriendsView</string>
|
||||
<string>addNewsBlurView</string>
|
||||
<string>addSitesView</string>
|
||||
<string>appDelegate</string>
|
||||
<string>googleReaderButton</string>
|
||||
<string>logo</string>
|
||||
<string>facebookActivityIndicator</string>
|
||||
<string>facebookButton</string>
|
||||
<string>friendsLabel</string>
|
||||
<string>nextButton</string>
|
||||
<string>previousButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>welcomeView</string>
|
||||
<string>twitterActivityIndicator</string>
|
||||
<string>twitterButton</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addFriendsView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addNewsBlurView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addSitesView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">appDelegate</string>
|
||||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">googleReaderButton</string>
|
||||
<string key="name">facebookActivityIndicator</string>
|
||||
<string key="candidateClassName">UIActivityIndicatorView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">facebookButton</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">logo</string>
|
||||
<string key="candidateClassName">UIImageView</string>
|
||||
<string key="name">friendsLabel</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">nextButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">previousButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
<string key="name">twitterActivityIndicator</string>
|
||||
<string key="candidateClassName">UIActivityIndicatorView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbar</string>
|
||||
<string key="candidateClassName">UIToolbar</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbarTitle</string>
|
||||
<string key="name">twitterButton</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">welcomeView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
|
|
@ -1097,38 +1081,27 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>tapCategoryButton:</string>
|
||||
<string>tapGoogleReaderButton</string>
|
||||
<string>tapNewsBlurButton:</string>
|
||||
<string>tapNextButton</string>
|
||||
<string>tapPopularButton:</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>tapCategoryButton:</string>
|
||||
<string>tapGoogleReaderButton</string>
|
||||
<string>tapNewsBlurButton:</string>
|
||||
<string>tapNextButton</string>
|
||||
<string>tapPopularButton:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapCategoryButton:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapGoogleReaderButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapNewsBlurButton:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
|
|
@ -1137,101 +1110,49 @@
|
|||
<string key="name">tapNextButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapPopularButton:</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>addFriendsView</string>
|
||||
<string>addNewsBlurView</string>
|
||||
<string>addSitesView</string>
|
||||
<string>appDelegate</string>
|
||||
<string>googleReaderButton</string>
|
||||
<string>logo</string>
|
||||
<string>instructionsLabel</string>
|
||||
<string>nextButton</string>
|
||||
<string>previousButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>welcomeView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIImageView</string>
|
||||
<string>UILabel</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIToolbar</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIView</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>addFriendsView</string>
|
||||
<string>addNewsBlurView</string>
|
||||
<string>addSitesView</string>
|
||||
<string>appDelegate</string>
|
||||
<string>googleReaderButton</string>
|
||||
<string>logo</string>
|
||||
<string>instructionsLabel</string>
|
||||
<string>nextButton</string>
|
||||
<string>previousButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>welcomeView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addFriendsView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addNewsBlurView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addSitesView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">appDelegate</string>
|
||||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">googleReaderButton</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">logo</string>
|
||||
<string key="candidateClassName">UIImageView</string>
|
||||
<string key="name">instructionsLabel</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">nextButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">previousButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbar</string>
|
||||
<string key="candidateClassName">UIToolbar</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbarTitle</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">welcomeView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
|
|
@ -1243,143 +1164,87 @@
|
|||
<string key="className">FirstTimeUserAddSitesViewController</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>tapCategoryButton:</string>
|
||||
<string>tapGoogleReaderButton</string>
|
||||
<string>tapNewsBlurButton:</string>
|
||||
<string>tapNextButton</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>
|
||||
<string key="NS.key.0">tapNextButton</string>
|
||||
<string key="NS.object.0">id</string>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>tapCategoryButton:</string>
|
||||
<string>tapGoogleReaderButton</string>
|
||||
<string>tapNewsBlurButton:</string>
|
||||
<string>tapNextButton</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapCategoryButton:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapGoogleReaderButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapNewsBlurButton:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapNextButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<string key="NS.key.0">tapNextButton</string>
|
||||
<object class="IBActionInfo" key="NS.object.0">
|
||||
<string key="name">tapNextButton</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="outlets">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>addFriendsView</string>
|
||||
<string>addNewsBlurView</string>
|
||||
<string>addSitesView</string>
|
||||
<string>activityIndicator</string>
|
||||
<string>appDelegate</string>
|
||||
<string>categoriesTable</string>
|
||||
<string>googleReaderButton</string>
|
||||
<string>logo</string>
|
||||
<string>googleReaderButtonWrapper</string>
|
||||
<string>instructionLabel</string>
|
||||
<string>nextButton</string>
|
||||
<string>previousButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>welcomeView</string>
|
||||
<string>scrollView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIActivityIndicatorView</string>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIImageView</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIToolbar</string>
|
||||
<string>UITableView</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIView</string>
|
||||
<string>UILabel</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIScrollView</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>addFriendsView</string>
|
||||
<string>addNewsBlurView</string>
|
||||
<string>addSitesView</string>
|
||||
<string>activityIndicator</string>
|
||||
<string>appDelegate</string>
|
||||
<string>categoriesTable</string>
|
||||
<string>googleReaderButton</string>
|
||||
<string>logo</string>
|
||||
<string>googleReaderButtonWrapper</string>
|
||||
<string>instructionLabel</string>
|
||||
<string>nextButton</string>
|
||||
<string>previousButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>welcomeView</string>
|
||||
<string>scrollView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addFriendsView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addNewsBlurView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addSitesView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
<string key="name">activityIndicator</string>
|
||||
<string key="candidateClassName">UIActivityIndicatorView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">appDelegate</string>
|
||||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">categoriesTable</string>
|
||||
<string key="candidateClassName">UITableView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">googleReaderButton</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">logo</string>
|
||||
<string key="candidateClassName">UIImageView</string>
|
||||
<string key="name">googleReaderButtonWrapper</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">instructionLabel</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">nextButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">previousButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbar</string>
|
||||
<string key="candidateClassName">UIToolbar</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbarTitle</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">welcomeView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
<string key="name">scrollView</string>
|
||||
<string key="candidateClassName">UIScrollView</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
|
|
@ -1407,12 +1272,16 @@
|
|||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>footer</string>
|
||||
<string>header</string>
|
||||
<string>logo</string>
|
||||
<string>nextButton</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UILabel</string>
|
||||
<string>UILabel</string>
|
||||
<string>UIImageView</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
</object>
|
||||
|
|
@ -1422,6 +1291,8 @@
|
|||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>footer</string>
|
||||
<string>header</string>
|
||||
<string>logo</string>
|
||||
<string>nextButton</string>
|
||||
</object>
|
||||
|
|
@ -1431,6 +1302,14 @@
|
|||
<string key="name">appDelegate</string>
|
||||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">footer</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">header</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">logo</string>
|
||||
<string key="candidateClassName">UIImageView</string>
|
||||
|
|
@ -1586,57 +1465,6 @@
|
|||
<string key="minorKey">./Classes/FriendsListViewController.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">GoogleReaderViewController</string>
|
||||
<string key="superclassName">UIViewController</string>
|
||||
<object class="NSMutableDictionary" key="actions">
|
||||
<string key="NS.key.0">tapCancelButton:</string>
|
||||
<string key="NS.object.0">id</string>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
<string key="NS.key.0">tapCancelButton:</string>
|
||||
<object class="IBActionInfo" key="NS.object.0">
|
||||
<string key="name">tapCancelButton:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="outlets">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>webView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UIWebView</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>appDelegate</string>
|
||||
<string>webView</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">webView</string>
|
||||
<string key="candidateClassName">UIWebView</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
<string key="minorKey">./Classes/GoogleReaderViewController.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">InteractionsModule</string>
|
||||
<string key="superclassName">UIView</string>
|
||||
|
|
@ -2032,7 +1860,6 @@
|
|||
<string>fontSettingsViewController</string>
|
||||
<string>friendsListViewController</string>
|
||||
<string>ftuxNavigationController</string>
|
||||
<string>googleReaderViewController</string>
|
||||
<string>loginViewController</string>
|
||||
<string>masterContainerViewController</string>
|
||||
<string>moveSiteViewController</string>
|
||||
|
|
@ -2059,7 +1886,6 @@
|
|||
<string>FontSettingsViewController</string>
|
||||
<string>FriendsListViewController</string>
|
||||
<string>UINavigationController</string>
|
||||
<string>GoogleReaderViewController</string>
|
||||
<string>LoginViewController</string>
|
||||
<string>NBContainerViewController</string>
|
||||
<string>MoveSiteViewController</string>
|
||||
|
|
@ -2089,7 +1915,6 @@
|
|||
<string>fontSettingsViewController</string>
|
||||
<string>friendsListViewController</string>
|
||||
<string>ftuxNavigationController</string>
|
||||
<string>googleReaderViewController</string>
|
||||
<string>loginViewController</string>
|
||||
<string>masterContainerViewController</string>
|
||||
<string>moveSiteViewController</string>
|
||||
|
|
@ -2158,10 +1983,6 @@
|
|||
<string key="name">ftuxNavigationController</string>
|
||||
<string key="candidateClassName">UINavigationController</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">googleReaderViewController</string>
|
||||
<string key="candidateClassName">GoogleReaderViewController</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">loginViewController</string>
|
||||
<string key="candidateClassName">LoginViewController</string>
|
||||
|
|
@ -2272,6 +2093,8 @@
|
|||
<string>homeButton</string>
|
||||
<string>innerView</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>noFocusMessage</string>
|
||||
<string>toolbarLeftMargin</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -2282,6 +2105,8 @@
|
|||
<string>UIBarButtonItem</string>
|
||||
<string>UIView</string>
|
||||
<string>UISegmentedControl</string>
|
||||
<string>UIView</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
|
|
@ -2295,6 +2120,8 @@
|
|||
<string>homeButton</string>
|
||||
<string>innerView</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>noFocusMessage</string>
|
||||
<string>toolbarLeftMargin</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -2326,6 +2153,14 @@
|
|||
<string key="name">intelligenceControl</string>
|
||||
<string key="candidateClassName">UISegmentedControl</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">noFocusMessage</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbarLeftMargin</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue