public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing story traversal buttons to not disappear randomly.

Browse source
This commit is contained in:
Samuel Clay 2013-03-13 14:05:58 -07:00
parent cb21babcff
commit 976842f01b
16 changed files with 149 additions and 176 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
media/img/icons/circular/g_icn_fav_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 562 B

28
media/ios/Classes/StoryDetailViewController.m
View file

@ -817,7 +817,7 @@
int viewportHeight = self.webView.scrollView.frame.size.height;
int topPosition = self.webView.scrollView.contentOffset.y;
int bottomPosition = webpageHeight - topPosition - viewportHeight;
BOOL singlePage = webpageHeight - 100 <= viewportHeight;
BOOL singlePage = webpageHeight - 110 <= viewportHeight;
BOOL atBottom = bottomPosition < 100;
BOOL atTop = topPosition < 10;
if (!atTop && !atBottom) {
@ -830,9 +830,22 @@
} completion:^(BOOL finished) {
}];
} else if (singlePage) {
NSLog(@"Single-D");
CGRect tvf = appDelegate.storyPageControl.traverseView.frame;
if (bottomPosition > 0) {
appDelegate.storyPageControl.traverseView.frame = CGRectMake(tvf.origin.x,
self.webView.scrollView.frame.size.height - tvf.size.height,
tvf.size.width, tvf.size.height);
} else {
appDelegate.storyPageControl.traverseView.frame = CGRectMake(tvf.origin.x,
(self.webView.scrollView.contentSize.height - self.webView.scrollView.contentOffset.y) - tvf.size.height,
tvf.size.width, tvf.size.height);
}
} else if (!singlePage && (atTop && !atBottom)) {
NSLog(@"B");
// Stick to bottom
// Pin to bottom of viewport, regardless of scrollview
appDelegate.storyPageControl.traversePinned = YES;
appDelegate.storyPageControl.traverseFloating = NO;
CGRect tvf = appDelegate.storyPageControl.traverseView.frame;
@ -847,11 +860,9 @@
}];
} else if (appDelegate.storyPageControl.traverseView.alpha == 1 &&
appDelegate.storyPageControl.traversePinned &&
!atBottom) {
appDelegate.storyPageControl.traversePinned) {
NSLog(@"C");
// Scroll with bottom of scrollview, but smoothly
appDelegate.storyPageControl.traversePinned = NO;
appDelegate.storyPageControl.traverseFloating = YES;
CGRect tvf = appDelegate.storyPageControl.traverseView.frame;
[UIView animateWithDuration:.3 delay:0
@ -861,7 +872,7 @@
(self.webView.scrollView.contentSize.height - self.webView.scrollView.contentOffset.y) - tvf.size.height,
tvf.size.width, tvf.size.height);
} completion:^(BOOL finished) {
appDelegate.storyPageControl.traversePinned = NO;
}];
} else {
NSLog(@"D");
@ -1356,11 +1367,14 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
} else {
contentWidthClass = @"NB-iphone";
}
NSString *riverClass = (appDelegate.isRiverView || appDelegate.isSocialView) ?
@"NB-river" : @"NB-non-river";
NSString *jsString = [[NSString alloc] initWithFormat:
@"$('body').attr('class', '%@');"
@"$('body').attr('class', '%@ %@');"
"document.getElementById(\"viewport\").setAttribute(\"content\", \"width=%i;initial-scale=1; maximum-scale=1.0; user-scalable=0;\");",
contentWidthClass,
riverClass,
contentWidth];
[self.webView stringByEvaluatingJavaScriptFromString:jsString];

3
media/ios/Classes/StoryPageControl.m
View file

@ -443,7 +443,8 @@
self.traverseView.frame = CGRectMake(tvf.origin.x,
self.scrollView.frame.size.height - tvf.size.height,
tvf.size.width, tvf.size.height);
appDelegate.storyPageControl.traverseView.alpha = 1;
self.traverseView.alpha = 1;
self.traversePinned = YES;
} completion:^(BOOL finished) {
}];

