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

cleaning up previous commits' formatting

Browse source
This commit is contained in:
Roy Yang 2012-06-18 17:20:34 -07:00
parent c609793c9b
commit 6b96b094b8
13 changed files with 161 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
media/iphone/Classes/FeedDetailViewController.m
View file

@ -90,9 +90,9 @@
[self.storyTitlesTable endUpdates];
}
[appDelegate setRecentlyReadStories:[NSMutableArray array]];
[self.intelligenceControl setImage:[UIImage imageNamed:@"dislike.png"] forSegmentAtIndex:0];
[self.intelligenceControl setImage:[UIImage imageNamed:@"thumbs_down.png"] forSegmentAtIndex:0];
[self.intelligenceControl setImage:[UIImage imageNamed:@"bullet_yellow.png"] forSegmentAtIndex:1];
[self.intelligenceControl setImage:[UIImage imageNamed:@"like.png"] forSegmentAtIndex:2];
[self.intelligenceControl setImage:[UIImage imageNamed:@"thumbs_up.png"] forSegmentAtIndex:2];
[self.intelligenceControl addTarget:self
action:@selector(selectIntelligence)
forControlEvents:UIControlEventValueChanged];
@ -108,9 +108,7 @@
}
- (void)viewDidAppear:(BOOL)animated {
// [[storyTitlesTable cellForRowAtIndexPath:[storyTitlesTable indexPathForSelectedRow]] setSelected:NO]; // TODO: DESELECT CELL --- done, see line below:
[self.storyTitlesTable deselectRowAtIndexPath:[storyTitlesTable indexPathForSelectedRow] animated:YES];
[super viewDidAppear:animated];
}
@ -421,11 +419,11 @@
cell.storyDate.text = [story objectForKey:@"short_parsed_date"];
int score = [NewsBlurAppDelegate computeStoryScore:[story objectForKey:@"intelligence"]];
if (score > 0) {
cell.storyUnreadIndicator.image = [UIImage imageNamed:@"like.png"];
cell.storyUnreadIndicator.image = [UIImage imageNamed:@"thumbs_up.png"];
} else if (score == 0) {
cell.storyUnreadIndicator.image = [UIImage imageNamed:@"bullet_yellow.png"];
} else if (score < 0) {
cell.storyUnreadIndicator.image = [UIImage imageNamed:@"dislike.png"];
cell.storyUnreadIndicator.image = [UIImage imageNamed:@"thumbs_down.png"];
}
// River view
@ -838,7 +836,9 @@
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:rowIndex inSection:0];
NSIndexPath *offsetIndexPath = [NSIndexPath indexPathForRow:rowIndex - 1 inSection:0];
[storyTitlesTable selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
[storyTitlesTable selectRowAtIndexPath:indexPath
animated:YES
scrollPosition:UITableViewScrollPositionNone];
FeedDetailTableCell *cell = (FeedDetailTableCell *) [storyTitlesTable cellForRowAtIndexPath:indexPath];
// check to see if the cell is completely visible
@ -850,7 +850,9 @@
[self changeRowStyleToRead:cell];
if (!completelyVisible) {
[storyTitlesTable scrollToRowAtIndexPath:offsetIndexPath atScrollPosition:UITableViewScrollPositionTop animated:YES];
[storyTitlesTable scrollToRowAtIndexPath:offsetIndexPath
atScrollPosition:UITableViewScrollPositionTop
animated:YES];
}
}

4
media/iphone/Classes/FeedsViewController.m
View file

