WIP: health sync

.github/workflows/analyze.yml

@@ -1,6 +1,10 @@
 name: Analyze
 on:
+  # Direct pushes are only validated on master (post-merge); everything else
+  # is covered by the pull_request trigger, avoiding duplicate runs for
+  # same-repo PR branches.
   push:
+    branches: [ master, ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
@@ -9,7 +13,6 @@ on:
       - 'ios/Runner/Info.plist'
       - 'android/app/src/main/res/xml/locales_config.xml'
   pull_request:
-    branches: [ master, ]
     paths:
       - '**/*.dart'
       - 'pubspec.yaml'

.github/workflows/ci.yml

@@ -1,11 +1,14 @@
-name: Continous Integration
+name: Continuous Integration
 on:
+  # Direct pushes are only validated on master (post-merge); everything else
+  # is covered by the pull_request trigger, avoiding duplicate runs for
+  # same-repo PR branches.
   push:
+    branches: [ master, ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
   pull_request:
-    branches: [ master, ]
     paths:
       - '**/*.dart'
       - 'pubspec.yaml'

android/app/build.gradle

@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "de.wger.flutter"
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 26
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName

android/app/src/main/AndroidManifest.xml

@@ -9,11 +9,21 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <!-- Health Connect permissions for the imported measurement types -->
+    <uses-permission android:name="android.permission.health.READ_BODY_FAT"/>
+    <uses-permission android:name="android.permission.health.READ_HEIGHT"/>
+    <uses-permission android:name="android.permission.health.READ_HEALTH_DATA_HISTORY"/>
+
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
             <data android:scheme="https" />
         </intent>
+        <!-- Health Connect -->
+        <package android:name="com.google.android.apps.healthdata" />
+        <intent>
+            <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
+        </intent>
     </queries>
 
     <supports-screens
@@ -66,8 +76,24 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="wger" android:host="app-auth" />
             </intent-filter>
+
+            <!-- Health Connect permissions rationale -->
+            <intent-filter>
+                <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
+            </intent-filter>
         </activity>
 
+        <!-- Required for Health Connect on Google Play -->
+        <activity-alias
+            android:name="ViewPermissionUsageActivity"
+            android:exported="true"
+            android:targetActivity=".MainActivity"
+            android:permission="android.permission.START_VIEW_PERMISSION_USAGE">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW_PERMISSION_USAGE" />
+                <category android:name="android.intent.category.HEALTH_PERMISSIONS" />
+            </intent-filter>
+        </activity-alias>
 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

android/app/src/main/kotlin/de/wger/flutter/MainActivity.kt

@@ -1,6 +1,6 @@
 package de.wger.flutter
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity() {
+class MainActivity: FlutterFragmentActivity() {
 }

ios/Runner.xcodeproj/project.pbxproj

@@ -77,7 +77,6 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				BB0286322FD60C00014F981C /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -105,13 +104,6 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		BB0286322FD60C00014F981C /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -295,7 +287,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -383,7 +375,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -432,7 +424,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner/Info.plist

@@ -86,6 +86,8 @@
 		<true/>
 		<key>NSCameraUsageDescription</key>
 		<string>Workout photos</string>
+		<key>NSHealthShareUsageDescription</key>
+		<string>wger uses your health data to automatically sync weight measurements from your smart scale</string>
 		<key>UIApplicationSceneManifest</key>
 		<dict>
 			<key>UIApplicationSupportsMultipleScenes</key>

ios/Runner/Runner.entitlements

@@ -4,5 +4,7 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.healthkit</key>
+	<true/>
 </dict>
 </plist>

lib/core/home_tabs_screen.dart

@@ -22,6 +22,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:wger/core/dashboard.dart';
 import 'package:wger/core/material.dart';
 import 'package:wger/features/gallery/screens/gallery_screen.dart';
+import 'package:wger/features/health/providers/health_sync.dart';
 import 'package:wger/features/nutrition/screens/nutritional_plans_screen.dart';
 import 'package:wger/features/routines/screens/routine_list_screen.dart';
 import 'package:wger/features/weight/screens/weight_screen.dart';
@@ -41,6 +42,20 @@ class _HomeTabsScreenState extends ConsumerState<HomeTabsScreen>
   int _selectedIndex = 0;
   bool _isWideScreen = false;
 
+  @override
+  void initState() {
+    super.initState();
+
+    // Pull any new readings from Apple Health / Health Connect once the app is
+    // open. The sync is a no-op unless the user enabled it in the settings.
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      ref.read(healthSyncProvider.notifier).syncOnAppOpen();
+    });
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();

lib/core/shared_preferences.dart

@@ -132,4 +132,31 @@ class PreferenceHelper {
       orElse: () => fallback.searchMode,
     );
   }
+
+  // --- Health sync ---
+
+  static const _healthSyncEnabledKey = 'healthSyncEnabled';
+  static const _lastHealthSyncTimestampKey = 'lastHealthSyncTimestamp';
+
+  Future<void> setHealthSyncEnabled(bool value) async {
+    await PreferenceHelper.asyncPref.setBool(_healthSyncEnabledKey, value);
+  }
+
+  Future<bool> getHealthSyncEnabled() async {
+    final value = await PreferenceHelper.asyncPref.getBool(_healthSyncEnabledKey);
+    return value ?? false;
+  }
+
+  Future<void> setLastHealthSyncTimestamp(String value) async {
+    await PreferenceHelper.asyncPref.setString(_lastHealthSyncTimestampKey, value);
+  }
+
+  Future<String?> getLastHealthSyncTimestamp() async {
+    return PreferenceHelper.asyncPref.getString(_lastHealthSyncTimestampKey);
+  }
+
+  Future<void> clearHealthSyncPreferences() async {
+    await PreferenceHelper.asyncPref.remove(_healthSyncEnabledKey);
+    await PreferenceHelper.asyncPref.remove(_lastHealthSyncTimestampKey);
+  }
 }

lib/core/widgets/dashboard/widgets/measurements.dart

@@ -45,7 +45,10 @@ class _DashboardMeasurementWidgetState extends ConsumerState<DashboardMeasuremen
     return AsyncValueWidget<List<MeasurementCategory>>(
       value: ref.watch(measurementProvider),
       loggerName: 'DashboardMeasurementWidget',
-      data: (categoriesList) {
+      data: (allCategories) {
+        // Children of multi-value groups are shown inside their parent's card
+        final categoriesList = allCategories.where((c) => c.parentId == null).toList();
+
         if (categoriesList.isEmpty) {
           return NothingFound(
             AppLocalizations.of(context).moreMeasurementEntries,

lib/database/converters/measurement_metric_type_converter.dart

@@ -0,0 +1,31 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:drift/drift.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+/// Maps a [MetricType] to and from the SQLite string format.
+class MeasurementMetricTypeConverter extends TypeConverter<MetricType, String> {
+  const MeasurementMetricTypeConverter();
+
+  @override
+  MetricType fromSql(String fromDb) => MetricType.fromWire(fromDb);
+
+  @override
+  String toSql(MetricType value) => value.wireValue;
+}

lib/database/powersync/database.dart

@@ -25,6 +25,7 @@ import 'package:wger/core/language.dart';
 import 'package:wger/core/license.dart';
 import 'package:wger/database/converters/date_only_text_converter.dart';
 import 'package:wger/database/converters/exercise_image_style_converter.dart';
+import 'package:wger/database/converters/measurement_metric_type_converter.dart';
 import 'package:wger/database/converters/time_of_day_converter.dart';
 import 'package:wger/database/converters/utc_datetime_converter.dart';
 import 'package:wger/database/converters/workout_impression_converter.dart';