public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iOS 7.1.

Browse source
This commit is contained in:
Samuel Clay 2017-11-06 21:13:07 -08:00
parent 8fbb855a04
commit c74c3d4c88
4 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -383,16 +383,19 @@
- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
inRotation = YES;
[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.scrollView.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.scrollView.bounds.size), NSStringFromCGSize(size));
inRotation = NO;
[self.view setNeedsLayout];
[self.view layoutIfNeeded];
@ -428,13 +431,13 @@
if (self.isPhoneOrCompact ||
UIInterfaceOrientationIsLandscape(orientation)) {
// scrollViewFrame.size.height = self.view.bounds.size.height;
// scrollViewFrame.size.height = self.scrollView.bounds.size.height;
// self.bottomSize.hidden = YES;
[self.bottomSizeHeightConstraint setConstant:0];
[self.scrollBottomConstraint setConstant:0];
[bottomSize setHidden:YES];
} else {
// scrollViewFrame.size.height = self.view.bounds.size.height - 12;
// scrollViewFrame.size.height = self.scrollView.bounds.size.height - 12;
// self.bottomSize.hidden = NO;
[self.bottomSizeHeightConstraint setConstant:12];
[self.scrollBottomConstraint setConstant:-12];
@ -516,7 +519,7 @@
// Scroll back to preserved index
CGRect frame = self.scrollView.bounds;
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
frame = self.view.bounds;
frame = self.scrollView.bounds;
}
frame.origin.x = frame.size.width * currentIndex;
frame.origin.y = 0;
@ -627,20 +630,20 @@
if (!outOfBounds) {
CGRect pageFrame = pageController.view.bounds;
pageFrame.origin.y = 0;
pageFrame.origin.x = CGRectGetWidth(self.view.bounds) * newIndex;
pageFrame.size.height = CGRectGetHeight(self.view.bounds) - self.bottomSizeHeightConstraint.constant;
pageFrame.origin.x = CGRectGetWidth(self.scrollView.bounds) * newIndex;
pageFrame.size.height = CGRectGetHeight(self.scrollView.bounds) - self.bottomSizeHeightConstraint.constant;
pageController.view.hidden = NO;
pageController.view.frame = pageFrame;
} else {
// NSLog(@"Out of bounds: was %d, now %d", pageController.pageIndex, newIndex);
CGRect pageFrame = pageController.view.bounds;
pageFrame.origin.x = CGRectGetWidth(self.view.bounds) * newIndex;
pageFrame.origin.y = CGRectGetHeight(self.view.bounds);
pageFrame.size.height = CGRectGetHeight(self.view.bounds) - self.bottomSizeHeightConstraint.constant;
pageFrame.origin.x = CGRectGetWidth(self.scrollView.bounds) * newIndex;
pageFrame.origin.y = CGRectGetHeight(self.scrollView.bounds);
pageFrame.size.height = CGRectGetHeight(self.scrollView.bounds) - self.bottomSizeHeightConstraint.constant;
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.scrollView.bounds), pageController.pageIndex, suppressRedraw);
if (suppressRedraw) return;
@ -769,7 +772,7 @@
animations:^{
[self.traverseView setNeedsLayout];
// self.traverseView.frame = CGRectMake(tvf.origin.x,
// self.view.bounds.size.height - tvf.size.height - bottomSizeHeightConstraint.constant - (self.view.safeAreaInsets.bottom - 20),
// self.scrollView.bounds.size.height - tvf.size.height - bottomSizeHeightConstraint.constant - (self.view.safeAreaInsets.bottom - 20),
// tvf.size.width, tvf.size.height);
self.traverseView.alpha = 1;
self.traversePinned = YES;
@ -895,7 +898,7 @@
}
- (void)setStoryFromScroll:(BOOL)force {
CGFloat pageWidth = self.view.bounds.size.width;
CGFloat pageWidth = self.scrollView.bounds.size.width;
float fractionalPage = self.scrollView.contentOffset.x / pageWidth;
NSInteger nearestNumber = lround(fractionalPage);

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

@ -58,7 +58,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>80</string>
<string>82</string>
<key>FacebookAppID</key>
<string>230426707030569</string>
<key>ITSAppUsesNonExemptEncryption</key>

4
clients/ios/Story Notification Service Extension/Info.plist
View file

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>7.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>82</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>

5
clients/ios/static/storyDetailView.css
View file

@ -626,6 +626,11 @@ div + p {
margin-left: -30px !important;
width: 667px !important;
}
.NB-width-724 .NB-story img.NB-large-image {
max-width: 724px;
margin-left: -30px !important;
width: 724px !important;
}
.NB-width-736 .NB-story img.NB-large-image {
max-width: 736px;
margin-left: -30px !important;