Merge remote-tracking branch 'origin/master' into v5

This commit is contained in:
Daniel
2018-06-28 13:37:10 +02:00
parent 95c8566d76
commit 23e0977954
14 changed files with 771 additions and 322 deletions
+4 -6
View File
@@ -306,13 +306,11 @@ export class Health extends IonicNativePlugin {
* nutrition.vitamin_a is given in micrograms in HealthKit and International Unit in Google Fit.
* Automatic conversion is not trivial and depends on the actual substance.
*
* @param queryOptions {HealthQueryOptions}
* @return {Promise<HealthData>}
* @param {HealthQueryOptions} queryOptions
* @return {Promise<HealthData[]>}
*/
@Cordova()
query(queryOptions: HealthQueryOptions): Promise<HealthData> {
return;
}
query(queryOptions: HealthQueryOptions): Promise<HealthData[]> { return; }
/**
* Gets aggregated data in a certain time window. Usually the sum is returned for the given quantity.
@@ -332,7 +330,7 @@ export class Health extends IonicNativePlugin {
* To be sure to get all the stored quantities, it's better to query single nutrients.
* nutrition.vitamin_a is given in micrograms in HealthKit and International Unit in Google Fit.
*
* @param queryOptionsAggregated {HealthQueryOptionsAggregated}
* @param {HealthQueryOptionsAggregated} queryOptionsAggregated
* @return {Promise<HealthData[]>}
*/
@Cordova()