mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
Styling feed detail to remove the bottom toolbar and integrate settings and mark read into top right.
This commit is contained in:
Samuel Clay
parent
f49037feb7
commit
d76fb024c8
11 changed files with 150 additions and 160 deletions
|
|
@ -12,6 +12,7 @@
|
|||
#import "BaseViewController.h"
|
||||
#import "Utilities.h"
|
||||
#import "WEPopoverController.h"
|
||||
#import "TransparentToolbar.h"
|
||||
|
||||
@class NewsBlurAppDelegate;
|
||||
@class FeedDetailTableCell;
|
||||
|
|
@ -30,21 +31,18 @@
|
|||
BOOL finishedAnimatingIn;
|
||||
|
||||
UITableView * storyTitlesTable;
|
||||
UIToolbar * feedViewToolbar;
|
||||
UISlider * feedScoreSlider;
|
||||
UIBarButtonItem * feedMarkReadButton;
|
||||
UISegmentedControl * intelligenceControl;
|
||||
WEPopoverController *popoverController;
|
||||
Class popoverClass;
|
||||
}
|
||||
|
||||
@property (nonatomic) IBOutlet NewsBlurAppDelegate *appDelegate;
|
||||
@property (nonatomic, strong) IBOutlet UITableView *storyTitlesTable;
|
||||
@property (nonatomic) IBOutlet UIToolbar *feedViewToolbar;
|
||||
@property (nonatomic) IBOutlet UISlider * feedScoreSlider;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * feedMarkReadButton;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * settingsButton;
|
||||
@property (nonatomic) IBOutlet UISegmentedControl * intelligenceControl;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * settingsBarButton;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * spacerBarButton;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * separatorBarButton;
|
||||
@property (nonatomic) IBOutlet TransparentToolbar * rightToolbar;
|
||||
@property (nonatomic, retain) WEPopoverController *popoverController;
|
||||
|
||||
@property (nonatomic) NSArray * stories;
|
||||
|
|
@ -63,7 +61,6 @@
|
|||
|
||||
- (void)renderStories:(NSArray *)newStories;
|
||||
- (void)scrollViewDidScroll:(UIScrollView *)scroll;
|
||||
- (IBAction)selectIntelligence;
|
||||
- (void)changeIntelligence:(NSInteger)newLevel;
|
||||
- (NSDictionary *)getStoryAtRow:(NSInteger)indexPathRow;
|
||||
- (void)checkScroll;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@
|
|||
#import "Utilities.h"
|
||||
#import "UIBarButtonItem+WEPopover.h"
|
||||
#import "WEPopoverController.h"
|
||||
#import "UIBarButtonItem+Image.h"
|
||||
#import "TransparentToolbar.h"
|
||||
|
||||
|
||||
#define kTableViewRowHeight 61;
|
||||
|
|
@ -40,14 +42,15 @@
|
|||
@implementation FeedDetailViewController
|
||||
|
||||
@synthesize popoverController;
|
||||
@synthesize storyTitlesTable, feedViewToolbar, feedScoreSlider, feedMarkReadButton;
|
||||
@synthesize settingsButton;
|
||||
@synthesize storyTitlesTable, feedMarkReadButton;
|
||||
@synthesize settingsBarButton;
|
||||
@synthesize spacerBarButton, separatorBarButton;
|
||||
@synthesize stories;
|
||||
@synthesize rightToolbar;
|
||||
@synthesize appDelegate;
|
||||
@synthesize feedPage;
|
||||
@synthesize pageFetching;
|
||||
@synthesize pageFinished;
|
||||
@synthesize intelligenceControl;
|
||||
@synthesize actionSheet_;
|
||||
@synthesize finishedAnimatingIn;
|
||||
|
||||
|
|
@ -63,6 +66,24 @@
|
|||
|
||||
popoverClass = [WEPopoverController class];
|
||||
self.storyTitlesTable.backgroundColor = UIColorFromRGB(0xf4f4f4);
|
||||
|
||||
rightToolbar = [[TransparentToolbar alloc]
|
||||
initWithFrame:CGRectMake(0, 0, 80,
|
||||
self.navigationController.view.frame.size.height)];
|
||||
|
||||
spacerBarButton = [[UIBarButtonItem alloc]
|
||||
initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
|
||||
spacerBarButton.width = -16;
|
||||
|
||||
UIImage *separatorImage = [UIImage imageNamed:@"bar-separator.png"];
|
||||
separatorBarButton = [UIBarButtonItem barItemWithImage:separatorImage target:nil action:nil];
|
||||
[separatorBarButton setEnabled:NO];
|
||||
|
||||
UIImage *settingsImage = [UIImage imageNamed:@"nav_icn_settings.png"];
|
||||
settingsBarButton = [UIBarButtonItem barItemWithImage:settingsImage target:self action:@selector(doOpenSettingsActionSheet:)];
|
||||
|
||||
UIImage *markreadImage = [UIImage imageNamed:@"markread.png"];
|
||||
feedMarkReadButton = [UIBarButtonItem barItemWithImage:markreadImage target:self action:@selector(doOpenMarkReadActionSheet:)];
|
||||
}
|
||||
|
||||
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
|
||||
|
|
@ -101,9 +122,19 @@
|
|||
[titleImageButton addTarget:self action:@selector(showUserProfile) forControlEvents:UIControlEventTouchUpInside];
|
||||
UIBarButtonItem *titleImageBarButton = [[UIBarButtonItem alloc]
|
||||
initWithCustomView:titleImageButton];
|
||||
self.navigationItem.rightBarButtonItem = titleImageBarButton;
|
||||
[rightToolbar setItems: [NSArray arrayWithObjects:
|
||||
spacerBarButton,
|
||||
feedMarkReadButton,
|
||||
separatorBarButton,
|
||||
titleImageBarButton, nil]];
|
||||
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightToolbar];
|
||||
} else {
|
||||
self.navigationItem.rightBarButtonItem = nil;
|
||||
[rightToolbar setItems: [NSArray arrayWithObjects:
|
||||
spacerBarButton,
|
||||
feedMarkReadButton,
|
||||
separatorBarButton,
|
||||
settingsBarButton, nil]];
|
||||
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:rightToolbar];
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -138,9 +169,9 @@
|
|||
(appDelegate.isRiverView &&
|
||||
[appDelegate.activeFolder isEqualToString:@"everything"]) ||
|
||||
[appDelegate.activeFolder isEqualToString:@"saved_stories"])) {
|
||||
settingsButton.enabled = NO;
|
||||
settingsBarButton.enabled = NO;
|
||||
} else {
|
||||
settingsButton.enabled = YES;
|
||||
settingsBarButton.enabled = YES;
|
||||
}
|
||||
|
||||
if (appDelegate.isSocialRiverView ||
|
||||
|
|
@ -195,14 +226,14 @@
|
|||
}
|
||||
|
||||
- (void)setUserAvatarLayout:(UIInterfaceOrientation)orientation {
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone && appDelegate.isSocialView) {
|
||||
if (UIInterfaceOrientationIsPortrait(orientation)) {
|
||||
UIButton *avatar = (UIButton *)self.navigationItem.rightBarButtonItem.customView;
|
||||
UIButton *avatar = (UIButton *)[(UIBarButtonItem *)[[rightToolbar items] lastObject] customView];
|
||||
CGRect buttonFrame = avatar.frame;
|
||||
buttonFrame.size = CGSizeMake(32, 32);
|
||||
avatar.frame = buttonFrame;
|
||||
} else {
|
||||
UIButton *avatar = (UIButton *)self.navigationItem.rightBarButtonItem.customView;
|
||||
UIButton *avatar = (UIButton *)[(UIBarButtonItem *)[[rightToolbar items] lastObject] customView];
|
||||
CGRect buttonFrame = avatar.frame;
|
||||
buttonFrame.size = CGSizeMake(28, 28);
|
||||
avatar.frame = buttonFrame;
|
||||
|
|
@ -823,15 +854,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (IBAction)selectIntelligence {
|
||||
NSInteger newLevel = [self.intelligenceControl selectedSegmentIndex] - 1;
|
||||
[self changeIntelligence:newLevel];
|
||||
|
||||
[self performSelector:@selector(checkScroll)
|
||||
withObject:nil
|
||||
afterDelay:1.0];
|
||||
}
|
||||
|
||||
- (void)changeIntelligence:(NSInteger)newLevel {
|
||||
NSInteger previousLevel = [appDelegate selectedIntelligence];
|
||||
NSMutableArray *insertIndexPaths = [NSMutableArray array];
|
||||
|
|
@ -1100,8 +1122,8 @@
|
|||
[self.popoverController setContainerViewProperties:[self improvedContainerViewProperties]];
|
||||
}
|
||||
[self.popoverController setPopoverContentSize:CGSizeMake(260, appDelegate.isRiverView ? 38 * 4 : 38 * 6)];
|
||||
[self.popoverController presentPopoverFromBarButtonItem:self.settingsButton
|
||||
permittedArrowDirections:UIPopoverArrowDirectionDown
|
||||
[self.popoverController presentPopoverFromBarButtonItem:self.settingsBarButton
|
||||
permittedArrowDirections:UIPopoverArrowDirectionUp
|
||||
animated:YES];
|
||||
}
|
||||
|
||||
|
|
@ -1386,11 +1408,5 @@
|
|||
return props;
|
||||
}
|
||||
|
||||
- (void)resetToolbar {
|
||||
self.navigationItem.leftBarButtonItem = nil;
|
||||
self.navigationItem.titleView = nil;
|
||||
self.navigationItem.rightBarButtonItem = nil;
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@
|
|||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
||||
// trainerViewController.modalPresentationStyle=UIModalPresentationFormSheet;
|
||||
// [navController presentModalViewController:trainerViewController animated:YES];
|
||||
[self.masterContainerViewController showTrainingPopover:self.feedDetailViewController.settingsButton];
|
||||
[self.masterContainerViewController showTrainingPopover:self.feedDetailViewController.settingsBarButton];
|
||||
} else {
|
||||
[navController presentModalViewController:trainerViewController animated:YES];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -278,6 +278,11 @@
|
|||
FF41309D162CEC7100DDB6A7 /* time.png in Resources */ = {isa = PBXBuildFile; fileRef = FF41309C162CEC7100DDB6A7 /* time.png */; };
|
||||
FF4130A0162CECAE00DDB6A7 /* email.png in Resources */ = {isa = PBXBuildFile; fileRef = FF41309F162CECAE00DDB6A7 /* email.png */; };
|
||||
FF4130A3162E10CF00DDB6A7 /* MenuTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4130A2162E10CF00DDB6A7 /* MenuTableViewCell.m */; };
|
||||
FF4151BC16DED7D10013E84B /* bar-separator.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151BA16DED7D10013E84B /* bar-separator.png */; };
|
||||
FF4151BD16DED7D10013E84B /* bar-separator@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151BB16DED7D10013E84B /* bar-separator@2x.png */; };
|
||||
FF4151C016DED9660013E84B /* UIBarButtonItem+Image.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4151BF16DED9660013E84B /* UIBarButtonItem+Image.m */; };
|
||||
FF4151C316DEDF9D0013E84B /* markread.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151C116DEDF9D0013E84B /* markread.png */; };
|
||||
FF4151C416DEDF9D0013E84B /* markread@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF4151C216DEDF9D0013E84B /* markread@2x.png */; };
|
||||
FF546DF71602930100948020 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF546DF61602930100948020 /* Default-568h@2x.png */; };
|
||||
FF546DF9160298E500948020 /* fleuron@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF546DF8160298E500948020 /* fleuron@2x.png */; };
|
||||
FF5EA47F143B691000B7563D /* AddSiteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF5EA47D143B691000B7563D /* AddSiteViewController.m */; };
|
||||
|
|
@ -743,6 +748,12 @@
|
|||
FF41309F162CECAE00DDB6A7 /* email.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = email.png; sourceTree = "<group>"; };
|
||||
FF4130A1162E10CF00DDB6A7 /* MenuTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuTableViewCell.h; sourceTree = "<group>"; };
|
||||
FF4130A2162E10CF00DDB6A7 /* MenuTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuTableViewCell.m; sourceTree = "<group>"; };
|
||||
FF4151BA16DED7D10013E84B /* bar-separator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bar-separator.png"; sourceTree = "<group>"; };
|
||||
FF4151BB16DED7D10013E84B /* bar-separator@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bar-separator@2x.png"; sourceTree = "<group>"; };
|
||||
FF4151BE16DED9660013E84B /* UIBarButtonItem+Image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIBarButtonItem+Image.h"; path = "Other Sources/UIBarButtonItem+Image.h"; sourceTree = "<group>"; };
|
||||
FF4151BF16DED9660013E84B /* UIBarButtonItem+Image.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIBarButtonItem+Image.m"; path = "Other Sources/UIBarButtonItem+Image.m"; sourceTree = "<group>"; };
|
||||
FF4151C116DEDF9D0013E84B /* markread.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = markread.png; sourceTree = "<group>"; };
|
||||
FF4151C216DEDF9D0013E84B /* markread@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "markread@2x.png"; sourceTree = "<group>"; };
|
||||
FF546DF61602930100948020 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
|
||||
FF546DF8160298E500948020 /* fleuron@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fleuron@2x.png"; sourceTree = "<group>"; };
|
||||
FF5EA47C143B691000B7563D /* AddSiteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteViewController.h; sourceTree = "<group>"; };
|
||||
|
|
@ -901,6 +912,8 @@
|
|||
43A4C3D415B00966008787B5 /* TransparentToolbar.m */,
|
||||
43A4C3D515B00966008787B5 /* UIView+TKCategory.h */,
|
||||
43A4C3D615B00966008787B5 /* UIView+TKCategory.m */,
|
||||
FF4151BE16DED9660013E84B /* UIBarButtonItem+Image.h */,
|
||||
FF4151BF16DED9660013E84B /* UIBarButtonItem+Image.m */,
|
||||
);
|
||||
name = "Other Sources";
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -1054,6 +1067,10 @@
|
|||
431B857615A132B600DCE497 /* Images */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
FF4151C116DEDF9D0013E84B /* markread.png */,
|
||||
FF4151C216DEDF9D0013E84B /* markread@2x.png */,
|
||||
FF4151BA16DED7D10013E84B /* bar-separator.png */,
|
||||
FF4151BB16DED7D10013E84B /* bar-separator@2x.png */,
|
||||
FF29708816DD7AA400E92F85 /* segmented */,
|
||||
FF85BF8416D6C2B7002D334D /* clock2.png */,
|
||||
FF85BF7A16D6AD6F002D334D /* g_icn_folder_rss.png */,
|
||||
|
|
@ -1937,6 +1954,10 @@
|
|||
FF29709616DD9F2600E92F85 /* nav_icn_settings@2x.png in Resources */,
|
||||
FF29709816DD9F7400E92F85 /* nav_icn_add@2x.png in Resources */,
|
||||
FF29709A16DDA02200E92F85 /* nav_icn_activity_hover@2x.png in Resources */,
|
||||
FF4151BC16DED7D10013E84B /* bar-separator.png in Resources */,
|
||||
FF4151BD16DED7D10013E84B /* bar-separator@2x.png in Resources */,
|
||||
FF4151C316DEDF9D0013E84B /* markread.png in Resources */,
|
||||
FF4151C416DEDF9D0013E84B /* markread@2x.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -2089,6 +2110,7 @@
|
|||
FF6A233216448E0700E15989 /* StoryPageControl.m in Sources */,
|
||||
FF67D3B2168924C40057A7DA /* TrainerViewController.m in Sources */,
|
||||
FF1660CD16D6FD8A00AF8541 /* SmallInteractionCell.m in Sources */,
|
||||
FF4151C016DED9660013E84B /* UIBarButtonItem+Image.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
|||
15
media/ios/Other Sources/UIBarButtonItem+Image.h
Normal file
15
media/ios/Other Sources/UIBarButtonItem+Image.h
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
//
|
||||
// UIBarButtonItem+Image.h
|
||||
// NewsBlur
|
||||
//
|
||||
// Created by Samuel Clay on 2/27/13.
|
||||
// Copyright (c) 2013 NewsBlur. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
@interface UIBarButtonItem (Image)
|
||||
|
||||
+(UIBarButtonItem *)barItemWithImage:(UIImage *)image target:(id)target action:(SEL)action;
|
||||
|
||||
@end
|
||||
24
media/ios/Other Sources/UIBarButtonItem+Image.m
Normal file
24
media/ios/Other Sources/UIBarButtonItem+Image.m
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
//
|
||||
// UIBarButtonItem+Image.m
|
||||
// NewsBlur
|
||||
//
|
||||
// Created by Samuel Clay on 2/27/13.
|
||||
// Copyright (c) 2013 NewsBlur. All rights reserved.
|
||||
//
|
||||
|
||||
#import "UIBarButtonItem+Image.h"
|
||||
|
||||
@implementation UIBarButtonItem (Image)
|
||||
|
||||
+(UIBarButtonItem *)barItemWithImage:(UIImage *)image target:(id)target action:(SEL)action
|
||||
{
|
||||
UIButton* button = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
button.bounds = CGRectMake(0, 0, image.size.width, image.size.height);
|
||||
[button setImage:image forState:UIControlStateNormal];
|
||||
[button addTarget:target action:action forControlEvents:UIControlEventTouchUpInside];
|
||||
|
||||
UIBarButtonItem* item = [[self alloc] initWithCustomView:button];
|
||||
return item;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -13,9 +13,7 @@
|
|||
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>IBProxyObject</string>
|
||||
<string>IBUIBarButtonItem</string>
|
||||
<string>IBUITableView</string>
|
||||
<string>IBUIToolbar</string>
|
||||
<string>IBUIView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="IBDocument.PluginDependencies">
|
||||
|
|
@ -44,10 +42,10 @@
|
|||
<object class="IBUITableView" id="576313732">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">274</int>
|
||||
<string key="NSFrameSize">{320, 392}</string>
|
||||
<string key="NSFrameSize">{320, 436}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView" ref="929039419"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor" id="544021943">
|
||||
<int key="NSColorSpace">3</int>
|
||||
<bytes key="NSWhite">MQA</bytes>
|
||||
|
|
@ -67,44 +65,6 @@
|
|||
<float key="IBUISectionHeaderHeight">22</float>
|
||||
<float key="IBUISectionFooterHeight">22</float>
|
||||
</object>
|
||||
<object class="IBUIToolbar" id="929039419">
|
||||
<reference key="NSNextResponder" ref="191373211"/>
|
||||
<int key="NSvFlags">266</int>
|
||||
<string key="NSFrame">{{0, 392}, {320, 44}}</string>
|
||||
<reference key="NSSuperview" ref="191373211"/>
|
||||
<reference key="NSWindow"/>
|
||||
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIBarStyle">1</int>
|
||||
<object class="NSMutableArray" key="IBUIItems">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBUIBarButtonItem" id="625055884">
|
||||
<string key="IBUITitle">Mark read</string>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBUIStyle">1</int>
|
||||
<reference key="IBUIToolbar" ref="929039419"/>
|
||||
</object>
|
||||
<object class="IBUIBarButtonItem" id="1004249118">
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<reference key="IBUIToolbar" ref="929039419"/>
|
||||
<int key="IBUISystemItemIdentifier">5</int>
|
||||
</object>
|
||||
<object class="IBUIBarButtonItem" id="274994040">
|
||||
<object class="NSCustomResource" key="IBUIImage">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">settings.png</string>
|
||||
</object>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<float key="IBUIWidth">38</float>
|
||||
<int key="IBUIStyle">1</int>
|
||||
<reference key="IBUIToolbar" ref="929039419"/>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSColor" key="IBUITintColor">
|
||||
<int key="NSColorSpace">2</int>
|
||||
<bytes key="NSRGB">MC45MDk4MDM5ODY1IDAuOTE3NjQ3MTIzMyAwLjg5NDExNzcxMwA</bytes>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<string key="NSFrame">{{0, 44}, {320, 436}}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
|
|
@ -120,14 +80,6 @@
|
|||
<object class="IBObjectContainer" key="IBDocument.Objects">
|
||||
<object class="NSMutableArray" key="connectionRecords">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">feedViewToolbar</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="929039419"/>
|
||||
</object>
|
||||
<int key="connectionID">23</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">storyTitlesTable</string>
|
||||
|
|
@ -136,14 +88,6 @@
|
|||
</object>
|
||||
<int key="connectionID">38</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">feedMarkReadButton</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="625055884"/>
|
||||
</object>
|
||||
<int key="connectionID">44</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">view</string>
|
||||
|
|
@ -152,14 +96,6 @@
|
|||
</object>
|
||||
<int key="connectionID">58</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">settingsButton</string>
|
||||
<reference key="source" ref="372490531"/>
|
||||
<reference key="destination" ref="274994040"/>
|
||||
</object>
|
||||
<int key="connectionID">63</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">dataSource</string>
|
||||
|
|
@ -176,22 +112,6 @@
|
|||
</object>
|
||||
<int key="connectionID">37</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||
<string key="label">doOpenMarkReadActionSheet:</string>
|
||||
<reference key="source" ref="625055884"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">62</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchEventConnection" key="connection">
|
||||
<string key="label">doOpenSettingsActionSheet:</string>
|
||||
<reference key="source" ref="274994040"/>
|
||||
<reference key="destination" ref="372490531"/>
|
||||
</object>
|
||||
<int key="connectionID">64</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||
<object class="NSArray" key="orderedObjects">
|
||||
|
|
@ -209,7 +129,6 @@
|
|||
<reference key="object" ref="191373211"/>
|
||||
<object class="NSMutableArray" key="children">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference ref="929039419"/>
|
||||
<reference ref="576313732"/>
|
||||
</object>
|
||||
<reference key="parent" ref="0"/>
|
||||
|
|
@ -233,32 +152,6 @@
|
|||
</object>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">7</int>
|
||||
<reference key="object" ref="929039419"/>
|
||||
<object class="NSMutableArray" key="children">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<reference ref="625055884"/>
|
||||
<reference ref="274994040"/>
|
||||
<reference ref="1004249118"/>
|
||||
</object>
|
||||
<reference key="parent" ref="191373211"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">41</int>
|
||||
<reference key="object" ref="625055884"/>
|
||||
<reference key="parent" ref="929039419"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">59</int>
|
||||
<reference key="object" ref="274994040"/>
|
||||
<reference key="parent" ref="929039419"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">60</int>
|
||||
<reference key="object" ref="1004249118"/>
|
||||
<reference key="parent" ref="929039419"/>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="flattenedProperties">
|
||||
|
|
@ -271,10 +164,6 @@
|
|||
<string>-2.IBPluginDependency</string>
|
||||
<string>1.IBPluginDependency</string>
|
||||
<string>4.IBPluginDependency</string>
|
||||
<string>41.IBPluginDependency</string>
|
||||
<string>59.IBPluginDependency</string>
|
||||
<string>60.IBPluginDependency</string>
|
||||
<string>7.IBPluginDependency</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -284,10 +173,6 @@
|
|||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<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">
|
||||
|
|
@ -758,7 +643,7 @@
|
|||
<string>feedScoreSlider</string>
|
||||
<string>feedViewToolbar</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>settingsButton</string>
|
||||
<string>settingsBarButton</string>
|
||||
<string>storyTitlesTable</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
|
@ -781,7 +666,7 @@
|
|||
<string>feedScoreSlider</string>
|
||||
<string>feedViewToolbar</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>settingsButton</string>
|
||||
<string>settingsBarButton</string>
|
||||
<string>storyTitlesTable</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
|
@ -807,7 +692,7 @@
|
|||
<string key="candidateClassName">UISegmentedControl</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">settingsButton</string>
|
||||
<string key="name">settingsBarButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
|
|
@ -2020,6 +1905,8 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showInteractionsPopover:</string>
|
||||
<string>showSettingsPopover:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
|
@ -2029,6 +1916,8 @@
|
|||
<string>UIButton</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
|
|
@ -2039,6 +1928,8 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showInteractionsPopover:</string>
|
||||
<string>showSettingsPopover:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
|
@ -2059,6 +1950,14 @@
|
|||
<string key="name">selectIntelligence</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">showInteractionsPopover:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">showSettingsPopover:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapAddSite:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
|
|
@ -2069,6 +1968,8 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>activitiesButton</string>
|
||||
<string>addBarButton</string>
|
||||
<string>appDelegate</string>
|
||||
<string>feedScoreSlider</string>
|
||||
<string>feedTitlesTable</string>
|
||||
|
|
@ -2077,10 +1978,13 @@
|
|||
<string>innerView</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>noFocusMessage</string>
|
||||
<string>settingsBarButton</string>
|
||||
<string>toolbarLeftMargin</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UISlider</string>
|
||||
<string>UITableView</string>
|
||||
|
|
@ -2090,12 +1994,15 @@
|
|||
<string>UISegmentedControl</string>
|
||||
<string>UIView</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</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>activitiesButton</string>
|
||||
<string>addBarButton</string>
|
||||
<string>appDelegate</string>
|
||||
<string>feedScoreSlider</string>
|
||||
<string>feedTitlesTable</string>
|
||||
|
|
@ -2104,10 +2011,19 @@
|
|||
<string>innerView</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>noFocusMessage</string>
|
||||
<string>settingsBarButton</string>
|
||||
<string>toolbarLeftMargin</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">activitiesButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addBarButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">appDelegate</string>
|
||||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
|
|
@ -2140,6 +2056,10 @@
|
|||
<string key="name">noFocusMessage</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">settingsBarButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbarLeftMargin</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
|
|
@ -2726,10 +2646,6 @@
|
|||
</object>
|
||||
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
||||
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
||||
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
|
||||
<string key="NS.key.0">settings.png</string>
|
||||
<string key="NS.object.0">{16, 16}</string>
|
||||
</object>
|
||||
<string key="IBCocoaTouchPluginVersion">2083</string>
|
||||
</data>
|
||||
</archive>
|
||||
|
|
|
|||
BIN
media/ios/Resources/bar-separator.png
Normal file
BIN
media/ios/Resources/bar-separator.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
media/ios/Resources/bar-separator@2x.png
Normal file
BIN
media/ios/Resources/bar-separator@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 282 B |
BIN
media/ios/Resources/markread.png
Normal file
BIN
media/ios/Resources/markread.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 397 B |
BIN
media/ios/Resources/markread@2x.png
Normal file
BIN
media/ios/Resources/markread@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 564 B |
Loading…
Add table
Reference in a new issue