-
Notifications
You must be signed in to change notification settings - Fork 444
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
feat: Build CareKit for macOS and visionOS #716
Open
cbaker6
wants to merge
12
commits into
carekit-apple:main
Choose a base branch
from
cbaker6:buildCareKitUI
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+390
−183
Open
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
f1e8bbc
feat: Build CareKitUI for macOS
cbaker6 bb36446
update CI to test against macOS
cbaker6 40e88e7
xcode proj builds for macOS
cbaker6 8f4f043
add macOS to test projects
cbaker6 1f9385c
Update swift.yml
cbaker6 c87e91c
Update swift.yml
cbaker6 56406fd
build for visionOS
cbaker6 857dd83
add visionOS to CI
cbaker6 41aee7b
add min visionOS requirement
cbaker6 8ae3970
fix file protections for macOS
cbaker6 5421c7b
nit
cbaker6 d9149c3
nits
cbaker6 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,6 @@ | |
|
||
import CareKitStore | ||
import Foundation | ||
import UIKit | ||
|
||
extension OCKAnyReadOnlyEventStore { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -86,7 +86,10 @@ public struct OCKTaskEvents: Collection, Identifiable { | |
|
||
// First make sure there is no matching event already stored in the data structure. | ||
let indexPath = self.indexPath(of: event) | ||
guard indexPath == nil else { return (self[indexPath!.section][indexPath!.row], false) } | ||
guard indexPath == nil else { | ||
let indexPathRowValue = rowValueOfIndexPath(indexPath!) | ||
return (self[indexPath!.section][indexPathRowValue], false) | ||
} | ||
|
||
// Append the event to the matching section if one exists. | ||
if let section = section(for: event.task) { | ||
|
@@ -113,7 +116,8 @@ public struct OCKTaskEvents: Collection, Identifiable { | |
public mutating func remove(event: OCKAnyEvent) -> OCKAnyEvent? { | ||
guard let indexPath = indexPath(of: event) else { return nil } | ||
var updatedEvents = events[indexPath.section] | ||
let removedEvent = updatedEvents.remove(at: indexPath.row) | ||
let indexPathRowValue = rowValueOfIndexPath(indexPath) | ||
let removedEvent = updatedEvents.remove(at: indexPathRowValue) | ||
|
||
// If the removed event was the last one in the section, remove the whole section. | ||
guard !updatedEvents.isEmpty else { | ||
|
@@ -132,7 +136,8 @@ public struct OCKTaskEvents: Collection, Identifiable { | |
public mutating func update(event: OCKAnyEvent) -> OCKAnyEvent? { | ||
// Update the matching event | ||
if let matchIndexPath = indexPath(of: event) { | ||
events[matchIndexPath.section][matchIndexPath.row] = event | ||
let matchIndexPathRowValue = rowValueOfIndexPath(matchIndexPath) | ||
events[matchIndexPath.section][matchIndexPathRowValue] = event | ||
return event | ||
// Else append the event | ||
} else { | ||
|
@@ -148,7 +153,19 @@ public struct OCKTaskEvents: Collection, Identifiable { | |
private func indexPath(of event: OCKAnyEvent) -> IndexPath? { | ||
guard let section = section(for: event.task) else { return nil } | ||
guard let row = events[section].firstIndex(where: { $0.matches(event) }) else { return nil } | ||
#if !os(macOS) | ||
return .init(row: row, section: section) | ||
#else | ||
return .init(item: row, section: section) | ||
#endif | ||
} | ||
|
||
private func rowValueOfIndexPath(_ indexPath: IndexPath) -> Int { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added this method because iOS and macOS use row/item respectively |
||
#if !os(macOS) | ||
return indexPath.row | ||
#else | ||
return indexPath.item | ||
#endif | ||
} | ||
|
||
// MARK: - Collection | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See comment below about row/item is handled for how iOS/macOS