22
media/ios/Classes/StoryPageControl.xib
View file

@ -97,7 +97,7 @@
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace" id="893071758">
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
@ -131,14 +131,17 @@
<double key="IBUIContentEdgeInsets.left">0.0</double>
<double key="IBUIContentEdgeInsets.right">20</double>
<string key="IBUINormalTitle">NEXT</string>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<object class="NSColor" key="IBUIHighlightedTitleColor" id="254282267">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
<object class="NSColor" key="IBUISelectedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4xOTY5OTQ3NTM2AA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<reference key="NSCustomColorSpace" ref="893071758"/>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC41ODgyMzUzMTg3IDAuNTk2MDc4NDU1NCAwLjU3MjU0OTA0NTEAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
@ -175,10 +178,7 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIProgress">0.5</float>
<int key="IBUIProgressViewStyle">1</int>
<object class="NSColor" key="IBUIProgressTintColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
<reference key="IBUIProgressTintColor" ref="254282267"/>
<object class="NSColor" key="IBUITrackTintColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC45MDk4MDM5ODY1IDAuOTE3NjQ3MTIzMyAwLjg5NDExNzcxMwA</bytes>
@ -4789,7 +4789,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="5.IBUserGuides" ref="0"/>
<boolean value="NO" key="5.showNotes"/>
<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="62.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<real value="0.0" key="62.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="64.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="64.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

6
media/ios/NewsBlur.xcodeproj/project.pbxproj
View file

@ -1104,9 +1104,6 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
FFDCA0C216E80952000D8E0C /* AdSupport.framework */,
FFDCA0C016E8094F000D8E0C /* Accounts.framework */,
FFDCA0BE16E80944000D8E0C /* Social.framework */,
080E96DDFE201D6D7F000001 /* Classes */,
4307BE511565EDF8007A932A /* Resources */,
43D0451C1565BC090085F811 /* Resources-iPad */,
@ -1161,6 +1158,9 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
FFDCA0C216E80952000D8E0C /* AdSupport.framework */,
FFDCA0C016E8094F000D8E0C /* Accounts.framework */,
FFDCA0BE16E80944000D8E0C /* Social.framework */,
FFDCA0B516E80877000D8E0C /* cocoa-oauth */,
FFDCA0A316E80866000D8E0C /* REComposeViewController */,
FFDC9FBF16E8078E000D8E0C /* FacebookSDK */,

21
media/ios/Resources-iPad/Classes/StoryPageControl~ipad.xib
View file

@ -95,15 +95,16 @@
<double key="IBUIContentEdgeInsets.right">20</double>
<string key="IBUINormalTitle">NEXT</string>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNjQ3MDU4OTA0IDAuMzY4NjI3NDU4OCAwLjM1Mjk0MTE4NTIAA</bytes>
</object>
<object class="NSColor" key="IBUISelectedTitleColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNjQ3MDU4OTA0IDAuMzY4NjI3NDU4OCAwLjM1Mjk0MTE4NTIAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace" id="17514693">
<int key="NSID">2</int>
</object>
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC41ODgyMzUzMTg3IDAuNTk2MDc4NDU1NCAwLjU3MjU0OTA0NTEAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
@ -144,7 +145,9 @@
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<reference key="NSCustomColorSpace" ref="17514693"/>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
<object class="NSCustomResource" key="IBUINormalBackgroundImage">
<string key="NSClassName">NSImage</string>
@ -4787,7 +4790,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="145.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<real value="2" key="145.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="146.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="1" key="146.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="147.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

114
media/ios/Resources-iPhone/AddSiteViewController.xib
View file

