Tested on James's iPhone

aakritil · Feb 18, 2024 · a570a8c · a570a8c
1 parent 33fe9fc
commit a570a8c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 27 deletions.
diff --git a/CardinalKit-Example/CardinalKit/Components/Onboarding/OnboardingPageView.swift b/CardinalKit-Example/CardinalKit/Components/Onboarding/OnboardingPageView.swift
@@ -70,7 +70,7 @@ struct OnboardingInfoView: View {
                 .frame(width: 100, height: 100)
                 .padding()
 
-            Text(title).font(.title)
+            Text(title).font(.title).multilineTextAlignment(.center)
 
             Text(description)
                 .font(.body)

diff --git a/CardinalKit-Example/CardinalKit/Components/Onboarding/OnboardingUIView.swift b/CardinalKit-Example/CardinalKit/Components/Onboarding/OnboardingUIView.swift
@@ -42,7 +42,7 @@ struct OnboardingUIView: View {
             Text(config.read(query: "Study Title") ?? "CardinalKit")
                 .foregroundColor(self.color)
                 .multilineTextAlignment(.center)
-                .font(.system(size: 35, weight: .bold, design: .default))
+                .font(.system(size: 40, weight: .bold, design: .default))
                 .padding(.leading, Metrics.paddingHorizontalMain)
                 .padding(.trailing, Metrics.paddingHorizontalMain)
 
@@ -59,7 +59,7 @@ struct OnboardingUIView: View {
                 Button(action: {
                     self.showingOnboard.toggle()
                 }, label: {
-                     Text("Join Study")
+                     Text("I'm a New User")
                         .padding(Metrics.paddingButtonLabel)
                         .frame(maxWidth: .infinity)
                         .foregroundColor(.white)

diff --git a/CardinalKit-Example/CardinalKit/Components/Tasks/TasksUIView.swift b/CardinalKit-Example/CardinalKit/Components/Tasks/TasksUIView.swift
@@ -179,7 +179,7 @@ struct TasksUIView: View {
             .padding()
 
             HStack {
-                Image(systemName: "exclamationmark.circle")
+                Image(systemName: apiResponse?.completed ?? false ? "exclamationmark.circle" : "checkmark.circle")
                     .resizable() // Allows the image to be resized
                     .aspectRatio(contentMode: .fit) // Maintains the aspect ratio of the image
                     .frame(width: 50, height: 50) // Sets the image size to 50x50 points
@@ -189,6 +189,7 @@ struct TasksUIView: View {
                         .frame(width: 60, height: 60)) // Makes the circle slightly larger than the icon
                 Text(apiResponse?.completed ?? false ? "Warning" : "Normal")
                     .foregroundColor(apiResponse?.completed ?? false ? .red : .green)
+                    .font(.system(size: 30))
             }
             .padding() // Adds some padding around the HStack contents
 

diff --git a/CardinalKit-Example/CardinalKit/Components/Tasks/Views/CoffeeUIView.swift b/CardinalKit-Example/CardinalKit/Components/Tasks/Views/CoffeeUIView.swift
@@ -29,8 +29,8 @@ struct CoffeeUIView: View {
             Image("SBDLogoGrey")
                 .resizable()
                 .scaledToFit()
-                .padding(.leading, Metrics.paddingHorizontalMain * 4)
-                .padding(.trailing, Metrics.paddingHorizontalMain * 4)
+                .padding(.leading, Metrics.paddingHorizontalMain * 1)
+                .padding(.trailing, Metrics.paddingHorizontalMain * 1)
                 .accessibilityLabel(Text("Logo"))
         }
     }

diff --git a/CardinalKit-Example/CardinalKit/Components/Tasks/Views/LearnUIView.swift b/CardinalKit-Example/CardinalKit/Components/Tasks/Views/LearnUIView.swift
@@ -35,8 +35,8 @@ struct LearnUIView: View {
             Image("SBDLogoGrey")
                 .resizable()
                 .scaledToFit()
-                .padding(.leading, Metrics.paddingHorizontalMain * 4)
-                .padding(.trailing, Metrics.paddingHorizontalMain * 4)
+                .padding(.leading, Metrics.paddingHorizontalMain * 1)
+                .padding(.trailing, Metrics.paddingHorizontalMain * 1)
                 .accessibilityLabel(Text("Logo"))
         }
     }

diff --git a/CardinalKit-Example/CardinalKit/Components/Tasks/Views/SensorsDemoUIView.swift b/CardinalKit-Example/CardinalKit/Components/Tasks/Views/SensorsDemoUIView.swift
@@ -97,8 +97,8 @@ struct SensorsDemoUIView: View {
             Image("SBDLogoGrey")
                 .resizable()
                 .scaledToFit()
-                .padding(.leading, Metrics.paddingHorizontalMain * 4)
-                .padding(.trailing, Metrics.paddingHorizontalMain * 4)
+                .padding(.leading, Metrics.paddingHorizontalMain * 1)
+                .padding(.trailing, Metrics.paddingHorizontalMain * 1)
                 .accessibilityLabel(Text("Biodesign Logo"))
 
             if useAppleWatch {

diff --git a/CardinalKit-Example/CardinalKit/Supporting Files/CKConfiguration.plist b/CardinalKit-Example/CardinalKit/Supporting Files/CKConfiguration.plist
@@ -23,7 +23,7 @@
 	<key>Review Consent Step Text</key>
 	<string>Review Consent Form</string>
 	<key>Reason for Consent Text</key>
-	<string>Consent to join the Developer Health Research Study.</string>
+	<string>Consent to join the SafeSip community and the Alcohol-overdose prevention effort</string>
 	<key>Consent File Name</key>
 	<string>My Consent Form</string>
 	<key>Passcode Text</key>
@@ -33,7 +33,7 @@
 	<key>Completion Step Title</key>
 	<string>Welcome aboard.</string>
 	<key>Completion Step Text</key>
-	<string>This step concludes the onboarding and consent process of the CardinalKit framework. Next up, you will see main app functionality.</string>
+	<string>This step concludes the onboarding and consent process of the SafeSip App. Next up, you will see main app functionality.</string>
 	<key>Health Permissions Title</key>
 	<string>Permission to read Accelerometer Data</string>
 	<key>Health Permissions Text</key>
@@ -52,17 +52,17 @@
 	<key>Sign In With Email</key>
 	<false/>
 	<key>Withdrawal Instruction Title</key>
-	<string>Are you sure you want to withdraw?</string>
+	<string>Are you sure you want to withdraw from using the SafeSip app?</string>
 	<key>Withdrawal Instruction Text</key>
-	<string>Withdrawing from the study will reset the app to the state it was in prior to you originally joining the study.</string>
+	<string>Withdrawing from registration will reset the app to the state it was in prior to you originally downloaded the app.</string>
 	<key>Withdraw Title</key>
 	<string>We appreciate your time.</string>
 	<key>Withdraw Text</key>
-	<string>Thank you for your contribution to this study. We are sorry that you could not continue. The app will now close.</string>
+	<string>Thank you for downloading SafeSip. We are sorry that you decided not to continue using it. The app will now close.</string>
 	<key>Passcode On Return Text</key>
 	<string>Welcome back!</string>
 	<key>Consent Title</key>
-	<string>Research Study Consent Form</string>
+	<string>SafeSip User Consent Form</string>
 	<key>Use CareKit</key>
 	<true/>
 	<key>Consent Form</key>
@@ -72,9 +72,15 @@
 			<key>Title</key>
 			<string>Hi there! 👋🏽</string>
 			<key>Summary</key>
-			<string>CardinalKit is a suite of tools designed to help you build a digital health app experience from the ground up. It integrates with Firebase to provide full-stack solutions. We hope you enjoy the love poured into this sample and make many great things with it!</string>
+			<string>SafeSip is an innovative application crafted to enhance personal safety through digital health monitoring. Utilizing advanced sensor technologies, including accelerometers, SafeSip offers a dynamic approach to managing alcohol consumption.</string>
 			<key>Content</key>
-			<string>CardinalKit is a suite of tools designed to help you build a digital health app experience from the ground up. It integrates with Firebase to provide full-stack solutions. We hope you enjoy the love poured into this sample and make many great things with it!</string>
+			<string>SafeSip is an innovative application crafted to enhance personal safety through digital health monitoring. Utilizing advanced sensor technologies, including accelerometers, SafeSip offers a dynamic approach to managing alcohol consumption. By providing real-time feedback on intoxication levels, our app aims to prevent potential overindulgence and ensure a safer social experience. We are excited for you to explore SafeSip&apos;s capabilities and look forward to seeing the positive impact it will have on your well-being and social interactions.
+
+
+
+
+
+</string>
 		</dict>
 		<key>DataGathering</key>
 		<dict>
@@ -144,25 +150,25 @@
 	<array>
 		<dict>
 			<key>Title</key>
-			<string>First Title</string>
+			<string>Real-time Monitoring</string>
 			<key>Description</key>
-			<string>You can customize this section your own logo and text.</string>
+			<string></string>
 			<key>Logo</key>
 			<string>ActivityIcon</string>
 		</dict>
 		<dict>
 			<key>Title</key>
-			<string>Second Title</string>
+			<string>Comprehensive Inbody Alcohol Statistics</string>
 			<key>Description</key>
-			<string>You can customize this section your own logo and text.</string>
+			<string></string>
 			<key>Logo</key>
 			<string>DataIcon</string>
 		</dict>
 		<dict>
 			<key>Title</key>
-			<string>Third Title</string>
+			<string>Multi-modal Digital Sensors</string>
 			<key>Description</key>
-			<string>You can customize this section your own logo and text.</string>
+			<string></string>
 			<key>Logo</key>
 			<string>WatchIcon</string>
 		</dict>
@@ -171,7 +177,7 @@
 	<array>
 		<dict>
 			<key>givenName</key>
-			<string>Johnny</string>
+			<string>James</string>
 			<key>familyName</key>
 			<string>Appleseed</string>
 			<key>title</key>

diff --git a/CardinalKit-Example/SafeSip.xcodeproj/project.pbxproj b/CardinalKit-Example/SafeSip.xcodeproj/project.pbxproj
@@ -1134,7 +1134,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 252K9YHJWG;
+				DEVELOPMENT_TEAM = 8GK666AU97;
 				INFOPLIST_FILE = "CardinalKit/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1143,7 +1143,7 @@
 				);
 				MARKETING_VERSION = 2.2.0;
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = com.safesip;
+				PRODUCT_BUNDLE_IDENTIFIER = com.safesip.james;
 				PRODUCT_NAME = "CardinalKit Example";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "CardinalKit/Supporting Files/CardinalKit_Example-Bridging-Header.h";