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

V5.0.2.

Browse source
This commit is contained in:
Samuel Clay 2015-12-01 16:51:18 -08:00
parent ef25dbbe57
commit d694993d8d
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clients/ios/Classes/StoryDetailViewController.m
View file

@ -282,7 +282,7 @@
[self changeWebViewWidth];
[self drawFeedGradient];
NSLog(@"viewWillLayoutSubviews: %.2f", self.webView.scrollView.bounds.size.width);
// NSLog(@"viewWillLayoutSubviews: %.2f", self.webView.scrollView.bounds.size.width);
}
- (void)layoutForInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
@ -317,7 +317,7 @@
- (void)drawStory:(BOOL)force withOrientation:(UIInterfaceOrientation)orientation {
if (!force && [self.activeStoryId isEqualToString:[self.activeStory objectForKey:@"story_hash"]]) {
NSLog(@"Already drawn story, drawing anyway: %@", [self.activeStory objectForKey:@"story_title"]);
// NSLog(@"Already drawn story, drawing anyway: %@", [self.activeStory objectForKey:@"story_title"]);
// return;
}
@ -359,7 +359,7 @@
int contentWidth = CGRectGetWidth(self.webView.scrollView.bounds);
NSString *contentWidthClass;
NSLog(@"Drawing story: %@ / %d", [self.activeStory objectForKey:@"story_title"], contentWidth);
// NSLog(@"Drawing story: %@ / %d", [self.activeStory objectForKey:@"story_title"], contentWidth);
if (UIInterfaceOrientationIsLandscape(orientation) && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
contentWidthClass = @"NB-ipad-wide";
@ -450,7 +450,7 @@
NSURL *baseURL = [NSURL fileURLWithPath:path];
dispatch_async(dispatch_get_main_queue(), ^{
NSLog(@"Drawing Story: %@", [self.activeStory objectForKey:@"story_title"]);
// NSLog(@"Drawing Story: %@", [self.activeStory objectForKey:@"story_title"]);
[self.webView setMediaPlaybackRequiresUserAction:NO];
[self.webView loadHTMLString:htmlString baseURL:baseURL];
[appDelegate.storyPageControl setTextButton:self];
@ -2048,7 +2048,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
// [webView setNeedsLayout];
// [webView layoutIfNeeded];
NSLog(@"changeWebViewWidth: %@ / %@ / %@", NSStringFromCGSize(self.view.bounds.size), NSStringFromCGSize(webView.scrollView.bounds.size), NSStringFromCGSize(webView.scrollView.contentSize));
// NSLog(@"changeWebViewWidth: %@ / %@ / %@", NSStringFromCGSize(self.view.bounds.size), NSStringFromCGSize(webView.scrollView.bounds.size), NSStringFromCGSize(webView.scrollView.contentSize));
NSInteger contentWidth = CGRectGetWidth(webView.scrollView.bounds);
UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
@ -2133,7 +2133,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
- (void)fetchTextView {
if (!self.activeStoryId || !self.activeStory) return;
self.inTextView = YES;
NSLog(@"Fetching Text: %@", [self.activeStory objectForKey:@"story_title"]);
// NSLog(@"Fetching Text: %@", [self.activeStory objectForKey:@"story_title"]);
if (self.activeStory == appDelegate.storyPageControl.currentPage.activeStory) {
dispatch_async(dispatch_get_main_queue(), ^{
[self.appDelegate.storyPageControl showFetchingTextNotifier];

20
clients/ios/Classes/StoryPageControl.m
View file

@ -85,8 +85,8 @@
nextPage.view.frame = self.scrollView.frame;
previousPage.view.frame = self.scrollView.frame;
NSLog(@"Scroll view content inset: %@", NSStringFromCGRect(self.scrollView.bounds));
NSLog(@"Scroll view frame pre: %@", NSStringFromCGRect(self.scrollView.frame));
// NSLog(@"Scroll view content inset: %@", NSStringFromCGRect(self.scrollView.bounds));
// NSLog(@"Scroll view frame pre: %@", NSStringFromCGRect(self.scrollView.frame));
[self.scrollView addSubview:currentPage.view];
[self.scrollView addSubview:nextPage.view];
[self.scrollView addSubview:previousPage.view];
@ -97,10 +97,10 @@
[self.scrollView setScrollEnabled:YES];
[self.scrollView setShowsHorizontalScrollIndicator:NO];
[self.scrollView setShowsVerticalScrollIndicator:NO];
NSLog(@"Scroll view frame post: %@", NSStringFromCGRect(self.scrollView.frame));
NSLog(@"Scroll view parent: %@", NSStringFromCGRect(currentPage.view.frame));
// NSLog(@"Scroll view frame post: %@", NSStringFromCGRect(self.scrollView.frame));
// NSLog(@"Scroll view parent: %@", NSStringFromCGRect(currentPage.view.frame));
[self.scrollView sizeToFit];
NSLog(@"Scroll view frame post 2: %@", NSStringFromCGRect(self.scrollView.frame));
// NSLog(@"Scroll view frame post 2: %@", NSStringFromCGRect(self.scrollView.frame));
popoverClass = [WYPopoverController class];
@ -325,14 +325,14 @@
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
[coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
NSLog(@"---> Story page control is re-orienting: %@ / %@", NSStringFromCGSize(self.view.bounds.size), NSStringFromCGSize(size));
// NSLog(@"---> Story page control is re-orienting: %@ / %@", NSStringFromCGSize(self.view.bounds.size), NSStringFromCGSize(size));
UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
_orientation = [UIApplication sharedApplication].statusBarOrientation;
[self layoutForInterfaceOrientation:orientation];
[self adjustDragBar:orientation];
[self reorientPages];
} completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
NSLog(@"---> Story page control did re-orient: %@ / %@", NSStringFromCGSize(self.view.bounds.size), NSStringFromCGSize(size));
// NSLog(@"---> Story page control did re-orient: %@ / %@", NSStringFromCGSize(self.view.bounds.size), NSStringFromCGSize(size));
}];
}
@ -407,7 +407,7 @@
CGRect frame = self.scrollView.frame;
self.scrollView.contentSize = frame.size;
NSLog(@"Pages are at: %f / %f / %f (%@)", previousPage.view.frame.origin.x, currentPage.view.frame.origin.x, nextPage.view.frame.origin.x, NSStringFromCGRect(frame));
// NSLog(@"Pages are at: %f / %f / %f (%@)", previousPage.view.frame.origin.x, currentPage.view.frame.origin.x, nextPage.view.frame.origin.x, NSStringFromCGRect(frame));
currentPage.view.frame = self.scrollView.frame;
nextPage.view.frame = self.scrollView.frame;
previousPage.view.frame = self.scrollView.frame;
@ -452,7 +452,7 @@
frame.origin.x = frame.size.width * currentIndex;
frame.origin.y = 0;
[self.scrollView scrollRectToVisible:frame animated:NO];
NSLog(@"---> Scrolling to story at: %@ %d-%d", NSStringFromCGRect(frame), currentPage.pageIndex, currentIndex);
// NSLog(@"---> Scrolling to story at: %@ %d-%d", NSStringFromCGRect(frame), currentPage.pageIndex, currentIndex);
[MBProgressHUD hideHUDForView:self.view animated:YES];
[self hideNotifier];
}
@ -546,7 +546,7 @@
pageController.view.hidden = YES;
pageController.view.frame = pageFrame;
}
NSLog(@"---> Story page control orient page: %@ (%d-%d)", NSStringFromCGRect(self.view.bounds), pageController.pageIndex, suppressRedraw);
// NSLog(@"---> Story page control orient page: %@ (%d-%d)", NSStringFromCGRect(self.view.bounds), pageController.pageIndex, suppressRedraw);
if (suppressRedraw) return;

2
clients/ios/NewsBlur-iPhone-Info.plist
View file

@ -58,7 +58,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>58</string>
<string>59</string>
<key>FacebookAppID</key>
<string>230426707030569</string>
<key>LSApplicationQueriesSchemes</key>