Merge branch 'main' into release-on-4.7.0

Author: kndoshn

iOS/DittoPOS.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 		14DECF212A3D16DF005BC2AE /* KDSOrdersGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14DECF202A3D16DF005BC2AE /* KDSOrdersGridView.swift */; };
 		14FFFEEF2A43639A00DD6806 /* POSOrderItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14FFFEEE2A43639A00DD6806 /* POSOrderItemView.swift */; };
 		14FFFEF12A43732400DD6806 /* SettingsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14FFFEF02A43732400DD6806 /* SettingsModel.swift */; };
+		A4ADA65E2BEAA3E800936AD6 /* DittoHealthMetrics in Frameworks */ = {isa = PBXBuildFile; productRef = A4ADA65D2BEAA3E800936AD6 /* DittoHealthMetrics */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -109,6 +110,7 @@
 				0E1E91A32BA0E40800046BC0 /* DittoHeartbeat in Frameworks */,
 				0E1E91A72BA0E40800046BC0 /* DittoPermissionsHealth in Frameworks */,
 				1435D5AF2A8EC7270046B661 /* DittoSwift in Frameworks */,
+				A4ADA65E2BEAA3E800936AD6 /* DittoHealthMetrics in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -274,6 +276,7 @@
 				0E1E91A62BA0E40800046BC0 /* DittoPermissionsHealth */,
 				0E1E91A82BA0E40800046BC0 /* DittoPresenceDegradation */,
 				0E1E91AA2BA0E40800046BC0 /* DittoPresenceViewer */,
+				A4ADA65D2BEAA3E800936AD6 /* DittoHealthMetrics */,
 			);
 			productName = DittoPOS;
 			productReference = 14CD51AD2A2FE2D50018DE87 /* DittoPOS.app */;
@@ -332,13 +335,15 @@
 /* Begin PBXShellScriptBuildPhase section */
 		14CD51C32A2FE5290018DE87 /* Generate Env.swift */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
 				"$(SRCROOT)/buildEnv.sh",
+				"$(SRCROOT)/.env",
 			);
 			name = "Generate Env.swift";
 			outputFileListPaths = (
@@ -523,6 +528,7 @@
 				DEVELOPMENT_ASSET_PATHS = "\"DittoPOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 3T2VMFZPPQ;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DittoPOS/Info.plist;
 				INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "Uses Bluetooth to connect and sync with nearby devices";
@@ -560,6 +566,7 @@
 				DEVELOPMENT_ASSET_PATHS = "\"DittoPOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 3T2VMFZPPQ;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = DittoPOS/Info.plist;
 				INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "Uses Bluetooth to connect and sync with nearby devices";
@@ -616,7 +623,7 @@
 			repositoryURL = "https://github.com/getditto/DittoSwiftTools";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.5.0;
+				minimumVersion = 4.9.0;
 			};
 		};
 		14CD51C42A2FE58E0018DE87 /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */ = {
@@ -685,6 +692,11 @@
 			package = 14CD51C42A2FE58E0018DE87 /* XCRemoteSwiftPackageReference "DittoSwiftPackage" */;
 			productName = DittoObjC;
 		};
+		A4ADA65D2BEAA3E800936AD6 /* DittoHealthMetrics */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 0E1E91992BA0E40800046BC0 /* XCRemoteSwiftPackageReference "DittoSwiftTools" */;
+			productName = DittoHealthMetrics;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 14CD51A52A2FE2D50018DE87 /* Project object */;

iOS/DittoPOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -60,6 +60,7 @@ class DittoService: ObservableObject {
 
     static var shared = DittoService()
     let ditto = DittoInstance.shared.ditto
+
     private let storeService: StoreService
     private let syncService: SyncService
 

iOS/DittoPOS/Data/DittoService.swift

@@ -8,6 +8,9 @@
 
 import SwiftUI
 import DittoHeartbeat
+import DittoHealthMetrics
+import DittoPermissionsHealth
+import DittoDiskUsage
 
 class HeartbeatConfigVM: ObservableObject {
 
@@ -43,7 +46,16 @@ class HeartbeatConfigVM: ObservableObject {
         if self.heartbeatVM.isEnabled {
             self.stopHeartbeat()
         }
-        self.heartbeatVM.startHeartbeat(config: DittoHeartbeatConfig(id: Settings.deviceId, secondsInterval: self.secondsInterval, metaData: self.metaData)) {_ in }
+        let healthMetricProviders: [HealthMetricProvider] = [
+            DittoPermissionsHealth.BluetoothManager(),
+            DittoPermissionsHealth.NetworkManager(),
+            DittoDiskUsage.DiskUsageViewModel(ditto: DittoService.shared.ditto)
+        ]
+        let hbConfig = DittoHeartbeatConfig(id: Settings.deviceId,
+                                            secondsInterval: self.secondsInterval,
+                                            metadata: self.metaData,
+                                            healthMetricProviders: healthMetricProviders)
+        self.heartbeatVM.startHeartbeat(config: hbConfig) {_ in }
     }
 
     func stopHeartbeat() {