@ -358,12 +358,7 @@
<double key="IBUIImageEdgeInsets.bottom">8</double>
<double key="IBUIImageEdgeInsets.left">8</double>
<double key="IBUIImageEdgeInsets.right">26</double>
<string key="IBUINormalTitle">Button</string>
<reference key="IBUIHighlightedTitleColor" ref="346851231"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
@ -1380,53 +1375,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>
@ -2342,7 +2290,6 @@
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
<string>findSitesViewController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
@ -2371,7 +2318,6 @@
<string>FeedDetailViewController</string>
<string>FeedsMenuViewController</string>
<string>NewsBlurViewController</string>
<string>FindSitesViewController</string>
<string>FirstTimeUserAddFriendsViewController</string>
<string>FirstTimeUserAddNewsBlurViewController</string>
<string>FirstTimeUserAddSitesViewController</string>
@ -2403,7 +2349,6 @@
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
<string>findSitesViewController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
@ -2453,10 +2398,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>
@ -2723,12 +2664,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">
@ -2738,6 +2685,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>
@ -2753,6 +2703,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">
@ -3097,13 +3059,13 @@
<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>fontSettingsButton</string>
<string>loadingIndicator</string>
<string>originalStoryButton</string>
<string>pageControl</string>
<string>progressView</string>
@ -3115,17 +3077,17 @@
<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>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIActivityIndicatorView</string>
<string>UIBarButtonItem</string>
<string>UIPageControl</string>
<string>UIProgressView</string>
@ -3137,20 +3099,20 @@
<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>fontSettingsButton</string>
<string>loadingIndicator</string>
<string>originalStoryButton</string>
<string>pageControl</string>
<string>progressView</string>
@ -3162,14 +3124,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>
@ -3184,16 +3142,20 @@
</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">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>
@ -3239,8 +3201,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>
@ -3354,7 +3316,7 @@
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">g_icn_folder_add.png</string>
<string key="NS.object.0">{32, 32}</string>
<string key="NS.object.0">{16, 16}</string>
</object>
<string key="IBCocoaTouchPluginVersion">2083</string>
</data>

74
media/ios/Resources-iPhone/MoveSiteViewController.xib
View file

@ -228,7 +228,6 @@
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="612255706"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:240</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<array key="IBUIItems">
@ -957,33 +956,6 @@
<string key="minorKey">./Classes/FeedsMenuViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FindSitesViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="sitesSearchBar">UISearchBar</string>
<string key="sitesTable">UITableView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="sitesSearchBar">
<string key="name">sitesSearchBar</string>
<string key="candidateClassName">UISearchBar</string>
</object>
<object class="IBToOneOutletInfo" key="sitesTable">
<string key="name">sitesTable</string>
<string key="candidateClassName">UITableView</string>
</object>
</dictionary>
<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>
@ -1558,7 +1530,6 @@
<string key="feedDetailViewController">FeedDetailViewController</string>
<string key="feedsMenuViewController">FeedsMenuViewController</string>
<string key="feedsViewController">NewsBlurViewController</string>
<string key="findSitesViewController">FindSitesViewController</string>
<string key="firstTimeUserAddFriendsViewController">FirstTimeUserAddFriendsViewController</string>
<string key="firstTimeUserAddNewsBlurViewController">FirstTimeUserAddNewsBlurViewController</string>
<string key="firstTimeUserAddSitesViewController">FirstTimeUserAddSitesViewController</string>
@ -1607,10 +1578,6 @@
<string key="name">feedsViewController</string>
<string key="candidateClassName">NewsBlurViewController</string>
</object>
<object class="IBToOneOutletInfo" key="findSitesViewController">
<string key="name">findSitesViewController</string>
<string key="candidateClassName">FindSitesViewController</string>
</object>
<object class="IBToOneOutletInfo" key="firstTimeUserAddFriendsViewController">
<string key="name">firstTimeUserAddFriendsViewController</string>
<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
@ -1807,6 +1774,9 @@
<string key="doCloseOriginalStoryViewController">id</string>
<string key="doOpenActionSheet">id</string>
<string key="loadAddress:">id</string>
<string key="webViewGoBack:">id</string>
<string key="webViewGoForward:">id</string>
<string key="webViewRefresh:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="doCloseOriginalStoryViewController">
@ -1821,6 +1791,18 @@
<string key="name">loadAddress:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="webViewGoBack:">
<string key="name">webViewGoBack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="webViewGoForward:">
<string key="name">webViewGoForward:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="webViewRefresh:">
<string key="name">webViewRefresh:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
@ -2027,13 +2009,13 @@
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="activity">UIBarButtonItem</string>
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="bottomPlaceholderToolbar">UIToolbar</string>
<string key="buttonAction">UIBarButtonItem</string>
<string key="buttonNext">UIBarButtonItem</string>
<string key="buttonPrevious">UIBarButtonItem</string>
<string key="buttonNext">UIButton</string>
<string key="buttonPrevious">UIButton</string>
<string key="fontSettingsButton">UIBarButtonItem</string>
<string key="loadingIndicator">UIActivityIndicatorView</string>
<string key="originalStoryButton">UIBarButtonItem</string>
<string key="pageControl">UIPageControl</string>
<string key="progressView">UIProgressView</string>
@ -2045,13 +2027,9 @@
<string key="spacer3BarButton">UIBarButtonItem</string>
<string key="spacerBarButton">UIBarButtonItem</string>
<string key="subscribeButton">UIBarButtonItem</string>
<string key="toolbar">UIToolbar</string>
<string key="traverseView">UIView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="activity">
<string key="name">activity</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
@ -2066,16 +2044,20 @@
</object>
<object class="IBToOneOutletInfo" key="buttonNext">
<string key="name">buttonNext</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="buttonPrevious">
<string key="name">buttonPrevious</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="fontSettingsButton">
<string key="name">fontSettingsButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="loadingIndicator">
<string key="name">loadingIndicator</string>
<string key="candidateClassName">UIActivityIndicatorView</string>
</object>
<object class="IBToOneOutletInfo" key="originalStoryButton">
<string key="name">originalStoryButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -2120,9 +2102,9 @@
<string key="name">subscribeButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
<object class="IBToOneOutletInfo" key="traverseView">
<string key="name">traverseView</string>
<string key="candidateClassName">UIView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">

