diff --git a/Anyline Tire Demo.xcodeproj/project.pbxproj b/Anyline Tire Demo.xcodeproj/project.pbxproj index 38f4937..f6ba6cd 100644 --- a/Anyline Tire Demo.xcodeproj/project.pbxproj +++ b/Anyline Tire Demo.xcodeproj/project.pbxproj @@ -120,11 +120,11 @@ 6B913234A2737D8FD555BDED /* ShowGuidanceSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowGuidanceSettingsView.swift; sourceTree = ""; }; 6E20CCB2348A1D5779AD369D /* ATDTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ATDTextField.swift; sourceTree = ""; }; 743A1DCAF06FD21B53070DE9 /* ResultDetailsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultDetailsViewModel.swift; sourceTree = ""; }; - 7806B02B24D5CA9894554DDF /* ProximaNova-Light.otf */ = {isa = PBXFileReference; path = "ProximaNova-Light.otf"; sourceTree = ""; }; + 7806B02B24D5CA9894554DDF /* ProximaNova-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ProximaNova-Light.otf"; sourceTree = ""; }; 79422290CE7EF2CD20C3D8EE /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; 846F00A3CE42550CD5D87E5F /* LandingTextViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LandingTextViewDelegate.swift; sourceTree = ""; }; 898D068837A772FDC17C4F80 /* tiretread_sound_beep_too_close.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = tiretread_sound_beep_too_close.wav; sourceTree = ""; }; - 8A35D4D3DBCB082A5C414DA4 /* ProximaNova-Bold.otf */ = {isa = PBXFileReference; path = "ProximaNova-Bold.otf"; sourceTree = ""; }; + 8A35D4D3DBCB082A5C414DA4 /* ProximaNova-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ProximaNova-Bold.otf"; sourceTree = ""; }; 8C50D0963153128DE17311B4 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 91A81A696C0FE10BADEDFFF0 /* ErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = ""; }; 9305D03F418897C0AD10B90F /* tiretread_focuspoint_found.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = tiretread_focuspoint_found.wav; sourceTree = ""; }; @@ -145,7 +145,7 @@ CBBFD690B0F8E473AD1285E8 /* VolumeButtonObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VolumeButtonObserver.swift; sourceTree = ""; }; D5BA79536B6EEBE089971CDA /* ScanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanViewController.swift; sourceTree = ""; }; D6FDFBEF38034A3F4671F98F /* UserDefaultsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsManager.swift; sourceTree = ""; }; - DB20B1D3E5DE027FAE19AD9F /* ProximaNova-Regular.otf */ = {isa = PBXFileReference; path = "ProximaNova-Regular.otf"; sourceTree = ""; }; + DB20B1D3E5DE027FAE19AD9F /* ProximaNova-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ProximaNova-Regular.otf"; sourceTree = ""; }; DBF323846DAEE03F621DBF05 /* ResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultViewController.swift; sourceTree = ""; }; DE123729BEA35B442A4649EC /* LoadingButtonActionsDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingButtonActionsDelegate.swift; sourceTree = ""; }; E0E627967E61F1B098CD294E /* ColorStruct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorStruct.swift; sourceTree = ""; }; @@ -806,7 +806,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.10.0; + MARKETING_VERSION = 1.11.0; PRODUCT_BUNDLE_IDENTIFIER = com.anyline.showcase.tiretread; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; @@ -899,7 +899,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.10.0; + MARKETING_VERSION = 1.11.0; PRODUCT_BUNDLE_IDENTIFIER = com.anyline.showcase.tiretread; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; @@ -940,7 +940,7 @@ repositoryURL = "https://github.com/Anyline/anyline-tiretread-spm-module"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 7.0.0; + minimumVersion = 8.0.0; }; }; 4B5AEA5F9FCA6152FDAB044B /* XCRemoteSwiftPackageReference "SnapKit" */ = { diff --git a/Anyline Tire Demo/Presentation/Features/Landing/Controller/RecorderViewController.swift b/Anyline Tire Demo/Presentation/Features/Landing/Controller/RecorderViewController.swift index 5cc3736..5c9bafd 100644 --- a/Anyline Tire Demo/Presentation/Features/Landing/Controller/RecorderViewController.swift +++ b/Anyline Tire Demo/Presentation/Features/Landing/Controller/RecorderViewController.swift @@ -142,7 +142,7 @@ class RecorderViewController: UIViewController { private func sendTireIdFeedback(uuid: String, tireId: String, qrViewController: QRCodeReaderViewController) { - AnylineTireTreadSdk.companion.sendTireIdFeedback(measurementUuid: uuid, tireId: tireId) { [weak self] (response: Response) in + AnylineTireTreadSdk.shared.sendTireIdFeedback(measurementUuid: uuid, tireId: tireId) { [weak self] (response: Response) in switch(response) { case _ as ResponseSuccess: diff --git a/Anyline Tire Demo/Presentation/Features/Landing/ViewModel/LandingViewModel.swift b/Anyline Tire Demo/Presentation/Features/Landing/ViewModel/LandingViewModel.swift index f9d1e93..220039f 100644 --- a/Anyline Tire Demo/Presentation/Features/Landing/ViewModel/LandingViewModel.swift +++ b/Anyline Tire Demo/Presentation/Features/Landing/ViewModel/LandingViewModel.swift @@ -19,7 +19,7 @@ class LandingViewModel { } var isInitialized: Bool { - AnylineTireTreadSdk.companion.isInitialized + AnylineTireTreadSdk.shared.isInitialized } func tryInitializeSdk(context: UIViewController, completion: @escaping (Bool, String?) -> Void) { @@ -31,7 +31,7 @@ class LandingViewModel { return } - try AnylineTireTreadSdk.companion.doInit(licenseKey: licenseString, context: context) + try AnylineTireTreadSdk.shared.doInit(licenseKey: licenseString) if isInitialized { completion(true, nil) diff --git a/Anyline Tire Demo/Presentation/Features/Loading/ViewModel/LoadingViewModel.swift b/Anyline Tire Demo/Presentation/Features/Loading/ViewModel/LoadingViewModel.swift index 73488e7..73d89e1 100644 --- a/Anyline Tire Demo/Presentation/Features/Loading/ViewModel/LoadingViewModel.swift +++ b/Anyline Tire Demo/Presentation/Features/Loading/ViewModel/LoadingViewModel.swift @@ -29,7 +29,7 @@ class LoadingViewModel { } private func fetchTreadDepthResult() { - AnylineTireTreadSdk.companion.getTreadDepthReportResult(measurementUuid: self.uuid, timeoutSeconds: 60) { [weak self] response in + AnylineTireTreadSdk.shared.getTreadDepthReportResult(measurementUuid: self.uuid, timeoutSeconds: 60) { [weak self] response in guard let self = self else { return } switch(response) { diff --git a/Anyline Tire Demo/Presentation/Features/Result details/ViewModel/ResultDetailsViewModel.swift b/Anyline Tire Demo/Presentation/Features/Result details/ViewModel/ResultDetailsViewModel.swift index 2d10a51..d0fe351 100644 --- a/Anyline Tire Demo/Presentation/Features/Result details/ViewModel/ResultDetailsViewModel.swift +++ b/Anyline Tire Demo/Presentation/Features/Result details/ViewModel/ResultDetailsViewModel.swift @@ -14,7 +14,7 @@ class ResultDetailsViewModel { private var uuid: String // MARK: - Public Properties - private let anylineSDK = AnylineTireTreadSdk.companion + private let anylineSDK = AnylineTireTreadSdk.shared // MARK: - Init init(delegate: ResultDetailsViewModelDelegate, uuid: String) { @@ -31,7 +31,7 @@ class ResultDetailsViewModel { resultDetailsViewModelDelegate?.showError(error: "error.license.missing_key".localized()) return } - try anylineSDK.doInit(licenseKey: licenceID, context: context) + try anylineSDK.doInit(licenseKey: licenceID) anylineSDK.getTreadDepthReportPdf(measurementUuid: self.uuid) { response in print("PDF fetched from SDK.") diff --git a/Anyline Tire Demo/Presentation/Features/Scan/Controller/ScanViewController.swift b/Anyline Tire Demo/Presentation/Features/Scan/Controller/ScanViewController.swift index 7831907..044d56c 100644 --- a/Anyline Tire Demo/Presentation/Features/Scan/Controller/ScanViewController.swift +++ b/Anyline Tire Demo/Presentation/Features/Scan/Controller/ScanViewController.swift @@ -203,7 +203,7 @@ extension ScanViewController: TireTreadScanViewCallback { if let uuid = uuid { var shouldRequestForFeedback: Bool = false do { - shouldRequestForFeedback = try AnylineTireTreadSdk.companion.shouldRequestTireIdFeedback() + shouldRequestForFeedback = try AnylineTireTreadSdk.shared.shouldRequestTireIdFeedback() } catch { print("caught exception: \(error.localizedDescription)") } diff --git a/Anyline Tire Demo/Presentation/Features/Settings/ViewModel/SettingsViewModel.swift b/Anyline Tire Demo/Presentation/Features/Settings/ViewModel/SettingsViewModel.swift index bd87bf5..2d477e1 100644 --- a/Anyline Tire Demo/Presentation/Features/Settings/ViewModel/SettingsViewModel.swift +++ b/Anyline Tire Demo/Presentation/Features/Settings/ViewModel/SettingsViewModel.swift @@ -22,7 +22,7 @@ class SettingsViewModel { func testLicenseKey(_ licenseKey: String, context: UIViewController) { do { - try AnylineTireTreadSdk.companion.doInit(licenseKey: licenseKey, context: context) + try AnylineTireTreadSdk.shared.doInit(licenseKey: licenseKey) requestPermissionsAndProceed(context: context) } catch { let errorMessage = "error.invalid_license".localized() + " (\(error.localizedDescription))" diff --git a/Anyline Tire Demo/Resources/System/SystemInfo.swift b/Anyline Tire Demo/Resources/System/SystemInfo.swift index 721c942..ca2d7e4 100644 --- a/Anyline Tire Demo/Resources/System/SystemInfo.swift +++ b/Anyline Tire Demo/Resources/System/SystemInfo.swift @@ -16,7 +16,7 @@ class SystemInfo { } static func getSDKVersion() -> String { - return AnylineTireTreadSdk.companion.sdkVersion + return AnylineTireTreadSdk.shared.sdkVersion } static func getDeviceName() -> String {