diff --git a/Child Labor.xcodeproj/project.pbxproj b/Child Labor.xcodeproj/project.pbxproj index ede6dd4..69a8703 100755 --- a/Child Labor.xcodeproj/project.pbxproj +++ b/Child Labor.xcodeproj/project.pbxproj @@ -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)", @@ -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)", diff --git a/Child Labor.xcodeproj/project.xcworkspace/xcuserdata/zolontech.xcuserdatad/UserInterfaceState.xcuserstate b/Child Labor.xcodeproj/project.xcworkspace/xcuserdata/zolontech.xcuserdatad/UserInterfaceState.xcuserstate index 3fcdec9..220c71e 100644 Binary files a/Child Labor.xcodeproj/project.xcworkspace/xcuserdata/zolontech.xcuserdatad/UserInterfaceState.xcuserstate and b/Child Labor.xcodeproj/project.xcworkspace/xcuserdata/zolontech.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Child Labor.xcodeproj/xcuserdata/zolontech.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Child Labor.xcodeproj/xcuserdata/zolontech.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 29a223f..025f606 100644 --- a/Child Labor.xcodeproj/xcuserdata/zolontech.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Child Labor.xcodeproj/xcuserdata/zolontech.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -20,5 +20,81 @@ landmarkType = "7"> + + + + + + + + + + + + + + + + + + diff --git a/Child Labor/FullReportViewController.swift b/Child Labor/FullReportViewController.swift index 9fd2f36..62e8996 100755 --- a/Child Labor/FullReportViewController.swift +++ b/Child Labor/FullReportViewController.swift @@ -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() @@ -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) { diff --git a/Child Labor/Main.storyboard b/Child Labor/Main.storyboard index cb95f77..80cee9d 100644 --- a/Child Labor/Main.storyboard +++ b/Child Labor/Main.storyboard @@ -438,7 +438,7 @@ - + @@ -1730,7 +1730,7 @@ and School - + @@ -2194,21 +2194,25 @@ and School - + - - + + + + + + - - - - + + + + - +