From 836ee64fd73fefac259b5cd31fabb59532762204 Mon Sep 17 00:00:00 2001
From: Evgenii Evstropov <evgeny@getcodified.com>
Date: Tue, 24 Apr 2018 21:30:40 +0200
Subject: [PATCH] add more units

---
 .../RCTAppleHealthKit+Methods_Body.m          |  1 -
 RCTAppleHealthKit/RCTAppleHealthKit+Utils.h   |  1 -
 RCTAppleHealthKit/RCTAppleHealthKit+Utils.m   | 61 +++----------------
 3 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m
index 49f826f..a64e396 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Methods_Body.m
@@ -32,7 +32,6 @@
         else {
             // Determine the weight in the required unit.
             double usersWeight = [mostRecentQuantity doubleValueForUnit:unit];
-
             NSDictionary *response = @{
                     @"value" : @(usersWeight),
                     @"startDate" : [RCTAppleHealthKit buildISO8601StringFromDate:startDate],
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h
index a78acc5..1f2df83 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.h
@@ -22,7 +22,6 @@
 + (NSDate *)startDateFromOptions:(NSDictionary *)options;
 + (NSDate *)endDateFromOptions:(NSDictionary *)options;
 + (NSDate *)endDateFromOptionsDefaultNow:(NSDictionary *)options;
-+ (HKUnit *)hkUnitFromOptions:(NSDictionary *)options;
 
 + (HKUnit *)hkUnitFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(HKUnit *)defaultValue;
 + (NSUInteger)uintFromOptions:(NSDictionary *)options key:(NSString *)key withDefault:(NSUInteger)defaultValue;
diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
index e161980..505e9ab 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Utils.m
@@ -123,58 +123,6 @@
     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 {
     NSString *unitString = [options objectForKey:key];
@@ -183,12 +131,21 @@
     if([unitString isEqualToString:@"gram"]){
         theUnit = [HKUnit gramUnit];
     }
+    if([unitString isEqualToString:@"kg"]){
+        theUnit = [HKUnit gramUnitWithMetricPrefix:HKMetricPrefixKilo];
+    }
+    if([unitString isEqualToString:@"stone"]){
+        theUnit = [HKUnit stoneUnit];
+    }
     if([unitString isEqualToString:@"pound"]){
         theUnit = [HKUnit poundUnit];
     }
     if([unitString isEqualToString:@"meter"]){
         theUnit = [HKUnit meterUnit];
     }
+    if([unitString isEqualToString:@"cm"]){
+        theUnit = [HKUnit meterUnitWithMetricPrefix:HKMetricPrefixCenti];
+    }
     if([unitString isEqualToString:@"inch"]){
         theUnit = [HKUnit inchUnit];
     }
-- 
2.26.2