@ -91,11 +91,11 @@
}
}
[self.intelligenceControl setImage:[UIImage imageNamed:@"dislike.png"]
[self.intelligenceControl setImage:[UIImage imageNamed:@"thumbs_down.png"]
forSegmentAtIndex:0];
[self.intelligenceControl setImage:[UIImage imageNamed:@"bullet_yellow.png"]
forSegmentAtIndex:1];
[self.intelligenceControl setImage:[UIImage imageNamed:@"like.png"]
[self.intelligenceControl setImage:[UIImage imageNamed:@"thumbs_up.png"]
forSegmentAtIndex:2];
[self.intelligenceControl addTarget:self
action:@selector(selectIntelligence)

5
media/iphone/Classes/OriginalStoryViewController.m
View file

@ -182,6 +182,7 @@
[UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
[self updateButtons];
}
- (void)webViewDidFinishLoad:(UIWebView *)aWebView
{
[MBProgressHUD hideHUDForView:self.view animated:YES];
@ -189,6 +190,7 @@
[self updateButtons];
[self updateTitle:aWebView];
}
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
{
[UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
@ -199,17 +201,20 @@
[self informError:error];
}
}
- (void)updateTitle:(UIWebView*)aWebView
{
NSString *pageTitleValue = [aWebView stringByEvaluatingJavaScriptFromString:@"document.title"];
self.pageTitle.text = [pageTitleValue stringByDecodingHTMLEntities];
}
- (void)updateAddress:(NSURLRequest*)request
{
NSURL *url = [request URL];
self.pageUrl.text = [url absoluteString];
[self loadAddress:nil];
}
- (void)updateButtons
{
self.forward.enabled = self.webView.canGoForward;

4
media/iphone/Classes/StoryDetailViewController.m
View file

@ -159,10 +159,6 @@
"h1, h2, h3, h4, h5, h6, div, table, span, pre, code, img {"
" max-width: 588px;"
"}"
"h1, h2, h3, h4, h5, h6, div, table, span, pre, code {"
" overflow: auto;"
"}"
"</style>"];
} else {

38
media/iphone/NewsBlur.xcodeproj/project.pbxproj
View file

@ -59,7 +59,6 @@
4307BEE41565EDF8007A932A /* warning.png in Resources */ = {isa = PBXBuildFile; fileRef = 4307BE7F1565EDF8007A932A /* warning.png */; };
4307BEE61565EDF8007A932A /* world.png in Resources */ = {isa = PBXBuildFile; fileRef = 4307BE801565EDF8007A932A /* world.png */; };
4307BEFE1565EEBC007A932A /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4307BEFD1565EEBC007A932A /* Base64.m */; };
430AD52D158D62A40092E1CF /* storyDetailView.js in Sources */ = {isa = PBXBuildFile; fileRef = 430AD52C158D62A40092E1CF /* storyDetailView.js */; };
433323B015886FA80025064D /* logo_newsblur.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323AF15886FA80025064D /* logo_newsblur.png */; };
433323B8158901A40025064D /* fountain_pen.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323B6158901A40025064D /* fountain_pen.png */; };
433323B9158901A40025064D /* fountain_pen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 433323B7158901A40025064D /* fountain_pen@2x.png */; };
@ -80,10 +79,10 @@
433D24851582EEC800AE9E72 /* FeedsViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43D045201565BC150085F811 /* FeedsViewController~ipad.xib */; };
433D24861582EECA00AE9E72 /* OriginalStoryViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43D045251565BC150085F811 /* OriginalStoryViewController~ipad.xib */; };
433D24871582EECD00AE9E72 /* StoryDetailViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43D045221565BC150085F811 /* StoryDetailViewController~ipad.xib */; };
435826C2158C0CFD00CC9797 /* dislike.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826BE158C0CFD00CC9797 /* dislike.png */; };
435826C3158C0CFD00CC9797 /* dislike@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826BF158C0CFD00CC9797 /* dislike@2x.png */; };
435826C4158C0CFD00CC9797 /* like.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826C0158C0CFD00CC9797 /* like.png */; };
435826C5158C0CFD00CC9797 /* like@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826C1158C0CFD00CC9797 /* like@2x.png */; };
435826C2158C0CFD00CC9797 /* thumbs_down.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826BE158C0CFD00CC9797 /* thumbs_down.png */; };
435826C3158C0CFD00CC9797 /* thumbs_down@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826BF158C0CFD00CC9797 /* thumbs_down@2x.png */; };
435826C4158C0CFD00CC9797 /* thumbs_up.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826C0158C0CFD00CC9797 /* thumbs_up.png */; };
435826C5158C0CFD00CC9797 /* thumbs_up@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 435826C1158C0CFD00CC9797 /* thumbs_up@2x.png */; };
4362C9F5158BA0A600A044B0 /* logo_512.png in Resources */ = {isa = PBXBuildFile; fileRef = 4362C9F4158BA0A600A044B0 /* logo_512.png */; };
43763AD1158F90B100B3DBE2 /* FontSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 43763ACF158F90B100B3DBE2 /* FontSettingsViewController.m */; };
43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43763AD0158F90B100B3DBE2 /* FontSettingsViewController.xib */; };
@ -271,7 +270,6 @@
4307BE801565EDF8007A932A /* world.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = world.png; sourceTree = "<group>"; };
4307BEFC1565EEBC007A932A /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
4307BEFD1565EEBC007A932A /* Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Base64.m; sourceTree = "<group>"; };
430AD52C158D62A40092E1CF /* storyDetailView.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = storyDetailView.js; sourceTree = "<group>"; };
433323AF15886FA80025064D /* logo_newsblur.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_newsblur.png; sourceTree = "<group>"; };
433323B6158901A40025064D /* fountain_pen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fountain_pen.png; sourceTree = "<group>"; };
433323B7158901A40025064D /* fountain_pen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fountain_pen@2x.png"; sourceTree = "<group>"; };
@ -283,12 +281,12 @@
433323CA158968ED0025064D /* FirstTimeUserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FirstTimeUserViewController.h; sourceTree = "<group>"; };
433323CB158968ED0025064D /* FirstTimeUserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FirstTimeUserViewController.m; sourceTree = "<group>"; };
433323CC158968ED0025064D /* FirstTimeUserViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = FirstTimeUserViewController.xib; path = Classes/FirstTimeUserViewController.xib; sourceTree = "<group>"; };
435826BE158C0CFD00CC9797 /* dislike.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dislike.png; sourceTree = "<group>"; };
435826BF158C0CFD00CC9797 /* dislike@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dislike@2x.png"; sourceTree = "<group>"; };
435826C0158C0CFD00CC9797 /* like.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = like.png; sourceTree = "<group>"; };
435826C1158C0CFD00CC9797 /* like@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "like@2x.png"; sourceTree = "<group>"; };
435826BE158C0CFD00CC9797 /* thumbs_down.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumbs_down.png; sourceTree = "<group>"; };
435826BF158C0CFD00CC9797 /* thumbs_down@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumbs_down@2x.png"; sourceTree = "<group>"; };
435826C0158C0CFD00CC9797 /* thumbs_up.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumbs_up.png; sourceTree = "<group>"; };
435826C1158C0CFD00CC9797 /* thumbs_up@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumbs_up@2x.png"; sourceTree = "<group>"; };
4362C9F4158BA0A600A044B0 /* logo_512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_512.png; sourceTree = "<group>"; };
43763ACE158F90B100B3DBE2 /* FontSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; path = FontSettingsViewController.h; sourceTree = "<group>"; };
43763ACE158F90B100B3DBE2 /* FontSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSettingsViewController.h; sourceTree = "<group>"; };
43763ACF158F90B100B3DBE2 /* FontSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontSettingsViewController.m; sourceTree = "<group>"; };
43763AD0158F90B100B3DBE2 /* FontSettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = FontSettingsViewController.xib; path = Classes/FontSettingsViewController.xib; sourceTree = "<group>"; };
43801386158A4E21006C7E37 /* style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = style.css; sourceTree = "<group>"; };
@ -608,7 +606,6 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
430AD52C158D62A40092E1CF /* storyDetailView.js */,
43801386158A4E21006C7E37 /* style.css */,
1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */,
1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */,
@ -681,10 +678,10 @@
4307BE511565EDF8007A932A /* Resources */ = {
isa = PBXGroup;
children = (
435826BE158C0CFD00CC9797 /* dislike.png */,
435826BF158C0CFD00CC9797 /* dislike@2x.png */,
435826C0158C0CFD00CC9797 /* like.png */,
435826C1158C0CFD00CC9797 /* like@2x.png */,
435826BE158C0CFD00CC9797 /* thumbs_down.png */,
435826BF158C0CFD00CC9797 /* thumbs_down@2x.png */,
435826C0158C0CFD00CC9797 /* thumbs_up.png */,
435826C1158C0CFD00CC9797 /* thumbs_up@2x.png */,
4307BE521565EDF8007A932A /* add_button.png */,
4307BE531565EDF8007A932A /* add_button@2x.png */,
4307BE541565EDF8007A932A /* arrow.png */,
@ -1331,10 +1328,10 @@
43C95C42158BD13D0086C69B /* category_selected_background.png in Resources */,
43C95C49158BEC450086C69B /* GoogleReaderViewController.xib in Resources */,
43C95C4B158BF8810086C69B /* google_reader_selected_background.png in Resources */,
435826C2158C0CFD00CC9797 /* dislike.png in Resources */,
435826C3158C0CFD00CC9797 /* dislike@2x.png in Resources */,
435826C4158C0CFD00CC9797 /* like.png in Resources */,
435826C5158C0CFD00CC9797 /* like@2x.png in Resources */,
435826C2158C0CFD00CC9797 /* thumbs_down.png in Resources */,
435826C3158C0CFD00CC9797 /* thumbs_down@2x.png in Resources */,
435826C4158C0CFD00CC9797 /* thumbs_up.png in Resources */,
435826C5158C0CFD00CC9797 /* thumbs_up@2x.png in Resources */,
43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -1445,7 +1442,6 @@
43C1E6401583DA3F006874F1 /* SplitStoryDetailViewController.m in Sources */,
433323CD158968ED0025064D /* FirstTimeUserViewController.m in Sources */,
43C95C48158BEC450086C69B /* GoogleReaderViewController.m in Sources */,
430AD52D158D62A40092E1CF /* storyDetailView.js in Sources */,
43763AD1158F90B100B3DBE2 /* FontSettingsViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;

102
media/iphone/Resources-iPad/Classes/LoginViewController~ipad.xib
View file

@ -681,7 +681,7 @@
<reference key="NSCustomColorSpace" ref="892872088"/>
</object>
<int key="IBUIBaselineAdjustment">1</int>
<float key="IBUIMinimumFontSize">17</float>
<float key="IBUIMinimumFontSize">16</float>
<int key="IBUINumberOfLines">2</int>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="491882177"/>
@ -1856,6 +1856,85 @@
<string key="minorKey">./Classes/FirstTimeUserViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FontSettingsViewController</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>changeFontSize:</string>
<string>changeFontStyle:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<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>changeFontSize:</string>
<string>changeFontStyle:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">changeFontSize:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">changeFontStyle:</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>largeFontSizeLabel</string>
<string>smallFontSizeLabel</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UILabel</string>
<string>UILabel</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>largeFontSizeLabel</string>
<string>smallFontSizeLabel</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">largeFontSizeLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">smallFontSizeLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FontSettingsViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">GoogleReaderViewController</string>
<string key="superclassName">UIViewController</string>
@ -2265,6 +2344,7 @@
<string>feedDetailViewController</string>
<string>feedsViewController</string>
<string>firstTimeUserViewController</string>
<string>fontSettingsViewController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string>
<string>moveSiteViewController</string>
@ -2282,6 +2362,7 @@
<string>FeedDetailViewController</string>
<string>FeedsViewController</string>
<string>FirstTimeUserViewController</string>
<string>FontSettingsViewController</string>
<string>GoogleReaderViewController</string>
<string>LoginViewController</string>
<string>MoveSiteViewController</string>
@ -2302,6 +2383,7 @@
<string>feedDetailViewController</string>
<string>feedsViewController</string>
<string>firstTimeUserViewController</string>
<string>fontSettingsViewController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string>
<string>moveSiteViewController</string>
@ -2331,6 +2413,10 @@
<string key="name">firstTimeUserViewController</string>
<string key="candidateClassName">FirstTimeUserViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fontSettingsViewController</string>
<string key="candidateClassName">FontSettingsViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">googleReaderViewController</string>
<string key="candidateClassName">GoogleReaderViewController</string>
@ -2541,11 +2627,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doNextUnreadStory</string>
<string>doPreviousStory</string>
<string>toggleFontSize:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@ -2554,6 +2642,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doNextUnreadStory</string>
<string>doPreviousStory</string>
<string>toggleFontSize:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2565,6 +2654,10 @@
<string key="name">doPreviousStory</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">toggleFontSize:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@ -2577,6 +2670,7 @@
<string>buttonNext</string>
<string>buttonPrevious</string>
<string>feedTitleGradient</string>
<string>popoverController</string>
<string>progressView</string>
<string>toolbar</string>
<string>webView</string>
@ -2589,6 +2683,7 @@
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIView</string>
<string>UIPopoverController</string>
<string>UIProgressView</string>
<string>UIToolbar</string>
<string>UIWebView</string>
@ -2604,6 +2699,7 @@
<string>buttonNext</string>
<string>buttonPrevious</string>
<string>feedTitleGradient</string>
<string>popoverController</string>
<string>progressView</string>
<string>toolbar</string>
<string>webView</string>
@ -2634,6 +2730,10 @@
<string key="name">feedTitleGradient</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">popoverController</string>
<string key="candidateClassName">UIPopoverController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">progressView</string>
<string key="candidateClassName">UIProgressView</string>

0
media/iphone/Resources/dislike.png → media/iphone/Resources/thumbs_down.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
media/iphone/Resources/dislike@2x.png → media/iphone/Resources/thumbs_down@2x.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 831 B

After

Width:  |  Height:  |  Size: 831 B

0
media/iphone/Resources/like.png → media/iphone/Resources/thumbs_up.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
media/iphone/Resources/like@2x.png → media/iphone/Resources/thumbs_up@2x.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

31
media/iphone/SplitStoryDetailViewController.m
View file

@ -36,14 +36,17 @@
// Do any additional setup after loading the view, typically from a nib.
}
- (void)viewDidAppear:(BOOL)animated {
- (void)viewDidAppear:(BOOL)animated
{
// messes up on FTUX, must put in a state test
// if (self.masterPopoverController) {
// [self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
// }
// if (self.masterPopoverController) {
// [self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1)
// inView:self.view
// permittedArrowDirections:UIPopoverArrowDirectionAny
// animated:YES];
// }
}
- (void)viewDidUnload
{
[super viewDidUnload];
@ -55,11 +58,14 @@
return YES;
}
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
duration:(NSTimeInterval)duration
{
[appDelegate adjustStoryDetailWebView];
}
- (void)showPopover {
- (void)showPopover
{
if (self.masterPopoverController) {
[self.masterPopoverController presentPopoverFromRect:CGRectMake(0, 0, 1, 1) inView:self.view
permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
@ -68,14 +74,19 @@
#pragma mark - Split view
- (void)splitViewController:(UISplitViewController *)splitController willHideViewController:(UIViewController *)viewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)popoverController
- (void)splitViewController:(UISplitViewController *)splitController
willHideViewController:(UIViewController *)viewController
withBarButtonItem:(UIBarButtonItem *)barButtonItem
forPopoverController:(UIPopoverController *)popoverController
{
barButtonItem.title = NSLocalizedString(@"NewsBlur", @"NewsBlur");
barButtonItem.title = NSLocalizedString(@"All Sites", @"All Sites");
[self.navigationItem setLeftBarButtonItem:barButtonItem animated:YES];
self.masterPopoverController = popoverController;
}
- (void)splitViewController:(UISplitViewController *)splitController willShowViewController:(UIViewController *)viewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem
- (void)splitViewController:(UISplitViewController *)splitController
willShowViewController:(UIViewController *)viewController
invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem
{
// Called when the view is shown again in the split view, invalidating the button and popover controller.
[self.navigationItem setLeftBarButtonItem:nil animated:YES];

0
media/iphone/storyDetailView.js
View file

7
media/iphone/style.css
View file

@ -7,6 +7,10 @@ body {
background: #f6f6f6;
}
h1, h2, h3, h4, h5, h6, div, table, span, pre, code {
overflow: auto;
}
a {
text-decoration: none;
color: #308ab8;
@ -150,8 +154,7 @@ del {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowNjExRUIzOTA4MjA2ODExOTM3NUNBMjMzRTI3QkY3MSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5MTRDQ0QwNzJFRTgxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5MTRDQ0QwNjJFRTgxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjBGMTFFQjM5MDgyMDY4MTE5Mzc1Q0EyMzNFMjdCRjcxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjA2MTFFQjM5MDgyMDY4MTE5Mzc1Q0EyMzNFMjdCRjcxIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+T58Z9QAABXNJREFUeNrEV01oHVUUvjNz5/fNy3s+CAQKRSHSVVxJJCWiKEKLolSEFLfuioIoSMCFm4orxZ0rQQSlQrC0KBQXpYGiq64KhUIhkFUgEIh5P/N3Z/y+OzPJe+X1pRmDTri8N3lnzjn3O9/5zh1j9fV3xP95ySYPGYYhTNPUn7yKohB5nuvP/yQBBrdtm+tX3Pppml7EEkqp00+g3KQhLMvUgU3TQmBHeL4vfN9/jb+OhkMxGg1FkiQVErn+LNE5JgEaPyE0gjGwJaTEbh3nPcd23sb3Fcd1F4OgxQS05dAbFO7QexRF0SOVZXeBxu00Tf4iIlyM8aTySFFM3zYDI6jjud77fhCs+35wjrt2HBfLEUhCICFtHrRCEUWjxTiOF9MkvhDHEe6jh3EU/YDv3yGh/SzLdCKPxzNWXn1rAm4Df9KWwnX9hVYY3gjbc8shAvjYMYNKKfWyUAqWhJfKlcjSTGQKK0tFilIgITEcDMRgMNgZDvsfR6PRL0AFiEyiIcHfcdCFheBeECzNtTu/dbrds0hABH6gd24hcM3+ugP0c1WpnMJB7UvYgZrQZQr6CwcH7rWDv/fXBoP+ZaCSqLGOkXV8OrSkJXzPP9tpd+90n+n15jpd1DnQjD9su6Jsu2JK7YieZSJJA7yxpLDJHZTJsV1+v4T/XxOFcRnoJEyUfmSOutR9jV1arbD901y322t3Osje1zuDX5FPqd+x7YpnXc/TCHEh6Uvw8yNKRiQ0JySzYAJkOsnWbs+ttlBzF/U2DFNn2aS/J5hO30CSfsCVNXBhI0vTDd5LNqqF3SNgrxWE661WSwcH4KJgrU5JcomkBzTCMBRxNLqaRBGTQAK69iCe568DgdAG2UzsPCdJ/uXOpyXhuB5ELDhnu/1VMxrdlRX8Pnr+AxoQllE02sX/52tuUP0mdB82+Zi4lHbWlPmgJmYEf9PE0+S0LyBemQDI8iZ+d6I4/hSC8TNsdkg89PqStO1lCM9XliXn6QR9vgVh+QLOb8HZLpkPz2ekZa3B9nNoRI91g912kiZfwvY6ktB2CPgc4n2iVPYhUF4xkLBkvtjRMoTiBQjIVimfmW4qOLvvut59EOgmROgOWLwH9l5MkrjPncEJGCz2i7zowvk3sNmA/Z+w24fdy5gPtNeoEhjsfAud9hGe2cBGvwaMQvLHJI6/x+cWnSoomaoGCdWO6gd+7IKYV7AxOuwzQSCiSUVwGYRwI8A22u4KcN6GFO+VAyrWZTA0B6SWcXBuEwT/jBNUUjph8JABaVjWrajGriGo62At5NneZDTKKcvmUaAcW2sDg9BGt5xt36ztOB2Z7JE/E/6kJiN83GZsySEBupM2pcKN6TSByKHdtKl1nwlS3Vyv0DpRP8dgdEgyUiX5XK129VVUG6ylnInJ/JhWywulM1ET7ZSXzqpna8ccSIaRjZ0DJlVEC7gqRftQpPKnOkYVjyVVHjhqeS5Ll59ArounOZDMeLwKRpg13JUmNPEla4Kc5OIzumNyJY7Im4smvpohUJcgHytBUwREg6z1kOJS+eF92TINEJg174zqtHPEWuyS8Ou6V7XXpKzuRZP3glmwoc85GaFcN3C3ALV8SRWZ7rHypFuRj1zQHdCEhDOStnjWw+SCHL8B4fAxK3oIuFdhM0/S4b6vSalRaPCSU6vftFWCYFJe73GOY11FMvMY3Wcgp98yD3TCLTU2dk+6jGefX5pxgNAHFeG3wlcwxf4A2ZxMZdUxi2cZc5TE0YvDQf8BZ4aqfjsRArNluJwDeNnYhM6fByGuYw70sXaAze+YZucxiB7Qpn4VO9V3QzKeAyaOeaIV9xD4XaKiX0ZUpl9A8DakX0iavBnz+keAAQD5JMFqtjq6lgAAAABJRU5ErkJggg==');
}
.NB-share-icon {
.NB-share-icon {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0NDI5RjhBQTA3MjA2ODExOTM3NUNBMjMzRTI3QkY3MSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo2MjMwMjFGQzJFRTcxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo2MjMwMjFGQjJFRTcxMUUxOTlBREI5OEUzQTY5NjQ1OCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjA2ODAxMTc0MDcyMDY4MTE5MTA5QjRBMERBMDUwNjdFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjQ0MjlGOEFBMDcyMDY4MTE5Mzc1Q0EyMzNFMjdCRjcxIi8+IDwvcmRmOkRlc2NyaXB0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');
}
.NB-share-wrapper {