BIN
media/ios/Resources/traverse_done.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 955 B

After

Width:  |  Height:  |  Size: 926 B

BIN
media/ios/Resources/traverse_done@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
media/ios/Resources/traverse_next.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 674 B

After

Width:  |  Height:  |  Size: 658 B

BIN
media/ios/Resources/traverse_next@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

BIN
media/ios/Resources/traverse_previous.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 718 B

After

Width:  |  Height:  |  Size: 672 B

BIN
media/ios/Resources/traverse_previous@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

53
media/ios/static/storyDetailView.css
View file

@ -407,7 +407,7 @@ del {
/* Comments */
#NB-comments-wrapper {
margin-bottom: 52px;
margin-bottom: 64px;
}
.NB-feed-story-comments {
margin: 0 !important;
@ -466,6 +466,7 @@ del {
.NB-share-wrapper {
margin-top: 36px;
overflow: hidden;
}
a.NB-show-profile {
@ -488,12 +489,6 @@ a.NB-show-profile {
font-size: 11px;
}
.NB-share-button.active,
.NB-save-button.active {
background: #217412;
box-shadow: none;
}
/* Edit, Like, and Reply buttons */
.NB-button {
@ -532,7 +527,7 @@ a.NB-show-profile {
text-transform: uppercase;
}
.NB-button.selected a {
.NB-button.active a {
text-shadow: none;
}
@ -550,15 +545,35 @@ a.NB-show-profile {
border-color: rgba(255, 255, 255, .3) rgba(0, 0, 0, .2) rgba(0, 0, 0, .3) rgba(255, 255, 255, .2);
border-radius: 2px;
}
.NB-button.NB-share-button div {
height: auto;
background: -webkit-gradient(
linear, left top, left bottom,
from(#DCDCDC),
color-stop(0.50, #DCDCDC),
color-stop(0.50, #D8D8D8),
to(#D8D8D8));
from(#DCDDD9),
color-stop(0.50, #DCDDD9),
color-stop(0.50, #D5D6D2),
to(#D5D6D2));
color: #90928B;
text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
line-height: 1.5em;
}
.NB-button:active div {
background: -webkit-gradient(
linear, left top, left bottom,
from(#6C6D69),
color-stop(0.50, #6C6D69),
color-stop(0.50, #656662),
to(#656662));
}
.NB-button.selected div {
background: #2379bf;
box-shadow: none;
}
.NB-button.NB-share-button:active div {
color: white;
text-shadow: 0 1px 0 rgba(0, 0, 0, .2);
}
.NB-iphone .NB-button div {
padding: 0px 5px 0px;
@ -596,7 +611,8 @@ a.NB-show-profile {
}
.NB-button .NB-story-comment-like-button-wrapper span {
background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGmSURBVCiRbZG/axRBHMXfzO7tbvYua+IFJQa0sRBs1IiQFIEIgvgDEUSs7CSFCJLaA1MJYjrFI5VgmkBiCDYWNgZJlaB/wgknxOT0Lnt7s7Mz852xOgzxXvne98OXxwMG6PXm3PSbzblbgzJ21Kit3mcT4ye34NyI0AeT87PvxeGcHwVGj0d34lJyJQ6Gz1myDwZ+eLpxOapGp8Y95lVPVM4sDUdjF8kSOmK3sZ81HhpGP4XMfi3e3eqx+tcnzyM/ngVjlzjjlcgvIy1aUEaiHIwg110oynNjzXep0h1OVjeMVTNJWK34Xoh2vous6ECoA7R6TRhSiEvJEFk1Rc40+OOZ+rtU7l9r9ZopA1BoAecsHIBcZ/B4CZ18L8uK9r3a9Y+LHADmry5/TmXrmabCDQUJFEkYKhD6EcgZ9FT77cKNT2sA4PfbO7jMWA3OfBwLxwDmILUAOQ1jSPbv/gHOnvdZiWlXQFulyGrle0GFgUFJOj0ImPgtmhCq+6or/6wbp1TIyzc9imq6oNH/AHJmZS/78fLF7S/fDu20/ah+4UMcJGf7xl8kb9PTscP82wAAAABJRU5ErkJggg==") no-repeat center center;
background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAuIwAALiMBeKU/dgAAABV0RVh0Q3JlYXRpb24gVGltZQAzLzEzLzEzh0DecgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGLSURBVFiFxZjReYJAEIQXv7zHDkIHMR1QgiVQgh1YAiWYDrSDpAPsIHagHfx54EwQ7rhjF2Re+D7cG4YZuF0UmQjABlhPxWcCkNNgZ+VaTSFIRIrOcVkAJ/6xfGw8YmvhMkfmEbCsIOk/NyZBZgAX+tho+UwOuQu/eX5Su2SNrAicXyY24OyJ645cw6l2yO037wMlhYbXElkslufG1tmdvdDwvjjrNU2xiBUAnyJyGUOauVe3VgiaBassy84i8iEi54W13KSdFLAGqthzMRNqQtsEUADXJ4rZR72jces4s5AfxvY8oGQetyq0gxzNvPw1kZArxgGuLWxvFHNk6vEWuBkEJTmT3Msc4av6bhKb7ZjmmkQ4gGmbLf5RdSyir3mSQ4RH1bEoYwWpkUWJJK2rF4nXGwbDoypA5eq2xDfS3ComHyDvbXSuvh5YY/tDAtgFiMMdulkXmhxsYw7w7SGtEteGIlT3sXUsogQOX4SlVlDZiUj1iexu7NDiOmkF3b8sDmqbH/n+xplQzS92BumDvmMUPAAAAABJRU5ErkJggg==") no-repeat center 2px;
background-size: 11px;
width: 16px;
height: 16px;
display: block;
@ -604,12 +620,6 @@ a.NB-show-profile {
margin: 0 6px;
}
.NB-button.selected div {
background: #2379bf;
box-shadow: none;
}
/* Story Comments */
.NB-right {
@ -703,7 +713,8 @@ a.NB-show-profile {
}
#story_pane .NB-story-comment .NB-story-comment-likes-icon {
float: right;
background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGmSURBVCiRbZG/axRBHMXfzO7tbvYua+IFJQa0sRBs1IiQFIEIgvgDEUSs7CSFCJLaA1MJYjrFI5VgmkBiCDYWNgZJlaB/wgknxOT0Lnt7s7Mz852xOgzxXvne98OXxwMG6PXm3PSbzblbgzJ21Kit3mcT4ye34NyI0AeT87PvxeGcHwVGj0d34lJyJQ6Gz1myDwZ+eLpxOapGp8Y95lVPVM4sDUdjF8kSOmK3sZ81HhpGP4XMfi3e3eqx+tcnzyM/ngVjlzjjlcgvIy1aUEaiHIwg110oynNjzXep0h1OVjeMVTNJWK34Xoh2vous6ECoA7R6TRhSiEvJEFk1Rc40+OOZ+rtU7l9r9ZopA1BoAecsHIBcZ/B4CZ18L8uK9r3a9Y+LHADmry5/TmXrmabCDQUJFEkYKhD6EcgZ9FT77cKNT2sA4PfbO7jMWA3OfBwLxwDmILUAOQ1jSPbv/gHOnvdZiWlXQFulyGrle0GFgUFJOj0ImPgtmhCq+6or/6wbp1TIyzc9imq6oNH/AHJmZS/78fLF7S/fDu20/ah+4UMcJGf7xl8kb9PTscP82wAAAABJRU5ErkJggg==") no-repeat center center;
background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAACe0lEQVRYCe1Wv2sUQRT+3t0RDBFsDguNaJHGQoWYnIiNogj+thCsBEvFxk7/ChEsFG2EENE/QlsR3YAEtbCLBhU0jQQlcDd+bzeRkd2debu3xSFZmLt333vzvu/em5kdcc5hlJ7WKIlRLZuCYh35DyuUyC0kcjv2z63+Jip0mWSXrISxOBlq27+SSXSwlJJ0sAsH3HKMMOYfrkIdnCWBpGMNp2NkFv9wgpAKynhaOGMhjMXUb9lLGccYfpBgfJ1kFT/RxVH3O0Ya8tevUAcnPDHKMYGtOBYis/jqC2p77dpgaqBtNQWJwBWsmSJsQ6zxu56gBUwz/84Cjj08JPcV4GYov6gT+cbZ280Z6gV+wUG3o2hqvkJ9nGTgYlFwQ9gi+jhVlisvqOfecvv2OOEOR5O3t0GaU3MrR8mTb5kf+FqO88b0mNCkD9ewP/E8v4pp9yI2N18hf8ase87Dbz+TPfPhivY82sxhEKN5wxXymd/IFQq7R2ibDwfsFTb8Bmbc00BMzhWukB8+4+b484EPBW0VX1GM5rMLytjtL1CHc0HBJU57yxZkii34WJKnDN7N82apzFmE2yvkcKEoQQS7GPHn3HZBgvO52QoIHnE8LPQBlQXZWpZIl4RfOdoe8SpbeJ0LVxc7kO3C+7Qm0t/ZRx9rfA0ddiseFjRtFRqkC9QX8wEDHPorRilUmGKC9x5jm+dYpcVtE9T6p11PeEfsYda984gzU7EtFAXMe75Kay/esuyq+p0EWqGb3DW2syiRa4y/y6Ft67Jtv2hHn3iFxrCXWT6zFUfMYpRWhescwTLbNhVVsh4Qr5A1U0Nx8Qo1RGRNsykoVqmRq9Af7+GQyu+uxIIAAAAASUVORK5CYII=") no-repeat center center;
background-size: 16px;
width: 16px;
height: 16px;
display: block;

4
media/ios/static/storyDetailView.js
View file

@ -23,11 +23,11 @@ $('.NB-train-button a').live('click', function () {
});
$('.NB-button').live('touchstart', function () {
$(this).addClass('selected');
$(this).addClass('active');
});
$('.NB-button').live('touchend', function (e) {
$(this).removeClass('selected');
$(this).removeClass('active');
});
function setImage(img) {