From a570a8c6842e01f6f9badab11c4f2f37ea0e5c62 Mon Sep 17 00:00:00 2001 From: James Bole Pan Date: Sat, 17 Feb 2024 23:09:39 -0800 Subject: [PATCH] Tested on James's iPhone --- .../Onboarding/OnboardingPageView.swift | 2 +- .../Onboarding/OnboardingUIView.swift | 4 +-- .../Components/Tasks/TasksUIView.swift | 3 +- .../Components/Tasks/Views/CoffeeUIView.swift | 4 +-- .../Components/Tasks/Views/LearnUIView.swift | 4 +-- .../Tasks/Views/SensorsDemoUIView.swift | 4 +-- .../Supporting Files/CKConfiguration.plist | 36 +++++++++++-------- .../SafeSip.xcodeproj/project.pbxproj | 4 +-- 8 files changed, 34 insertions(+), 27 deletions(-) diff --git a/CardinalKit-Example/CardinalKit/Components/Onboarding/OnboardingPageView.swift b/CardinalKit-Example/CardinalKit/Components/Onboarding/OnboardingPageView.swift index cc886ad6..5e9a8d5d 100644 --- 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 index f0e76c09..afd4cc58 100644 --- 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 index 0a9ba2a2..1101a39c 100644 --- 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 index 380cb058..ebc53f74 100644 --- 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 index ba46a898..8ebd19e8 100644 --- 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 index 6d1e333f..de66b5ca 100644 --- 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 index 78156897..31ff93dc 100644 --- a/CardinalKit-Example/CardinalKit/Supporting Files/CKConfiguration.plist +++ b/CardinalKit-Example/CardinalKit/Supporting Files/CKConfiguration.plist @@ -23,7 +23,7 @@ Review Consent Step Text Review Consent Form Reason for Consent Text - Consent to join the Developer Health Research Study. + Consent to join the SafeSip community and the Alcohol-overdose prevention effort Consent File Name My Consent Form Passcode Text @@ -33,7 +33,7 @@ Completion Step Title Welcome aboard. Completion Step Text - This step concludes the onboarding and consent process of the CardinalKit framework. Next up, you will see main app functionality. + This step concludes the onboarding and consent process of the SafeSip App. Next up, you will see main app functionality. Health Permissions Title Permission to read Accelerometer Data Health Permissions Text @@ -52,17 +52,17 @@ Sign In With Email Withdrawal Instruction Title - Are you sure you want to withdraw? + Are you sure you want to withdraw from using the SafeSip app? Withdrawal Instruction Text - Withdrawing from the study will reset the app to the state it was in prior to you originally joining the study. + Withdrawing from registration will reset the app to the state it was in prior to you originally downloaded the app. Withdraw Title We appreciate your time. Withdraw Text - Thank you for your contribution to this study. We are sorry that you could not continue. The app will now close. + Thank you for downloading SafeSip. We are sorry that you decided not to continue using it. The app will now close. Passcode On Return Text Welcome back! Consent Title - Research Study Consent Form + SafeSip User Consent Form Use CareKit Consent Form @@ -72,9 +72,15 @@ Title Hi there! 👋🏽 Summary - 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! + 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. Content - 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! + 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's capabilities and look forward to seeing the positive impact it will have on your well-being and social interactions. + + + + + + DataGathering @@ -144,25 +150,25 @@ Title - First Title + Real-time Monitoring Description - You can customize this section your own logo and text. + Logo ActivityIcon Title - Second Title + Comprehensive Inbody Alcohol Statistics Description - You can customize this section your own logo and text. + Logo DataIcon Title - Third Title + Multi-modal Digital Sensors Description - You can customize this section your own logo and text. + Logo WatchIcon @@ -171,7 +177,7 @@ givenName - Johnny + James familyName Appleseed title diff --git a/CardinalKit-Example/SafeSip.xcodeproj/project.pbxproj b/CardinalKit-Example/SafeSip.xcodeproj/project.pbxproj index 79e54a08..8093baa1 100644 --- 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";