Skip to content

Commit 580291d

Browse files
cbaker6cbaker6
committed
feat: Add Insights tab on iOS and watchOS
1 parent a8f54c6 commit 580291d

File tree

14 files changed

+432
-137
lines changed

14 files changed

+432
-137
lines changed

‎OCKSample.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
7036E517256F2413006E9A3C /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7036E516256F2413006E9A3C /* ProfileViewModel.swift */; };
3232
7036E64025717F85006E9A3C /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7036E63F25717F85006E9A3C /* Constants.swift */; };
3333
704352422DB09A5C00A12187 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E7C4CA0A22809AD500ECC3D7 /* Assets.xcassets */; };
34+
7055723F2DC1E63A008E5B0A /* InsightsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7055723E2DC1E63A008E5B0A /* InsightsView.swift */; };
35+
705572402DC1EAEE008E5B0A /* InsightsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7055723E2DC1E63A008E5B0A /* InsightsView.swift */; };
3436
7075151E28DE1A8300A57A0C /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7075151C28DE1A7400A57A0C /* MainView.swift */; };
3537
7075152028DE1BB400A57A0C /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7075151F28DE1BB400A57A0C /* LoginView.swift */; };
3638
707CC714254DA91900116728 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 707CC70F254DA91900116728 /* Localizable.strings */; };
@@ -171,6 +173,7 @@
171173
7036E4D2256EBE35006E9A3C /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
172174
7036E516256F2413006E9A3C /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
173175
7036E63F25717F85006E9A3C /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
176+
7055723E2DC1E63A008E5B0A /* InsightsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InsightsView.swift; sourceTree = "<group>"; };
174177
705B22BE25E2C1A700C472AC /* OCKWatchSample Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "OCKWatchSample Extension.entitlements"; sourceTree = "<group>"; };
175178
7075151C28DE1A7400A57A0C /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
176179
7075151F28DE1BB400A57A0C /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
@@ -305,6 +308,7 @@
305308
70E3422C2DB058A7005124F9 /* Cards */,
306309
70308878258272CD00FFABB6 /* Care */,
307310
7030887D258272F400FFABB6 /* Contact */,
311+
7055723D2DC1E457008E5B0A /* Insights */,
308312
7030887E2582731300FFABB6 /* Login */,
309313
7030887C258272E700FFABB6 /* Profile */,
310314
91693819271B64CB00A634ED /* Stylers */,
@@ -347,6 +351,14 @@
347351
path = Login;
348352
sourceTree = "<group>";
349353
};
354+
7055723D2DC1E457008E5B0A /* Insights */ = {
355+
isa = PBXGroup;
356+
children = (
357+
7055723E2DC1E63A008E5B0A /* InsightsView.swift */,
358+
);
359+
path = Insights;
360+
sourceTree = "<group>";
361+
};
350362
7075151B28DE1A5B00A57A0C /* Main */ = {
351363
isa = PBXGroup;
352364
children = (
@@ -775,6 +787,7 @@
775787
70E342302DB062F8005124F9 /* NoHighlightStyle.swift in Sources */,
776788
70221F2F28D7CDE400971195 /* AppDelegate+ParseRemoteDelegate.swift in Sources */,
777789
7083A857279CA40F00B3832E /* PCKUtility.swift in Sources */,
790+
705572402DC1EAEE008E5B0A /* InsightsView.swift in Sources */,
778791
91AD923924A4C42D00925D4D /* OCKWatchSampleApp.swift in Sources */,
779792
70F03AA627860B2500E5AFB4 /* OCKPatient+Parse.swift in Sources */,
780793
70221F3828D8C0CB00971195 /* AppDelegateKey.swift in Sources */,
@@ -805,6 +818,7 @@
805818
7099D20829E98E200037CD8E /* UserType.swift in Sources */,
806819
70F921AC27CABE3000368CEC /* SessionDelegate.swift in Sources */,
807820
70F0EFEA28C2EE6C0005B5A2 /* AppDelegateKey.swift in Sources */,
821+
7055723F2DC1E63A008E5B0A /* InsightsView.swift in Sources */,
808822
7036E64025717F85006E9A3C /* Constants.swift in Sources */,
809823
7099D20529E98DFF0037CD8E /* TaskID.swift in Sources */,
810824
7036E4CE256E9A0C006E9A3C /* ContactView.swift in Sources */,
@@ -970,7 +984,7 @@
970984
"$(inherited)",
971985
"@executable_path/Frameworks",
972986
);
973-
MACOSX_DEPLOYMENT_TARGET = 13.0;
987+
MACOSX_DEPLOYMENT_TARGET = 14.0;
974988
PRODUCT_BUNDLE_IDENTIFIER = edu.usc.netrecon.ParseCarekitSample;
975989
PRODUCT_NAME = "$(TARGET_NAME)";
976990
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1094,7 +1108,7 @@
10941108
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
10951109
SWIFT_VERSION = 5.0;
10961110
TARGETED_DEVICE_FAMILY = 4;
1097-
WATCHOS_DEPLOYMENT_TARGET = 9.0;
1111+
WATCHOS_DEPLOYMENT_TARGET = 10.0;
10981112
};
10991113
name = Debug;
11001114
};
@@ -1120,7 +1134,7 @@
11201134
SKIP_INSTALL = YES;
11211135
SWIFT_VERSION = 5.0;
11221136
TARGETED_DEVICE_FAMILY = 4;
1123-
WATCHOS_DEPLOYMENT_TARGET = 9.0;
1137+
WATCHOS_DEPLOYMENT_TARGET = 10.0;
11241138
};
11251139
name = Release;
11261140
};
@@ -1214,7 +1228,7 @@
12141228
"$(inherited)",
12151229
"@executable_path/Frameworks",
12161230
);
1217-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1231+
MACOSX_DEPLOYMENT_TARGET = 14.0;
12181232
PRODUCT_BUNDLE_IDENTIFIER = edu.usc.netrecon.ParseCarekitSample;
12191233
PRODUCT_NAME = "$(TARGET_NAME)";
12201234
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1275,15 +1289,15 @@
12751289
repositoryURL = "https://github.com/netreconlab/CareKitEssentials";
12761290
requirement = {
12771291
kind = upToNextMajorVersion;
1278-
minimumVersion = "1.0.0-alpha.46";
1292+
minimumVersion = "1.0.0-alpha.49";
12791293
};
12801294
};
12811295
70202EBF2807333900CF73FB /* XCRemoteSwiftPackageReference "CareKit" */ = {
12821296
isa = XCRemoteSwiftPackageReference;
12831297
repositoryURL = "https://github.com/cbaker6/CareKit.git";
12841298
requirement = {
12851299
kind = upToNextMajorVersion;
1286-
minimumVersion = "3.0.0-beta.42";
1300+
minimumVersion = "3.0.0-beta.44";
12871301
};
12881302
};
12891303
918FDEAD271B3F8F0045A0EF /* XCRemoteSwiftPackageReference "ParseCareKit" */ = {

‎OCKSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OCKSample/Extensions/AppDelegate+UIApplicationDelegate.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ extension AppDelegate: UIApplicationDelegate {
6666
return true
6767
}
6868

69-
func application(_ application: UIApplication,
70-
configurationForConnecting connectingSceneSession: UISceneSession,
71-
options: UIScene.ConnectionOptions) -> UISceneConfiguration {
72-
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
73-
}
74-
7569
func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {}
7670

7771
func application(_ application: UIApplication,

‎OCKSample/Main/Care/CareViewController.swift‎

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ import os.log
3636
import SwiftUI
3737
import UIKit
3838

39-
// swiftlint:disable type_body_length
40-
4139
@MainActor
4240
class CareViewController: OCKDailyPageViewController {
4341

@@ -280,52 +278,6 @@ class CareViewController: OCKDailyPageViewController {
280278

281279
case TaskID.nausea:
282280

283-
let title = String(localized: "NAUSEA_DOXYLAMINE_INTAKE")
284-
let subtitle = String(localized: "THIS_WEEK")
285-
let duration = Calendar
286-
.current
287-
.dateIntervalOfWeek(for: Date())
288-
289-
// dynamic gradient colors
290-
let nauseaGradientStart = Color(TintColorFlipKey.defaultValue)
291-
let nauseaGradientEnd = Color.accentColor
292-
293-
let nauseaDataSeries = CKEDataSeriesConfiguration(
294-
taskID: task.id,
295-
mark: .bar,
296-
legendTitle: String(localized: "NAUSEA"),
297-
color: nauseaGradientEnd,
298-
gradientStartColor: nauseaGradientStart,
299-
stackingMethod: .unstacked
300-
) { event in
301-
event.computeProgress(by: .summingOutcomeValues)
302-
}
303-
304-
let doxylamineDataSeries = CKEDataSeriesConfiguration(
305-
taskID: TaskID.doxylamine,
306-
mark: .bar,
307-
legendTitle: String(localized: "DOXYLAMINE"),
308-
color: Color(UIColor.systemGray2),
309-
gradientStartColor: .gray,
310-
stackingMethod: .unstacked
311-
) { event in
312-
event.computeProgress(by: .summingOutcomeValues)
313-
}
314-
315-
let configurations = [
316-
nauseaDataSeries,
317-
doxylamineDataSeries
318-
]
319-
320-
// This is a SwiftUI View Chart.
321-
let chart = CareEssentialChartView(
322-
title: title,
323-
subtitle: subtitle,
324-
dateInterval: duration,
325-
period: .day,
326-
configurations: configurations
327-
).formattedHostingController()
328-
329281
#if os(iOS)
330282
/*
331283
Also create a card (UIKit view) that displays a single event.
@@ -337,20 +289,10 @@ class CareViewController: OCKDailyPageViewController {
337289
store: self.store
338290
)
339291

340-
let cards: [UIViewController] = [
341-
chart,
342-
nauseaCard
343-
]
344-
345-
return cards
292+
return [nauseaCard]
346293

347294
#else
348-
349-
let cards: [UIViewController] = [
350-
chart
351-
]
352-
353-
return cards
295+
return []
354296
#endif
355297

356298
default:

0 commit comments

Comments
 (0)