Fixing splash screen fade.

This commit is contained in:
Samuel Clay 2013-04-12 10:11:21 -07:00
parent 74d39a4de1
commit 405b425938
7 changed files with 86 additions and 124 deletions

View file

@ -1,19 +1,18 @@
# NewsBlur
* A visual feed reader with intelligence.
* Live at [www.newsblur.com](http://www.newsblur.com).
* NewsBlur is a personal news reader bringing people together
to talk about the world. A new sound of an old instrument.
* [www.newsblur.com](http://www.newsblur.com).
* Created by [Samuel Clay](http://www.samuelclay.com).
* Twitter: [@samuelclay](http://twitter.com/samuelclay) and
[@newsblur](http://twitter.com/newsblur).
## Features
1. Shows the original site (you have to see it to believe it)
2. Hides stories you don't want to read based on tags, keywords, authors, etc.
3. Highlights stories you want to read, based on the same criteria.
## Technologies
### Server-side

4
fabfile.py vendored
View file

@ -248,8 +248,8 @@ def backup_mongo():
def backup_postgresql():
# crontab for postgres master server
# 0 4 * * * python /srv/newsblur/utils/backups/backup_psql.py
# 0 * * * * sudo find /var/lib/postgresql/9.1/archive -mtime +1 -exec rm {} \;
# 0 * * * * sudo find /var/lib/postgresql/9.2/archive -mtime +1 -exec rm {} \;
# 0 */4 * * * sudo find /var/lib/postgresql/9.2/archive -type f -mmin +360 -delete
with cd(os.path.join(env.NEWSBLUR_PATH, 'utils/backups')):
# run('./postgresql_backup.sh')
run('python backup_psql.py')

View file

@ -10035,6 +10035,9 @@ form.opml_import_form input {
width: 16px;
height: 16px;
float: left;
margin: 7px 6px 0 0;
}
.NB-modal-friends .NB-module-search-input label img {
margin: 3px 0 0 0;
}

View file

@ -153,11 +153,11 @@
[window addSubview:self.navigationController.view];
self.window.rootViewController = self.navigationController;
}
[window makeKeyAndVisible];
[self.feedsViewController fetchFeedList:YES];
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
splashView = [[UIImageView alloc] init];
int rotate = 0;
@ -178,24 +178,24 @@
splashView.frame = self.view.frame;
splashView.image = [UIImage imageNamed:@"Default-Portrait.png"];
} else if (IS_IPHONE_5) {
splashView.frame = self.window.frame;
splashView.frame = CGRectMake(0, 0, self.window.frame.size.width, 568);
splashView.image = [UIImage imageNamed:@"Default-568h.png"];
} else {
splashView.frame = self.window.frame;
splashView.image = [UIImage imageNamed:@"Default.png"];
}
[splashView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
// [splashView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
splashView.alpha = 1.0;
[window addSubview:splashView];
[window bringSubviewToFront:splashView];
[window.rootViewController.view addSubview:splashView];
[UIView beginAnimations:nil context:nil];
[UIView setAnimationDuration:.6];
[UIView setAnimationTransition:UIViewAnimationTransitionNone forView:window cache:YES];
[UIView setAnimationDelegate:self];
[UIView setAnimationDidStopSelector:@selector(startupAnimationDone:finished:context:)];
splashView.alpha = 0.0;
// splashView.frame = CGRectMake(-60, -80, 440, 728);
splashView.frame = CGRectMake(0, -1 * splashView.frame.size.height, splashView.frame.size.width, splashView.frame.size.height);
// splashView.frame = CGRectMake(-60, -80, 440, 728);
splashView.alpha = .4;
[UIView commitAnimations];
[ShareThis startSessionWithFacebookURLSchemeSuffix:@"newsblur" pocketAPI:@"c23d9HbTT2a8fma098AfIr9zQTgcF0l9" readabilityKey:@"samuelclay" readabilitySecret:@"ktLQc88S9WCE8PfvZ4u4q995Q3HMzg6Q"];

View file

@ -21,12 +21,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes/NewsBlurAppDelegate.m"
timestampString = "378407777.087073"
timestampString = "387479373.491375"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "683"
endingLineNumber = "683"
landmarkName = "-recalculateIntelligenceScores:"
landmarkName = "-loadRiverFeedDetailView"
landmarkType = "5">
</FileBreakpoint>
</FileBreakpoints>

View file

@ -13,8 +13,8 @@
// #define BACKGROUND_REFRESH_SECONDS -5
#define BACKGROUND_REFRESH_SECONDS -10*60
// #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"dev.newsblur.com"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"]
// #define NEWSBLUR_URL [NSString stringWithFormat:@"dev.newsblur.com"]
#define NEWSBLUR_LINK_COLOR 0x405BA8
#define NEWSBLUR_HIGHLIGHT_COLOR 0xd2e6fd

View file

@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12C3006</string>
<string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">2083</string>
@ -186,7 +186,7 @@
</object>
</object>
</object>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="684340155"/>
@ -195,7 +195,6 @@
<bytes key="NSWhite">MQA</bytes>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
@ -467,12 +466,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addFolder</string>
<string>addSite</string>
<string>checkSiteAddress</string>
<string>doAddButton</string>
<string>doCancelButton</string>
<string>selectAddTypeSignup</string>
<string>toggleAddFolder:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -481,26 +479,20 @@
<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>addFolder</string>
<string>addSite</string>
<string>checkSiteAddress</string>
<string>doAddButton</string>
<string>doCancelButton</string>
<string>selectAddTypeSignup</string>
<string>toggleAddFolder:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">addFolder</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">addSite</string>
<string key="candidateClassName">id</string>
@ -518,7 +510,7 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">selectAddTypeSignup</string>
<string key="name">toggleAddFolder:</string>
<string key="candidateClassName">id</string>
</object>
</object>
@ -529,8 +521,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>activityIndicator</string>
<string>addButton</string>
<string>addFolderButton</string>
<string>addFolderInput</string>
<string>addTypeControl</string>
<string>addingLabel</string>
<string>appDelegate</string>
<string>cancelButton</string>
@ -547,8 +539,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIActivityIndicatorView</string>
<string>UIBarButtonItem</string>
<string>UIButton</string>
<string>UITextField</string>
<string>UISegmentedControl</string>
<string>UILabel</string>
<string>NewsBlurAppDelegate</string>
<string>UIBarButtonItem</string>
@ -568,8 +560,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>activityIndicator</string>
<string>addButton</string>
<string>addFolderButton</string>
<string>addFolderInput</string>
<string>addTypeControl</string>
<string>addingLabel</string>
<string>appDelegate</string>
<string>cancelButton</string>
@ -593,12 +585,12 @@
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addFolderInput</string>
<string key="candidateClassName">UITextField</string>
<string key="name">addFolderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addTypeControl</string>
<string key="candidateClassName">UISegmentedControl</string>
<string key="name">addFolderInput</string>
<string key="candidateClassName">UITextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addingLabel</string>
@ -1013,53 +1005,6 @@
<string key="minorKey">./Classes/FeedsMenuViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FindSitesViewController</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>sitesSearchBar</string>
<string>sitesTable</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UISearchBar</string>
<string>UITableView</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>sitesSearchBar</string>
<string>sitesTable</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">sitesSearchBar</string>
<string key="candidateClassName">UISearchBar</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">sitesTable</string>
<string key="candidateClassName">UITableView</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FindSitesViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserAddFriendsViewController</string>
<string key="superclassName">UIViewController</string>
@ -1975,7 +1920,6 @@
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
<string>findSitesViewController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
@ -2004,7 +1948,6 @@
<string>FeedDetailViewController</string>
<string>FeedsMenuViewController</string>
<string>NewsBlurViewController</string>
<string>FindSitesViewController</string>
<string>FirstTimeUserAddFriendsViewController</string>
<string>FirstTimeUserAddNewsBlurViewController</string>
<string>FirstTimeUserAddSitesViewController</string>
@ -2036,7 +1979,6 @@
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
<string>findSitesViewController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
@ -2086,10 +2028,6 @@
<string key="name">feedsViewController</string>
<string key="candidateClassName">NewsBlurViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">findSitesViewController</string>
<string key="candidateClassName">FindSitesViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">firstTimeUserAddFriendsViewController</string>
<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
@ -2356,12 +2294,18 @@
<string>doCloseOriginalStoryViewController</string>
<string>doOpenActionSheet</string>
<string>loadAddress:</string>
<string>webViewGoBack:</string>
<string>webViewGoForward:</string>
<string>webViewRefresh:</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>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@ -2371,6 +2315,9 @@
<string>doCloseOriginalStoryViewController</string>
<string>doOpenActionSheet</string>
<string>loadAddress:</string>
<string>webViewGoBack:</string>
<string>webViewGoForward:</string>
<string>webViewRefresh:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2386,6 +2333,18 @@
<string key="name">loadAddress:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">webViewGoBack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">webViewGoForward:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">webViewRefresh:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@ -2730,17 +2689,16 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>activity</string>
<string>appDelegate</string>
<string>bottomPlaceholderToolbar</string>
<string>buttonAction</string>
<string>buttonNext</string>
<string>buttonPrevious</string>
<string>circularProgressView</string>
<string>fontSettingsButton</string>
<string>loadingIndicator</string>
<string>originalStoryButton</string>
<string>pageControl</string>
<string>progressView</string>
<string>progressViewContainer</string>
<string>rightToolbar</string>
<string>scrollView</string>
<string>separatorBarButton</string>
@ -2748,21 +2706,20 @@
<string>spacer3BarButton</string>
<string>spacerBarButton</string>
<string>subscribeButton</string>
<string>toolbar</string>
<string>traverseView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIBarButtonItem</string>
<string>NewsBlurAppDelegate</string>
<string>UIToolbar</string>
<string>UIBarButtonItem</string>
<string>UIButton</string>
<string>UIButton</string>
<string>THCircularProgressView</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIActivityIndicatorView</string>
<string>UIBarButtonItem</string>
<string>UIPageControl</string>
<string>UIProgressView</string>
<string>UIView</string>
<string>TransparentToolbar</string>
<string>UIScrollView</string>
<string>UIBarButtonItem</string>
@ -2770,24 +2727,23 @@
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIView</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>activity</string>
<string>appDelegate</string>
<string>bottomPlaceholderToolbar</string>
<string>buttonAction</string>
<string>buttonNext</string>
<string>buttonPrevious</string>
<string>circularProgressView</string>
<string>fontSettingsButton</string>
<string>loadingIndicator</string>
<string>originalStoryButton</string>
<string>pageControl</string>
<string>progressView</string>
<string>progressViewContainer</string>
<string>rightToolbar</string>
<string>scrollView</string>
<string>separatorBarButton</string>
@ -2795,14 +2751,10 @@
<string>spacer3BarButton</string>
<string>spacerBarButton</string>
<string>subscribeButton</string>
<string>toolbar</string>
<string>traverseView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">activity</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
@ -2817,16 +2769,24 @@
</object>
<object class="IBToOneOutletInfo">
<string key="name">buttonNext</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">buttonPrevious</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">circularProgressView</string>
<string key="candidateClassName">THCircularProgressView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fontSettingsButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">loadingIndicator</string>
<string key="candidateClassName">UIActivityIndicatorView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">originalStoryButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -2835,14 +2795,6 @@
<string key="name">pageControl</string>
<string key="candidateClassName">UIPageControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">progressView</string>
<string key="candidateClassName">UIProgressView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">progressViewContainer</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">rightToolbar</string>
<string key="candidateClassName">TransparentToolbar</string>
@ -2872,8 +2824,8 @@
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
<string key="name">traverseView</string>
<string key="candidateClassName">UIView</string>
</object>
</object>
</object>
@ -2882,6 +2834,14 @@
<string key="minorKey">./Classes/StoryPageControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">THCircularProgressView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/THCircularProgressView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">TrainerViewController</string>
<string key="superclassName">BaseViewController</string>