Merge pull request #20 from Plangora/master

add source of fitdata from devices

.gitignore

@@ -5,3 +5,5 @@
 .pub/
 
 build/
+.idea/
+*.iml

android/build.gradle

@@ -41,6 +41,6 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.android.gms:play-services-fitness:17.0.0'
+    implementation 'com.google.android.gms:play-services-fitness:18.0.0'
     implementation 'com.google.android.gms:play-services-auth:17.0.0'
 }

android/src/main/kotlin/com/example/fit_kit/FitKitPlugin.kt

@@ -158,6 +158,7 @@ class FitKitPlugin(private val registrar: Registrar) : MethodCallHandler {
         }
         map["date_from"] = dataPoint.getStartTime(TimeUnit.MILLISECONDS)
         map["date_to"] = dataPoint.getEndTime(TimeUnit.MILLISECONDS)
+        map["source"] = dataPoint.originalDataSource.streamName
         return map
     }
 }

example/pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -66,28 +66,28 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -120,7 +120,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:

ios/Classes/SwiftFitKitPlugin.swift

@@ -92,13 +92,22 @@ public class SwiftFitKitPlugin: NSObject, FlutterPlugin {
 
             print(samples)
             result(samples.map { sample -> NSDictionary in
-                return [
+                [
                     "value": sample.quantity.doubleValue(for: request.unit),
                     "date_from": Int(sample.startDate.timeIntervalSince1970 * 1000),
                     "date_to": Int(sample.endDate.timeIntervalSince1970 * 1000),
+                    "source": self.readSource(sample: sample),
                 ]
             })
         }
         healthStore!.execute(query)
     }
+
+    private func readSource(sample: HKQuantitySample) -> String {
+        if #available(iOS 9, *) {
+            return sample.sourceRevision.source.name;
+        }
+
+        return sample.source.name;
+    }
 }

lib/src/fit_data.dart

@@ -4,15 +4,17 @@ class FitData {
   final num value;
   final DateTime dateFrom;
   final DateTime dateTo;
+  final String source;
 
-  FitData(this.value, this.dateFrom, this.dateTo);
+  FitData(this.value, this.dateFrom, this.dateTo, this.source);
 
   FitData.fromJson(Map<dynamic, dynamic> json)
       : value = json['value'],
         dateFrom = DateTime.fromMillisecondsSinceEpoch(json['date_from']),
-        dateTo = DateTime.fromMillisecondsSinceEpoch(json['date_to']);
+        dateTo = DateTime.fromMillisecondsSinceEpoch(json['date_to']),
+        source = json['source'];
 
   @override
   String toString() =>
-      'FitData(value: $value, dateFrom: $dateFrom, dateTo: $dateTo)';
+      'FitData(value: $value, dateFrom: $dateFrom, dateTo: $dateTo, source: $source)';
 }

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -52,28 +52,28 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -106,7 +106,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description: