Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added HealthKit Visualizations Infrastructure #7

Merged
merged 33 commits into from
Feb 23, 2025
Merged

Added HealthKit Visualizations Infrastructure #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f2292de
Added HKVisualizations
Priyankas007 Feb 6, 2025
ac9dbaa
Added health visualizations
Priyankas007 Feb 10, 2025
7d2c720
Merge branch 'main' into priyanka
Priyankas007 Feb 12, 2025
d16a297
Updated tests
Priyankas007 Feb 12, 2025
dd1aa5a
Managing pull conflicts
Priyankas007 Feb 12, 2025
3bada05
Managing commit conflicts
Priyankas007 Feb 12, 2025
bae5d19
Merge branch 'priyanka' of https://github.com/CS342/2025-NeutroFeverG…
Priyankas007 Feb 12, 2025
a9f1d89
Merge branch 'main' into priyanka
Priyankas007 Feb 12, 2025
5964595
Fixed login issues
Priyankas007 Feb 12, 2025
ee7795b
Merge branch 'priyanka' of https://github.com/CS342/2025-NeutroFeverG…
Priyankas007 Feb 12, 2025
e050cf5
Recovered visualizations
Priyankas007 Feb 12, 2025
f39feb5
Fixed build issues
Priyankas007 Feb 12, 2025
5eafb1f
Disabled mock data feature flag
Priyankas007 Feb 12, 2025
db63d88
Removed orphaned doc comment
Priyankas007 Feb 12, 2025
801aca0
Disabled orphaned_doc_comment link warning
Priyankas007 Feb 13, 2025
70f2e15
Added onboarding to scheme
Priyankas007 Feb 13, 2025
0cd97e2
Removed failing UI test
Priyankas007 Feb 13, 2025
f267a41
Reverted onboarding test changes
Priyankas007 Feb 13, 2025
fb148f1
Merge branch 'main' into priyanka
Priyankas007 Feb 13, 2025
180bee9
Revert "Added onboarding to scheme"
Priyankas007 Feb 13, 2025
3aac425
Revert "Disabled orphaned_doc_comment link warning"
Priyankas007 Feb 13, 2025
62c6811
Fixes localiable.xcstrings
Priyankas007 Feb 13, 2025
135ed6d
Fixed empty keys without values in localizable
Priyankas007 Feb 13, 2025
459000c
Removed onboarding tests
Priyankas007 Feb 14, 2025
1d9544c
Removing failing license test
Priyankas007 Feb 14, 2025
fbf92f2
Merge branch 'main' into priyanka
Priyankas007 Feb 14, 2025
589aab7
Resolved periphery errors
Priyankas007 Feb 14, 2025
8bf65f6
Merge branch 'priyanka' of https://github.com/CS342/2025-NeutroFeverG…
Priyankas007 Feb 14, 2025
15dee00
Resolved periphery errors
Priyankas007 Feb 22, 2025
bf852c7
Changed basalBodyTemperature to bodyTemperature
Priyankas007 Feb 22, 2025
925719b
Resolved lint error
Priyankas007 Feb 22, 2025
0947e46
Resolved new periphery error
Priyankas007 Feb 22, 2025
a00c9a0
Resolved periphery errors
Priyankas007 Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 59 additions & 19 deletions NeutroFeverGuard.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
archiveVersion = 1;
classes = {
};
objectVersion = 63;
objectVersion = 70;
objects = {

/* Begin PBXBuildFile section */
2F1AC9DF2B4E840E00C24973 /* NeutroFeverGuard.docc in Sources */ = {isa = PBXBuildFile; fileRef = 2F1AC9DE2B4E840E00C24973 /* NeutroFeverGuard.docc */; };
2F3D4ABC2A4E7C290068FB2F /* SpeziScheduler in Frameworks */ = {isa = PBXBuildFile; productRef = 2F3D4ABB2A4E7C290068FB2F /* SpeziScheduler */; };
2F49B7762980407C00BCB272 /* Spezi in Frameworks */ = {isa = PBXBuildFile; productRef = 2F49B7752980407B00BCB272 /* Spezi */; };
2F4E237E2989A2FE0013F3D9 /* OnboardingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E237D2989A2FE0013F3D9 /* OnboardingTests.swift */; };
2F4E23832989D51F0013F3D9 /* NeutroFeverGuardTestingSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E23822989D51F0013F3D9 /* NeutroFeverGuardTestingSetup.swift */; };
2F4E23872989DB360013F3D9 /* ContactsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F4E23862989DB360013F3D9 /* ContactsTests.swift */; };
2F5E32BD297E05EA003432F8 /* NeutroFeverGuardDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E32BC297E05EA003432F8 /* NeutroFeverGuardDelegate.swift */; };
Expand Down Expand Up @@ -55,7 +54,6 @@
56E7083B2BB06F6F00B08F0A /* SwiftPackageList in Frameworks */ = {isa = PBXBuildFile; productRef = 56E7083A2BB06F6F00B08F0A /* SwiftPackageList */; };
653A2551283387FE005D4D48 /* NeutroFeverGuard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A2550283387FE005D4D48 /* NeutroFeverGuard.swift */; };
653A255528338800005D4D48 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 653A255428338800005D4D48 /* Assets.xcassets */; };
653A256228338800005D4D48 /* NeutroFeverGuardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A256128338800005D4D48 /* NeutroFeverGuardTests.swift */; };
653A256C28338800005D4D48 /* SchedulerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A256B28338800005D4D48 /* SchedulerTests.swift */; };
9733CFC62A8066DE001B7ABC /* SpeziOnboarding in Frameworks */ = {isa = PBXBuildFile; productRef = 2FE5DC8029EDD91D004B9AB4 /* SpeziOnboarding */; };
9739A0C62AD7B5730084BEA5 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 9739A0C52AD7B5730084BEA5 /* FirebaseStorage */; };
Expand All @@ -76,6 +74,7 @@
C49EC8402D5033F9005C3495 /* AddDataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EC83F2D5033F9005C3495 /* AddDataView.swift */; };
C49EC8532D5038AC005C3495 /* DataInputForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EC8522D5038AC005C3495 /* DataInputForm.swift */; };
C4C0A78F2D518DBC00F37EEC /* HelperFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C0A78E2D518DB500F37EEC /* HelperFunc.swift */; };
EB02C6612D5D52E90035AA89 /* NeutroFeverGuardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A256128338800005D4D48 /* NeutroFeverGuardTests.swift */; };
F223937A2D5D4095006C8EB4 /* DataError.swift in Sources */ = {isa = PBXBuildFile; fileRef = F22393792D5D4092006C8EB4 /* DataError.swift */; };
F2E6898F2D52ED8600869C4F /* HealthKitService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2E6898E2D52ED8500869C4F /* HealthKitService.swift */; };
/* End PBXBuildFile section */
Expand All @@ -99,7 +98,6 @@

