Skip to content

Commit

Permalink
Move to weight scale service provided by SpeziBluetooth
Browse files Browse the repository at this point in the history
  • Loading branch information
@Supereg
Supereg committed May 31, 2024
1 parent 9e3715d commit d3a55b6
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 281 deletions.
22 changes: 1 addition & 21 deletions ENGAGEHF.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,13 @@
4D49AB002BC9D50400C77310 /* BluetoothViews in Frameworks */ = {isa = PBXBuildFile; productRef = 4D49AAFF2BC9D50400C77310 /* BluetoothViews */; };
4D49AB022BC9D50400C77310 /* SpeziBluetooth in Frameworks */ = {isa = PBXBuildFile; productRef = 4D49AB012BC9D50400C77310 /* SpeziBluetooth */; };
4D49AB062BC9D56900C77310 /* WeightScaleDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D49AB052BC9D56900C77310 /* WeightScaleDevice.swift */; };
4D49AB0D2BC9DF9100C77310 /* WeightScaleFeature.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D49AB0C2BC9DF9100C77310 /* WeightScaleFeature.swift */; };
4D49AB0F2BC9DF9B00C77310 /* WeightMeasurement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D49AB0E2BC9DF9B00C77310 /* WeightMeasurement.swift */; };
4D4AA0A52BC5E43E00676489 /* OnboardingUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D4AA0A42BC5E43E00676489 /* OnboardingUITests.swift */; };
4DB025CA2BBE3A59002D2545 /* HomeViewUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DB025C92BBE3A59002D2545 /* HomeViewUITests.swift */; };
4DB025D52BBF2E08002D2545 /* Dashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DB025D42BBF2E08002D2545 /* Dashboard.swift */; };
4DB025D82BBF2EEC002D2545 /* Greeting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DB025D72BBF2EEC002D2545 /* Greeting.swift */; };
4DBDD3442BBFAD64001FB0CA /* InvitationCodeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBDD3432BBFAD64001FB0CA /* InvitationCodeError.swift */; };
4DBDD3462BBFAE2D001FB0CA /* InvitationCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DBDD3452BBFAE2D001FB0CA /* InvitationCodeView.swift */; };
4DBDD3482BC073EF001FB0CA /* FirebaseFunctions in Frameworks */ = {isa = PBXBuildFile; productRef = 4DBDD3472BC073EF001FB0CA /* FirebaseFunctions */; };
4DDFC76E2BFAA4AE002B07A1 /* WeightScaleService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDFC76D2BFAA4AE002B07A1 /* WeightScaleService.swift */; };
4DDFC7702BFAEAD7002B07A1 /* ConfirmMeasurementButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDFC76F2BFAEAD7002B07A1 /* ConfirmMeasurementButton.swift */; };
4DDFC7762BFB46FF002B07A1 /* MeasurementLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDFC7752BFB46FF002B07A1 /* MeasurementLayer.swift */; };
4DDFC7792BFB4E7D002B07A1 /* ViewElements.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DDFC7782BFB4E7D002B07A1 /* ViewElements.swift */; };
Expand Down Expand Up @@ -127,15 +124,12 @@
4D052DB72BE07892006A784E /* MeasurementManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasurementManager.swift; sourceTree = "<group>"; };
4D19ED002BE5CAFC00CDBAA8 /* MeasurementRecordedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasurementRecordedView.swift; sourceTree = "<group>"; };
4D49AB052BC9D56900C77310 /* WeightScaleDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightScaleDevice.swift; sourceTree = "<group>"; };
4D49AB0C2BC9DF9100C77310 /* WeightScaleFeature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightScaleFeature.swift; sourceTree = "<group>"; };
4D49AB0E2BC9DF9B00C77310 /* WeightMeasurement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightMeasurement.swift; sourceTree = "<group>"; };
4D4AA0A42BC5E43E00676489 /* OnboardingUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingUITests.swift; sourceTree = "<group>"; };
4DB025C92BBE3A59002D2545 /* HomeViewUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewUITests.swift; sourceTree = "<group>"; };
4DB025D42BBF2E08002D2545 /* Dashboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dashboard.swift; sourceTree = "<group>"; };
4DB025D72BBF2EEC002D2545 /* Greeting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Greeting.swift; sourceTree = "<group>"; };
4DBDD3432BBFAD64001FB0CA /* InvitationCodeError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationCodeError.swift; sourceTree = "<group>"; };
4DBDD3452BBFAE2D001FB0CA /* InvitationCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationCodeView.swift; sourceTree = "<group>"; };
4DDFC76D2BFAA4AE002B07A1 /* WeightScaleService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeightScaleService.swift; sourceTree = "<group>"; };
4DDFC76F2BFAEAD7002B07A1 /* ConfirmMeasurementButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmMeasurementButton.swift; sourceTree = "<group>"; };
4DDFC7752BFB46FF002B07A1 /* MeasurementLayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeasurementLayer.swift; sourceTree = "<group>"; };
4DDFC7782BFB4E7D002B07A1 /* ViewElements.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewElements.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -293,22 +287,11 @@
4D49AB092BC9DA8B00C77310 /* WeightScale */ = {
isa = PBXGroup;
children = (
4D49AB0A2BC9DA9300C77310 /* Characteristics */,
4D49AB052BC9D56900C77310 /* WeightScaleDevice.swift */,
4DDFC76D2BFAA4AE002B07A1 /* WeightScaleService.swift */,
);
path = WeightScale;
sourceTree = "<group>";
};
4D49AB0A2BC9DA9300C77310 /* Characteristics */ = {
isa = PBXGroup;
children = (
4D49AB0C2BC9DF9100C77310 /* WeightScaleFeature.swift */,
4D49AB0E2BC9DF9B00C77310 /* WeightMeasurement.swift */,
);
path = Characteristics;
sourceTree = "<group>";
};
4D49AB142BCF6FC400C77310 /* Devices */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -596,7 +579,6 @@
4D19ED012BE5CAFC00CDBAA8 /* MeasurementRecordedView.swift in Sources */,
2FE5DCB129EE6107004B9AB4 /* AccountOnboarding.swift in Sources */,
2FE5DC3A29EDD7CA004B9AB4 /* Welcome.swift in Sources */,
4DDFC76E2BFAA4AE002B07A1 /* WeightScaleService.swift in Sources */,
2FE5DC3829EDD7CA004B9AB4 /* InterestingModules.swift in Sources */,
2FE5DC3529EDD7CA004B9AB4 /* Consent.swift in Sources */,
2FE5DC4529EDD7F2004B9AB4 /* Binding+Negate.swift in Sources */,
Expand All @@ -612,8 +594,6 @@
4D052DB82BE07892006A784E /* MeasurementManager.swift in Sources */,
4DB025D82BBF2EEC002D2545 /* Greeting.swift in Sources */,
A9720E432ABB68CC00872D23 /* AccountSetupHeader.swift in Sources */,
4D49AB0F2BC9DF9B00C77310 /* WeightMeasurement.swift in Sources */,
4D49AB0D2BC9DF9100C77310 /* WeightScaleFeature.swift in Sources */,
2FE5DC4029EDD7EE004B9AB4 /* FeatureFlags.swift in Sources */,
2FE5DC4629EDD7F2004B9AB4 /* Bundle+Image.swift in Sources */,
2F4E23832989D51F0013F3D9 /* ENGAGEHFTestingSetup.swift in Sources */,
Expand Down Expand Up @@ -1243,7 +1223,7 @@
repositoryURL = "https://github.com/StanfordSpezi/SpeziBluetooth.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.0.2;
minimumVersion = 1.3.0;
};
};
5661551B2AB8384200209B80 /* XCRemoteSwiftPackageReference "swift-package-list" */ = {
Expand Down
106 changes: 0 additions & 106 deletions ENGAGEHF/Bluetooth/Devices/WeightScale/Characteristics/WeightMeasurement.swift
View file

This file was deleted.

76 changes: 0 additions & 76 deletions ENGAGEHF/Bluetooth/Devices/WeightScale/Characteristics/WeightScaleFeature.swift
View file

This file was deleted.

15 changes: 14 additions & 1 deletion ENGAGEHF/Bluetooth/Devices/WeightScale/WeightScaleDevice.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,22 @@ class WeightScaleDevice: BluetoothDevice, Identifiable {
}

MeasurementManager.manager.deviceInformation = deviceInformation
MeasurementManager.manager.weightScaleParams = service.weightScaleFeature
MeasurementManager.manager.weightScaleParams = service.features

Check warning on line 42 in ENGAGEHF/Bluetooth/Devices/WeightScale/WeightScaleDevice.swift

View check run for this annotation

Codecov / codecov/patch

ENGAGEHF/Bluetooth/Devices/WeightScale/WeightScaleDevice.swift#L42 

Added line #L42 was not covered by tests
MeasurementManager.manager.deviceName = name

MeasurementManager.manager.loadMeasurement(measurement)
}
}


// TODO: move somewhere!

Check failure on line 50 in ENGAGEHF/Bluetooth/Devices/WeightScale/WeightScaleDevice.swift

View workflow job for this annotation

GitHub Actions / SwiftLint / SwiftLint 

Todo Violation: TODOs should be resolved (move somewhere!) (todo)
extension WeightMeasurement.Unit {
var massUnit: String {
switch self {
case .si:
return "kg"
case .imperial:
return "lb"
}
}

Check warning on line 59 in ENGAGEHF/Bluetooth/Devices/WeightScale/WeightScaleDevice.swift

View check run for this annotation

Codecov / codecov/patch

ENGAGEHF/Bluetooth/Devices/WeightScale/WeightScaleDevice.swift#L52-L59 

Added lines #L52 - L59 were not covered by tests
}
28 changes: 0 additions & 28 deletions ENGAGEHF/Bluetooth/Devices/WeightScale/WeightScaleService.swift
View file

This file was deleted.

Loading

0 comments on commit d3a55b6

Please sign in to comment.