Added Landing Screen, Notifications Screen, and updated all Onboarding Pages

PAWS.xcodeproj/project.pbxproj

@@ -29,6 +29,8 @@
 		2F5E32BD297E05EA003432F8 /* PAWSAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F5E32BC297E05EA003432F8 /* PAWSAppDelegate.swift */; };
 		2FC9759F2978E39600BA99FE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2FC9759E2978E39600BA99FE /* Localizable.strings */; };
 		2FC975A82978F11A00BA99FE /* Home.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FC975A72978F11A00BA99FE /* Home.swift */; };
+		3637947E2992F3B000B3C006 /* PAWSLandingScreen in Frameworks */ = {isa = PBXBuildFile; productRef = 3637947D2992F3B000B3C006 /* PAWSLandingScreen */; };
+		36379481299308AA00B3C006 /* PAWSNotificationScreen in Frameworks */ = {isa = PBXBuildFile; productRef = 36379480299308AA00B3C006 /* PAWSNotificationScreen */; };
 		653A2551283387FE005D4D48 /* PAWS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A2550283387FE005D4D48 /* PAWS.swift */; };
 		653A255528338800005D4D48 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 653A255428338800005D4D48 /* Assets.xcassets */; };
 		653A256228338800005D4D48 /* PAWSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A256128338800005D4D48 /* PAWSTests.swift */; };
@@ -79,9 +81,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				36379481299308AA00B3C006 /* PAWSNotificationScreen in Frameworks */,
 				2F59B941298C628800C5107F /* PAWSOnboardingFlow in Frameworks */,
 				2F49B7822980419C00BCB272 /* Questionnaires in Frameworks */,
 				2F49B77E2980407C00BCB272 /* Scheduler in Frameworks */,
+				3637947E2992F3B000B3C006 /* PAWSLandingScreen in Frameworks */,
 				2F59B93F298C628800C5107F /* PAWSMockDataStorageProvider in Frameworks */,
 				2F49B77A2980407C00BCB272 /* HealthKitDataSource in Frameworks */,
 				2F59B945298C628800C5107F /* PAWSSharedContext in Frameworks */,
@@ -224,6 +228,8 @@
 				2F59B940298C628800C5107F /* PAWSOnboardingFlow */,
 				2F59B942298C628800C5107F /* PAWSSchedule */,
 				2F59B944298C628800C5107F /* PAWSSharedContext */,
+				3637947D2992F3B000B3C006 /* PAWSLandingScreen */,
+				36379480299308AA00B3C006 /* PAWSNotificationScreen */,
 			);
 			productName = TemplateApplication;
 			productReference = 653A254D283387FE005D4D48 /* PAWS.app */;
@@ -519,8 +525,8 @@
 				INFOPLIST_FILE = "PAWS/Supporting Files/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = PAWS;
 				INFOPLIST_KEY_NSCameraUsageDescription = "This message should never appear. Please adjust this when you start using camera information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
-				INFOPLIST_KEY_NSHealthShareUsageDescription = "The CS342 2023 PAWS Team Application uses the step count to demonstrate CardinalKit's integration with HealthKit.";
-				INFOPLIST_KEY_NSHealthUpdateUsageDescription = "The CS342 2023 PAWS Team Application uses the step count to demonstrate CardinalKit's integration with HealthKit.";
+				INFOPLIST_KEY_NSHealthShareUsageDescription = "The PAWS Application uses the heart rate information to extract ECG data and provide it to the researchers. ";
+				INFOPLIST_KEY_NSHealthUpdateUsageDescription = "The PAWS Application uses the heart rate information to extract ECG data and provide it to the researchers. ";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
@@ -566,8 +572,8 @@
 				INFOPLIST_FILE = "PAWS/Supporting Files/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = PAWS;
 				INFOPLIST_KEY_NSCameraUsageDescription = "This message should never appear. Please adjust this when you start using camera information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
-				INFOPLIST_KEY_NSHealthShareUsageDescription = "The CS342 2023 PAWS Team Application uses the step count to demonstrate CardinalKit's integration with HealthKit.";
-				INFOPLIST_KEY_NSHealthUpdateUsageDescription = "The CS342 2023 PAWS Team Application uses the step count to demonstrate CardinalKit's integration with HealthKit.";
+				INFOPLIST_KEY_NSHealthShareUsageDescription = "The PAWS Application uses the heart rate information to extract ECG data and provide it to the researchers. ";
+				INFOPLIST_KEY_NSHealthUpdateUsageDescription = "The PAWS Application uses the heart rate information to extract ECG data and provide it to the researchers. ";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "This message should never appear. Please adjust this when you start using location information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect.";
@@ -801,6 +807,14 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PAWSSharedContext;
 		};
+		3637947D2992F3B000B3C006 /* PAWSLandingScreen */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = PAWSLandingScreen;
+		};
+		36379480299308AA00B3C006 /* PAWSNotificationScreen */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = PAWSNotificationScreen;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 653A2545283387FE005D4D48 /* Project object */;

PAWS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

PAWS.xcodeproj/xcshareddata/xcschemes/PAWS.xcscheme

@@ -76,6 +76,12 @@
             ReferencedContainer = "container:PAWS.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--showOnboarding"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

PAWS/Home.swift

@@ -9,27 +9,34 @@
 import PAWSContacts
 import PAWSMockDataStorageProvider
 import PAWSSchedule
+import PAWSNotificationScreen
 import PAWSSharedContext
 import SwiftUI
 
 
 struct HomeView: View {
     enum Tabs: String {
-        case schedule
+        //case schedule
+        case notifications
         case contact
         case mockUpload
     }
 
 
-    @AppStorage(StorageKeys.homeTabSelection) var selectedTab = Tabs.schedule
+    @AppStorage(StorageKeys.homeTabSelection) var selectedTab = Tabs.notifications
 
 
     var body: some View {
         TabView(selection: $selectedTab) {
-            ScheduleView()
-                .tag(Tabs.schedule)
+            //            ScheduleView()
+            //                .tag(Tabs.schedule)
+            //                .tabItem {
+            //                    Label("SCHEDULE_TAB_TITLE", systemImage: "square.and.arrow.up")
+            //                }
+            NotificationScreen()
+                .tag(Tabs.notifications)
                 .tabItem {
-                    Label("SCHEDULE_TAB_TITLE", systemImage: "list.clipboard")
+                    Label("NOTIFICATIONS_TAB_TITLE", systemImage: "bell.fill")
                 }
             Contacts()
                 .tag(Tabs.contact)

PAWS/PAWS.swift

@@ -10,22 +10,41 @@ import CardinalKit
 import PAWSOnboardingFlow
 import PAWSSharedContext
 import SwiftUI
-
+import PAWSLandingScreen
 
 @main
 struct PAWS: App {
     @UIApplicationDelegateAdaptor(PAWSAppDelegate.self) var appDelegate
     @AppStorage(StorageKeys.onboardingFlowComplete) var completedOnboardingFlow = false
+//    @AppStorage(StorageKeys.accountCreated) var completedAccountSetup = false
+
+    @State var pressedStart = false
 
+    var isSheetPresented: Binding<Bool> {
+        Binding(
+            get: {
+                !completedOnboardingFlow && pressedStart
+            }, set: { _ in }
+        )
+    }
 
     var body: some Scene {
         WindowGroup {
-            HomeView()
-                .sheet(isPresented: !$completedOnboardingFlow) {
-                    OnboardingFlow()
+//            if  completedAccountSetup {
+            Group {
+                if completedOnboardingFlow  {
+                    HomeView()
+                } else {
+                    LandingScreen(pressedStart: $pressedStart)
                 }
-                .testingSetup()
+            }
+                    .sheet(isPresented: isSheetPresented) {
+                        OnboardingFlow()
+                    }
+                    .interactiveDismissDisabled(true)
+                    .testingSetup()
                 .cardinalKit(appDelegate)
+
         }
     }
 }

PAWS/PAWSAppDelegate.swift

@@ -24,7 +24,20 @@ class PAWSAppDelegate: CardinalKitAppDelegate {
             if HKHealthStore.isHealthDataAvailable() {
                 HealthKit {
                     CollectSample(
-                        HKQuantityType(.stepCount),
+                        HKQuantityType(.heartRate),
+                        deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
+                    )
+                    CollectSample(
+                        HKQuantityType(.heartRateVariabilitySDNN),
+                        deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
+                    )
+                    CollectSample(
+                        HKQuantityType(.restingHeartRate),
+                        deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
+                    )
+
+                    CollectSample(
+                        HKQuantityType.electrocardiogramType(),
                         deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
                     )
                 } adapter: {

PAWS/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "1024.png",
+      "filename" : "paws-logo.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

PAWS/Supporting Files/Assets.xcassets/aydin_zahedivash.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "aydin_zahedivash.jpg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PAWS/Supporting Files/Assets.xcassets/scott-ceresnak.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "scott-ceresnak.jpeg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PAWS/Supporting Files/Localizable.strings

@@ -7,6 +7,9 @@
 //
 
 
+// MARK: - Notifications
+"NOTIFICATIONS_TAB_TITLE" = "Notifications";
+
 // MARK: - Contacts
 "CONTACTS_TAB_TITLE" = "Contacts";
 

PAWSModules/Package.swift

@@ -22,7 +22,11 @@ let package = Package(
         .library(name: "PAWSMockDataStorageProvider", targets: ["PAWSMockDataStorageProvider"]),
         .library(name: "PAWSOnboardingFlow", targets: ["PAWSOnboardingFlow"]),
         .library(name: "PAWSSchedule", targets: ["PAWSSchedule"]),
-        .library(name: "PAWSSharedContext", targets: ["PAWSSharedContext"])
+        .library(name: "PAWSSharedContext", targets: ["PAWSSharedContext"]),
+        .library(name: "PAWSLandingScreen", targets: ["PAWSLandingScreen"]),
+        .library(name: "PAWSNotificationScreen", targets: ["PAWSNotificationScreen"]),
+
+
     ],
     dependencies: [
         .package(url: "https://github.com/StanfordBDHG/CardinalKit.git", .upToNextMinor(from: "0.2.1"))
@@ -73,6 +77,27 @@ let package = Package(
         .target(
             name: "PAWSSharedContext",
             dependencies: []
+        ),
+        .target(
+            name: "PAWSLandingScreen",
+            dependencies: [],
+            resources: [
+                .process("Resources")
+            ]
+        ),
+        .target(
+            name: "PAWSNotificationScreen",
+            dependencies: [],
+            resources: [
+                .process("Resources")
+            ]
+        ),
+        .target(
+            name: "PAWSRegisterScreen",
+            dependencies: [],
+            resources: [
+                .process("Resources")
+            ]
         )
     ]
 )

PAWSModules/Sources/PAWSContacts/Contacts.swift

@@ -16,31 +16,64 @@ public struct Contacts: View {
     let contacts = [
         Contact(
             name: PersonNameComponents(
-                givenName: "Leland",
-                familyName: "Stanford"
+                givenName: "Scott",
+                familyName: "Ceresnak"
             ),
-            image: Image(systemName: "figure.wave.circle"),
-            title: "University Founder",
-            description: String(localized: "LELAND_STANFORD_BIO", bundle: .module),
+            image: Image(systemName: "person.circle"),
+            title: "Professor of Pediatrics (Cardiology)",
+            description: String(localized: "SCOTT_CERESNAK_BIO", bundle: .module),
             organization: "Stanford University",
             address: {
                 let address = CNMutablePostalAddress()
                 address.country = "USA"
                 address.state = "CA"
-                address.postalCode = "94305"
-                address.city = "Stanford"
-                address.street = "450 Serra Mall"
+                address.postalCode = "94304"
+                address.city = "Palo Alto"
+                address.street = "725 Welch Rd"
                 return address
             }(),
             contactOptions: [
-                .call("+1 (650) 723-2300"),
-                .text("+1 (650) 723-2300"),
-                .email(addresses: ["contact@stanford.edu"]),
+                //.call("+1 (650) 723-2300"),
+                //.text("+1 (650) 723-2300"),
+                .email(addresses: ["ceresnak@stanford.edu"]),
                 ContactOption(
                     image: Image(systemName: "safari.fill"),
                     title: "Website",
                     action: {
-                        if let url = URL(string: "https://stanford.edu") {
+                        if let url = URL(string: "https://profiles.stanford.edu/intranet/scott-ceresnak?tab=bio") {
+                           UIApplication.shared.open(url)
+                        }
+                    }
+                )
+            ]
+        ),
+        Contact(
+            name: PersonNameComponents(
+                givenName: "Aydin",
+                familyName: "Zahedivash"
+            ),
+            image: Image(systemName: "person.circle"),
+            title: "Pediatric Stanford Cardiology Fellow",
+            description: String(localized: "AYDIN_ZAHEDIVASH_BIO", bundle: .module),
+            organization: "Stanford University",
+            address: {
+                let address = CNMutablePostalAddress()
+                address.country = "USA"
+                address.state = "CA"
+                address.postalCode = "94304"
+                address.city = "Palo Alto"
+                address.street = "725 Welch Rd"
+                return address
+            }(),
+            contactOptions: [
+                //.call("+1 (650) 723-2300"),
+                //.text("+1 (650) 723-2300"),
+                .email(addresses: ["[email protected]"]),
+                ContactOption(
+                    image: Image(systemName: "safari.fill"),
+                    title: "Website",
+                    action: {
+                        if let url = URL(string: "https://profiles.stanford.edu/intranet/scott-ceresnak?tab=bio") {
                            UIApplication.shared.open(url)
                         }
                     }

PAWSModules/Sources/PAWSContacts/Resources/en.lproj/Localizable.strings

@@ -8,5 +8,5 @@
 
 // MARK: - Contacts
 "CONTACTS_NAVIGATION_TITLE" = "Contacts";
-"LELAND_STANFORD_BIO" = "Amasa Leland Stanford (March 9, 1824 – June 21, 1893) was an American industrialist and politician. [...] He and his wife Jane were also the founders of Stanford University, which they named after their late son.
-[https://en.wikipedia.org/wiki/Leland_Stanford]";
+"SCOTT_CERESNAK_BIO" = "Dr. Scott R. Ceresnak is a pediatric cardiologist in Walnut Creek, California and is affiliated with multiple hospitals in the area, including California Pacific Medical Center and Stanford Health Care-Stanford Hospital. He received his medical degree from Rutgers Robert Wood Johnson Medical School and has been in practice for more than 20 years.";
+"AYDIN_ZAHEDIVASH_BIO" = "";