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.

Sign up for GitHub

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

Jump to bottom

Use asset when available in detail card view #579

Merged
merged 13 commits into from
May 7, 2021
Merged

Use asset when available in detail card view #579

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9a078ec
Use asset when available in detail card view
cbaker6 May 5, 2021
5f68276
Make asset part of OCKAnyTask protocol to replicate OCKObjectCompatabe.
cbaker6 May 5, 2021
b8d0c99
Update CareKit/CareKit/Shared/Task/Controller/OCKTaskController.swift
cbaker6 May 5, 2021
2324e46
One possible one liner but doesn't look that good IMO
cbaker6 May 5, 2021
44725fd
Use nil coalescing, slightly better
cbaker6 May 5, 2021
9f193f4
Test image in OCKSample app using current asset
cbaker6 May 5, 2021
d05625e
support sf symbol and system images as asset
cbaker6 May 5, 2021
8c0ce66
Use sf symbol for doxylamine example
cbaker6 May 5, 2021
760db2c
add UIImage extension
cbaker6 May 5, 2021
45a51b9
nit
cbaker6 May 5, 2021
dab8afa
Update OCKContactUtility.swift
cbaker6 May 5, 2021
e1ecb63
Nit
cbaker6 May 5, 2021
b97ecf0
add asset to catalog
cbaker6 May 6, 2021
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
1 change: 1 addition & 0 deletions CareKit/CareKit/Shared/Task/Controller/OCKTaskController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ open class OCKTaskController: ObservableObject {
let detailViewController = OCKDetailViewController(showsCloseButton: true)
detailViewController.detailView.titleLabel.text = task.title
detailViewController.detailView.bodyLabel.text = task.instructions
detailViewController.detailView.imageView.image = task.asset.map(UIImage.init(named:)) ?? nil
cbaker6 marked this conversation as resolved.
Show resolved Hide resolved
return detailViewController
}

Expand Down
3 changes: 3 additions & 0 deletions CareKitStore/CareKitStore/Protocols/Tasks/OCKAnyTask.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ public protocol OCKAnyTask {
/// An universally unique identifier for this task.
var uuid: UUID { get }

/// A string representation of an asset.
var asset: String? { get }

cbaker6 marked this conversation as resolved.
Show resolved Hide resolved
/// An identifier for this task in a remote store.
var remoteID: String? { get }

Expand Down
2 changes: 1 addition & 1 deletion OCKSample/OCKSample/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private extension OCKStore {
var doxylamine = OCKTask(id: "doxylamine", title: "Take Doxylamine",
carePlanUUID: nil, schedule: schedule)
doxylamine.instructions = "Take 25mg of doxylamine when you experience nausea."

doxylamine.asset = "AppIcon"
let nauseaSchedule = OCKSchedule(composing: [
OCKScheduleElement(start: beforeBreakfast, end: nil, interval: DateComponents(day: 1),
text: "Anytime throughout the day", targetValues: [], duration: .allDay)
Expand Down