Merge pull request #1267 from carp-dk/health13/prs

Health 13.2.0

Author: iarata

packages/health/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 13.2.0
+
+* Add get health data by UUID (see `getHealthDataByUUID()`) - PR [#1193](https://github.com/carp-dk/flutter-plugins/pull/1193), [#1194](https://github.com/carp-dk/flutter-plugins/pull/1194)
+* Add delete by UUID (`deleteByUUID()`)
+* Add support for unit conversion in `WeightRecord`, `HeightRecord`, `BodyTemperatureRecord`, and `BloodGlucoseRecord` - PR [#1212](https://github.com/carp-dk/flutter-plugins/pull/1223)
+* Update `compileSDK` to 36 - Fix [#1261](https://github.com/carp-dk/flutter-plugins/issues/1261)
+* Update Gradle to 8.9.1
+* Update `org.jetbrains.kotlin.android` to 2.1.0
+* Update `androidx.health.connect:connect-client` to 1.1.0-rc03
+* Update `device_info_plus` to 12.1.0 - Fix [#1264](https://github.com/carp-dk/flutter-plugins/issues/1264)
+
 ## 13.1.4
 
 * Fix adding mindfulness resulted in crash in iOS

packages/health/README.md

@@ -270,6 +270,22 @@ flutter: Health Plugin Error:
 flutter:  PlatformException(FlutterHealth, Results are null, Optional(Error Domain=com.apple.healthkit Code=6 "Protected health data is inaccessible" UserInfo={NSLocalizedDescription=Protected health data is inaccessible}))
 ```
 
+### Fetch single health data by UUID
+
+In order to retrieve a single record, it is required to provide `String uuid` and `HealthDataType type`.
+
+Please see example below:
+```dart
+HealthDataPoint? healthPoint = await health.getHealthDataByUUID(
+  uuid: 'random-uuid-string',
+  type: HealthDataType.STEPS,
+);
+```
+```
+I/FLUTTER_HEALTH( 9161): Success: {uuid=random-uuid-string, value=12, date_from=1742259061009, date_to=1742259092888, source_id=, source_name=com.google.android.apps.fitness, recording_method=0}
+```
+> Assuming that the `uuid` and `type` are coming from your database.
+
 ### Filtering by recording method
 
 Google Health Connect and Apple HealthKit both provide ways to distinguish samples collected "automatically" and manually entered data by the user.
@@ -322,6 +338,43 @@ Furthermore, the plugin now exposes three new functions to help you check and re
 2. `isHealthDataInBackgroundAuthorized()`: Checks the current status of the Health Data in Background permission
 3. `requestHealthDataInBackgroundAuthorization()`: Requests the Health Data in Background permission.
 
+### Fetch single health data by UUID
+
+In order to retrieve a single record, it is required to provide `String uuid` and `HealthDataType type`.
+
+Please see example below:
+```dart
+HealthDataPoint? healthPoint = await health.getHealthDataByUUID(
+  uuid: 'E9F2EEAD-8FC5-4CE5-9FF5-7C4E535FB8B8',
+  type: HealthDataType.WORKOUT,
+);
+```
+```
+data by UUID: HealthDataPoint -
+    uuid: E9F2EEAD-8FC5-4CE5-9FF5-7C4E535FB8B8,
+    value: WorkoutHealthValue - workoutActivityType: RUNNING,
+           totalEnergyBurned: null,
+           totalEnergyBurnedUnit: KILOCALORIE,
+           totalDistance: 2400,
+           totalDistanceUnit: METER
+           totalSteps: null,
+           totalStepsUnit: null,
+    unit: NO_UNIT,
+    dateFrom: 2025-05-02 07:31:00.000,
+    dateTo: 2025-05-02 08:25:00.000,
+    dataType: WORKOUT,
+    platform: HealthPlatformType.appleHealth,
+    deviceId: unknown,
+    sourceId: com.apple.Health,
+    sourceName: Health
+    recordingMethod: RecordingMethod.manual
+    workoutSummary: WorkoutSummary - workoutType: runningtotalDistance: 2400, totalEnergyBurned: 0, totalSteps: 0
+    metadata: null
+    deviceModel: null
+```
+> Assuming that the `uuid` and `type` are coming from your database.
+
+
 ## Data Types
 
 The plugin supports the following [`HealthDataType`](https://pub.dev/documentation/health/latest/health/HealthDataType.html).

packages/health/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -41,7 +41,7 @@ android {
     }
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 34
+        targetSdkVersion 36
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
@@ -51,12 +51,11 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
+    def composeBom = platform('androidx.compose:compose-bom:2025.09.00')
     implementation(composeBom)
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10"
 
-    implementation("androidx.health.connect:connect-client:1.1.0-alpha11")
-    def fragment_version = "1.8.6"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
+    implementation("androidx.health.connect:connect-client:1.1.0-rc03")
+    implementation "androidx.fragment:fragment-ktx:1.8.9"
 
 }

packages/health/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Sep 16 09:25:00 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataConverter.kt

@@ -21,20 +21,34 @@ class HealthDataConverter {
      * @return List<Map<String, Any?>> List of converted records (some records may split into multiple entries)
      * @throws IllegalArgumentException If the record type is not supported
      */
-    fun convertRecord(record: Any, dataType: String): List<Map<String, Any?>> {
+    fun convertRecord(record: Any, dataType: String, dataUnit: String? = null): List<Map<String, Any?>> {
         val metadata = (record as Record).metadata
 
         return when (record) {
             // Single-value instant records
-            is WeightRecord -> listOf(createInstantRecord(metadata, record.time, record.weight.inKilograms))
-            is HeightRecord -> listOf(createInstantRecord(metadata, record.time, record.height.inMeters))
+            is WeightRecord -> listOf(createInstantRecord(metadata, record.time, when (dataUnit) {
+                                "POUND" -> record.weight.inPounds
+                                else -> record.weight.inKilograms
+                            }))
+            is HeightRecord -> listOf(createInstantRecord(metadata, record.time, when (dataUnit) {
+                                "CENTIMETER" -> (record.height.inMeters * 100)
+                                "INCH" -> record.height.inInches
+                                else -> record.height.inMeters
+                            }))
             is BodyFatRecord -> listOf(createInstantRecord(metadata, record.time, record.percentage.value))
             is LeanBodyMassRecord -> listOf(createInstantRecord(metadata, record.time, record.mass.inKilograms))
             is HeartRateVariabilityRmssdRecord -> listOf(createInstantRecord(metadata, record.time, record.heartRateVariabilityMillis))
-            is BodyTemperatureRecord -> listOf(createInstantRecord(metadata, record.time, record.temperature.inCelsius))
+            is BodyTemperatureRecord -> listOf(createInstantRecord(metadata, record.time, when (dataUnit) {
+                                "DEGREE_FAHRENHEIT" -> record.temperature.inFahrenheit
+                                "KELVIN" -> record.temperature.inCelsius + 273.15
+                                else -> record.temperature.inCelsius
+                            }))
             is BodyWaterMassRecord -> listOf(createInstantRecord(metadata, record.time, record.mass.inKilograms))
             is OxygenSaturationRecord -> listOf(createInstantRecord(metadata, record.time, record.percentage.value))
-            is BloodGlucoseRecord -> listOf(createInstantRecord(metadata, record.time, record.level.inMilligramsPerDeciliter))
+            is BloodGlucoseRecord -> listOf(createInstantRecord(metadata, record.time, when (dataUnit) {
+                                "MILLIMOLES_PER_LITER" -> record.level.inMillimolesPerLiter
+                                else -> record.level.inMilligramsPerDeciliter
+                            }))
             is BasalMetabolicRateRecord -> listOf(createInstantRecord(metadata, record.time, record.basalMetabolicRate.inKilocaloriesPerDay))
             is RestingHeartRateRecord -> listOf(createInstantRecord(metadata, record.time, record.beatsPerMinute))
             is RespiratoryRateRecord -> listOf(createInstantRecord(metadata, record.time, record.rate))
@@ -236,7 +250,7 @@ class HealthDataConverter {
             )
         )
     }
-    
+
     companion object {
         private const val BLOOD_PRESSURE_DIASTOLIC = "BLOOD_PRESSURE_DIASTOLIC"
         private const val MEAL_UNKNOWN = "UNKNOWN"

packages/health/android/src/main/kotlin/cachet/plugins/health/HealthDataOperations.kt

@@ -3,7 +3,6 @@ package cachet.plugins.health
 import android.util.Log
 import androidx.health.connect.client.HealthConnectClient
 import androidx.health.connect.client.HealthConnectFeatures
-import androidx.health.connect.client.feature.ExperimentalFeatureAvailabilityApi
 import androidx.health.connect.client.permission.HealthPermission
 import androidx.health.connect.client.permission.HealthPermission.Companion.PERMISSION_READ_HEALTH_DATA_HISTORY
 import androidx.health.connect.client.permission.HealthPermission.Companion.PERMISSION_READ_HEALTH_DATA_IN_BACKGROUND
@@ -103,7 +102,6 @@ class HealthDataOperations(
      * @param call Method call from Flutter (unused)
      * @param result Flutter result callback returning boolean availability status
      */
-    @OptIn(ExperimentalFeatureAvailabilityApi::class)
     fun isHealthDataHistoryAvailable(call: MethodCall, result: Result) {
         scope.launch {
             result.success(
@@ -139,7 +137,6 @@ class HealthDataOperations(
      * @param call Method call from Flutter (unused)
      * @param result Flutter result callback returning boolean availability status
      */
-    @OptIn(ExperimentalFeatureAvailabilityApi::class)
     fun isHealthDataInBackgroundAvailable(call: MethodCall, result: Result) {
         scope.launch {
             result.success(
@@ -247,6 +244,45 @@ class HealthDataOperations(
         }
     }
 
+    /**
+     * Deletes a specific health record by its client record ID and data type. Allows precise
+     * deletion of individual health records using client-side IDs.
+     *
+     * @param call Method call containing 'dataTypeKey', 'recordId', and 'clientRecordId'
+     * @param result Flutter result callback returning boolean success status
+     */
+    fun deleteByClientRecordId(call: MethodCall, result: Result) {
+        val arguments = call.arguments as? HashMap<*, *>
+        val dataTypeKey = (arguments?.get("dataTypeKey") as? String)!!
+        val recordId = listOfNotNull(arguments["recordId"] as? String)
+        val clientRecordId = listOfNotNull(arguments["clientRecordId"] as? String)
+        if (!HealthConstants.mapToType.containsKey(dataTypeKey)) {
+            Log.w("FLUTTER_HEALTH::ERROR", "Datatype $dataTypeKey not found in HC")
+            result.success(false)
+            return
+        }
+        val classType = HealthConstants.mapToType[dataTypeKey]!!
+
+        scope.launch {
+            try {
+                healthConnectClient.deleteRecords(
+                        classType,
+                        recordId,
+                        clientRecordId
+                )
+                result.success(true)
+            } catch (e: Exception) {
+                Log.e(
+                        "FLUTTER_HEALTH::ERROR",
+                        "Error deleting record with ClientRecordId: $clientRecordId"
+                )
+                Log.e("FLUTTER_HEALTH::ERROR", e.message ?: "unknown error")
+                Log.e("FLUTTER_HEALTH::ERROR", e.stackTraceToString())
+                result.success(false)
+            }
+        }
+    }
+
     /**
      * Internal helper method to prepare Health Connect permission strings. Converts data type names
      * and access levels into proper permission format.