Commit 836ee64f authored by Evgenii Evstropov's avatar Evgenii Evstropov

add more units

parent a28741e4
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
else { else {
// Determine the weight in the required unit. // Determine the weight in the required unit.
double usersWeight = [mostRecentQuantity doubleValueForUnit:unit]; double usersWeight = [mostRecentQuantity doubleValueForUnit:unit];
NSDictionary *response = @{ NSDictionary *response = @{
@"value" : @(usersWeight), @"value" : @(usersWeight),
@"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate], @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate],
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
+ (NSDate *)startDateFromOptions:(NSDictionary *)options; + (NSDate *)startDateFromOptions:(NSDictionary *)options;
+ (NSDate *)endDateFromOptions:(NSDictionary *)options; + (NSDate *)endDateFromOptions:(NSDictionary *)options;
+ (NSDate *)endDateFromOptionsDefaultNow:(NSDictionary *)options; + (NSDate *)endDateFromOptionsDefaultNow:(NSDictionary *)options;
+ (HKUnit *)hkUnitFromOptions:(NSDictionary *)options;
+ (HKUnit *)hkUnitFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(HKUnit *)defaultValue; + (HKUnit *)hkUnitFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(HKUnit *)defaultValue;
+ (NSUInteger)uintFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(NSUInteger)defaultValue; + (NSUInteger)uintFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(NSUInteger)defaultValue;
......
...@@ -123,58 +123,6 @@ ...@@ -123,58 +123,6 @@
return date; return date;
} }
// ==========
// DEPRECATED
// ==========
+ (HKUnit *)hkUnitFromOptions:(NSDictionary *)options {
NSString *unitString = [options objectForKey:@"unit"];
HKUnit *theUnit;
if([unitString isEqualToString:@"gram"]){
theUnit = [HKUnit gramUnit];
}
if([unitString isEqualToString:@"pound"]){
theUnit = [HKUnit poundUnit];
}
if([unitString isEqualToString:@"meter"]){
theUnit = [HKUnit meterUnit];
}
if([unitString isEqualToString:@"mile"]){
theUnit = [HKUnit mileUnit];
}
if([unitString isEqualToString:@"inch"]){
theUnit = [HKUnit inchUnit];
}
if([unitString isEqualToString:@"foot"]){
theUnit = [HKUnit footUnit];
}
if([unitString isEqualToString:@"second"]){
theUnit = [HKUnit secondUnit];
}
if([unitString isEqualToString:@"minute"]){
theUnit = [HKUnit minuteUnit];
}
if([unitString isEqualToString:@"hour"]){
theUnit = [HKUnit hourUnit];
}
if([unitString isEqualToString:@"day"]){
theUnit = [HKUnit dayUnit];
}
if([unitString isEqualToString:@"joule"]){
theUnit = [HKUnit jouleUnit];
}
if([unitString isEqualToString:@"calorie"]){
theUnit = [HKUnit calorieUnit];
}
if([unitString isEqualToString:@"count"]){
theUnit = [HKUnit countUnit];
}
if([unitString isEqualToString:@"percent"]){
theUnit = [HKUnit percentUnit];
}
return theUnit;
}
+ (HKUnit *)hkUnitFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(HKUnit *)defaultValue { + (HKUnit *)hkUnitFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(HKUnit *)defaultValue {
NSString *unitString = [options objectForKey:key]; NSString *unitString = [options objectForKey:key];
...@@ -183,12 +131,21 @@ ...@@ -183,12 +131,21 @@
if([unitString isEqualToString:@"gram"]){ if([unitString isEqualToString:@"gram"]){
theUnit = [HKUnit gramUnit]; theUnit = [HKUnit gramUnit];
} }
if([unitString isEqualToString:@"kg"]){
theUnit = [HKUnit gramUnitWithMetricPrefix:HKMetricPrefixKilo];
}
if([unitString isEqualToString:@"stone"]){
theUnit = [HKUnit stoneUnit];
}
if([unitString isEqualToString:@"pound"]){ if([unitString isEqualToString:@"pound"]){
theUnit = [HKUnit poundUnit]; theUnit = [HKUnit poundUnit];
} }
if([unitString isEqualToString:@"meter"]){ if([unitString isEqualToString:@"meter"]){
theUnit = [HKUnit meterUnit]; theUnit = [HKUnit meterUnit];
} }
if([unitString isEqualToString:@"cm"]){
theUnit = [HKUnit meterUnitWithMetricPrefix:HKMetricPrefixCenti];
}
if([unitString isEqualToString:@"inch"]){ if([unitString isEqualToString:@"inch"]){
theUnit = [HKUnit inchUnit]; theUnit = [HKUnit inchUnit];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment