diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.h b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.h index 68096d982b694f03a552960fe3dbaefa22e79a40..3a859b0354f78ed7d5d089bbfc61711d5e1c4a49 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.h +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.h @@ -10,10 +10,10 @@ @interface RCTAppleHealthKit (Methods_Fitness) -- (void)fitness_getStepCountForToday:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; +//- (void)fitness_getStepCountForToday:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)fitness_getStepCountOnDay:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; -- (void)fitness_getDailyStepCounts:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; +//- (void)fitness_getDailyStepCounts:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)fitness_getDailyStepSamples:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)fitness_saveSteps:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m index 15c6733840d482b6b80a0c293d559123296375cb..f885df4b2e15545fb83922c1c5eff7bee0c27477 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m @@ -12,23 +12,23 @@ @implementation RCTAppleHealthKit (Methods_Fitness) -- (void)fitness_getStepCountForToday:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback -{ - HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; - HKUnit *stepsUnit = [HKUnit countUnit]; - - [self fetchSumOfSamplesTodayForType:stepCountType - unit:stepsUnit - completion:^(double totalSteps, NSError *error) { - if (!totalSteps) { - NSLog(@"Either an error occured fetching the user's step count information or none has been stored yet. In your app, try to handle this gracefully."); - callback(@[RCTMakeError(@"Either an error occured fetching the user's step count information or none has been stored yet. In your app, try to handle this gracefully.", nil, nil)]); - return; - } - - callback(@[[NSNull null], @(totalSteps)]); - }]; -} +//- (void)fitness_getStepCountForToday:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback +//{ +// HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; +// HKUnit *stepsUnit = [HKUnit countUnit]; +// +// [self fetchSumOfSamplesTodayForType:stepCountType +// unit:stepsUnit +// completion:^(double totalSteps, NSError *error) { +// if (!totalSteps) { +// NSLog(@"Either an error occured fetching the user's step count information or none has been stored yet. In your app, try to handle this gracefully."); +// callback(@[RCTMakeError(@"Either an error occured fetching the user's step count information or none has been stored yet. In your app, try to handle this gracefully.", nil, nil)]); +// return; +// } +// +// callback(@[[NSNull null], @(totalSteps)]); +// }]; +//} - (void)fitness_getStepCountOnDay:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback @@ -46,45 +46,52 @@ [self fetchSumOfSamplesOnDayForType:stepCountType unit:stepsUnit day:date - completion:^(double totalSteps, NSError *error) { - if (!totalSteps) { + completion:^(double value, NSDate *startDate, NSDate *endDate, NSError *error) { + if (!value) { NSLog(@"could not fetch step count for day: %@", error); callback(@[RCTMakeError(@"could not fetch step count for day", error, nil)]); return; } - callback(@[[NSNull null], @(totalSteps)]); - }]; -} - + NSDictionary *response = @{ + @"value" : @(value), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + callback(@[[NSNull null], response]); + }]; +} -- (void)fitness_getDailyStepCounts:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback -{ - NSDate *startDate = [RCTAppleHealthKit startDateFromOptions:input]; - NSDate *endDate = [RCTAppleHealthKit endDateFromOptionsDefaultNow:input]; - - if(startDate == nil) { - callback(@[RCTMakeError(@"could not parse required startDate from options.startDate", nil, nil)]); - return; - } - HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; - HKUnit *stepsUnit = [HKUnit countUnit]; - [self fetchCumulativeSumStatisticsCollection:stepCountType - unit:stepsUnit - startDate:startDate - endDate:endDate - completion:^(NSArray *arr, NSError *err){ - if (err != nil) { - NSLog(@"error with fetchCumulativeSumStatisticsCollection: %@", err); - callback(@[RCTMakeError(@"error with fetchCumulativeSumStatisticsCollection", err, nil)]); - return; - } - callback(@[[NSNull null], arr]); - }]; -} +// +//- (void)fitness_getDailyStepCounts:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback +//{ +// NSDate *startDate = [RCTAppleHealthKit startDateFromOptions:input]; +// NSDate *endDate = [RCTAppleHealthKit endDateFromOptionsDefaultNow:input]; +// +// if(startDate == nil) { +// callback(@[RCTMakeError(@"could not parse required startDate from options.startDate", nil, nil)]); +// return; +// } +// +// HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; +// HKUnit *stepsUnit = [HKUnit countUnit]; +// +// [self fetchCumulativeSumStatisticsCollection:stepCountType +// unit:stepsUnit +// startDate:startDate +// endDate:endDate +// completion:^(NSArray *arr, NSError *err){ +// if (err != nil) { +// NSLog(@"error with fetchCumulativeSumStatisticsCollection: %@", err); +// callback(@[RCTMakeError(@"error with fetchCumulativeSumStatisticsCollection", err, nil)]); +// return; +// } +// callback(@[[NSNull null], arr]); +// }]; +//} @@ -157,13 +164,21 @@ HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierDistanceWalkingRunning]; - [self fetchSumOfSamplesOnDayForType:quantityType unit:unit day:date completion:^(double distance, NSError *error) { + [self fetchSumOfSamplesOnDayForType:quantityType unit:unit day:date completion:^(double distance, NSDate *startDate, NSDate *endDate, NSError *error) { if (!distance) { NSLog(@"ERROR getting DistanceWalkingRunning: %@", error); callback(@[RCTMakeError(@"ERROR getting DistanceWalkingRunning", error, nil)]); return; } - callback(@[[NSNull null], @(distance)]); + + NSDictionary *response = @{ + @"value" : @(distance), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + + + callback(@[[NSNull null], response]); }]; } @@ -175,13 +190,20 @@ HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierDistanceCycling]; - [self fetchSumOfSamplesOnDayForType:quantityType unit:unit day:date completion:^(double distance, NSError *error) { + [self fetchSumOfSamplesOnDayForType:quantityType unit:unit day:date completion:^(double distance, NSDate *startDate, NSDate *endDate, NSError *error) { if (!distance) { NSLog(@"ERROR getting DistanceCycling: %@", error); callback(@[RCTMakeError(@"ERROR getting DistanceCycling", error, nil)]); return; } - callback(@[[NSNull null], @(distance)]); + + NSDictionary *response = @{ + @"value" : @(distance), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + + callback(@[[NSNull null], response]); }]; } @@ -193,13 +215,20 @@ HKQuantityType *quantityType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierFlightsClimbed]; - [self fetchSumOfSamplesOnDayForType:quantityType unit:unit day:date completion:^(double count, NSError *error) { + [self fetchSumOfSamplesOnDayForType:quantityType unit:unit day:date completion:^(double count, NSDate *startDate, NSDate *endDate, NSError *error) { if (!count) { NSLog(@"ERROR getting FlightsClimbed: %@", error); callback(@[RCTMakeError(@"ERROR getting FlightsClimbed", error, nil), @(count)]); return; } - callback(@[[NSNull null], @(count)]); + + NSDictionary *response = @{ + @"value" : @(count), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + + callback(@[[NSNull null], response]); }]; } diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h index bb7da93bd7a9ca5f22c3dbe8bb3314e68a187e7a..7b9134966251baed7be8fca24d8ee4f32ebcc59d 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.h @@ -12,7 +12,7 @@ - (void)fetchMostRecentQuantitySampleOfType:(HKQuantityType *)quantityType predicate:(NSPredicate *)predicate completion:(void (^)(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error))completion; - (void)fetchSumOfSamplesTodayForType:(HKQuantityType *)quantityType unit:(HKUnit *)unit completion:(void (^)(double, NSError *))completionHandler; -- (void)fetchSumOfSamplesOnDayForType:(HKQuantityType *)quantityType unit:(HKUnit *)unit day:(NSDate *)day completion:(void (^)(double, NSError *))completionHandler; +- (void)fetchSumOfSamplesOnDayForType:(HKQuantityType *)quantityType unit:(HKUnit *)unit day:(NSDate *)day completion:(void (^)(double, NSDate *, NSDate *, NSError *))completionHandler; - (void)fetchCumulativeSumStatisticsCollection:(HKQuantityType *)quantityType unit:(HKUnit *)unit diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m index 867d5b9510f571ea63e3c2ed863644394abb22a9..491fe62b96681a5449716ff97fc10bc24378068c 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m @@ -138,10 +138,16 @@ + + + + + + - (void)fetchSumOfSamplesOnDayForType:(HKQuantityType *)quantityType unit:(HKUnit *)unit day:(NSDate *)day - completion:(void (^)(double, NSError *))completionHandler { + completion:(void (^)(double, NSDate *, NSDate *, NSError *))completionHandler { NSPredicate *predicate = [RCTAppleHealthKit predicateForSamplesOnDay:day]; HKStatisticsQuery *query = [[HKStatisticsQuery alloc] initWithQuantityType:quantityType @@ -150,9 +156,11 @@ completionHandler:^(HKStatisticsQuery *query, HKStatistics *result, NSError *error) { HKQuantity *sum = [result sumQuantity]; + NSDate *startDate = result.startDate; + NSDate *endDate = result.endDate; if (completionHandler) { double value = [sum doubleValueForUnit:unit]; - completionHandler(value, error); + completionHandler(value,startDate, endDate, error); } }]; @@ -162,6 +170,12 @@ + + + + + + - (void)fetchCumulativeSumStatisticsCollection:(HKQuantityType *)quantityType unit:(HKUnit *)unit startDate:(NSDate *)startDate diff --git a/RCTAppleHealthKit/RCTAppleHealthKit.m b/RCTAppleHealthKit/RCTAppleHealthKit.m index 5578806235e4e6bf2047ee8208efdb747457c31b..2105fdef4fd799e104123f27ee5eddbcc159c647 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit.m @@ -7,9 +7,9 @@ // #import "RCTAppleHealthKit.h" -#import "RCTAppleHealthKit+Queries.h" +//#import "RCTAppleHealthKit+Queries.h" #import "RCTAppleHealthKit+TypesAndPermissions.h" -#import "RCTAppleHealthKit+Utils.h" +//#import "RCTAppleHealthKit+Utils.h" #import "RCTAppleHealthKit+Methods_Body.h" #import "RCTAppleHealthKit+Methods_Fitness.h" diff --git a/examples/BodyMeasurements/ios/BodyMeasurements.xcodeproj/project.pbxproj b/examples/BodyMeasurements/ios/BodyMeasurements.xcodeproj/project.pbxproj index 4ddcbc9d38853fb0d3b54f410485328b976f784f..7e69275afdffedd67210b6463622af58d43fb0a8 100644 --- a/examples/BodyMeasurements/ios/BodyMeasurements.xcodeproj/project.pbxproj +++ b/examples/BodyMeasurements/ios/BodyMeasurements.xcodeproj/project.pbxproj @@ -22,7 +22,7 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; - 378DCB661D31876000E83D06 /* libRCTAppleHealthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 378DCB651D31875D00E83D06 /* libRCTAppleHealthKit.a */; }; + 378DCB6D1D318E0C00E83D06 /* libRCTAppleHealthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 378DCB6C1D318E0700E83D06 /* libRCTAppleHealthKit.a */; }; 37E9B8741D21B52F0090B19B /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37E9B8731D21B52F0090B19B /* HealthKit.framework */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -91,9 +91,9 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; - 378DCB641D31875D00E83D06 /* PBXContainerItemProxy */ = { + 378DCB6B1D318E0700E83D06 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 378DCB601D31875D00E83D06 /* RCTAppleHealthKit.xcodeproj */; + containerPortal = 378DCB671D318E0700E83D06 /* RCTAppleHealthKit.xcodeproj */; proxyType = 2; remoteGlobalIDString = 3774C88D1D2092F20000B3F3; remoteInfo = RCTAppleHealthKit; @@ -134,7 +134,7 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = BodyMeasurements/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = BodyMeasurements/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 378DCB601D31875D00E83D06 /* RCTAppleHealthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAppleHealthKit.xcodeproj; path = "../node_modules/react-native-apple-healthkit/RCTAppleHealthKit.xcodeproj"; sourceTree = ""; }; + 378DCB671D318E0700E83D06 /* RCTAppleHealthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAppleHealthKit.xcodeproj; path = "../node_modules/react-native-apple-healthkit/RCTAppleHealthKit.xcodeproj"; sourceTree = ""; }; 37E9B8731D21B52F0090B19B /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 37E9B8751D21B52F0090B19B /* BodyMeasurements.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = BodyMeasurements.entitlements; path = BodyMeasurements/BodyMeasurements.entitlements; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; @@ -154,7 +154,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 378DCB661D31876000E83D06 /* libRCTAppleHealthKit.a in Frameworks */, + 378DCB6D1D318E0C00E83D06 /* libRCTAppleHealthKit.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 37E9B8741D21B52F0090B19B /* HealthKit.framework in Frameworks */, @@ -268,10 +268,10 @@ name = Products; sourceTree = ""; }; - 378DCB611D31875D00E83D06 /* Products */ = { + 378DCB681D318E0700E83D06 /* Products */ = { isa = PBXGroup; children = ( - 378DCB651D31875D00E83D06 /* libRCTAppleHealthKit.a */, + 378DCB6C1D318E0700E83D06 /* libRCTAppleHealthKit.a */, ); name = Products; sourceTree = ""; @@ -287,7 +287,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 378DCB601D31875D00E83D06 /* RCTAppleHealthKit.xcodeproj */, + 378DCB671D318E0700E83D06 /* RCTAppleHealthKit.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, @@ -411,8 +411,8 @@ ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; }, { - ProductGroup = 378DCB611D31875D00E83D06 /* Products */; - ProjectRef = 378DCB601D31875D00E83D06 /* RCTAppleHealthKit.xcodeproj */; + ProductGroup = 378DCB681D318E0700E83D06 /* Products */; + ProjectRef = 378DCB671D318E0700E83D06 /* RCTAppleHealthKit.xcodeproj */; }, { ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; @@ -516,11 +516,11 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 378DCB651D31875D00E83D06 /* libRCTAppleHealthKit.a */ = { + 378DCB6C1D318E0700E83D06 /* libRCTAppleHealthKit.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRCTAppleHealthKit.a; - remoteRef = 378DCB641D31875D00E83D06 /* PBXContainerItemProxy */; + remoteRef = 378DCB6B1D318E0700E83D06 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { diff --git a/examples/StepsDemo/app/components/home/index.js b/examples/StepsDemo/app/components/home/index.js index ef7c2e9803fd0b258ad79e572b46af303afd90ba..cbb686c22b408661336bd45417a78711a310fc90 100644 --- a/examples/StepsDemo/app/components/home/index.js +++ b/examples/StepsDemo/app/components/home/index.js @@ -71,11 +71,11 @@ class Home extends Component { * @private */ _fetchStepsToday() { - AppleHealthKit.getStepCount(null, (err, steps) => { + AppleHealthKit.getStepCount(null, (err, res) => { if(this._handleHKError(err, 'getStepCount')){ return; } - this.setState({stepsToday: steps}); + this.setState({stepsToday: res.value}); }); } diff --git a/examples/StepsDemo/ios/StepsDemo.xcodeproj/project.pbxproj b/examples/StepsDemo/ios/StepsDemo.xcodeproj/project.pbxproj index 4fbb7325ee4a80dea8f4e9c7abb77b7b20562cc7..c9481ba613699a25bcb30cb5dab21e2afd639b1a 100644 --- a/examples/StepsDemo/ios/StepsDemo.xcodeproj/project.pbxproj +++ b/examples/StepsDemo/ios/StepsDemo.xcodeproj/project.pbxproj @@ -23,7 +23,7 @@ 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 378616B61D257B040027C300 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 378616B51D257B040027C300 /* HealthKit.framework */; }; - 378DCB541D31810500E83D06 /* libRCTAppleHealthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 378DCB531D31810200E83D06 /* libRCTAppleHealthKit.a */; }; + 378DCB741D3190C800E83D06 /* libRCTAppleHealthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 378DCB731D3190C100E83D06 /* libRCTAppleHealthKit.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -91,9 +91,9 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = React; }; - 378DCB521D31810200E83D06 /* PBXContainerItemProxy */ = { + 378DCB721D3190C100E83D06 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 378DCB4E1D31810200E83D06 /* RCTAppleHealthKit.xcodeproj */; + containerPortal = 378DCB6E1D3190C100E83D06 /* RCTAppleHealthKit.xcodeproj */; proxyType = 2; remoteGlobalIDString = 3774C88D1D2092F20000B3F3; remoteInfo = RCTAppleHealthKit; @@ -136,7 +136,7 @@ 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; 378616B51D257B040027C300 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 378616B71D257B040027C300 /* StepsDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = StepsDemo.entitlements; path = StepsDemo/StepsDemo.entitlements; sourceTree = ""; }; - 378DCB4E1D31810200E83D06 /* RCTAppleHealthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAppleHealthKit.xcodeproj; path = "../node_modules/react-native-apple-healthkit/RCTAppleHealthKit.xcodeproj"; sourceTree = ""; }; + 378DCB6E1D3190C100E83D06 /* RCTAppleHealthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAppleHealthKit.xcodeproj; path = "../node_modules/react-native-apple-healthkit/RCTAppleHealthKit.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -154,7 +154,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 378DCB541D31810500E83D06 /* libRCTAppleHealthKit.a in Frameworks */, + 378DCB741D3190C800E83D06 /* libRCTAppleHealthKit.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 378616B61D257B040027C300 /* HealthKit.framework in Frameworks */, @@ -268,10 +268,10 @@ name = Products; sourceTree = ""; }; - 378DCB4F1D31810200E83D06 /* Products */ = { + 378DCB6F1D3190C100E83D06 /* Products */ = { isa = PBXGroup; children = ( - 378DCB531D31810200E83D06 /* libRCTAppleHealthKit.a */, + 378DCB731D3190C100E83D06 /* libRCTAppleHealthKit.a */, ); name = Products; sourceTree = ""; @@ -287,7 +287,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 378DCB4E1D31810200E83D06 /* RCTAppleHealthKit.xcodeproj */, + 378DCB6E1D3190C100E83D06 /* RCTAppleHealthKit.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, @@ -411,8 +411,8 @@ ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; }, { - ProductGroup = 378DCB4F1D31810200E83D06 /* Products */; - ProjectRef = 378DCB4E1D31810200E83D06 /* RCTAppleHealthKit.xcodeproj */; + ProductGroup = 378DCB6F1D3190C100E83D06 /* Products */; + ProjectRef = 378DCB6E1D3190C100E83D06 /* RCTAppleHealthKit.xcodeproj */; }, { ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; @@ -516,11 +516,11 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 378DCB531D31810200E83D06 /* libRCTAppleHealthKit.a */ = { + 378DCB731D3190C100E83D06 /* libRCTAppleHealthKit.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRCTAppleHealthKit.a; - remoteRef = 378DCB521D31810200E83D06 /* PBXContainerItemProxy */; + remoteRef = 378DCB721D3190C100E83D06 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = { diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/Contents.json b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/Contents.json deleted file mode 100644 index a08b283c43fe14043cdc57dbe8b4147e3b077e50..0000000000000000000000000000000000000000 --- a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/Contents.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "images" : [ - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "steps-4.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "steps-5.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "steps-6.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "steps-2.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "steps-3.png", - "scale" : "3x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "steps-7.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "steps-8.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "steps.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "steps-1.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-1.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-1.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-1.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-2.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-2.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-2.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-3.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-3.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-3.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-4.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-4.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-4.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-5.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-5.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-5.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-6.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-6.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-6.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-7.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-7.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-7.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-8.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-8.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps-8.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps.png deleted file mode 100644 index a32c9940fe139b7d11f60be169ea8614e8139731..0000000000000000000000000000000000000000 Binary files a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon-1.appiconset/steps.png and /dev/null differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Contents.json index 118c98f7461bf98b2bc7e061150d8021121ad277..1a9126bac71460150685dd238c86e59038580a03 100644 --- a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,33 +1,105 @@ { "images" : [ { + "size" : "29x29", "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", "scale" : "3x" }, { + "size" : "60x60", "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", "scale" : "2x" }, { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", "idiom" : "iphone", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@3x.png", "scale" : "3x" } ], diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..2cebaea621aaa0eb9c121e53ca7030f6b0d88b48 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..61e7ddd8e20de1d9765ab2514c9083d8f7f6e284 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..bde1792adb28a71a0537a2dbc01bce6976c433f8 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..334a19dac0f4b96adee9b3cd10e47adce48e4cb4 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..aa073575bf3f45c8e6a5c6498bcf6e55d2a969a8 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..af9f5bbf9fe0cb3a1de78c00e269d8fffd19253d Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..a30dfe3af2e90ca4d928202f658655f8c4f2d6c8 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..af9f5bbf9fe0cb3a1de78c00e269d8fffd19253d Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..8d8413c5a106e79c489670dea10974233fcd349e Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..6125536a763cc0f0e8cd019366cb36bd9a6f1dd7 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ee3a9528a7c16c0f90a999d1e821bc24778562a7 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..547c71db303159157049b466dafe38392029e30f Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png differ diff --git a/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..bc33d5be0b755c5816cd8db2669ba7d6fcc0bf02 Binary files /dev/null and b/examples/StepsDemo/ios/StepsDemo/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