From 62fbdfdf03c3004505cd0d56c0ad7f535b481d5c Mon Sep 17 00:00:00 2001 From: Greg Wilson Date: Fri, 8 Jul 2016 11:34:05 -0400 Subject: [PATCH] standardized method naming in Body methods, standardized callback object and error messages --- .../RCTAppleHealthKit+Methods_Body.h | 8 +- .../RCTAppleHealthKit+Methods_Body.m | 116 +++++++++++------ .../RCTAppleHealthKit+Methods_Fitness.m | 41 +++--- RCTAppleHealthKit/RCTAppleHealthKit+Queries.m | 122 ++++++++++-------- RCTAppleHealthKit/RCTAppleHealthKit.m | 8 +- 5 files changed, 175 insertions(+), 120 deletions(-) diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.h b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.h index 789bcc2..b0dc173 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.h +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.h @@ -10,19 +10,19 @@ @interface RCTAppleHealthKit (Methods_Body) -- (void)body_getCurrentWeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; +- (void)body_getLatestWeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)body_getWeightSamples:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)body_saveWeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)body_getLatestBodyMassIndex:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)body_saveBodyMassIndex:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; -- (void)body_getMostRecentHeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; +- (void)body_getLatestHeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)body_getHeightSamples:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; - (void)body_saveHeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; -- (void)body_getMostRecentBodyFatPercentage:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; -- (void)body_getMostRecentLeanBodyMass:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; +- (void)body_getLatestBodyFatPercentage:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; +- (void)body_getLatestLeanBodyMass:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback; @end diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m index a2fcd51..c420020 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m @@ -10,10 +10,11 @@ #import "RCTAppleHealthKit+Queries.h" #import "RCTAppleHealthKit+Utils.h" + @implementation RCTAppleHealthKit (Methods_Body) -- (void)body_getCurrentWeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback +- (void)body_getLatestWeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { // Query to get the user's latest weight, if it exists. HKQuantityType *weightType = [HKQuantityType quantityTypeForIdentifier:HKQuantityTypeIdentifierBodyMass]; @@ -23,15 +24,24 @@ unit = [HKUnit poundUnit]; } - [self fetchMostRecentQuantitySampleOfType:weightType predicate:nil completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { + [self fetchMostRecentQuantitySampleOfType:weightType + predicate:nil + completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { if (!mostRecentQuantity) { - NSLog(@"Either an error occured fetching the user's weight 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 weight information or none has been stored yet. In your app, try to handle this gracefully.", nil, nil)]); + NSLog(@"error getting latest weight: %@", error); + callback(@[RCTMakeError(@"error getting latest weight", error, nil)]); } else { // Determine the weight in the required unit. double usersWeight = [mostRecentQuantity doubleValueForUnit:unit]; - callback(@[[NSNull null], @(usersWeight)]); + + NSDictionary *response = @{ + @"value" : @(usersWeight), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + + callback(@[[NSNull null], response]); } }]; } @@ -84,8 +94,8 @@ [self.healthStore saveObject:weightSample withCompletion:^(BOOL success, NSError *error) { if (!success) { - NSLog(@"An error occured saving the weight sample %@. In your app, try to handle this gracefully. The error was: %@.", weightSample, error); - callback(@[RCTMakeError(@"An error occured saving the weight sample", nil, nil)]); + NSLog(@"error saving the weight sample: %@", error); + callback(@[RCTMakeError(@"error saving the weight sample", error, nil)]); return; } callback(@[[NSNull null], @(weight)]); @@ -98,10 +108,12 @@ // Query to get the user's latest BMI, if it exists. HKQuantityType *bmiType = [HKQuantityType quantityTypeForIdentifier:HKQuantityTypeIdentifierBodyMassIndex]; - [self fetchMostRecentQuantitySampleOfType:bmiType predicate:nil completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { + [self fetchMostRecentQuantitySampleOfType:bmiType + predicate:nil + completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { if (!mostRecentQuantity) { - NSLog(@"Either an error occured fetching the user's bmi 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 bmi information or none has been stored yet. In your app, try to handle this gracefully.", nil, nil)]); + NSLog(@"error getting latest BMI: %@", error); + callback(@[RCTMakeError(@"error getting latest BMI", error, nil)]); } else { // Determine the bmi in the required unit. @@ -133,8 +145,8 @@ [self.healthStore saveObject:bmiSample withCompletion:^(BOOL success, NSError *error) { if (!success) { - NSLog(@"An error occured saving the bmi sample %@. In your app, try to handle this gracefully. The error was: %@.", bmiSample, error); - callback(@[RCTMakeError(@"An error occured saving the bmi sample", nil, nil)]); + NSLog(@"error saving BMI sample: %@.", error); + callback(@[RCTMakeError(@"error saving BMI sample", error, nil)]); return; } callback(@[[NSNull null], @(bmi)]); @@ -143,7 +155,7 @@ -- (void)body_getMostRecentHeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback +- (void)body_getLatestHeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { HKQuantityType *heightType = [HKQuantityType quantityTypeForIdentifier:HKQuantityTypeIdentifierHeight]; @@ -152,15 +164,24 @@ unit = [HKUnit inchUnit]; } - [self fetchMostRecentQuantitySampleOfType:heightType predicate:nil completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { + [self fetchMostRecentQuantitySampleOfType:heightType + predicate:nil + completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { if (!mostRecentQuantity) { - NSLog(@"Either an error occured fetching the user's height 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 height information or none has been stored yet. In your app, try to handle this gracefully.", nil, nil)]); + NSLog(@"error getting latest height: %@", error); + callback(@[RCTMakeError(@"error getting latest height", error, nil)]); } else { // Determine the height in the required unit. - double usersHeight = [mostRecentQuantity doubleValueForUnit:unit]; - callback(@[[NSNull null], @(usersHeight)]); + double height = [mostRecentQuantity doubleValueForUnit:unit]; + + NSDictionary *response = @{ + @"value" : @(height), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + + callback(@[[NSNull null], response]); } }]; } @@ -188,15 +209,15 @@ ascending:ascending limit:limit completion:^(NSArray *results, NSError *error) { - if(results){ - callback(@[[NSNull null], results]); - return; - } else { - NSLog(@"error getting height samples: %@", error); - callback(@[RCTMakeError(@"error getting height samples", nil, nil)]); - return; - } - }]; + if(results){ + callback(@[[NSNull null], results]); + return; + } else { + NSLog(@"error getting height samples: %@", error); + callback(@[RCTMakeError(@"error getting height samples", error, nil)]); + return; + } + }]; } @@ -217,8 +238,8 @@ [self.healthStore saveObject:heightSample withCompletion:^(BOOL success, NSError *error) { if (!success) { - NSLog(@"An error occured saving the height sample %@. In your app, try to handle this gracefully. The error was: %@.", heightSample, error); - callback(@[RCTMakeError(@"An error occured saving the height sample", nil, nil)]); + NSLog(@"error saving height sample: %@", error); + callback(@[RCTMakeError(@"error saving height sample", error, nil)]); return; } callback(@[[NSNull null], @(height)]); @@ -226,14 +247,17 @@ } -- (void)body_getMostRecentBodyFatPercentage:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback + +- (void)body_getLatestBodyFatPercentage:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { HKQuantityType *bodyFatPercentType = [HKQuantityType quantityTypeForIdentifier:HKQuantityTypeIdentifierBodyFatPercentage]; - [self fetchMostRecentQuantitySampleOfType:bodyFatPercentType predicate:nil completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { + [self fetchMostRecentQuantitySampleOfType:bodyFatPercentType + predicate:nil + completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { if (!mostRecentQuantity) { - NSLog(@"Either an error occured fetching the user's BodyFatPercentage 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 BodyFatPercentage information or none has been stored yet. In your app, try to handle this gracefully.", nil, nil)]); + NSLog(@"error getting latest body fat percentage: %@", error); + callback(@[RCTMakeError(@"error getting latest body fat percentage", error, nil)]); } else { // Determine the weight in the required unit. @@ -242,26 +266,40 @@ percentage = percentage * 100; - callback(@[[NSNull null], @(percentage)]); + NSDictionary *response = @{ + @"value" : @(percentage), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + + callback(@[[NSNull null], response]); } }]; } -- (void)body_getMostRecentLeanBodyMass:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback +- (void)body_getLatestLeanBodyMass:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { HKQuantityType *leanBodyMassType = [HKQuantityType quantityTypeForIdentifier:HKQuantityTypeIdentifierLeanBodyMass]; - [self fetchMostRecentQuantitySampleOfType:leanBodyMassType predicate:nil completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { + [self fetchMostRecentQuantitySampleOfType:leanBodyMassType + predicate:nil + completion:^(HKQuantity *mostRecentQuantity, NSDate *startDate, NSDate *endDate, NSError *error) { if (!mostRecentQuantity) { - NSLog(@"Either an error occured fetching the user's LeanBodyMass 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 LeanBodyMass information or none has been stored yet. In your app, try to handle this gracefully.", nil, nil)]); + NSLog(@"error getting latest lean body mass: %@", error); + callback(@[RCTMakeError(@"error getting latest lean body mass", error, nil)]); } else { HKUnit *weightUnit = [HKUnit poundUnit]; double leanBodyMass = [mostRecentQuantity doubleValueForUnit:weightUnit]; - callback(@[[NSNull null], @(leanBodyMass)]); + NSDictionary *response = @{ + @"value" : @(leanBodyMass), + @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], + @"endDate" : [RCTAppleHealthKit buildISO8601StringFromDate:endDate], + }; + + callback(@[[NSNull null], response]); } }]; } diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m index e73b878..1f52448 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Fitness.m @@ -17,7 +17,9 @@ HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; HKUnit *stepsUnit = [HKUnit countUnit]; - [self fetchSumOfSamplesTodayForType:stepCountType unit:stepsUnit completion:^(double totalSteps, NSError *error) { + [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)]); @@ -31,7 +33,8 @@ - (void)fitness_getStepCountForDay:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { - NSDate *date = [RCTAppleHealthKit dateFromOptions:input]; + NSDate *date = [RCTAppleHealthKit dateFromOptions:input key:@"date" withDefault:[NSDate date]]; + if(date == nil) { callback(@[RCTMakeError(@"could not parse date from options.date", nil, nil)]); return; @@ -40,7 +43,10 @@ HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; HKUnit *stepsUnit = [HKUnit countUnit]; - [self fetchSumOfSamplesOnDayForType:stepCountType unit:stepsUnit day:date completion:^(double totalSteps, NSError *error) { + [self fetchSumOfSamplesOnDayForType:stepCountType + unit:stepsUnit + day:date + completion:^(double totalSteps, NSError *error) { if (!totalSteps) { NSLog(@"could not fetch step count for day: %@", error); callback(@[RCTMakeError(@"could not fetch step count for day", error, nil)]); @@ -66,7 +72,11 @@ HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; HKUnit *stepsUnit = [HKUnit countUnit]; - [self fetchCumulativeSumStatisticsCollection:stepCountType unit:stepsUnit startDate:startDate endDate:endDate completion:^(NSArray *arr, NSError *err){ + [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)]); @@ -93,7 +103,13 @@ HKQuantityType *stepCountType = [HKObjectType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; - [self fetchCumulativeSumStatisticsCollection:stepCountType unit:unit startDate:startDate endDate:endDate ascending:ascending limit:limit completion:^(NSArray *arr, NSError *err){ + [self fetchCumulativeSumStatisticsCollection:stepCountType + unit:unit + startDate:startDate + endDate:endDate + ascending:ascending + limit:limit + completion:^(NSArray *arr, NSError *err){ if (err != nil) { NSLog(@"error with fetchCumulativeSumStatisticsCollection: %@", err); callback(@[RCTMakeError(@"error with fetchCumulativeSumStatisticsCollection", err, nil)]); @@ -107,27 +123,16 @@ - (void)fitness_saveSteps:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { - -// double height = [RCTAppleHealthKit doubleValueFromOptions:input]; double value = [RCTAppleHealthKit doubleFromOptions:input key:@"value" withDefault:(double)0]; - NSDate *startDate = [RCTAppleHealthKit dateFromOptions:input key:@"startDate" withDefault:nil]; NSDate *endDate = [RCTAppleHealthKit dateFromOptions:input key:@"endDate" withDefault:[NSDate date]]; - HKUnit *unit = [HKUnit countUnit]; - -// NSDate *sampleDate = [RCTAppleHealthKit dateFromOptionsDefaultNow:input]; - -// HKUnit *heightUnit = [RCTAppleHealthKit hkUnitFromOptions:input]; -// if(heightUnit == nil){ -// heightUnit = [HKUnit inchUnit]; -// } - if(startDate == nil || endDate == nil){ callback(@[RCTMakeError(@"startDate and endDate are required in options", nil, nil)]); return; } + HKUnit *unit = [HKUnit countUnit]; HKQuantity *quantity = [HKQuantity quantityWithUnit:unit doubleValue:value]; HKQuantityType *type = [HKQuantityType quantityTypeForIdentifier:HKQuantityTypeIdentifierStepCount]; HKQuantitySample *sample = [HKQuantitySample quantitySampleWithType:type quantity:quantity startDate:startDate endDate:endDate]; @@ -145,7 +150,6 @@ - - (void)fitness_getDistanceWalkingRunningOnDay:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { HKUnit *unit = [RCTAppleHealthKit hkUnitFromOptions:input key:@"unit" withDefault:[HKUnit meterUnit]]; @@ -181,6 +185,7 @@ }]; } + - (void)fitness_getFlightsClimbedOnDay:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback { HKUnit *unit = [HKUnit countUnit]; diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m index d621700..867d5b9 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m @@ -16,30 +16,35 @@ predicate:(NSPredicate *)predicate completion:(void (^)(HKQuantity *, NSDate *, NSDate *, NSError *))completion { - NSSortDescriptor *timeSortDescriptor = [[NSSortDescriptor alloc] initWithKey:HKSampleSortIdentifierEndDate ascending:NO]; - HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:quantityType - predicate:predicate - limit:1 - sortDescriptors:@[timeSortDescriptor] - resultsHandler:^(HKSampleQuery *query, NSArray *results, NSError *error) { - - if (!results) { - if (completion) { - completion(nil, nil, nil, error); - } - return; - } - - if (completion) { - // If quantity isn't in the database, return nil in the completion block. - HKQuantitySample *quantitySample = results.firstObject; - HKQuantity *quantity = quantitySample.quantity; - NSDate *startDate = quantitySample.startDate; - NSDate *endDate = quantitySample.endDate; - completion(quantity, startDate, endDate, error); - } - - }]; + NSSortDescriptor *timeSortDescriptor = [[NSSortDescriptor alloc] + initWithKey:HKSampleSortIdentifierEndDate + ascending:NO + ]; + + HKSampleQuery *query = [[HKSampleQuery alloc] + initWithSampleType:quantityType + predicate:predicate + limit:1 + sortDescriptors:@[timeSortDescriptor] + resultsHandler:^(HKSampleQuery *query, NSArray *results, NSError *error) { + + if (!results) { + if (completion) { + completion(nil, nil, nil, error); + } + return; + } + + if (completion) { + // If quantity isn't in the database, return nil in the completion block. + HKQuantitySample *quantitySample = results.firstObject; + HKQuantity *quantity = quantitySample.quantity; + NSDate *startDate = quantitySample.startDate; + NSDate *endDate = quantitySample.endDate; + completion(quantity, startDate, endDate, error); + } + } + ]; [self.healthStore executeQuery:query]; } @@ -52,46 +57,53 @@ limit:(NSUInteger)lim completion:(void (^)(NSArray *, NSError *))completion { - NSSortDescriptor *timeSortDescriptor = [[NSSortDescriptor alloc] initWithKey:HKSampleSortIdentifierEndDate ascending:asc]; - HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:quantityType - predicate:predicate - limit:lim - sortDescriptors:@[timeSortDescriptor] - resultsHandler:^(HKSampleQuery *query, NSArray *results, NSError *error) { + NSSortDescriptor *timeSortDescriptor = [[NSSortDescriptor alloc] initWithKey:HKSampleSortIdentifierEndDate + ascending:asc]; + + // declare the block + void (^handlerBlock)(HKSampleQuery *query, NSArray *results, NSError *error); + // create and assign the block + handlerBlock = ^(HKSampleQuery *query, NSArray *results, NSError *error) { + if (!results) { + if (completion) { + completion(nil, error); + } + return; + } - if (!results) { - if (completion) { - completion(nil, error); - } - return; - } + if (completion) { + NSMutableArray *data = [NSMutableArray arrayWithCapacity:1]; - if (completion) { - NSMutableArray *data = [NSMutableArray arrayWithCapacity:1]; + dispatch_async(dispatch_get_main_queue(), ^{ - dispatch_async(dispatch_get_main_queue(), ^{ + for (HKQuantitySample *sample in results) { + HKQuantity *quantity = sample.quantity; + double value = [quantity doubleValueForUnit:unit]; - for (HKQuantitySample *sample in results) { - HKQuantity *quantity = sample.quantity; - double value = [quantity doubleValueForUnit:unit]; + NSString *startDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.startDate]; + NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate]; - NSString *startDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.startDate]; - NSString *endDateString = [RCTAppleHealthKit buildISO8601StringFromDate:sample.endDate]; + NSDictionary *elem = @{ + @"value" : @(value), + @"startDate" : startDateString, + @"endDate" : endDateString, + }; - NSDictionary *elem = @{ - @"value" : @(value), - @"startDate" : startDateString, - @"endDate" : endDateString, - }; + [data addObject:elem]; + } - [data addObject:elem]; - } + completion(data, error); + }); + } + }; - completion(data, error); - }); - } - }]; + HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:quantityType + predicate:predicate + limit:lim + sortDescriptors:@[timeSortDescriptor] + resultsHandler:handlerBlock]; + [self.healthStore executeQuery:query]; } diff --git a/RCTAppleHealthKit/RCTAppleHealthKit.m b/RCTAppleHealthKit/RCTAppleHealthKit.m index b6b254a..22d1c1c 100644 --- a/RCTAppleHealthKit/RCTAppleHealthKit.m +++ b/RCTAppleHealthKit/RCTAppleHealthKit.m @@ -42,7 +42,7 @@ RCT_EXPORT_METHOD(getDateOfBirth:(NSDictionary *)input callback:(RCTResponseSend RCT_EXPORT_METHOD(getLatestWeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback) { - [self body_getCurrentWeight:input callback:callback]; + [self body_getLatestWeight:input callback:callback]; } RCT_EXPORT_METHOD(getWeightSamples:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback) @@ -58,7 +58,7 @@ RCT_EXPORT_METHOD(saveWeight:(NSDictionary *)input callback:(RCTResponseSenderBl RCT_EXPORT_METHOD(getLatestHeight:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback) { - [self body_getMostRecentHeight:input callback:callback]; + [self body_getLatestHeight:input callback:callback]; } RCT_EXPORT_METHOD(getHeightSamples:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback) @@ -85,12 +85,12 @@ RCT_EXPORT_METHOD(saveBmi:(NSDictionary *)input callback:(RCTResponseSenderBlock RCT_EXPORT_METHOD(getLatestBodyFatPercentage:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback) { - [self body_getMostRecentBodyFatPercentage:input callback:callback]; + [self body_getLatestBodyFatPercentage:input callback:callback]; } RCT_EXPORT_METHOD(getLatestLeanBodyMass:(NSDictionary *)input callback:(RCTResponseSenderBlock)callback) { - [self body_getMostRecentLeanBodyMass:input callback:callback]; + [self body_getLatestLeanBodyMass:input callback:callback]; } -- 2.26.2