mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-31 21:41:33 +00:00
#1270 (replacing UIWebView with WKWebView)
- Tweaks for Xcoce 11.4. - Web view fixes.
This commit is contained in:
David Sinclair
Samuel Clay
parent
a6aeba2619
commit
f613f18fe6
4 changed files with 23 additions and 1717 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -238,7 +238,6 @@
|
|||
43C3D40A15D468BA0066D36D /* all.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40915D468BA0066D36D /* all.png */; };
|
||||
43C3D40C15D469010066D36D /* unread_yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40B15D469010066D36D /* unread_yellow.png */; };
|
||||
43C3D41215D46D330066D36D /* all@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41115D46D330066D36D /* all@2x.png */; };
|
||||
43C95C49158BEC450086C69B /* GoogleReaderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */; };
|
||||
43CE0F5F15DADB7F00608ED8 /* SiteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 43CE0F5E15DADB7F00608ED8 /* SiteCell.m */; };
|
||||
43D818A315B940C200733444 /* DataUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D818A215B940C200733444 /* DataUtilities.m */; };
|
||||
43E8381E15BC73EB000553BE /* FirstTimeUserAddFriendsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 43E8381615BC73EA000553BE /* FirstTimeUserAddFriendsViewController.m */; };
|
||||
|
|
@ -936,7 +935,6 @@
|
|||
43C3D40915D468BA0066D36D /* all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = all.png; sourceTree = "<group>"; };
|
||||
43C3D40B15D469010066D36D /* unread_yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unread_yellow.png; sourceTree = "<group>"; };
|
||||
43C3D41115D46D330066D36D /* all@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "all@2x.png"; sourceTree = "<group>"; };
|
||||
43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = GoogleReaderViewController.xib; path = Classes/GoogleReaderViewController.xib; sourceTree = "<group>"; };
|
||||
43CE0F5D15DADB7E00608ED8 /* SiteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SiteCell.h; sourceTree = "<group>"; };
|
||||
43CE0F5E15DADB7F00608ED8 /* SiteCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SiteCell.m; sourceTree = "<group>"; };
|
||||
43D0451F1565BC150085F811 /* MainWindow~ipad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow~ipad.xib"; path = "Resources-iPad/MainWindow~ipad.xib"; sourceTree = "<group>"; };
|
||||
|
|
@ -2296,7 +2294,6 @@
|
|||
isa = PBXGroup;
|
||||
children = (
|
||||
433323B5158901A40025064D /* Images */,
|
||||
43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */,
|
||||
43D045241565BC150085F811 /* LoginViewController~ipad.xib */,
|
||||
FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */,
|
||||
43D0451F1565BC150085F811 /* MainWindow~ipad.xib */,
|
||||
|
|
@ -2992,7 +2989,6 @@
|
|||
FF9DC9EB1C860944006097E1 /* bar_separator_dark.png in Resources */,
|
||||
433323CE158968ED0025064D /* FirstTimeUserViewController.xib in Resources */,
|
||||
FFB7050D1925921F0052101C /* line_spacing_xl.png in Resources */,
|
||||
43C95C49158BEC450086C69B /* GoogleReaderViewController.xib in Resources */,
|
||||
43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */,
|
||||
439DAB211590DA350019B0EB /* FeedsMenuViewController.xib in Resources */,
|
||||
010EDEFC1B238722003B79DE /* 1Password.xcassets in Resources */,
|
||||
|
|
@ -3942,7 +3938,6 @@
|
|||
STRIP_INSTALLED_PRODUCT = NO;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Other Sources/BridgingHeader.h";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
VALID_ARCHS = "armv7s armv7 arm64";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
|
|
@ -3990,7 +3985,6 @@
|
|||
STRIP_INSTALLED_PRODUCT = NO;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Other Sources/BridgingHeader.h";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
||||
VALID_ARCHS = "armv7s armv7 arm64";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#import "Utilities.h"
|
||||
#import "ThemeManager.h"
|
||||
#import <SystemConfiguration/SystemConfiguration.h>
|
||||
#import <MobileCoreServices/MobileCoreServices.h>
|
||||
#import <CoreServices/CoreServices.h>
|
||||
|
||||
//#define DEBUG 1
|
||||
//#define PROD_DEBUG 1
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
|
||||
<device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StoryDetailViewController">
|
||||
|
|
@ -10,7 +12,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"/>
|
||||
<outlet property="webView" destination="JOM-Xx-504" id="HVw-7M-HDD"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
|
|
@ -18,35 +20,36 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="768" height="980"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" id="bfM-JE-U7c">
|
||||
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bfM-JE-U7c">
|
||||
<rect key="frame" x="224" y="296" width="320" height="235"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="big_world_white.png" id="113">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="big_world_white.png" translatesAutoresizingMaskIntoConstraints="NO" id="113">
|
||||
<rect key="frame" x="40" y="20" width="240" height="128"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Select a story to read" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="10" id="90">
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" fixedFrame="YES" text="Select a story to read" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="90">
|
||||
<rect key="frame" x="104" y="151" width="112" height="64"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
|
||||
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="textColor" red="0.66666668653488159" green="0.66666668653488159" blue="0.66666668653488159" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<color key="shadowColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<color key="shadowColor" red="0.3333333432674408" green="0.3333333432674408" blue="0.3333333432674408" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<size key="shadowOffset" width="0.0" height="1"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</view>
|
||||
<webView hidden="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="39">
|
||||
<wkWebView multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JOM-Xx-504">
|
||||
<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">
|
||||
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<wkWebViewConfiguration key="configuration" allowsInlineMediaPlayback="YES">
|
||||
<audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" audio="YES" video="YES"/>
|
||||
<wkPreferences key="preferences"/>
|
||||
</wkWebViewConfiguration>
|
||||
</wkWebView>
|
||||
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" 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>
|
||||
|
|
@ -54,9 +57,10 @@
|
|||
<color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<point key="canvasLocation" x="138.28125" y="153.515625"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="big_world_white.png" width="128" height="128"/>
|
||||
<image name="big_world_white.png" width="30.719999313354492" height="30.719999313354492"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue