mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
iOS: reverted WKWebView changes
I kept a copy of the files from before the change, just in case, so I just copied them back in to revert everything.
This commit is contained in:
David Sinclair
parent
90f320ca6e
commit
e98cf18bfd
4 changed files with 443 additions and 441 deletions
|
|
@ -7,7 +7,6 @@
|
|||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
#import <WebKit/WebKit.h>
|
||||
#import <QuartzCore/QuartzCore.h>
|
||||
#import "BaseViewController.h"
|
||||
|
||||
|
|
@ -16,13 +15,33 @@
|
|||
|
||||
@interface StoryDetailViewController : BaseViewController
|
||||
<UIScrollViewDelegate, UIGestureRecognizerDelegate,
|
||||
UIActionSheetDelegate>
|
||||
UIActionSheetDelegate> {
|
||||
NewsBlurAppDelegate *appDelegate;
|
||||
|
||||
NSString *activeStoryId;
|
||||
NSMutableDictionary *activeStory;
|
||||
UIView *innerView;
|
||||
UIWebView *webView;
|
||||
NSInteger pageIndex;
|
||||
BOOL pullingScrollview;
|
||||
BOOL inTextView;
|
||||
BOOL inDoubleTap;
|
||||
BOOL hasScrolled;
|
||||
NSURL *activeLongPressUrl;
|
||||
NSInteger actionSheetViewImageIndex;
|
||||
NSInteger actionSheetCopyImageIndex;
|
||||
NSInteger actionSheetSaveImageIndex;
|
||||
CGSize preRotateSize;
|
||||
CGFloat scrollPct;
|
||||
|
||||
UIInterfaceOrientation _orientation;
|
||||
}
|
||||
|
||||
@property (nonatomic) IBOutlet NewsBlurAppDelegate *appDelegate;
|
||||
@property (nonatomic) NSString *activeStoryId;
|
||||
@property (nonatomic, readwrite) NSMutableDictionary *activeStory;
|
||||
@property (nonatomic) IBOutlet UIView *innerView;
|
||||
@property (nonatomic) IBOutlet WKWebView *webView;
|
||||
@property (nonatomic) IBOutlet UIWebView *webView;
|
||||
@property (nonatomic) IBOutlet UIView *feedTitleGradient;
|
||||
@property (nonatomic) IBOutlet UIView *noStoryMessage;
|
||||
@property (nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
|
||||
|
|
@ -31,17 +50,9 @@ UIActionSheetDelegate>
|
|||
@property (nonatomic, assign) BOOL inTextView;
|
||||
@property (nonatomic, assign) BOOL isRecentlyUnread;
|
||||
@property (nonatomic) BOOL hasStory;
|
||||
@property (nonatomic) BOOL inDoubleTap;
|
||||
@property (nonatomic) CGFloat scrollPct;
|
||||
@property (nonatomic) BOOL hasScrolled;
|
||||
@property (nonatomic) NSInteger actionSheetCopyImageIndex;
|
||||
@property (nonatomic) NSInteger actionSheetSaveImageIndex;
|
||||
@property (nonatomic) NSInteger actionSheetViewImageIndex;
|
||||
@property (nonatomic) NSURL *activeLongPressUrl;
|
||||
|
||||
@property NSInteger pageIndex;
|
||||
@property (nonatomic) MBProgressHUD *storyHUD;
|
||||
@property (nonatomic) UIInterfaceOrientation cachedOrientation;
|
||||
|
||||
- (void)initStory;
|
||||
- (void)hideNoStoryMessage;
|
||||
|
|
@ -81,6 +92,8 @@ UIActionSheetDelegate>
|
|||
- (void)refreshHeader;
|
||||
- (void)refreshSideoptions;
|
||||
|
||||
- (CGPoint)pointForGesture:(UIGestureRecognizer *)gestureRecognizer;
|
||||
|
||||
- (void)showTextOrStoryView;
|
||||
- (void)showStoryView;
|
||||
- (void)fetchTextView;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -10,6 +10,7 @@
|
|||
<outlet property="activityIndicator" destination="BHa-eI-8aP" id="szf-ha-x2J"/>
|
||||
<outlet property="noStoryMessage" destination="bfM-JE-U7c" id="3Wi-jn-nk8"/>
|
||||
<outlet property="view" destination="1" id="55"/>
|
||||
<outlet property="webView" destination="39" id="54"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
|
|
@ -37,12 +38,20 @@
|
|||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
</view>
|
||||
<webView hidden="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="39">
|
||||
<rect key="frame" x="0.0" y="0.0" width="768" height="980"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="-1" id="52"/>
|
||||
</connections>
|
||||
</webView>
|
||||
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" id="BHa-eI-8aP">
|
||||
<rect key="frame" x="366" y="507" width="37" height="37"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
</activityIndicatorView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
<connections>
|
||||
<outlet property="activityIndicator" destination="LBH-6T-jFu" id="zQr-GD-QKs"/>
|
||||
<outlet property="view" destination="1" id="75"/>
|
||||
<outlet property="webView" destination="39" id="54"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
|
|
@ -19,11 +20,22 @@
|
|||
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="LBH-6T-jFu">
|
||||
<rect key="frame" x="142" y="212" width="37" height="37"/>
|
||||
</activityIndicatorView>
|
||||
<webView multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="39">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
|
||||
<color key="backgroundColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="-1" id="52"/>
|
||||
</connections>
|
||||
</webView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="LBH-6T-jFu" firstAttribute="centerX" secondItem="1" secondAttribute="centerX" id="AIu-Em-rhG"/>
|
||||
<constraint firstItem="39" firstAttribute="leading" secondItem="1" secondAttribute="leading" id="DpF-n8-Epm"/>
|
||||
<constraint firstItem="LBH-6T-jFu" firstAttribute="centerY" secondItem="1" secondAttribute="centerY" id="T4x-f0-Y9g"/>
|
||||
<constraint firstAttribute="trailing" secondItem="39" secondAttribute="trailing" id="UNS-0C-ycK"/>
|
||||
<constraint firstItem="39" firstAttribute="top" secondItem="1" secondAttribute="top" id="eYc-te-DnY"/>
|
||||
<constraint firstAttribute="bottom" secondItem="39" secondAttribute="bottom" id="nHf-0B-3lN"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue