Skip to content

Commit

Permalink
Merge pull request #158 from Zolon-DOL/master
Browse files Browse the repository at this point in the history 
iOS 16 related bugfix 19 Sep 2022
  • Loading branch information
@pbhatt17
pbhatt17 authored Sep 19, 2022
2 parents bc2478d + 0368ced commit b7905a5
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Child Labor.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4974,7 +4974,7 @@
DEVELOPMENT_TEAM = R6D6GHBLNG;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Child Labor/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -5002,7 +5002,7 @@
DEVELOPMENT_TEAM = R6D6GHBLNG;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Child Labor/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
Expand Down
Binary file modified ...eproj/project.xcworkspace/xcuserdata/zolontech.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
76 changes: 76 additions & 0 deletions Child Labor.xcodeproj/xcuserdata/zolontech.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,81 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
uuid = "3C230EC8-2AB6-4281-99D3-DF71972B7533"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
breakpointStackSelectionBehavior = "1"
scope = "1"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "3BFE5ED2-D1BA-4D1C-8B7C-2CE51EFE1501"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Child Labor/FullReportViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "32"
endingLineNumber = "32"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BA96CA05-02FD-4E8E-BDE7-C6D4913B591F"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Child Labor/FullReportViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
landmarkName = "viewDidLoad()"
landmarkType = "7">
<Locations>
<Location
uuid = "BA96CA05-02FD-4E8E-BDE7-C6D4913B591F - d3cedab571eac70e"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "Child_Labor.FullReportViewController.viewDidLoad() -&gt; ()"
moduleName = "Child Labor"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zolontech/Documents/zolon/Child-Labor/Child%20Labor/FullReportViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
offsetFromSymbolStart = "404">
</Location>
<Location
uuid = "BA96CA05-02FD-4E8E-BDE7-C6D4913B591F - d3cedab571eac70e"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "Child_Labor.FullReportViewController.viewDidLoad() -&gt; ()"
moduleName = "Child Labor"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zolontech/Documents/zolon/Child-Labor/Child%20Labor/FullReportViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
offsetFromSymbolStart = "648">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
8 changes: 6 additions & 2 deletions Child Labor/FullReportViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
//

import UIKit
import WebKit

class FullReportViewController: GAITrackedViewController {

var countryName = "Brazil"

@IBOutlet weak var webView: UIWebView!
@IBOutlet weak var webView: WKWebView!

override func viewDidLoad() {
super.viewDidLoad()
Expand All @@ -28,7 +29,10 @@ class FullReportViewController: GAITrackedViewController {

let pdfData = try? Data(contentsOf: targetURL)

webView.load(pdfData!, mimeType: "application/pdf", textEncodingName: "utf-8", baseURL: NSURL() as URL)
//webView.load(pdfData!, mimeType: "application/pdf", textEncodingName: "utf-8", baseURL: NSURL() as URL)
let fileURL = URL(fileURLWithPath: localFilePath ?? "")

webView.loadFileURL(fileURL, allowingReadAccessTo: fileURL)
}

@IBAction func closeFullReport(_ sender: AnyObject) {
Expand Down
24 changes: 14 additions & 10 deletions Child Labor/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@
<nil key="title"/>
<barButtonItem key="backBarButtonItem" title="Countries/Areas" id="bsP-lW-rNn"/>
<segmentedControl key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="9d8-lJ-Jve">
<rect key="frame" x="50" y="0.0" width="245" height="33"/>
<rect key="frame" x="50" y="3" width="245" height="33"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<segments>
<segment title="A–Z"/>
Expand Down Expand Up @@ -1730,7 +1730,7 @@ and School</string>
<nil key="title"/>
<barButtonItem key="backBarButtonItem" title="Goods" id="Yto-wh-IYj"/>
<segmentedControl key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="d0V-2m-jRq">
<rect key="frame" x="80.5" y="0.0" width="159" height="32"/>
<rect key="frame" x="80.5" y="3" width="159" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<segments>
<segment title="A–Z"/>
Expand Down Expand Up @@ -2194,21 +2194,25 @@ and School</string>
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<webView contentMode="scaleToFill" scalesPageToFit="YES" paginationMode="topToBottom" translatesAutoresizingMaskIntoConstraints="NO" id="sg6-q9-nJr">
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Cb-9a-Bcg">
<rect key="frame" x="0.0" y="44" width="320" height="475"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</webView>
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<wkWebViewConfiguration key="configuration">
<audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
<wkPreferences key="preferences"/>
</wkWebViewConfiguration>
</wkWebView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="sg6-q9-nJr" firstAttribute="leading" secondItem="fGq-gl-AB7" secondAttribute="leadingMargin" constant="-16" id="Ka6-Yp-gh2"/>
<constraint firstAttribute="trailingMargin" secondItem="sg6-q9-nJr" secondAttribute="trailing" constant="-16" id="RAs-QM-Ou2"/>
<constraint firstItem="Pu7-mQ-mFp" firstAttribute="top" secondItem="sg6-q9-nJr" secondAttribute="bottom" id="V4g-sI-cPA"/>
<constraint firstItem="sg6-q9-nJr" firstAttribute="top" secondItem="1ag-65-Kis" secondAttribute="bottom" id="if2-0h-ZAC"/>
<constraint firstItem="Pu7-mQ-mFp" firstAttribute="top" secondItem="5Cb-9a-Bcg" secondAttribute="bottom" id="4zn-23-Hrn"/>
<constraint firstAttribute="trailing" secondItem="5Cb-9a-Bcg" secondAttribute="trailing" id="8M4-IJ-Orh"/>
<constraint firstItem="5Cb-9a-Bcg" firstAttribute="leading" secondItem="fGq-gl-AB7" secondAttribute="leading" id="Asz-ae-JrK"/>
<constraint firstItem="5Cb-9a-Bcg" firstAttribute="top" secondItem="1ag-65-Kis" secondAttribute="bottom" id="u0k-Qj-qVa"/>
</constraints>
</view>
<connections>
<outlet property="webView" destination="sg6-q9-nJr" id="Wi5-hW-VkR"/>
<outlet property="webView" destination="5Cb-9a-Bcg" id="uIy-u1-mfF"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="2bE-QM-jrm" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down

0 comments on commit b7905a5

Please sign in to comment.