bug fixes and persistent read/unread

This commit is contained in:
Roy Yang 2012-06-27 10:04:44 -07:00
parent efe2572cd7
commit 90219aafc7
10 changed files with 1280 additions and 739 deletions

View file

@ -57,6 +57,7 @@
- (IBAction)doSwitchSitesUnread;
- (void)loadFavicons;
- (void)loadAvatars;
- (void)switchSitesUnread;
- (void)saveAndDrawFavicons:(ASIHTTPRequest *)request;
- (void)requestFailed:(ASIHTTPRequest *)request;
- (void)pullToRefreshViewShouldRefresh:(PullToRefreshView *)view;

View file

@ -51,6 +51,16 @@
}
- (void)viewDidLoad {
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
if ([userPreferences integerForKey:@"showAllFeeds"] == 0) {
self.viewShowingAllFeeds = NO;
[self.sitesButton setImage:[UIImage imageNamed:@"16-list.png"]];
} else {
self.viewShowingAllFeeds = YES;
[self.sitesButton setImage:[UIImage imageNamed:@"ellipses.png"]];
}
self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc]
initWithBarButtonSystemItem:UIBarButtonSystemItemAdd
target:self
@ -59,7 +69,6 @@
[self.navigationItem.rightBarButtonItem setImage:[UIImage imageNamed:@"add_button.png"]];
[appDelegate showNavigationBar:NO];
self.viewShowingAllFeeds = NO;
pull = [[PullToRefreshView alloc] initWithScrollView:self.feedTitlesTable];
[pull setDelegate:self];
[self.feedTitlesTable addSubview:pull];
@ -234,9 +243,9 @@
[self loadFavicons];
appDelegate.activeUsername = [results objectForKey:@"user"];
if (appDelegate.feedsViewController.view.window) {
//if (appDelegate.feedsViewController.view.window) {
[appDelegate setTitle:[results objectForKey:@"user"]];
}
//}
NSMutableDictionary *sortedFolders = [[NSMutableDictionary alloc] init];
NSArray *sortedArray;
@ -299,11 +308,19 @@
appDelegate.dictFolders = sortedFolders;
[appDelegate.dictFoldersArray sortUsingSelector:@selector(caseInsensitiveCompare:)];
[self calculateFeedLocations:YES];
if (self.viewShowingAllFeeds) {
[self calculateFeedLocations:NO];
} else {
[self calculateFeedLocations:YES];
}
[self.feedTitlesTable reloadData];
NSLog(@"appDelegate.dictFolders: %@", appDelegate.dictFolders);
NSLog(@"appDelegate.dictFoldersArray: %@", appDelegate.dictFoldersArray);
// test for latest version of app
NSString *serveriPhoneVersion = [results objectForKey:@"iphone_version"];
NSString *currentiPhoneVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
@ -361,15 +378,22 @@
- (IBAction)doSwitchSitesUnread {
self.viewShowingAllFeeds = !self.viewShowingAllFeeds;
NSDictionary *feed;
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
if (self.viewShowingAllFeeds) {
[self.sitesButton setImage:[UIImage imageNamed:@"ellipses_half.png"]];
// [self.sitesButton setTitle:@"Unreads"];
} else {
[self.sitesButton setImage:[UIImage imageNamed:@"ellipses.png"]];
// [self.sitesButton setTitle:@"All Sites"];
[userPreferences setInteger:1 forKey:@"showAllFeeds"];
} else {
[self.sitesButton setImage:[UIImage imageNamed:@"16-list.png"]];
[userPreferences setInteger:0 forKey:@"showAllFeeds"];
}
[userPreferences synchronize];
[self switchSitesUnread];
}
- (void)switchSitesUnread {
NSDictionary *feed;
NSInteger intelligenceLevel = [appDelegate selectedIntelligence];
NSMutableArray *indexPaths = [NSMutableArray array];
@ -378,7 +402,7 @@
[self calculateFeedLocations:NO];
}
// NSLog(@"View showing all: %d and %@", self.viewShowingAllFeeds, self.stillVisibleFeeds);
// NSLog(@"View showing all: %d and %@", self.viewShowingAllFeeds, self.stillVisibleFeeds);
for (int s=0; s < [appDelegate.dictFoldersArray count]; s++) {
NSString *folderName = [appDelegate.dictFoldersArray objectAtIndex:s];
@ -394,7 +418,7 @@
} else {
feed = [appDelegate.dictFeeds objectForKey:feedIdStr];
}
int maxScore = [NewsBlurViewController computeMaxScoreForFeed:feed];
if (!self.viewShowingAllFeeds ||
@ -424,7 +448,7 @@
CGPoint offset = CGPointMake(0, 0);
[self.feedTitlesTable setContentOffset:offset animated:YES];
// Forget still visible feeds, since they won't be populated when
// all feeds are showing, and shouldn't be populated after this
// hide/show runs.

View file

@ -1,6 +1,6 @@
//
// MBProgressHUD.h
// Version 0.4
// Version 0.5
// Created by Matej Bukovinski on 2.4.09.
//
@ -26,41 +26,65 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <CoreGraphics/CoreGraphics.h>
@protocol MBProgressHUDDelegate;
/////////////////////////////////////////////////////////////////////////////////////////////
typedef enum {
/** Progress is shown using an UIActivityIndicatorView. This is the default. */
MBProgressHUDModeIndeterminate,
/** Progress is shown using a MBRoundProgressView. */
/** Progress is shown using an UIActivityIndicatorView. This is the default. */
MBProgressHUDModeIndeterminate,
/** Progress is shown using a round, pie-chart like, progress view. */
MBProgressHUDModeDeterminate,
/** Progress is shown using a ring-shaped progress view. */
MBProgressHUDModeAnnularDeterminate,
/** Shows a custom view */
MBProgressHUDModeCustomView
MBProgressHUDModeCustomView,
/** Shows only labels */
MBProgressHUDModeText
} MBProgressHUDMode;
typedef enum {
/** Opacity animation */
MBProgressHUDAnimationFade,
/** Opacity + scale animation */
MBProgressHUDAnimationZoom
/** Opacity animation */
MBProgressHUDAnimationFade,
/** Opacity + scale animation */
MBProgressHUDAnimationZoom
} MBProgressHUDAnimation;
/////////////////////////////////////////////////////////////////////////////////////////////
#ifndef MB_STRONG
#if __has_feature(objc_arc)
#define MB_STRONG strong
#else
#define MB_STRONG retain
#endif
#endif
#ifndef MB_WEAK
#if __has_feature(objc_arc_weak)
#define MB_WEAK weak
#elif __has_feature(objc_arc)
#define MB_WEAK unsafe_unretained
#else
#define MB_WEAK assign
#endif
#endif
/**
* Displays a simple HUD window containing a progress indicator and two optional labels for short messages.
*
* This is a simple drop-in class for displaying a progress HUD view similar to Apples private UIProgressHUD class.
* This is a simple drop-in class for displaying a progress HUD view similar to Apple's private UIProgressHUD class.
* The MBProgressHUD window spans over the entire space given to it by the initWithFrame constructor and catches all
* user input on this region, thereby preventing the user operations on components below the view. The HUD itself is
* drawn centered as a rounded semi-transparent view witch resizes depending on the user specified content.
* drawn centered as a rounded semi-transparent view which resizes depending on the user specified content.
*
* This view supports three modes of operation:
* This view supports four modes of operation:
* - MBProgressHUDModeIndeterminate - shows a UIActivityIndicatorView
* - MBProgressHUDModeDeterminate - shows a custom round progress indicator (MBRoundProgressView)
* - MBProgressHUDModeDeterminate - shows a custom round progress indicator
* - MBProgressHUDModeAnnularDeterminate - shows a custom annular progress indicator
* - MBProgressHUDModeCustomView - shows an arbitrary, user specified view (@see customView)
*
* All three modes can have optional labels assigned:
@ -68,105 +92,132 @@ typedef enum {
* indicator view.
* - If also the detailsLabelText property is set then another label is placed below the first label.
*/
@interface MBProgressHUD : UIView {
MBProgressHUDMode mode;
MBProgressHUDAnimation animationType;
SEL methodForExecution;
id targetForExecution;
id objectForExecution;
BOOL useAnimation;
float yOffset;
float xOffset;
float width;
float height;
float margin;
BOOL dimBackground;
BOOL taskInProgress;
float graceTime;
float minShowTime;
NSTimer *graceTimer;
NSTimer *minShowTimer;
NSDate *showStarted;
UIView *indicator;
UILabel *label;
UILabel *detailsLabel;
float progress;
id<MBProgressHUDDelegate> delegate;
NSString *labelText;
NSString *detailsLabelText;
float opacity;
UIFont *labelFont;
UIFont *detailsLabelFont;
BOOL isFinished;
BOOL removeFromSuperViewOnHide;
UIView *customView;
CGAffineTransform rotationTransform;
}
@interface MBProgressHUD : UIView
/**
* Creates a new HUD, adds it to provided view and shows it. The counterpart to this method is hideHUDForView:animated:.
*
* @param view The view that the HUD will be added to
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
* @param animated If set to YES the HUD will appear using the current animationType. If set to NO the HUD will not use
* animations while appearing.
* @return A reference to the created HUD.
*
* @see hideHUDForView:animated:
* @see animationType
*/
+ (MBProgressHUD *)showHUDAddedTo:(UIView *)view animated:(BOOL)animated;
/**
* Finds a HUD sibview and hides it. The counterpart to this method is showHUDAddedTo:animated:.
* Finds the top-most HUD subview and hides it. The counterpart to this method is showHUDAddedTo:animated:.
*
* @param view The view that is going to be searched for a HUD subview.
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
* @return YES if a HUD was found and removed, NO otherwise.
*
* @see hideHUDForView:animated:
* @see showHUDAddedTo:animated:
* @see animationType
*/
+ (BOOL)hideHUDForView:(UIView *)view animated:(BOOL)animated;
/**
* Finds all the HUD subviews and hides them.
*
* @param view The view that is going to be searched for HUD subviews.
* @param animated If set to YES the HUDs will disappear using the current animationType. If set to NO the HUDs will not use
* animations while disappearing.
* @return the number of HUDs found and removed.
*
* @see hideAllHUDForView:animated:
* @see animationType
*/
+ (NSUInteger)hideAllHUDsForView:(UIView *)view animated:(BOOL)animated;
/**
* Finds the top-most HUD subview and returns it.
*
* @param view The view that is going to be searched.
* @return A reference to the last HUD subview discovered.
*/
+ (MBProgressHUD *)HUDForView:(UIView *)view;
/**
* Finds all HUD subviews and returns them.
*
* @param view The view that is going to be searched.
* @return All found HUD views (array of MBProgressHUD objects).
*/
+ (NSArray *)allHUDsForView:(UIView *)view;
/**
* A convenience constructor that initializes the HUD with the window's bounds. Calls the designated constructor with
* Display the HUD. You need to make sure that the main thread completes its run loop soon after this method call so
* the user interface can be updated. Call this method when your task is already set-up to be executed in a new thread
* (e.g., when using something like NSOperation or calling an asynchronous call like NSURLRequest).
*
* @param animated If set to YES the HUD will appear using the current animationType. If set to NO the HUD will not use
* animations while appearing.
*
* @see animationType
*/
- (void)show:(BOOL)animated;
/**
* Hide the HUD. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to
* hide the HUD when your task completes.
*
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
*
* @see animationType
*/
- (void)hide:(BOOL)animated;
/**
* Hide the HUD after a delay. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to
* hide the HUD when your task completes.
*
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
* @param delay Delay in secons until the HUD is hidden.
*
* @see animationType
*/
- (void)hide:(BOOL)animated afterDelay:(NSTimeInterval)delay;
/**
* Shows the HUD while a background task is executing in a new thread, then hides the HUD.
*
* This method also takes care of autorelease pools so your method does not have to be concerned with setting up a
* pool.
*
* @param method The method to be executed while the HUD is shown. This method will be executed in a new thread.
* @param target The object that the target method belongs to.
* @param object An optional object to be passed to the method.
* @param animated If set to YES the HUD will (dis)appear using the current animationType. If set to NO the HUD will not use
* animations while (dis)appearing.
*/
- (void)showWhileExecuting:(SEL)method onTarget:(id)target withObject:(id)object animated:(BOOL)animated;
/**
* Initializes the HUD with the window's bounds. Calls the designated constructor with
* window.bounds as the parameter.
*
* @param window The window instance that will provide the bounds for the HUD. Should probably be the same instance as
* @param window The window instance that will provide the bounds for the HUD. Should be the same instance as
* the HUD's superview (i.e., the window that the HUD will be added to).
*/
- (id)initWithWindow:(UIWindow *)window;
/**
* A convenience constructor that initializes the HUD with the view's bounds. Calls the designated constructor with
* Initializes the HUD with the view's bounds. Calls the designated constructor with
* view.bounds as the parameter
*
* @param view The view instance that will provide the bounds for the HUD. Should probably be the same instance as
* @param view The view instance that will provide the bounds for the HUD. Should be the same instance as
* the HUD's superview (i.e., the view that the HUD will be added to).
*/
- (id)initWithView:(UIView *)view;
/**
* The UIView (i.g., a UIIMageView) to be shown when the HUD is in MBProgressHUDModeCustomView.
* For best results use a 37 by 37 pixel view (so the bounds match the build in indicator bounds).
*/
@property (retain) UIView *customView;
/**
* MBProgressHUD operation mode. Switches between indeterminate (MBProgressHUDModeIndeterminate) and determinate
* progress (MBProgressHUDModeDeterminate). The default is MBProgressHUDModeIndeterminate.
* MBProgressHUD operation mode. The default is MBProgressHUDModeIndeterminate.
*
* @see MBProgressHUDMode
*/
@ -179,12 +230,18 @@ typedef enum {
*/
@property (assign) MBProgressHUDAnimation animationType;
/**
* The HUD delegate object. If set the delegate will receive hudWasHidden callbacks when the HUD was hidden. The
* delegate should conform to the MBProgressHUDDelegate protocol and implement the hudWasHidden method. The delegate
* object will not be retained.
/**
* The UIView (e.g., a UIImageView) to be shown when the HUD is in MBProgressHUDModeCustomView.
* For best results use a 37 by 37 pixel view (so the bounds match the built in indicator bounds).
*/
@property (assign) id<MBProgressHUDDelegate> delegate;
@property (MB_STRONG) UIView *customView;
/**
* The HUD delegate object.
*
* @see MBProgressHUDDelegate
*/
@property (MB_WEAK) id<MBProgressHUDDelegate> delegate;
/**
* An optional short message to be displayed below the activity indicator. The HUD is automatically resized to fit
@ -195,7 +252,7 @@ typedef enum {
/**
* An optional details message displayed below the labelText message. This message is displayed only if the labelText
* property is also set and is different from an empty string (@"").
* property is also set and is different from an empty string (@""). The details text can span multiple lines.
*/
@property (copy) NSString *detailsLabelText;
@ -215,8 +272,7 @@ typedef enum {
@property (assign) float yOffset;
/**
* The amounth of space between the HUD edge and the HUD elements (labels, indicators or custom views).
*
* The amounth of space between the HUD edge and the HUD elements (labels, indicators or custom views).
* Defaults to 20.0
*/
@property (assign) float margin;
@ -228,7 +284,7 @@ typedef enum {
/*
* Grace period is the time (in seconds) that the invoked method may be run without
* showing the HUD. If the task finishes befor the grace time runs out, the HUD will
* showing the HUD. If the task finishes before the grace time runs out, the HUD will
* not be shown at all.
* This may be used to prevent HUD display for very short tasks.
* Defaults to 0 (no grace time).
@ -237,7 +293,6 @@ typedef enum {
*/
@property (assign) float graceTime;
/**
* The minimum time (in seconds) that the HUD is shown.
* This avoids the problem of the HUD being shown and than instantly hidden.
@ -251,12 +306,12 @@ typedef enum {
* This property is automatically set when using showWhileExecuting:onTarget:withObject:animated:.
* When threading is done outside of the HUD (i.e., when the show: and hide: methods are used directly),
* you need to set this property when your task starts and completes in order to have normal graceTime
* functunality.
* functionality.
*/
@property (assign) BOOL taskInProgress;
/**
* Removes the HUD from it's parent view when hidden.
* Removes the HUD from its parent view when hidden.
* Defaults to NO.
*/
@property (assign) BOOL removeFromSuperViewOnHide;
@ -264,70 +319,30 @@ typedef enum {
/**
* Font to be used for the main label. Set this property if the default is not adequate.
*/
@property (retain) UIFont* labelFont;
@property (MB_STRONG) UIFont* labelFont;
/**
* Font to be used for the details label. Set this property if the default is not adequate.
*/
@property (retain) UIFont* detailsLabelFont;
@property (MB_STRONG) UIFont* detailsLabelFont;
/**
* The progress of the progress indicator, from 0.0 to 1.0. Defaults to 0.0.
*/
@property (assign) float progress;
/**
* Display the HUD. You need to make sure that the main thread completes its run loop soon after this method call so
* the user interface can be updated. Call this method when your task is already set-up to be executed in a new thread
* (e.g., when using something like NSOperation or calling an asynchronous call like NSUrlRequest).
*
* If you need to perform a blocking thask on the main thread, you can try spining the run loop imeidiately after calling this
* method by using:
*
* [[NSRunLoop currentRunLoop] runUntilDate:[NSDate distantPast]];
*
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
/**
* The minimum size of the HUD bezel. Defaults to CGSizeZero (no minimum size).
*/
- (void)show:(BOOL)animated;
@property (assign) CGSize minSize;
/**
* Hide the HUD. This still calls the hudWasHidden delegate. This is the counterpart of the hide: method. Use it to
* hide the HUD when your task completes.
*
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
/**
* Force the HUD dimensions to be equal if possible.
*/
- (void)hide:(BOOL)animated;
/**
* Hide the HUD after a delay. This still calls the hudWasHidden delegate. This is the counterpart of the hide: method. Use it to
* hide the HUD when your task completes.
*
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
* @param delay Delay in secons until the HUD is hidden.
*/
- (void)hide:(BOOL)animated afterDelay:(NSTimeInterval)delay;
/**
* Shows the HUD while a background task is executing in a new thread, then hides the HUD.
*
* This method also takes care of NSAutoreleasePools so your method does not have to be concerned with setting up a
* pool.
*
* @param method The method to be executed while the HUD is shown. This method will be executed in a new thread.
* @param target The object that the target method belongs to.
* @param object An optional object to be passed to the method.
* @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
* animations while disappearing.
*/
- (void)showWhileExecuting:(SEL)method onTarget:(id)target withObject:(id)object animated:(BOOL)animated;
@property (assign, getter = isSquare) BOOL square;
@end
/////////////////////////////////////////////////////////////////////////////////////////////
@protocol MBProgressHUDDelegate <NSObject>
@ -338,30 +353,22 @@ typedef enum {
*/
- (void)hudWasHidden:(MBProgressHUD *)hud;
/**
* @deprecated use hudWasHidden: instead
* @see hudWasHidden:
*/
- (void)hudWasHidden __attribute__ ((deprecated));
@end
/////////////////////////////////////////////////////////////////////////////////////////////
/**
* A progress view for showing definite progress by filling up a circle (pie chart).
*/
@interface MBRoundProgressView : UIView {
@private
float _progress;
}
@interface MBRoundProgressView : UIView
/**
* Progress (0.0 to 1.0)
*/
@property (nonatomic, assign) float progress;
/*
* Display mode - NO = round or YES = annular. Defaults to round.
*/
@property (nonatomic, assign, getter = isAnnular) BOOL annular;
@end
/////////////////////////////////////////////////////////////////////////////////////////////

File diff suppressed because it is too large Load diff

View file

@ -95,6 +95,9 @@
437AA8C61592F8D2005463F5 /* bullets_yellow_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8C41592F8D2005463F5 /* bullets_yellow_green.png */; };
437AA8CA159394E2005463F5 /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437AA8C8159394E2005463F5 /* ShareViewController.m */; };
437AA8CB159394E2005463F5 /* ShareViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8C9159394E2005463F5 /* ShareViewController.xib */; };
438F525D159B65E200211B65 /* 16-List.png in Resources */ = {isa = PBXBuildFile; fileRef = 438F525B159B65E200211B65 /* 16-List.png */; };
438F525E159B65E200211B65 /* 16-List@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 438F525C159B65E200211B65 /* 16-List@2x.png */; };
438F5262159B6F8C00211B65 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 438F5261159B6F0400211B65 /* MBProgressHUD.m */; };
439DAB201590DA350019B0EB /* FeedsMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 439DAB1E1590DA350019B0EB /* FeedsMenuViewController.m */; };
439DAB211590DA350019B0EB /* FeedsMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 439DAB1F1590DA350019B0EB /* FeedsMenuViewController.xib */; };
439DAB281590E6720019B0EB /* 53-house.png in Resources */ = {isa = PBXBuildFile; fileRef = 439DAB261590E6720019B0EB /* 53-house.png */; };
@ -215,7 +218,6 @@
FF38DB1313F2112D00251891 /* UIView+TKCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = FF38DB1213F2112D00251891 /* UIView+TKCategory.m */; };
FF38DB1A13F21B2C00251891 /* ABTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF38DB1913F21B2C00251891 /* ABTableViewCell.m */; };
FF4BBC1E13F7487A001EBEBD /* TransparentToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = FF4BBC1D13F7487A001EBEBD /* TransparentToolbar.m */; };
FF56EC7B13F755E40009D8E0 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = FF56EC7A13F755E40009D8E0 /* MBProgressHUD.m */; };
FF5EA47F143B691000B7563D /* AddSiteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF5EA47D143B691000B7563D /* AddSiteViewController.m */; };
FF70DD2D1457A76E0053CFB0 /* StringHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = FF70DD2C1457A76E0053CFB0 /* StringHelper.m */; };
FF793E1B13F1A9F700F282D2 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = FF793E1813F1A9F700F282D2 /* ASIDataCompressor.m */; };
@ -317,6 +319,10 @@
437AA8C7159394E2005463F5 /* ShareViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = "<group>"; };
437AA8C8159394E2005463F5 /* ShareViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = "<group>"; };
437AA8C9159394E2005463F5 /* ShareViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ShareViewController.xib; path = Classes/ShareViewController.xib; sourceTree = "<group>"; };
438F525B159B65E200211B65 /* 16-List.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "16-List.png"; sourceTree = "<group>"; };
438F525C159B65E200211B65 /* 16-List@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "16-List@2x.png"; sourceTree = "<group>"; };
438F5260159B6F0400211B65 /* MBProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
438F5261159B6F0400211B65 /* MBProgressHUD.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
439DAB1D1590DA350019B0EB /* FeedsMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedsMenuViewController.h; sourceTree = "<group>"; };
439DAB1E1590DA350019B0EB /* FeedsMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedsMenuViewController.m; sourceTree = "<group>"; };
439DAB1F1590DA350019B0EB /* FeedsMenuViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = FeedsMenuViewController.xib; path = ../Classes/FeedsMenuViewController.xib; sourceTree = "<group>"; };
@ -545,8 +551,6 @@
FF38DB1913F21B2C00251891 /* ABTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ABTableViewCell.m; sourceTree = "<group>"; };
FF4BBC1C13F7487A001EBEBD /* TransparentToolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransparentToolbar.h; sourceTree = "<group>"; };
FF4BBC1D13F7487A001EBEBD /* TransparentToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransparentToolbar.m; sourceTree = "<group>"; };
FF56EC7913F755E40009D8E0 /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
FF56EC7A13F755E40009D8E0 /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
FF5EA47C143B691000B7563D /* AddSiteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteViewController.h; sourceTree = "<group>"; };
FF5EA47D143B691000B7563D /* AddSiteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddSiteViewController.m; sourceTree = "<group>"; };
FF70DD2B1457A76E0053CFB0 /* StringHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringHelper.h; sourceTree = "<group>"; };
@ -670,6 +674,8 @@
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
isa = PBXGroup;
children = (
438F5260159B6F0400211B65 /* MBProgressHUD.h */,
438F5261159B6F0400211B65 /* MBProgressHUD.m */,
FF38DB1813F21B2C00251891 /* ABTableViewCell.h */,
FF38DB1913F21B2C00251891 /* ABTableViewCell.m */,
4307BEFC1565EEBC007A932A /* Base64.h */,
@ -680,8 +686,6 @@
FF38679D13D8914A00F8AB3A /* GTMNString+HTML.m */,
FFD2BB8A1401AD85004277DA /* libTestFlight.a */,
29B97316FDCFA39411CA2CEA /* main.m */,
FF56EC7913F755E40009D8E0 /* MBProgressHUD.h */,
FF56EC7A13F755E40009D8E0 /* MBProgressHUD.m */,
32CA4F630368D1EE00C91783 /* NewsBlur_Prefix.pch */,
FF38679913D88EEC00F8AB3A /* NSString+HTML.h */,
FF38679A13D88EEC00F8AB3A /* NSString+HTML.m */,
@ -724,6 +728,8 @@
4307BE511565EDF8007A932A /* Resources */ = {
isa = PBXGroup;
children = (
438F525B159B65E200211B65 /* 16-List.png */,
438F525C159B65E200211B65 /* 16-List@2x.png */,
43CF31B31593BC1500296407 /* 208-facebook-green.png */,
43CF31B41593BC1500296407 /* 208-facebook.png */,
43CF31B11593BA4800296407 /* 32-Twitter-Green.png */,
@ -1404,6 +1410,8 @@
43CF31B51593BC1500296407 /* 208-facebook-green.png in Resources */,
43CF31B61593BC1500296407 /* 208-facebook.png in Resources */,
43E8856015951F930032022E /* reader.css in Resources */,
438F525D159B65E200211B65 /* 16-List.png in Resources */,
438F525E159B65E200211B65 /* 16-List@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1414,6 +1422,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
438F5262159B6F8C00211B65 /* MBProgressHUD.m in Sources */,
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
1D3623260D0F684500981E51 /* NewsBlurAppDelegate.m in Sources */,
28D7ACF80DDB3853001CB0EB /* NewsBlurViewController.m in Sources */,
@ -1443,7 +1452,6 @@
FF38DB1313F2112D00251891 /* UIView+TKCategory.m in Sources */,
FF38DB1A13F21B2C00251891 /* ABTableViewCell.m in Sources */,
FF4BBC1E13F7487A001EBEBD /* TransparentToolbar.m in Sources */,
FF56EC7B13F755E40009D8E0 /* MBProgressHUD.m in Sources */,
FF5EA47F143B691000B7563D /* AddSiteViewController.m in Sources */,
FFD887F01445F1E800385399 /* AddSiteAutocompleteCell.m in Sources */,
FFE5322F144C8AC300ACFDE0 /* Utilities.m in Sources */,

View file

@ -75,6 +75,7 @@
<string key="NSFrame">{{79, 8}, {161, 30}}</string>
<reference key="NSSuperview" ref="895374018"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBSegmentControlStyle">2</int>
<int key="IBNumberOfSegments">3</int>
@ -131,7 +132,7 @@
<object class="IBUIBarButtonItem" id="240724681">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">ellipses.png</string>
<string key="NSResourceName">16-List.png</string>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<float key="IBUIWidth">42</float>
@ -583,6 +584,46 @@
<string key="minorKey">./Classes/BaseViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FeedDashboardViewController</string>
<string key="superclassName">UIViewController</string>
<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>toolbar</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UIToolbar</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>toolbar</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">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FeedDashboardViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FeedDetailViewController</string>
<string key="superclassName">BaseViewController</string>
@ -712,14 +753,42 @@
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">appDelegate</string>
<string key="NS.object.0">NewsBlurAppDelegate</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>menuTableView</string>
<string>toolbar</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UITableView</string>
<string>UIToolbar</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">appDelegate</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>menuTableView</string>
<string>toolbar</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">menuTableView</string>
<string key="candidateClassName">UITableView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -785,6 +854,7 @@
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
@ -797,6 +867,7 @@
<string>UIView</string>
<string>NewsBlurAppDelegate</string>
<string>UIButton</string>
<string>UIImageView</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIButton</string>
@ -812,6 +883,7 @@
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
@ -839,6 +911,10 @@
<string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -902,12 +978,16 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>fontSizeSegment</string>
<string>fontStyleSegment</string>
<string>largeFontSizeLabel</string>
<string>smallFontSizeLabel</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UISegmentedControl</string>
<string>UISegmentedControl</string>
<string>UILabel</string>
<string>UILabel</string>
</object>
@ -917,6 +997,8 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>fontSizeSegment</string>
<string>fontStyleSegment</string>
<string>largeFontSizeLabel</string>
<string>smallFontSizeLabel</string>
</object>
@ -926,6 +1008,14 @@
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fontSizeSegment</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fontStyleSegment</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">largeFontSizeLabel</string>
<string key="candidateClassName">UILabel</string>
@ -1347,6 +1437,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addSiteViewController</string>
<string>feedDashboardViewController</string>
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
@ -1357,6 +1448,7 @@
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
<string>shareViewController</string>
<string>splitStoryController</string>
<string>splitStoryDetailNavigationController</string>
<string>splitStoryDetailViewController</string>
@ -1366,6 +1458,7 @@
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>AddSiteViewController</string>
<string>FeedDashboardViewController</string>
<string>FeedDetailViewController</string>
<string>FeedsMenuViewController</string>
<string>NewsBlurViewController</string>
@ -1376,6 +1469,7 @@
<string>MoveSiteViewController</string>
<string>UINavigationController</string>
<string>OriginalStoryViewController</string>
<string>ShareViewController</string>
<string>UISplitViewController</string>
<string>UINavigationController</string>
<string>SplitStoryDetailViewController</string>
@ -1388,6 +1482,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addSiteViewController</string>
<string>feedDashboardViewController</string>
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
@ -1398,6 +1493,7 @@
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
<string>shareViewController</string>
<string>splitStoryController</string>
<string>splitStoryDetailNavigationController</string>
<string>splitStoryDetailViewController</string>
@ -1410,6 +1506,10 @@
<string key="name">addSiteViewController</string>
<string key="candidateClassName">AddSiteViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">feedDashboardViewController</string>
<string key="candidateClassName">FeedDashboardViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">feedDetailViewController</string>
<string key="candidateClassName">FeedDetailViewController</string>
@ -1450,6 +1550,10 @@
<string key="name">originalStoryViewController</string>
<string key="candidateClassName">OriginalStoryViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">shareViewController</string>
<string key="candidateClassName">ShareViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">splitStoryController</string>
<string key="candidateClassName">UISplitViewController</string>
@ -1484,17 +1588,17 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doAddButton</string>
<string>doSwitchSitesUnread</string>
<string>sectionTapped:</string>
<string>sectionUntapped:</string>
<string>sectionUntappedOutside:</string>
<string>selectIntelligence</string>
<string>showMenuButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UIButton</string>
<string>id</string>
@ -1505,19 +1609,15 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doAddButton</string>
<string>doSwitchSitesUnread</string>
<string>sectionTapped:</string>
<string>sectionUntapped:</string>
<string>sectionUntappedOutside:</string>
<string>selectIntelligence</string>
<string>showMenuButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doAddButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doSwitchSitesUnread</string>
<string key="candidateClassName">id</string>
@ -1530,6 +1630,10 @@
<string key="name">sectionUntapped:</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBActionInfo">
<string key="name">sectionUntappedOutside:</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBActionInfo">
<string key="name">selectIntelligence</string>
<string key="candidateClassName">id</string>
@ -1544,24 +1648,24 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButton</string>
<string>appDelegate</string>
<string>feedScoreSlider</string>
<string>feedTitlesTable</string>
<string>feedViewToolbar</string>
<string>homeButton</string>
<string>intelligenceControl</string>
<string>popoverController</string>
<string>sitesButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIBarButtonItem</string>
<string>NewsBlurAppDelegate</string>
<string>UISlider</string>
<string>UITableView</string>
<string>UIToolbar</string>
<string>UIBarButtonItem</string>
<string>UISegmentedControl</string>
<string>UIPopoverController</string>
<string>UIBarButtonItem</string>
</object>
</object>
@ -1569,21 +1673,17 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButton</string>
<string>appDelegate</string>
<string>feedScoreSlider</string>
<string>feedTitlesTable</string>
<string>feedViewToolbar</string>
<string>homeButton</string>
<string>intelligenceControl</string>
<string>popoverController</string>
<string>sitesButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">addButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
@ -1608,6 +1708,10 @@
<string key="name">intelligenceControl</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">popoverController</string>
<string key="candidateClassName">UIPopoverController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">sitesButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -1754,6 +1858,134 @@
<string key="minorKey">./Classes/OriginalStoryViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ShareViewController</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>doCancelButton:</string>
<string>doReplyToComment:</string>
<string>doShareThisStory:</string>
<string>doToggleButton:</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>doCancelButton:</string>
<string>doReplyToComment:</string>
<string>doShareThisStory:</string>
<string>doToggleButton:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doCancelButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doReplyToComment:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doShareThisStory:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doToggleButton:</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>appDelegate</string>
<string>commentField</string>
<string>facebookButton</string>
<string>siteFavicon</string>
<string>siteInformation</string>
<string>submitButton</string>
<string>toolbarTitle</string>
<string>twitterButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UITextView</string>
<string>UIButton</string>
<string>UIImageView</string>
<string>UILabel</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIButton</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>commentField</string>
<string>facebookButton</string>
<string>siteFavicon</string>
<string>siteInformation</string>
<string>submitButton</string>
<string>toolbarTitle</string>
<string>twitterButton</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">commentField</string>
<string key="candidateClassName">UITextView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">facebookButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">siteFavicon</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">siteInformation</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">submitButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">twitterButton</string>
<string key="candidateClassName">UIButton</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ShareViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SplitStoryDetailViewController</string>
<string key="superclassName">UIViewController</string>
@ -1923,8 +2155,8 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">ellipses.png</string>
<string key="NS.object.0">{32, 24}</string>
<string key="NS.key.0">16-List.png</string>
<string key="NS.object.0">{16, 16}</string>
</object>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1280</int>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
@ -47,6 +47,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{-6, 0}, {326, 416}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="895374018"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
@ -73,6 +74,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{79, 8}, {161, 30}}</string>
<reference key="NSSuperview" ref="895374018"/>
<reference key="NSWindow"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBSegmentControlStyle">2</int>
<int key="IBNumberOfSegments">3</int>
@ -115,6 +117,7 @@
</object>
<string key="NSFrame">{{0, 416}, {320, 44}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="117639116"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@ -128,7 +131,7 @@
<object class="IBUIBarButtonItem" id="240724681">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">ellipses.png</string>
<string key="NSResourceName">16-List.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIWidth">42</float>
@ -156,6 +159,7 @@
</object>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="224086083"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@ -575,6 +579,46 @@
<string key="minorKey">./Classes/BaseViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FeedDashboardViewController</string>
<string key="superclassName">UIViewController</string>
<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>toolbar</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UIToolbar</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>toolbar</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">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FeedDashboardViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FeedDetailViewController</string>
<string key="superclassName">BaseViewController</string>
@ -704,14 +748,42 @@
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">appDelegate</string>
<string key="NS.object.0">NewsBlurAppDelegate</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>menuTableView</string>
<string>toolbar</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UITableView</string>
<string>UIToolbar</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">appDelegate</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>menuTableView</string>
<string>toolbar</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">menuTableView</string>
<string key="candidateClassName">UITableView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -777,6 +849,7 @@
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
@ -789,6 +862,7 @@
<string>UIView</string>
<string>NewsBlurAppDelegate</string>
<string>UIButton</string>
<string>UIImageView</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIButton</string>
@ -804,6 +878,7 @@
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
@ -831,6 +906,10 @@
<string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -894,12 +973,16 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>fontSizeSegment</string>
<string>fontStyleSegment</string>
<string>largeFontSizeLabel</string>
<string>smallFontSizeLabel</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UISegmentedControl</string>
<string>UISegmentedControl</string>
<string>UILabel</string>
<string>UILabel</string>
</object>
@ -909,6 +992,8 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>fontSizeSegment</string>
<string>fontStyleSegment</string>
<string>largeFontSizeLabel</string>
<string>smallFontSizeLabel</string>
</object>
@ -918,6 +1003,14 @@
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fontSizeSegment</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fontStyleSegment</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">largeFontSizeLabel</string>
<string key="candidateClassName">UILabel</string>
@ -1339,6 +1432,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addSiteViewController</string>
<string>feedDashboardViewController</string>
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
@ -1349,6 +1443,7 @@
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
<string>shareViewController</string>
<string>splitStoryController</string>
<string>splitStoryDetailNavigationController</string>
<string>splitStoryDetailViewController</string>
@ -1358,6 +1453,7 @@
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>AddSiteViewController</string>
<string>FeedDashboardViewController</string>
<string>FeedDetailViewController</string>
<string>FeedsMenuViewController</string>
<string>NewsBlurViewController</string>
@ -1368,6 +1464,7 @@
<string>MoveSiteViewController</string>
<string>UINavigationController</string>
<string>OriginalStoryViewController</string>
<string>ShareViewController</string>
<string>UISplitViewController</string>
<string>UINavigationController</string>
<string>SplitStoryDetailViewController</string>
@ -1380,6 +1477,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addSiteViewController</string>
<string>feedDashboardViewController</string>
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
@ -1390,6 +1488,7 @@
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
<string>shareViewController</string>
<string>splitStoryController</string>
<string>splitStoryDetailNavigationController</string>
<string>splitStoryDetailViewController</string>
@ -1402,6 +1501,10 @@
<string key="name">addSiteViewController</string>
<string key="candidateClassName">AddSiteViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">feedDashboardViewController</string>
<string key="candidateClassName">FeedDashboardViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">feedDetailViewController</string>
<string key="candidateClassName">FeedDetailViewController</string>
@ -1442,6 +1545,10 @@
<string key="name">originalStoryViewController</string>
<string key="candidateClassName">OriginalStoryViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">shareViewController</string>
<string key="candidateClassName">ShareViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">splitStoryController</string>
<string key="candidateClassName">UISplitViewController</string>
@ -1476,17 +1583,17 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doAddButton</string>
<string>doSwitchSitesUnread</string>
<string>sectionTapped:</string>
<string>sectionUntapped:</string>
<string>sectionUntappedOutside:</string>
<string>selectIntelligence</string>
<string>showMenuButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>UIButton</string>
<string>UIButton</string>
<string>UIButton</string>
<string>id</string>
@ -1497,19 +1604,15 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doAddButton</string>
<string>doSwitchSitesUnread</string>
<string>sectionTapped:</string>
<string>sectionUntapped:</string>
<string>sectionUntappedOutside:</string>
<string>selectIntelligence</string>
<string>showMenuButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doAddButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doSwitchSitesUnread</string>
<string key="candidateClassName">id</string>
@ -1522,6 +1625,10 @@
<string key="name">sectionUntapped:</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBActionInfo">
<string key="name">sectionUntappedOutside:</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBActionInfo">
<string key="name">selectIntelligence</string>
<string key="candidateClassName">id</string>
@ -1536,24 +1643,24 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButton</string>
<string>appDelegate</string>
<string>feedScoreSlider</string>
<string>feedTitlesTable</string>
<string>feedViewToolbar</string>
<string>homeButton</string>
<string>intelligenceControl</string>
<string>popoverController</string>
<string>sitesButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIBarButtonItem</string>
<string>NewsBlurAppDelegate</string>
<string>UISlider</string>
<string>UITableView</string>
<string>UIToolbar</string>
<string>UIBarButtonItem</string>
<string>UISegmentedControl</string>
<string>UIPopoverController</string>
<string>UIBarButtonItem</string>
</object>
</object>
@ -1561,21 +1668,17 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButton</string>
<string>appDelegate</string>
<string>feedScoreSlider</string>
<string>feedTitlesTable</string>
<string>feedViewToolbar</string>
<string>homeButton</string>
<string>intelligenceControl</string>
<string>popoverController</string>
<string>sitesButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">addButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
@ -1600,6 +1703,10 @@
<string key="name">intelligenceControl</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">popoverController</string>
<string key="candidateClassName">UIPopoverController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">sitesButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -1746,6 +1853,134 @@
<string key="minorKey">./Classes/OriginalStoryViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ShareViewController</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>doCancelButton:</string>
<string>doReplyToComment:</string>
<string>doShareThisStory:</string>
<string>doToggleButton:</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>doCancelButton:</string>
<string>doReplyToComment:</string>
<string>doShareThisStory:</string>
<string>doToggleButton:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doCancelButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doReplyToComment:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doShareThisStory:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">doToggleButton:</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>appDelegate</string>
<string>commentField</string>
<string>facebookButton</string>
<string>siteFavicon</string>
<string>siteInformation</string>
<string>submitButton</string>
<string>toolbarTitle</string>
<string>twitterButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UITextView</string>
<string>UIButton</string>
<string>UIImageView</string>
<string>UILabel</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIButton</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>commentField</string>
<string>facebookButton</string>
<string>siteFavicon</string>
<string>siteInformation</string>
<string>submitButton</string>
<string>toolbarTitle</string>
<string>twitterButton</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">commentField</string>
<string key="candidateClassName">UITextView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">facebookButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">siteFavicon</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">siteInformation</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">submitButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">twitterButton</string>
<string key="candidateClassName">UIButton</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ShareViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SplitStoryDetailViewController</string>
<string key="superclassName">UIViewController</string>
@ -1904,6 +2139,10 @@
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3100" key="NS.object.0"/>
@ -1911,8 +2150,8 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">ellipses.png</string>
<string key="NS.object.0">{32, 24}</string>
<string key="NS.key.0">16-List.png</string>
<string key="NS.object.0">{16, 16}</string>
</object>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -72,6 +72,10 @@
#pragma mark - Split view
//-(BOOL)splitViewController:(UISplitViewController *)svc shouldHideViewController:(UIViewController *)vc inOrientation:(UIInterfaceOrientation)orientation {
// return YES;
//}
- (void)splitViewController:(UISplitViewController *)splitController
willHideViewController:(UIViewController *)viewController
withBarButtonItem:(UIBarButtonItem *)barButtonItem