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.

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 Landing Screen, Notifications Screen, and updated all Onboarding Pages #4

Merged
merged 31 commits into from
Feb 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5bedab1
Updated onboarding screens and made a landing page.
ckunchur Feb 8, 2023
5514924
added notification screen
ckunchur Feb 9, 2023
74ba390
added app logo as homescreen icon
ckunchur Feb 9, 2023
d24c132
Update PAWSModules/Sources/PAWSOnboardingFlow/OnboardingFlow.swift
ckunchur Feb 14, 2023
1914daf
Update PAWSModules/Sources/PAWSOnboardingFlow/OnboardingFlow.swift
ckunchur Feb 14, 2023
94d4967
Update PAWSModules/Sources/PAWSOnboardingFlow/InterestingModules.swift
ckunchur Feb 14, 2023
90ae055
Update PAWS/Home.swift
ckunchur Feb 14, 2023
31b935d
Update PAWS/PAWS.swift
ckunchur Feb 14, 2023
241e86f
Update PAWS/PAWS.swift
ckunchur Feb 14, 2023
7632261
Update PAWS/PAWS.swift
ckunchur Feb 14, 2023
f9f01e3
swiftlint errors
ckunchur Feb 14, 2023
4bef384
fixed lint errors
ckunchur Feb 14, 2023
9dd13ba
fixed merge issues in home file
ckunchur Feb 14, 2023
fa1360e
deleted stuff
ckunchur Feb 14, 2023
a05d559
deleted register screen
ckunchur Feb 14, 2023
67d962b
deleted image files
ckunchur Feb 14, 2023
20038a2
deleted image files
ckunchur Feb 14, 2023
b40a66e
added license file
ckunchur Feb 14, 2023
f1a609e
fixed swiftlint errors
ckunchur Feb 14, 2023
931dc66
update gitignore
ckunchur Feb 15, 2023
df2a15e
add logo license
ckunchur Feb 15, 2023
754eb5c
fixed swiftlint errors
ckunchur Feb 15, 2023
b4d5473
temporarily reomved onboarding and mock upload tests for first merge
ckunchur Feb 15, 2023
0c76221
temporarily reomved onboarding and mock upload tests for first merge
ckunchur Feb 15, 2023
5091cdb
Fix Tests
PSchmiedmayer Feb 15, 2023
969fc4e
Improve Code Structure
PSchmiedmayer Feb 15, 2023
1034441
Improve Code Structure
PSchmiedmayer Feb 15, 2023
311574d
Fix compilation error with the icon
PSchmiedmayer Feb 15, 2023
221b0bc
Increase the timeouts in the HealthKit tests
PSchmiedmayer Feb 15, 2023
489d1ad
Remove unused code
PSchmiedmayer Feb 15, 2023
b862063
Fix unused import
PSchmiedmayer Feb 16, 2023
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
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@
#
# SPDX-License-Identifier: MIT
#
*.png filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
.build/
!PAWS.xcodeproj

project.xcworkspace/

# IDE related folders
.idea

Expand Down
91 changes: 62 additions & 29 deletions PAWS.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions PAWS.xcodeproj/project.xcworkspace/contents.xcworkspacedata

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 6 additions & 0 deletions PAWS.xcodeproj/xcshareddata/xcschemes/PAWS.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
ReferencedContainer = "container:PAWS.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "--showOnboarding"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
4 changes: 1 addition & 3 deletions PAWS.xctestplan
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
}
],
"defaultOptions" : {
"maximumTestRepetitions" : 2,
"targetForVariableExpansion" : {
"containerPath" : "container:PAWS.xcodeproj",
"identifier" : "653A254C283387FE005D4D48",
"name" : "PAWS"
},
"testRepetitionMode" : "retryOnFailure"
}
},
"testTargets" : [
{
Expand Down
12 changes: 6 additions & 6 deletions PAWS/Home.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@

import PAWSContacts
import PAWSMockDataStorageProvider
import PAWSSchedule
import PAWSNotificationScreen
import PAWSSharedContext
import SwiftUI


struct HomeView: View {
enum Tabs: String {
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)
NotificationScreen()
.tag(Tabs.notifications)
.tabItem {
Label("SCHEDULE_TAB_TITLE", systemImage: "list.clipboard")
Label("NOTIFICATIONS_TAB_TITLE", systemImage: "bell.fill")
}
Contacts()
.tag(Tabs.contact)
Expand Down
22 changes: 19 additions & 3 deletions PAWS/PAWS.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,38 @@
//

import CardinalKit
import PAWSLandingScreen
import PAWSOnboardingFlow
import PAWSSharedContext
import SwiftUI


@main
struct PAWS: App {
@UIApplicationDelegateAdaptor(PAWSAppDelegate.self) var appDelegate
@AppStorage(StorageKeys.onboardingFlowComplete) var completedOnboardingFlow = false

@State var pressedStart = false

var isSheetPresented: Binding<Bool> {
Binding(
get: {
!completedOnboardingFlow && pressedStart
}, set: { _ in }
)
}

var body: some Scene {
WindowGroup {
HomeView()
.sheet(isPresented: !$completedOnboardingFlow) {
Group {
if completedOnboardingFlow {
HomeView()
} else {
LandingScreen(pressedStart: $pressedStart)
}
}
.sheet(isPresented: isSheetPresented) {
OnboardingFlow()
.interactiveDismissDisabled(true)
}
.testingSetup()
.cardinalKit(appDelegate)
Expand Down
16 changes: 13 additions & 3 deletions PAWS/PAWSAppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import HealthKit
import HealthKitDataSource
import HealthKitToFHIRAdapter
import PAWSMockDataStorageProvider
import PAWSSchedule
import Questionnaires
import Scheduler
import SwiftUI
Expand All @@ -24,7 +23,19 @@ class PAWSAppDelegate: CardinalKitAppDelegate {
if HKHealthStore.isHealthDataAvailable() {
HealthKit {
CollectSample(
HKQuantityType(.stepCount),
HKQuantityType(.heartRate),
deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
PSchmiedmayer marked this conversation as resolved.
Show resolved Hide resolved
)
CollectSample(
HKQuantityType(.heartRateVariabilitySDNN),
deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
)
CollectSample(
HKQuantityType(.restingHeartRate),
deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
)
CollectSample(
HKQuantityType.electrocardiogramType(),
deliverySetting: .anchorQuery(.afterAuthorizationAndApplicationWillLaunch)
)
} adapter: {
Expand All @@ -33,7 +44,6 @@ class PAWSAppDelegate: CardinalKitAppDelegate {
}
QuestionnaireDataSource()
MockDataStorageProvider()
PAWSScheduler()
}
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "1024.png",
"filename" : "paws-logo.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions PAWS/Supporting Files/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
//


// MARK: - Notifications
"NOTIFICATIONS_TAB_TITLE" = "Notifications";

// MARK: - Contacts
"CONTACTS_TAB_TITLE" = "Contacts";

Expand Down
Loading