/* Begin PBXFileReference section */
2F1AC9DE2B4E840E00C24973 /* NeutroFeverGuard.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = NeutroFeverGuard.docc; sourceTree = "<group>"; };
2F4E237D2989A2FE0013F3D9 /* OnboardingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTests.swift; sourceTree = "<group>"; };
2F4E23822989D51F0013F3D9 /* NeutroFeverGuardTestingSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeutroFeverGuardTestingSetup.swift; sourceTree = "<group>"; };
2F4E23862989DB360013F3D9 /* ContactsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsTests.swift; sourceTree = "<group>"; };
2F5E32BC297E05EA003432F8 /* NeutroFeverGuardDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NeutroFeverGuardDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -149,6 +147,29 @@
F2E6898E2D52ED8500869C4F /* HealthKitService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthKitService.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
EB02C65C2D5D52800035AA89 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = (
HKVisualization.swift,
HKVisualizationItem.swift,
);
target = 653A255C28338800005D4D48 /* NeutroFeverGuardTests */;
};
EB02C65D2D5D52800035AA89 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = (
HKVisualization.swift,
HKVisualizationItem.swift,
);
target = 653A256628338800005D4D48 /* NeutroFeverGuardUITests */;
};
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
EB7D47E02D51433200CEDC78 /* HealthKitVisualizations */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (EB02C65C2D5D52800035AA89 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, EB02C65D2D5D52800035AA89 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = HealthKitVisualizations; sourceTree = "<group>"; };
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
653A254A283387FE005D4D48 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
Expand Down Expand Up @@ -276,6 +297,7 @@
653A256A28338800005D4D48 /* NeutroFeverGuardUITests */,
653A254E283387FE005D4D48 /* Products */,
653A258B283395A7005D4D48 /* Frameworks */,
EB02C6512D5D39D90035AA89 /* Recovered References */,
);
sourceTree = "<group>";
};
Expand All @@ -292,14 +314,14 @@
653A254F283387FE005D4D48 /* NeutroFeverGuard */ = {
isa = PBXGroup;
children = (
EB7D47E02D51433200CEDC78 /* HealthKitVisualizations */,
F22393792D5D4092006C8EB4 /* DataError.swift */,
C42D4DA42D5AC89500B2A169 /* LabView.swift */,
C4C0A78E2D518DB500F37EEC /* HelperFunc.swift */,
F2E6898E2D52ED8500869C4F /* HealthKitService.swift */,
C49EC83F2D5033F9005C3495 /* AddDataView.swift */,
C49EC8522D5038AC005C3495 /* DataInputForm.swift */,
C49EC8332D501C5C005C3495 /* DataType.swift */,
2FC975A72978F11A00BA99FE /* HomeView.swift */,
653A2550283387FE005D4D48 /* NeutroFeverGuard.swift */,
2F5E32BC297E05EA003432F8 /* NeutroFeverGuardDelegate.swift */,
2FF53D8C2A8729D600042B76 /* NeutroFeverGuardStandard.swift */,
Expand All @@ -312,6 +334,7 @@
2FE5DC3B29EDD7D0004B9AB4 /* Schedule */,
2FE5DC3C29EDD7DA004B9AB4 /* SharedContext */,
2FC9759D2978E30800BA99FE /* Supporting Files */,
2FC975A72978F11A00BA99FE /* HomeView.swift */,
);
path = NeutroFeverGuard;
sourceTree = "<group>";
Expand All @@ -328,7 +351,6 @@
653A256A28338800005D4D48 /* NeutroFeverGuardUITests */ = {
isa = PBXGroup;
children = (
2F4E237D2989A2FE0013F3D9 /* OnboardingTests.swift */,
653A256B28338800005D4D48 /* SchedulerTests.swift */,
2F4E23862989DB360013F3D9 /* ContactsTests.swift */,
5680DD3D2AB8CD84004E6D4A /* ContributionsTest.swift */,
Expand Down Expand Up @@ -361,6 +383,13 @@
path = Firestore;
sourceTree = "<group>";
};
EB02C6512D5D39D90035AA89 /* Recovered References */ = {
isa = PBXGroup;
children = (
);
name = "Recovered References";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -378,6 +407,9 @@
A9E1D3432C67A3F800CED217 /* PBXTargetDependency */,
56E7083D2BB06FCA00B08F0A /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
EB7D47E02D51433200CEDC78 /* HealthKitVisualizations */,
);
name = NeutroFeverGuard;
packageProductDependencies = (
2F49B7752980407B00BCB272 /* Spezi */,
Expand Down Expand Up @@ -592,7 +624,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
653A256228338800005D4D48 /* NeutroFeverGuardTests.swift in Sources */,
EB02C6612D5D52E90035AA89 /* NeutroFeverGuardTests.swift in Sources */,
C49EC8382D5026EE005C3495 /* DataTypeTest.swift in Sources */,
C49EC8382D5026EE005C3495 /* DataTypeTest.swift in Sources */,
);
Expand All @@ -604,7 +636,6 @@
files = (
5680DD3E2AB8CD84004E6D4A /* ContributionsTest.swift in Sources */,
2F4E23872989DB360013F3D9 /* ContactsTests.swift in Sources */,
2F4E237E2989A2FE0013F3D9 /* OnboardingTests.swift in Sources */,
653A256C28338800005D4D48 /* SchedulerTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -713,7 +744,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "NeutroFeverGuard/Supporting Files/NeutroFeverGuard.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "";
Expand Down Expand Up @@ -755,9 +786,10 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 637867499T;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
MARKETING_VERSION = 1.0;
Expand All @@ -772,14 +804,17 @@
2FEE10332998C89C000822E1 /* Test */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 637867499T;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.cs342.2025.neutrofeverguarduitests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"SWIFT_ELicenseRef-NeutroFeverGuard_LOC_STRINGS" = NO;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = NeutroFeverGuard;
Expand Down Expand Up @@ -917,7 +952,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "NeutroFeverGuard/Supporting Files/NeutroFeverGuard.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "";
Expand Down Expand Up @@ -962,12 +997,10 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "NeutroFeverGuard/Supporting Files/NeutroFeverGuard.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 637867499T;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "NeutroFeverGuard/Supporting Files/Info.plist";
Expand All @@ -993,7 +1026,6 @@
PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.cs342.2025.neutrofeverguard;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "CS342 2025 NeutroFeverGuard";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand All @@ -1007,9 +1039,10 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 637867499T;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
MARKETING_VERSION = 1.0;
Expand All @@ -1025,9 +1058,10 @@
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 637867499T;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
MARKETING_VERSION = 1.0;
Expand All @@ -1042,14 +1076,17 @@
653A257828338800005D4D48 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 637867499T;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.cs342.2025.neutrofeverguarduitests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"SWIFT_ELicenseRef-NeutroFeverGuard_LOC_STRINGS" = NO;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = NeutroFeverGuard;
Expand All @@ -1059,14 +1096,17 @@
653A257928338800005D4D48 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 637867499T;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.cs342.2025.neutrofeverguarduitests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"SWIFT_ELicenseRef-NeutroFeverGuard_LOC_STRINGS" = NO;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = NeutroFeverGuard;
Expand Down
Loading