diff --git a/CHANGELOG.md b/CHANGELOG.md index 920da450..da4be0b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 The changes documented here do not include those from the original repository. -## [Unreleased] +## [Version 1.3.0] +- Feat: [iOS] Add a method to retrieve workouts raw data from HealthKit (https://outsystemsrd.atlassian.net/browse/RMET-2128). ## [Version 1.2.12] diff --git a/package.json b/package.json index 84b9790c..7cb53b1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.outsystems.plugins.healthfitness", - "version": "1.2.12", + "version": "1.3.0", "description": "Health & Fitness cordova plugin for OutSystems applications.", "keywords": [ "ecosystem:cordova", diff --git a/plugin.xml b/plugin.xml index 351ed64c..1af051da 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,5 +1,5 @@ - + HealthFitness Health & Fitness cordova plugin for OutSystems applications. OutSystems Inc diff --git a/src/ios/OSHealthFitness.swift b/src/ios/OSHealthFitness.swift index 2ed23c3f..1f934788 100644 --- a/src/ios/OSHealthFitness.swift +++ b/src/ios/OSHealthFitness.swift @@ -19,8 +19,8 @@ class OSHealthFitness: CDVPlugin { let fitnessVariables = command.arguments[2] as? String ?? "" let healthVariables = command.arguments[3] as? String ?? "" let profileVariables = command.arguments[4] as? String ?? "" - let summaryVariables = command.arguments[5] as? String ?? "" - let variable = VariableStruct(allVariables: allVariables, fitnessVariables: fitnessVariables, healthVariables: healthVariables, profileVariables: profileVariables, summaryVariables: summaryVariables) + let workoutVariables = command.argument(at: 6) as? String ?? "" + let variable = VariableStruct(allVariables: allVariables, fitnessVariables: fitnessVariables, healthVariables: healthVariables, profileVariables: profileVariables, workoutVariables: workoutVariables) self.plugin?.requestPermissions(customPermissions:customPermissions, variable: variable) { [weak self] authorized, error in guard let self = self else { return } @@ -195,7 +195,7 @@ class OSHealthFitness: CDVPlugin { self.callbackId = command.callbackId let queryParameters = command.arguments[0] as? String ?? "" - if let params = queryParameters.decode() as QueryParameters? { + if let params = queryParameters.decode() as AdvancedQueryParameters? { let variable = params.variable ?? "" let startDate = params.startDate ?? "" @@ -226,6 +226,27 @@ class OSHealthFitness: CDVPlugin { } } } + + @objc(getWorkoutData:) + func getWorkoutData(command: CDVInvokedUrlCommand) { + self.callbackId = command.callbackId + + guard let arg = command.argument(at: 0) as? String, let queryParameters = arg.decode() as WorkoutAdvancedQueryParameters? else { return } + let workoutTypeVariableDictionary = queryParameters.workoutTypeVariableDictionary + let startDate = Date(queryParameters.startDate ?? "") + let endDate = Date(queryParameters.endDate ?? "") + + self.plugin?.workoutAdvancedQuery(workoutTypeVariableDictionary: workoutTypeVariableDictionary, date: (startDate, endDate), completion: { [weak self] success, result, error in + guard let self = self else { return } + + if success { + self.sendResult(result: result, error: nil, callBackID: self.callbackId) + } else { + self.sendResult(result: nil, error: error, callBackID: self.callbackId) + } + }) + + } } // MARK: - OSCommonPluginLib's PlatformProtocol Methods diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/Info.plist b/src/ios/frameworks/OSHealthFitnessLib.xcframework/Info.plist index 390efee3..6d5b8047 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/Info.plist +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/Info.plist @@ -6,30 +6,30 @@ LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath OSHealthFitnessLib.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath OSHealthFitnessLib.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom index 1dde91aa..310df8d8 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom index 45206d41..5def7018 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h index 58984c89..22e6b4ae 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h @@ -221,6 +221,7 @@ SWIFT_CLASS("_TtC18OSHealthFitnessLib13BackgroundJob") - (nonnull instancetype)initWithEntity:(NSEntityDescription * _Nonnull)entity insertIntoManagedObjectContext:(NSManagedObjectContext * _Nullable)context OBJC_DESIGNATED_INITIALIZER; @end + @class NSString; @class NSDate; @class Notification; @@ -249,6 +250,7 @@ SWIFT_CLASS("_TtC18OSHealthFitnessLib12Notification") @end + @interface Notification (SWIFT_EXTENSION(OSHealthFitnessLib)) @property (nonatomic, copy) NSString * _Nullable body; @property (nonatomic) int64_t id; diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib.h b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib.h deleted file mode 100644 index 80cc79cf..00000000 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// OSHealthFitnessLib.h -// OSHealthFitnessLib -// -// Created by Carlos Correa on 26/10/2021. -// - -#import - -//! Project version number for OSHealthFitnessLib. -FOUNDATION_EXPORT double OSHealthFitnessLibVersionNumber; - -//! Project version string for OSHealthFitnessLib. -FOUNDATION_EXPORT const unsigned char OSHealthFitnessLibVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Info.plist b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Info.plist index af1893cc..1080a900 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Info.plist and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Info.plist differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftdoc b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftdoc index 49a57e53..89085115 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftdoc and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftinterface b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftinterface index f9ab41e9..a1e06ded 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftinterface +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,12 +1,11 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12) -// swift-module-flags: -target arm64-apple-ios12.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSHealthFitnessLib +// swift-module-flags: -target arm64-apple-ios13.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSHealthFitnessLib import CloudKit import CoreData import Foundation import HealthKit import NotificationCenter -@_exported import OSHealthFitnessLib import Swift import UserNotifications import _Concurrency @@ -25,6 +24,8 @@ public enum HealthKitErrors : Swift.Int, Foundation.CustomNSError, Foundation.Lo case invalidBackgroundJobID case backgroundJobNotFound case unsubscribeError + case workoutTypeNotAvailable + case workoutTypeNotAuthorized public var errorDescription: Swift.String? { get } @@ -41,7 +42,7 @@ extension Swift.Encodable { public func encode() -> Swift.String } public struct VariableStruct { - public init(allVariables: Swift.String, fitnessVariables: Swift.String, healthVariables: Swift.String, profileVariables: Swift.String, summaryVariables: Swift.String) + public init(allVariables: Swift.String, fitnessVariables: Swift.String, healthVariables: Swift.String, profileVariables: Swift.String, workoutVariables: Swift.String) } open class HealthFitnessPlugin { public init() @@ -54,8 +55,133 @@ open class HealthFitnessPlugin { public func setBackgroundJob(variable: Swift.String, timeUnit: (name: Swift.String, grouping: Swift.Int), notificationFrequency: (name: Swift.String, grouping: Swift.Int), jobFrequency: Swift.String, condition: Swift.String, value: Swift.Double, notificationText: (header: Swift.String, body: Swift.String), completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) public func updateBackgroundJob(id: Swift.Int64?, notificationFrequency: (name: Swift.String?, grouping: Swift.Int?), condition: Swift.String?, value: Swift.Double?, notificationText: (header: Swift.String?, body: Swift.String?), isActive: Swift.Bool?, completion: @escaping (Swift.Bool, Foundation.NSError?) -> Swift.Void) public func advancedQuery(variable: Swift.String, date: (start: Foundation.Date, end: Foundation.Date), timeUnit: Swift.String, operationType: Swift.String, mostRecent: Swift.Bool, onlyFilledBlocks: Swift.Bool, resultType: OSHealthFitnessLib.AdvancedQueryResultType = .allType, timeUnitLength: Swift.Int, completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) + public func workoutAdvancedQuery(workoutTypeVariableDictionary: OSHealthFitnessLib.WorkoutTypeVariableDictionary, date: (start: Foundation.Date, end: Foundation.Date), completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) @objc deinit } +public enum UInt128Errors : Swift.Error { + case invalidString + public static func == (a: OSHealthFitnessLib.UInt128Errors, b: OSHealthFitnessLib.UInt128Errors) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public struct UInt128 { + public var significantBits: OSHealthFitnessLib.UInt128 { + get + } + public init(upperBits: Swift.UInt64, lowerBits: Swift.UInt64) + public init() + public init?(_ source: Swift.String) +} +extension OSHealthFitnessLib.UInt128 : Swift.FixedWidthInteger { + public var nonzeroBitCount: Swift.Int { + get + } + public var leadingZeroBitCount: Swift.Int { + get + } + public var bigEndian: OSHealthFitnessLib.UInt128 { + get + } + public var littleEndian: OSHealthFitnessLib.UInt128 { + get + } + public var byteSwapped: OSHealthFitnessLib.UInt128 { + get + } + public init(_truncatingBits bits: Swift.UInt) + public init(bigEndian value: OSHealthFitnessLib.UInt128) + public init(littleEndian value: OSHealthFitnessLib.UInt128) + public func addingReportingOverflow(_ rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func subtractingReportingOverflow(_ rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func multipliedReportingOverflow(by rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func multipliedFullWidth(by other: OSHealthFitnessLib.UInt128) -> (high: OSHealthFitnessLib.UInt128, low: OSHealthFitnessLib.UInt128.Magnitude) + public func dividedReportingOverflow(by rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func dividingFullWidth(_ dividend: (high: OSHealthFitnessLib.UInt128, low: OSHealthFitnessLib.UInt128)) -> (quotient: OSHealthFitnessLib.UInt128, remainder: OSHealthFitnessLib.UInt128) + public func remainderReportingOverflow(dividingBy rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func quotientAndRemainder(dividingBy rhs: OSHealthFitnessLib.UInt128) -> (quotient: OSHealthFitnessLib.UInt128, remainder: OSHealthFitnessLib.UInt128) +} +extension OSHealthFitnessLib.UInt128 { + public static var bitWidth: Swift.Int { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.BinaryInteger { + public var words: [Swift.UInt] { + get + } + public var trailingZeroBitCount: Swift.Int { + get + } + public init?(exactly source: T) where T : Swift.BinaryFloatingPoint + public init(_ source: T) where T : Swift.BinaryFloatingPoint + public static func / (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func /= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func % (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func %= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func |= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func ^= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &>>= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &<<= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public typealias Stride = Swift.Int + public typealias Words = [Swift.UInt] +} +extension OSHealthFitnessLib.UInt128 : Swift.UnsignedInteger { +} +extension OSHealthFitnessLib.UInt128 : Swift.Hashable { + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.Numeric { + public static func + (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func += (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func - (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func -= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func * (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func *= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public typealias Magnitude = OSHealthFitnessLib.UInt128 +} +extension OSHealthFitnessLib.UInt128 : Swift.Equatable { + public static func == (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> Swift.Bool +} +extension OSHealthFitnessLib.UInt128 : Swift.ExpressibleByIntegerLiteral { + public init(integerLiteral value: Swift.IntegerLiteralType) + public typealias IntegerLiteralType = Swift.IntegerLiteralType +} +extension OSHealthFitnessLib.UInt128 : Swift.CustomStringConvertible { + public var description: Swift.String { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.CustomDebugStringConvertible { + public var debugDescription: Swift.String { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.Comparable { + public static func < (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> Swift.Bool +} +extension OSHealthFitnessLib.UInt128 : Swift.Codable { + public init(from decoder: Swift.Decoder) throws + public func encode(to encoder: Swift.Encoder) throws +} +extension OSHealthFitnessLib.UInt128 { + @available(swift, deprecated: 3.2, renamed: "init(_:)") + public static func fromUnparsedString(_ source: Swift.String) throws -> OSHealthFitnessLib.UInt128 + @available(swift, deprecated: 5.0, renamed: "init(_:)", message: "The ExpressibleByStringLiteral conformance has been removed. Use failable initializer instead.") + public init(stringLiteral value: Swift.StringLiteralType) +} +extension Swift.BinaryFloatingPoint { + public init(_ value: OSHealthFitnessLib.UInt128) + public init?(exactly value: OSHealthFitnessLib.UInt128) +} +extension Swift.String { + public init(_ value: OSHealthFitnessLib.UInt128, radix: Swift.Int = 10, uppercase: Swift.Bool = false) +} extension Foundation.Date { public struct ResultStruct { } @@ -86,6 +212,107 @@ public class BackgroundJobParameters : Swift.Codable { public func encode(to encoder: Swift.Encoder) throws required public init(from decoder: Swift.Decoder) throws } +public enum WorkoutTypeEnum : Swift.String { + case americanFootball + case archery + case australianFootball + case badminton + case barre + case baseball + case basketball + case bowling + case boxing + case climbing + case coreTraining + case crossCountrySkiing + case crossTraining + case curling + case cycling + case dance + case danceInspiredTraining + case discSports + case downhillSkiing + case elliptical + case equestrianSports + case fencing + case fitnessGaming + case fishing + case flexibility + case functionalStrengthTraining + case golf + case gymnastics + case handball + case handCycling + case highIntensityIntervalTraining + case hiking + case hockey + case hunting + case jumpRope + case kickboxing + case lacrosse + case martialArts + case mindAndBody + case mixedCardio + case paddleSports + case pilates + case play + case preparationAndRecovery + case racquetball + case rowing + case rugby + case running + case sailing + case skatingSports + case snowboarding + case snowSports + case soccer + case softball + case squash + case stairClimbing + case stairs + case stepTraining + case surfingSports + case swimming + case tableTennis + case taiChi + case tennis + case trackAndField + case traditionalStrengthTraining + case volleyball + case walking + case waterFitness + case waterPolo + case waterSports + case wheelchairRunPace + case wheelchairWalkPace + case wrestling + case yoga + public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String + public var rawValue: Swift.String { + get + } +} +public struct VariableType : Swift.OptionSet { + public let rawValue: Swift.Int + public init(rawValue: Swift.Int) + public typealias ArrayLiteralElement = OSHealthFitnessLib.VariableType + public typealias Element = OSHealthFitnessLib.VariableType + public typealias RawValue = Swift.Int +} +extension OSHealthFitnessLib.VariableType { + public static func getVariableType(for description: Swift.String) -> OSHealthFitnessLib.VariableType? +} +public struct WorkoutType : Swift.OptionSet, Swift.Hashable { + public let rawValue: OSHealthFitnessLib.UInt128 + public init(rawValue: OSHealthFitnessLib.UInt128) + public typealias ArrayLiteralElement = OSHealthFitnessLib.WorkoutType + public typealias Element = OSHealthFitnessLib.WorkoutType + public typealias RawValue = OSHealthFitnessLib.UInt128 +} +extension OSHealthFitnessLib.WorkoutType { + public static func getWorkoutType(for description: Swift.String) -> OSHealthFitnessLib.WorkoutType? +} public enum AdvancedQueryReturnTypeEnum : Swift.String { case allData case removeEmptyDataBlocks @@ -108,7 +335,7 @@ public struct AdvancedQueryResultType : Swift.OptionSet { extension OSHealthFitnessLib.AdvancedQueryResultType { public static func get(with description: Swift.String) -> OSHealthFitnessLib.AdvancedQueryResultType } -@_hasMissingDesignatedInitializers public class QueryParameters : Swift.Codable { +@_hasMissingDesignatedInitializers public class AdvancedQueryParameters : Swift.Codable { final public let variable: Swift.String? final public let startDate: Swift.String?, endDate: Swift.String? final public let timeUnit: Swift.String?, operationType: Swift.String? @@ -119,6 +346,27 @@ extension OSHealthFitnessLib.AdvancedQueryResultType { public func encode(to encoder: Swift.Encoder) throws required public init(from decoder: Swift.Decoder) throws } +@_hasMissingDesignatedInitializers public class WorkoutAdvancedQueryParameters : Swift.Codable { + final public let workoutTypeVariables: [OSHealthFitnessLib.WorkoutTypeVariableMapping] + final public let startDate: Swift.String? + final public let endDate: Swift.String? + @objc deinit + public func encode(to encoder: Swift.Encoder) throws + required public init(from decoder: Swift.Decoder) throws +} +public typealias WorkoutTypeVariableDictionary = [OSHealthFitnessLib.WorkoutType : OSHealthFitnessLib.VariableType] +extension OSHealthFitnessLib.WorkoutAdvancedQueryParameters { + public var workoutTypeVariableDictionary: OSHealthFitnessLib.WorkoutTypeVariableDictionary { + get + } +} +@_hasMissingDesignatedInitializers public class WorkoutTypeVariableMapping : Swift.Codable { + final public let workoutType: Swift.String + final public let variables: [Swift.String] + @objc deinit + public func encode(to encoder: Swift.Encoder) throws + required public init(from decoder: Swift.Decoder) throws +} @objc @_inheritsConvenienceInitializers public class BackgroundJob : CoreData.NSManagedObject { @objc override dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?) @objc deinit @@ -174,6 +422,9 @@ extension OSHealthFitnessLib.BackgroundJob { @objc set } } +extension OSHealthFitnessLib.BackgroundJob : Swift.Identifiable { + public typealias ID = Swift.Int64 +} @objc @_inheritsConvenienceInitializers public class Notification : CoreData.NSManagedObject { @objc override dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?) @objc deinit @@ -197,9 +448,17 @@ extension OSHealthFitnessLib.Notification { @objc set } } +extension OSHealthFitnessLib.Notification : Swift.Identifiable { + public typealias ID = Swift.Int64 +} extension OSHealthFitnessLib.HealthKitErrors : Swift.Equatable {} extension OSHealthFitnessLib.HealthKitErrors : Swift.Hashable {} extension OSHealthFitnessLib.HealthKitErrors : Swift.RawRepresentable {} +extension OSHealthFitnessLib.UInt128Errors : Swift.Equatable {} +extension OSHealthFitnessLib.UInt128Errors : Swift.Hashable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.Equatable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.Hashable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.RawRepresentable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.Equatable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.Hashable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.RawRepresentable {} diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/module.modulemap b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/module.modulemap index 981e335b..d1128522 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/module.modulemap +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Modules/module.modulemap @@ -1,11 +1,4 @@ framework module OSHealthFitnessLib { - umbrella header "OSHealthFitnessLib.h" - - export * - module * { export * } -} - -module OSHealthFitnessLib.Swift { - header "OSHealthFitnessLib-Swift.h" - requires objc + header "OSHealthFitnessLib-Swift.h" + requires objc } diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/OSHealthFitnessLib b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/OSHealthFitnessLib index 3b0fb871..e3993e6a 100755 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/OSHealthFitnessLib and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/OSHealthFitnessLib differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom index 1dde91aa..310df8d8 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel 2.mom differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom index 45206d41..5def7018 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/BackgroundModel.momd/BackgroundModel.mom differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h index dd292f2f..181ff968 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib-Swift.h @@ -223,6 +223,7 @@ SWIFT_CLASS("_TtC18OSHealthFitnessLib13BackgroundJob") - (nonnull instancetype)initWithEntity:(NSEntityDescription * _Nonnull)entity insertIntoManagedObjectContext:(NSManagedObjectContext * _Nullable)context OBJC_DESIGNATED_INITIALIZER; @end + @class NSString; @class NSDate; @class Notification; @@ -251,6 +252,7 @@ SWIFT_CLASS("_TtC18OSHealthFitnessLib12Notification") @end + @interface Notification (SWIFT_EXTENSION(OSHealthFitnessLib)) @property (nonatomic, copy) NSString * _Nullable body; @property (nonatomic) int64_t id; @@ -488,6 +490,7 @@ SWIFT_CLASS("_TtC18OSHealthFitnessLib13BackgroundJob") - (nonnull instancetype)initWithEntity:(NSEntityDescription * _Nonnull)entity insertIntoManagedObjectContext:(NSManagedObjectContext * _Nullable)context OBJC_DESIGNATED_INITIALIZER; @end + @class NSString; @class NSDate; @class Notification; @@ -516,6 +519,7 @@ SWIFT_CLASS("_TtC18OSHealthFitnessLib12Notification") @end + @interface Notification (SWIFT_EXTENSION(OSHealthFitnessLib)) @property (nonatomic, copy) NSString * _Nullable body; @property (nonatomic) int64_t id; diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib.h b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib.h deleted file mode 100644 index 80cc79cf..00000000 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Headers/OSHealthFitnessLib.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// OSHealthFitnessLib.h -// OSHealthFitnessLib -// -// Created by Carlos Correa on 26/10/2021. -// - -#import - -//! Project version number for OSHealthFitnessLib. -FOUNDATION_EXPORT double OSHealthFitnessLibVersionNumber; - -//! Project version string for OSHealthFitnessLib. -FOUNDATION_EXPORT const unsigned char OSHealthFitnessLibVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Info.plist b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Info.plist index fa47d27c..4670d982 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Info.plist and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Info.plist differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 2b0c460f..edeaa373 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 4111bb0e..901cdf6b 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,12 +1,11 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12) -// swift-module-flags: -target arm64-apple-ios12.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSHealthFitnessLib +// swift-module-flags: -target arm64-apple-ios13.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSHealthFitnessLib import CloudKit import CoreData import Foundation import HealthKit import NotificationCenter -@_exported import OSHealthFitnessLib import Swift import UserNotifications import _Concurrency @@ -25,6 +24,8 @@ public enum HealthKitErrors : Swift.Int, Foundation.CustomNSError, Foundation.Lo case invalidBackgroundJobID case backgroundJobNotFound case unsubscribeError + case workoutTypeNotAvailable + case workoutTypeNotAuthorized public var errorDescription: Swift.String? { get } @@ -41,7 +42,7 @@ extension Swift.Encodable { public func encode() -> Swift.String } public struct VariableStruct { - public init(allVariables: Swift.String, fitnessVariables: Swift.String, healthVariables: Swift.String, profileVariables: Swift.String, summaryVariables: Swift.String) + public init(allVariables: Swift.String, fitnessVariables: Swift.String, healthVariables: Swift.String, profileVariables: Swift.String, workoutVariables: Swift.String) } open class HealthFitnessPlugin { public init() @@ -54,8 +55,133 @@ open class HealthFitnessPlugin { public func setBackgroundJob(variable: Swift.String, timeUnit: (name: Swift.String, grouping: Swift.Int), notificationFrequency: (name: Swift.String, grouping: Swift.Int), jobFrequency: Swift.String, condition: Swift.String, value: Swift.Double, notificationText: (header: Swift.String, body: Swift.String), completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) public func updateBackgroundJob(id: Swift.Int64?, notificationFrequency: (name: Swift.String?, grouping: Swift.Int?), condition: Swift.String?, value: Swift.Double?, notificationText: (header: Swift.String?, body: Swift.String?), isActive: Swift.Bool?, completion: @escaping (Swift.Bool, Foundation.NSError?) -> Swift.Void) public func advancedQuery(variable: Swift.String, date: (start: Foundation.Date, end: Foundation.Date), timeUnit: Swift.String, operationType: Swift.String, mostRecent: Swift.Bool, onlyFilledBlocks: Swift.Bool, resultType: OSHealthFitnessLib.AdvancedQueryResultType = .allType, timeUnitLength: Swift.Int, completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) + public func workoutAdvancedQuery(workoutTypeVariableDictionary: OSHealthFitnessLib.WorkoutTypeVariableDictionary, date: (start: Foundation.Date, end: Foundation.Date), completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) @objc deinit } +public enum UInt128Errors : Swift.Error { + case invalidString + public static func == (a: OSHealthFitnessLib.UInt128Errors, b: OSHealthFitnessLib.UInt128Errors) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public struct UInt128 { + public var significantBits: OSHealthFitnessLib.UInt128 { + get + } + public init(upperBits: Swift.UInt64, lowerBits: Swift.UInt64) + public init() + public init?(_ source: Swift.String) +} +extension OSHealthFitnessLib.UInt128 : Swift.FixedWidthInteger { + public var nonzeroBitCount: Swift.Int { + get + } + public var leadingZeroBitCount: Swift.Int { + get + } + public var bigEndian: OSHealthFitnessLib.UInt128 { + get + } + public var littleEndian: OSHealthFitnessLib.UInt128 { + get + } + public var byteSwapped: OSHealthFitnessLib.UInt128 { + get + } + public init(_truncatingBits bits: Swift.UInt) + public init(bigEndian value: OSHealthFitnessLib.UInt128) + public init(littleEndian value: OSHealthFitnessLib.UInt128) + public func addingReportingOverflow(_ rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func subtractingReportingOverflow(_ rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func multipliedReportingOverflow(by rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func multipliedFullWidth(by other: OSHealthFitnessLib.UInt128) -> (high: OSHealthFitnessLib.UInt128, low: OSHealthFitnessLib.UInt128.Magnitude) + public func dividedReportingOverflow(by rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func dividingFullWidth(_ dividend: (high: OSHealthFitnessLib.UInt128, low: OSHealthFitnessLib.UInt128)) -> (quotient: OSHealthFitnessLib.UInt128, remainder: OSHealthFitnessLib.UInt128) + public func remainderReportingOverflow(dividingBy rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func quotientAndRemainder(dividingBy rhs: OSHealthFitnessLib.UInt128) -> (quotient: OSHealthFitnessLib.UInt128, remainder: OSHealthFitnessLib.UInt128) +} +extension OSHealthFitnessLib.UInt128 { + public static var bitWidth: Swift.Int { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.BinaryInteger { + public var words: [Swift.UInt] { + get + } + public var trailingZeroBitCount: Swift.Int { + get + } + public init?(exactly source: T) where T : Swift.BinaryFloatingPoint + public init(_ source: T) where T : Swift.BinaryFloatingPoint + public static func / (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func /= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func % (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func %= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func |= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func ^= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &>>= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &<<= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public typealias Stride = Swift.Int + public typealias Words = [Swift.UInt] +} +extension OSHealthFitnessLib.UInt128 : Swift.UnsignedInteger { +} +extension OSHealthFitnessLib.UInt128 : Swift.Hashable { + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.Numeric { + public static func + (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func += (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func - (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func -= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func * (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func *= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public typealias Magnitude = OSHealthFitnessLib.UInt128 +} +extension OSHealthFitnessLib.UInt128 : Swift.Equatable { + public static func == (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> Swift.Bool +} +extension OSHealthFitnessLib.UInt128 : Swift.ExpressibleByIntegerLiteral { + public init(integerLiteral value: Swift.IntegerLiteralType) + public typealias IntegerLiteralType = Swift.IntegerLiteralType +} +extension OSHealthFitnessLib.UInt128 : Swift.CustomStringConvertible { + public var description: Swift.String { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.CustomDebugStringConvertible { + public var debugDescription: Swift.String { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.Comparable { + public static func < (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> Swift.Bool +} +extension OSHealthFitnessLib.UInt128 : Swift.Codable { + public init(from decoder: Swift.Decoder) throws + public func encode(to encoder: Swift.Encoder) throws +} +extension OSHealthFitnessLib.UInt128 { + @available(swift, deprecated: 3.2, renamed: "init(_:)") + public static func fromUnparsedString(_ source: Swift.String) throws -> OSHealthFitnessLib.UInt128 + @available(swift, deprecated: 5.0, renamed: "init(_:)", message: "The ExpressibleByStringLiteral conformance has been removed. Use failable initializer instead.") + public init(stringLiteral value: Swift.StringLiteralType) +} +extension Swift.BinaryFloatingPoint { + public init(_ value: OSHealthFitnessLib.UInt128) + public init?(exactly value: OSHealthFitnessLib.UInt128) +} +extension Swift.String { + public init(_ value: OSHealthFitnessLib.UInt128, radix: Swift.Int = 10, uppercase: Swift.Bool = false) +} extension Foundation.Date { public struct ResultStruct { } @@ -86,6 +212,107 @@ public class BackgroundJobParameters : Swift.Codable { public func encode(to encoder: Swift.Encoder) throws required public init(from decoder: Swift.Decoder) throws } +public enum WorkoutTypeEnum : Swift.String { + case americanFootball + case archery + case australianFootball + case badminton + case barre + case baseball + case basketball + case bowling + case boxing + case climbing + case coreTraining + case crossCountrySkiing + case crossTraining + case curling + case cycling + case dance + case danceInspiredTraining + case discSports + case downhillSkiing + case elliptical + case equestrianSports + case fencing + case fitnessGaming + case fishing + case flexibility + case functionalStrengthTraining + case golf + case gymnastics + case handball + case handCycling + case highIntensityIntervalTraining + case hiking + case hockey + case hunting + case jumpRope + case kickboxing + case lacrosse + case martialArts + case mindAndBody + case mixedCardio + case paddleSports + case pilates + case play + case preparationAndRecovery + case racquetball + case rowing + case rugby + case running + case sailing + case skatingSports + case snowboarding + case snowSports + case soccer + case softball + case squash + case stairClimbing + case stairs + case stepTraining + case surfingSports + case swimming + case tableTennis + case taiChi + case tennis + case trackAndField + case traditionalStrengthTraining + case volleyball + case walking + case waterFitness + case waterPolo + case waterSports + case wheelchairRunPace + case wheelchairWalkPace + case wrestling + case yoga + public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String + public var rawValue: Swift.String { + get + } +} +public struct VariableType : Swift.OptionSet { + public let rawValue: Swift.Int + public init(rawValue: Swift.Int) + public typealias ArrayLiteralElement = OSHealthFitnessLib.VariableType + public typealias Element = OSHealthFitnessLib.VariableType + public typealias RawValue = Swift.Int +} +extension OSHealthFitnessLib.VariableType { + public static func getVariableType(for description: Swift.String) -> OSHealthFitnessLib.VariableType? +} +public struct WorkoutType : Swift.OptionSet, Swift.Hashable { + public let rawValue: OSHealthFitnessLib.UInt128 + public init(rawValue: OSHealthFitnessLib.UInt128) + public typealias ArrayLiteralElement = OSHealthFitnessLib.WorkoutType + public typealias Element = OSHealthFitnessLib.WorkoutType + public typealias RawValue = OSHealthFitnessLib.UInt128 +} +extension OSHealthFitnessLib.WorkoutType { + public static func getWorkoutType(for description: Swift.String) -> OSHealthFitnessLib.WorkoutType? +} public enum AdvancedQueryReturnTypeEnum : Swift.String { case allData case removeEmptyDataBlocks @@ -108,7 +335,7 @@ public struct AdvancedQueryResultType : Swift.OptionSet { extension OSHealthFitnessLib.AdvancedQueryResultType { public static func get(with description: Swift.String) -> OSHealthFitnessLib.AdvancedQueryResultType } -@_hasMissingDesignatedInitializers public class QueryParameters : Swift.Codable { +@_hasMissingDesignatedInitializers public class AdvancedQueryParameters : Swift.Codable { final public let variable: Swift.String? final public let startDate: Swift.String?, endDate: Swift.String? final public let timeUnit: Swift.String?, operationType: Swift.String? @@ -119,6 +346,27 @@ extension OSHealthFitnessLib.AdvancedQueryResultType { public func encode(to encoder: Swift.Encoder) throws required public init(from decoder: Swift.Decoder) throws } +@_hasMissingDesignatedInitializers public class WorkoutAdvancedQueryParameters : Swift.Codable { + final public let workoutTypeVariables: [OSHealthFitnessLib.WorkoutTypeVariableMapping] + final public let startDate: Swift.String? + final public let endDate: Swift.String? + @objc deinit + public func encode(to encoder: Swift.Encoder) throws + required public init(from decoder: Swift.Decoder) throws +} +public typealias WorkoutTypeVariableDictionary = [OSHealthFitnessLib.WorkoutType : OSHealthFitnessLib.VariableType] +extension OSHealthFitnessLib.WorkoutAdvancedQueryParameters { + public var workoutTypeVariableDictionary: OSHealthFitnessLib.WorkoutTypeVariableDictionary { + get + } +} +@_hasMissingDesignatedInitializers public class WorkoutTypeVariableMapping : Swift.Codable { + final public let workoutType: Swift.String + final public let variables: [Swift.String] + @objc deinit + public func encode(to encoder: Swift.Encoder) throws + required public init(from decoder: Swift.Decoder) throws +} @objc @_inheritsConvenienceInitializers public class BackgroundJob : CoreData.NSManagedObject { @objc override dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?) @objc deinit @@ -174,6 +422,9 @@ extension OSHealthFitnessLib.BackgroundJob { @objc set } } +extension OSHealthFitnessLib.BackgroundJob : Swift.Identifiable { + public typealias ID = Swift.Int64 +} @objc @_inheritsConvenienceInitializers public class Notification : CoreData.NSManagedObject { @objc override dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?) @objc deinit @@ -197,9 +448,17 @@ extension OSHealthFitnessLib.Notification { @objc set } } +extension OSHealthFitnessLib.Notification : Swift.Identifiable { + public typealias ID = Swift.Int64 +} extension OSHealthFitnessLib.HealthKitErrors : Swift.Equatable {} extension OSHealthFitnessLib.HealthKitErrors : Swift.Hashable {} extension OSHealthFitnessLib.HealthKitErrors : Swift.RawRepresentable {} +extension OSHealthFitnessLib.UInt128Errors : Swift.Equatable {} +extension OSHealthFitnessLib.UInt128Errors : Swift.Hashable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.Equatable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.Hashable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.RawRepresentable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.Equatable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.Hashable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.RawRepresentable {} diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index ef306814..ce1c94a5 100644 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index bd2c785e..4eab864e 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,12 +1,11 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12) -// swift-module-flags: -target x86_64-apple-ios12.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSHealthFitnessLib +// swift-module-flags: -target x86_64-apple-ios13.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name OSHealthFitnessLib import CloudKit import CoreData import Foundation import HealthKit import NotificationCenter -@_exported import OSHealthFitnessLib import Swift import UserNotifications import _Concurrency @@ -25,6 +24,8 @@ public enum HealthKitErrors : Swift.Int, Foundation.CustomNSError, Foundation.Lo case invalidBackgroundJobID case backgroundJobNotFound case unsubscribeError + case workoutTypeNotAvailable + case workoutTypeNotAuthorized public var errorDescription: Swift.String? { get } @@ -41,7 +42,7 @@ extension Swift.Encodable { public func encode() -> Swift.String } public struct VariableStruct { - public init(allVariables: Swift.String, fitnessVariables: Swift.String, healthVariables: Swift.String, profileVariables: Swift.String, summaryVariables: Swift.String) + public init(allVariables: Swift.String, fitnessVariables: Swift.String, healthVariables: Swift.String, profileVariables: Swift.String, workoutVariables: Swift.String) } open class HealthFitnessPlugin { public init() @@ -54,8 +55,133 @@ open class HealthFitnessPlugin { public func setBackgroundJob(variable: Swift.String, timeUnit: (name: Swift.String, grouping: Swift.Int), notificationFrequency: (name: Swift.String, grouping: Swift.Int), jobFrequency: Swift.String, condition: Swift.String, value: Swift.Double, notificationText: (header: Swift.String, body: Swift.String), completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) public func updateBackgroundJob(id: Swift.Int64?, notificationFrequency: (name: Swift.String?, grouping: Swift.Int?), condition: Swift.String?, value: Swift.Double?, notificationText: (header: Swift.String?, body: Swift.String?), isActive: Swift.Bool?, completion: @escaping (Swift.Bool, Foundation.NSError?) -> Swift.Void) public func advancedQuery(variable: Swift.String, date: (start: Foundation.Date, end: Foundation.Date), timeUnit: Swift.String, operationType: Swift.String, mostRecent: Swift.Bool, onlyFilledBlocks: Swift.Bool, resultType: OSHealthFitnessLib.AdvancedQueryResultType = .allType, timeUnitLength: Swift.Int, completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) + public func workoutAdvancedQuery(workoutTypeVariableDictionary: OSHealthFitnessLib.WorkoutTypeVariableDictionary, date: (start: Foundation.Date, end: Foundation.Date), completion: @escaping (Swift.Bool, Swift.String?, Foundation.NSError?) -> Swift.Void) @objc deinit } +public enum UInt128Errors : Swift.Error { + case invalidString + public static func == (a: OSHealthFitnessLib.UInt128Errors, b: OSHealthFitnessLib.UInt128Errors) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public struct UInt128 { + public var significantBits: OSHealthFitnessLib.UInt128 { + get + } + public init(upperBits: Swift.UInt64, lowerBits: Swift.UInt64) + public init() + public init?(_ source: Swift.String) +} +extension OSHealthFitnessLib.UInt128 : Swift.FixedWidthInteger { + public var nonzeroBitCount: Swift.Int { + get + } + public var leadingZeroBitCount: Swift.Int { + get + } + public var bigEndian: OSHealthFitnessLib.UInt128 { + get + } + public var littleEndian: OSHealthFitnessLib.UInt128 { + get + } + public var byteSwapped: OSHealthFitnessLib.UInt128 { + get + } + public init(_truncatingBits bits: Swift.UInt) + public init(bigEndian value: OSHealthFitnessLib.UInt128) + public init(littleEndian value: OSHealthFitnessLib.UInt128) + public func addingReportingOverflow(_ rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func subtractingReportingOverflow(_ rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func multipliedReportingOverflow(by rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func multipliedFullWidth(by other: OSHealthFitnessLib.UInt128) -> (high: OSHealthFitnessLib.UInt128, low: OSHealthFitnessLib.UInt128.Magnitude) + public func dividedReportingOverflow(by rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func dividingFullWidth(_ dividend: (high: OSHealthFitnessLib.UInt128, low: OSHealthFitnessLib.UInt128)) -> (quotient: OSHealthFitnessLib.UInt128, remainder: OSHealthFitnessLib.UInt128) + public func remainderReportingOverflow(dividingBy rhs: OSHealthFitnessLib.UInt128) -> (partialValue: OSHealthFitnessLib.UInt128, overflow: Swift.Bool) + public func quotientAndRemainder(dividingBy rhs: OSHealthFitnessLib.UInt128) -> (quotient: OSHealthFitnessLib.UInt128, remainder: OSHealthFitnessLib.UInt128) +} +extension OSHealthFitnessLib.UInt128 { + public static var bitWidth: Swift.Int { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.BinaryInteger { + public var words: [Swift.UInt] { + get + } + public var trailingZeroBitCount: Swift.Int { + get + } + public init?(exactly source: T) where T : Swift.BinaryFloatingPoint + public init(_ source: T) where T : Swift.BinaryFloatingPoint + public static func / (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func /= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func % (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func %= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func |= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func ^= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &>>= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func &<<= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public typealias Stride = Swift.Int + public typealias Words = [Swift.UInt] +} +extension OSHealthFitnessLib.UInt128 : Swift.UnsignedInteger { +} +extension OSHealthFitnessLib.UInt128 : Swift.Hashable { + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.Numeric { + public static func + (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func += (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func - (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func -= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public static func * (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> OSHealthFitnessLib.UInt128 + public static func *= (lhs: inout OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) + public typealias Magnitude = OSHealthFitnessLib.UInt128 +} +extension OSHealthFitnessLib.UInt128 : Swift.Equatable { + public static func == (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> Swift.Bool +} +extension OSHealthFitnessLib.UInt128 : Swift.ExpressibleByIntegerLiteral { + public init(integerLiteral value: Swift.IntegerLiteralType) + public typealias IntegerLiteralType = Swift.IntegerLiteralType +} +extension OSHealthFitnessLib.UInt128 : Swift.CustomStringConvertible { + public var description: Swift.String { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.CustomDebugStringConvertible { + public var debugDescription: Swift.String { + get + } +} +extension OSHealthFitnessLib.UInt128 : Swift.Comparable { + public static func < (lhs: OSHealthFitnessLib.UInt128, rhs: OSHealthFitnessLib.UInt128) -> Swift.Bool +} +extension OSHealthFitnessLib.UInt128 : Swift.Codable { + public init(from decoder: Swift.Decoder) throws + public func encode(to encoder: Swift.Encoder) throws +} +extension OSHealthFitnessLib.UInt128 { + @available(swift, deprecated: 3.2, renamed: "init(_:)") + public static func fromUnparsedString(_ source: Swift.String) throws -> OSHealthFitnessLib.UInt128 + @available(swift, deprecated: 5.0, renamed: "init(_:)", message: "The ExpressibleByStringLiteral conformance has been removed. Use failable initializer instead.") + public init(stringLiteral value: Swift.StringLiteralType) +} +extension Swift.BinaryFloatingPoint { + public init(_ value: OSHealthFitnessLib.UInt128) + public init?(exactly value: OSHealthFitnessLib.UInt128) +} +extension Swift.String { + public init(_ value: OSHealthFitnessLib.UInt128, radix: Swift.Int = 10, uppercase: Swift.Bool = false) +} extension Foundation.Date { public struct ResultStruct { } @@ -86,6 +212,107 @@ public class BackgroundJobParameters : Swift.Codable { public func encode(to encoder: Swift.Encoder) throws required public init(from decoder: Swift.Decoder) throws } +public enum WorkoutTypeEnum : Swift.String { + case americanFootball + case archery + case australianFootball + case badminton + case barre + case baseball + case basketball + case bowling + case boxing + case climbing + case coreTraining + case crossCountrySkiing + case crossTraining + case curling + case cycling + case dance + case danceInspiredTraining + case discSports + case downhillSkiing + case elliptical + case equestrianSports + case fencing + case fitnessGaming + case fishing + case flexibility + case functionalStrengthTraining + case golf + case gymnastics + case handball + case handCycling + case highIntensityIntervalTraining + case hiking + case hockey + case hunting + case jumpRope + case kickboxing + case lacrosse + case martialArts + case mindAndBody + case mixedCardio + case paddleSports + case pilates + case play + case preparationAndRecovery + case racquetball + case rowing + case rugby + case running + case sailing + case skatingSports + case snowboarding + case snowSports + case soccer + case softball + case squash + case stairClimbing + case stairs + case stepTraining + case surfingSports + case swimming + case tableTennis + case taiChi + case tennis + case trackAndField + case traditionalStrengthTraining + case volleyball + case walking + case waterFitness + case waterPolo + case waterSports + case wheelchairRunPace + case wheelchairWalkPace + case wrestling + case yoga + public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String + public var rawValue: Swift.String { + get + } +} +public struct VariableType : Swift.OptionSet { + public let rawValue: Swift.Int + public init(rawValue: Swift.Int) + public typealias ArrayLiteralElement = OSHealthFitnessLib.VariableType + public typealias Element = OSHealthFitnessLib.VariableType + public typealias RawValue = Swift.Int +} +extension OSHealthFitnessLib.VariableType { + public static func getVariableType(for description: Swift.String) -> OSHealthFitnessLib.VariableType? +} +public struct WorkoutType : Swift.OptionSet, Swift.Hashable { + public let rawValue: OSHealthFitnessLib.UInt128 + public init(rawValue: OSHealthFitnessLib.UInt128) + public typealias ArrayLiteralElement = OSHealthFitnessLib.WorkoutType + public typealias Element = OSHealthFitnessLib.WorkoutType + public typealias RawValue = OSHealthFitnessLib.UInt128 +} +extension OSHealthFitnessLib.WorkoutType { + public static func getWorkoutType(for description: Swift.String) -> OSHealthFitnessLib.WorkoutType? +} public enum AdvancedQueryReturnTypeEnum : Swift.String { case allData case removeEmptyDataBlocks @@ -108,7 +335,7 @@ public struct AdvancedQueryResultType : Swift.OptionSet { extension OSHealthFitnessLib.AdvancedQueryResultType { public static func get(with description: Swift.String) -> OSHealthFitnessLib.AdvancedQueryResultType } -@_hasMissingDesignatedInitializers public class QueryParameters : Swift.Codable { +@_hasMissingDesignatedInitializers public class AdvancedQueryParameters : Swift.Codable { final public let variable: Swift.String? final public let startDate: Swift.String?, endDate: Swift.String? final public let timeUnit: Swift.String?, operationType: Swift.String? @@ -119,6 +346,27 @@ extension OSHealthFitnessLib.AdvancedQueryResultType { public func encode(to encoder: Swift.Encoder) throws required public init(from decoder: Swift.Decoder) throws } +@_hasMissingDesignatedInitializers public class WorkoutAdvancedQueryParameters : Swift.Codable { + final public let workoutTypeVariables: [OSHealthFitnessLib.WorkoutTypeVariableMapping] + final public let startDate: Swift.String? + final public let endDate: Swift.String? + @objc deinit + public func encode(to encoder: Swift.Encoder) throws + required public init(from decoder: Swift.Decoder) throws +} +public typealias WorkoutTypeVariableDictionary = [OSHealthFitnessLib.WorkoutType : OSHealthFitnessLib.VariableType] +extension OSHealthFitnessLib.WorkoutAdvancedQueryParameters { + public var workoutTypeVariableDictionary: OSHealthFitnessLib.WorkoutTypeVariableDictionary { + get + } +} +@_hasMissingDesignatedInitializers public class WorkoutTypeVariableMapping : Swift.Codable { + final public let workoutType: Swift.String + final public let variables: [Swift.String] + @objc deinit + public func encode(to encoder: Swift.Encoder) throws + required public init(from decoder: Swift.Decoder) throws +} @objc @_inheritsConvenienceInitializers public class BackgroundJob : CoreData.NSManagedObject { @objc override dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?) @objc deinit @@ -174,6 +422,9 @@ extension OSHealthFitnessLib.BackgroundJob { @objc set } } +extension OSHealthFitnessLib.BackgroundJob : Swift.Identifiable { + public typealias ID = Swift.Int64 +} @objc @_inheritsConvenienceInitializers public class Notification : CoreData.NSManagedObject { @objc override dynamic public init(entity: CoreData.NSEntityDescription, insertInto context: CoreData.NSManagedObjectContext?) @objc deinit @@ -197,9 +448,17 @@ extension OSHealthFitnessLib.Notification { @objc set } } +extension OSHealthFitnessLib.Notification : Swift.Identifiable { + public typealias ID = Swift.Int64 +} extension OSHealthFitnessLib.HealthKitErrors : Swift.Equatable {} extension OSHealthFitnessLib.HealthKitErrors : Swift.Hashable {} extension OSHealthFitnessLib.HealthKitErrors : Swift.RawRepresentable {} +extension OSHealthFitnessLib.UInt128Errors : Swift.Equatable {} +extension OSHealthFitnessLib.UInt128Errors : Swift.Hashable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.Equatable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.Hashable {} +extension OSHealthFitnessLib.WorkoutTypeEnum : Swift.RawRepresentable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.Equatable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.Hashable {} extension OSHealthFitnessLib.AdvancedQueryReturnTypeEnum : Swift.RawRepresentable {} diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/module.modulemap b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/module.modulemap index 981e335b..d1128522 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/module.modulemap +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Modules/module.modulemap @@ -1,11 +1,4 @@ framework module OSHealthFitnessLib { - umbrella header "OSHealthFitnessLib.h" - - export * - module * { export * } -} - -module OSHealthFitnessLib.Swift { - header "OSHealthFitnessLib-Swift.h" - requires objc + header "OSHealthFitnessLib-Swift.h" + requires objc } diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/OSHealthFitnessLib b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/OSHealthFitnessLib index 870e40c0..d239e9bc 100755 Binary files a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/OSHealthFitnessLib and b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/OSHealthFitnessLib differ diff --git a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/_CodeSignature/CodeResources b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/_CodeSignature/CodeResources index 48fdab3f..09b231d4 100644 --- a/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/_CodeSignature/CodeResources +++ b/src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ BackgroundModel.momd/BackgroundModel 2.mom - 8wXG8gSJkUu4YevHWntAnVPkMRA= + z3gtC433QCGafUDHom/iHq5+aBA= BackgroundModel.momd/BackgroundModel 2.omo @@ -14,7 +14,7 @@ BackgroundModel.momd/BackgroundModel.mom - CqH/1S2zlmn4mBtH7ebi75Ecu9o= + wnvIhUKGuyHpV9aWK+26V03fMS0= BackgroundModel.momd/VersionInfo.plist @@ -22,43 +22,39 @@ Headers/OSHealthFitnessLib-Swift.h - lN1ZPeHtM4Dc8Jgkq9Kvli7qvok= - - Headers/OSHealthFitnessLib.h - - 95oj0j+qXIUT2mlng9KDQ4IZ/40= + 0gq5xr6aqdnPYks8yp86LT05BUw= Info.plist - kDBhmV9rq1/Hhmk1hEem9jz/hzE= + tAfrv4EgEzAZe194QSaJ1aITenw= Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc - EjGLrT9KPXRvC1AIKn671piUtug= + CjE98e8xu0Of8m9jplEJeIy7fq8= Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface - mtXpyuVnbchMzaxMyGkSppPZkcc= + 9ppZzJSA7OyRF3sCK0RNIsJgdP0= Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftmodule - /tFxOKj78CvExf/do6PaWo0QiVA= + Ym4nok7RDcCDZowJPGGXERaJVw8= Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - Z/nr4l2D4fg6McFuK8IPAj+nvsI= + miDqM99JPCs9QF0j6SkpLd7o3h0= Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - 8qtNUqzO8wkoTU5kRy6ChYskTZY= + mq7SrNGBmFyHpo1L8uHnarJNrwo= Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - m9D1byHot0X6Kvr08DWrEb0XzrQ= + R1Ko5mLjZxhKiLfe59tdtWpNASM= Modules/module.modulemap - +P83mM4rI61JMQ9isT6khRRqS+c= + sw87f2yJ3lU2kd25gEKxIZALetM= files2 @@ -67,7 +63,7 @@ hash2 - k2qhT/WaSI355iIX+zFCEL6UR0x6fLW7yCiYmp4HkmU= + xw9jtvnGnhj0QUsLx9w9KJXAob0StM3SqLl+e02OZFw= BackgroundModel.momd/BackgroundModel 2.omo @@ -81,7 +77,7 @@ hash2 - xeouW/zTp2jT1BekuljMVTbmAtRaLucEcaydaIHRK9w= + swXMac8aOl4S0kubEFCmbnYEX7TWafp2J7U2F97O1yE= BackgroundModel.momd/VersionInfo.plist @@ -95,63 +91,56 @@ hash2 - YEBTwnCfOBwsO8w9eK/xlVHqS4tc5VihjhBYPN3bIMA= - - - Headers/OSHealthFitnessLib.h - - hash2 - - s4EQ5On3Z3CqX1VR0cfmL9xC9kqaxgfkRAlUEwQfpPg= + +y17S8NZQaNCgQI8DLvYD5jPVld3nTzbrzBRguqxlDM= Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftdoc hash2 - 6Fh9jQIOoflYI5pYjJUbwN6X/BvJPTz2CF5S1u+XzRw= + 5Z5W0U0uNiXyBhx7v05yQ3pumZ0fwE6IUVv+R4Fj6CA= Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - gsCJCS5YlnAjRHxzVPGhE8Vo8Hv0R4kVpfL8T8oSz5Q= + 2PWaU0ST7wt49vpdeafd586eMnqAlPTyP/y3mYPDJFg= Modules/OSHealthFitnessLib.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - MRCuIx2N3ji7Lsx+1FWTLRoic6nQ5FnvwKVVQ/86HNw= + jwmN9qBabrcuy0Gco+c8zlraZflWWmyF+Cy3o9x6O+E= Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - WAZKmfDsnm3LRmZjxtG4tbbN5LILzF5h2w+BNavIHAE= + TJbDwFrd58cSfx5giBAeqs+P5JEY1LnJehm/zjQgdrs= Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - AZufY9MQEQgkxeaIxScKRPRE4xRAfXTbQoQvNxLIfT8= + uch1CqfUd8cA6doqNeDmtKkTXMb6XXR9IEjfCb5315M= Modules/OSHealthFitnessLib.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - KLJpWiJgE0oUp55s5slc+maUQgF8l0mV/wO3jx6BEY8= + XBGkHrfuM70uVkphMvEmOWSihXyx/IpQOXD9sg8QPYw= Modules/module.modulemap hash2 - c+G3Fwt5gru0Zrr+9A9BKy06X/7gGytLFPS1tJHk6MM= + P7SE820E52XFwuSc9IyT2YlJFy1uZqPxi8tOPOxwGfg= diff --git a/www/OSHealthFitness.js b/www/OSHealthFitness.js index 32d90111..1eb6a753 100644 --- a/www/OSHealthFitness.js +++ b/www/OSHealthFitness.js @@ -8,10 +8,11 @@ exports.requestPermissions = function (success, error, params) { fitnessVariables, healthVariables, profileVariables, - summaryVariables + summaryVariables, + workoutVariables } = params; - var args = [customPermissions, allVariables, fitnessVariables, healthVariables, profileVariables, summaryVariables]; + var args = [customPermissions, allVariables, fitnessVariables, healthVariables, profileVariables, summaryVariables, workoutVariables]; exec(success, error, 'OSHealthFitness', 'requestPermissions', args); }; @@ -20,6 +21,10 @@ exports.getData = function (success, error, params) { exec(success, error, 'OSHealthFitness', 'getData', [params]); }; +exports.getWorkoutData = function (success, error, params) { + exec(success, error, 'OSHealthFitness', 'getWorkoutData', [params]); +}; + exports.updateData = function (success, error) { exec(success, error, 'OSHealthFitness', 'updateData'); };