Skip to content

Commit 211f2df

Browse files
cbaker6cbaker6
authored
fix: Issues preventing some previews from showing (#139)
* Fix previews * Bump CareKitEssentials * Share assets across OS's
1 parent 920e6d5 commit 211f2df

File tree

65 files changed

+19
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+19
-439
lines changed

‎OCKSample.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
7036E4D3256EBE35006E9A3C /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7036E4D2256EBE35006E9A3C /* MainView.swift */; };
3131
7036E517256F2413006E9A3C /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7036E516256F2413006E9A3C /* ProfileViewModel.swift */; };
3232
7036E64025717F85006E9A3C /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7036E63F25717F85006E9A3C /* Constants.swift */; };
33+
704352422DB09A5C00A12187 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E7C4CA0A22809AD500ECC3D7 /* Assets.xcassets */; };
3334
7075151E28DE1A8300A57A0C /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7075151C28DE1A7400A57A0C /* MainView.swift */; };
3435
7075152028DE1BB400A57A0C /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7075151F28DE1BB400A57A0C /* LoginView.swift */; };
3536
707CC714254DA91900116728 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 707CC70F254DA91900116728 /* Localizable.strings */; };
@@ -699,6 +700,7 @@
699700
91AD924624A4C42E00925D4D /* Preview Assets.xcassets in Resources */,
700701
91AD922D24A4C42D00925D4D /* Assets.xcassets in Resources */,
701702
70F03AB42788C76700E5AFB4 /* ParseCareKit.plist in Resources */,
703+
704352422DB09A5C00A12187 /* Assets.xcassets in Resources */,
702704
91AD924324A4C42E00925D4D /* Assets.xcassets in Resources */,
703705
707CC717254DA91900116728 /* Localizable.stringsdict in Resources */,
704706
);
@@ -1273,7 +1275,7 @@
12731275
repositoryURL = "https://github.com/netreconlab/CareKitEssentials";
12741276
requirement = {
12751277
kind = upToNextMajorVersion;
1276-
minimumVersion = "1.0.0-alpha.40";
1278+
minimumVersion = "1.0.0-alpha.44";
12771279
};
12781280
};
12791281
70202EBF2807333900CF73FB /* XCRemoteSwiftPackageReference "CareKit" */ = {

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

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

‎OCKSample/Main/Care/CareView.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,6 @@ struct CareView_Previews: PreviewProvider {
6363
CareView()
6464
.environment(\.appDelegate, AppDelegate())
6565
.environment(\.careStore, Utility.createPreviewStore())
66+
.careKitStyle(Styler())
6667
}
6768
}

‎OCKSample/Main/Contact/ContactView.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@ struct ContactView_Previews: PreviewProvider {
4646
static var previews: some View {
4747
ContactView()
4848
.environment(\.careStore, Utility.createPreviewStore())
49+
.careKitStyle(Styler())
4950
}
5051
}

‎OCKSample/Main/MainTabView.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// This was built using tutorial: https://www.hackingwithswift.com/books/ios-swiftui/creating-tabs-with-tabview-and-tabitem
1010

1111
import CareKitStore
12+
import CareKitUI
1213
import SwiftUI
1314

1415
struct MainTabView: View {
@@ -59,6 +60,8 @@ struct MainTabView: View {
5960
struct MainTabView_Previews: PreviewProvider {
6061
static var previews: some View {
6162
MainTabView(loginViewModel: .init())
63+
.environment(\.appDelegate, AppDelegate())
6264
.environment(\.careStore, Utility.createPreviewStore())
65+
.careKitStyle(Styler())
6366
}
6467
}

‎OCKSample/Main/MainView.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,6 @@ struct MainView_Previews: PreviewProvider {
7070
MainView()
7171
.environment(\.appDelegate, AppDelegate())
7272
.environment(\.careStore, Utility.createPreviewStore())
73+
.careKitStyle(Styler())
7374
}
7475
}

‎OCKSample/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@
226226
"subtype" : "49mm"
227227
},
228228
{
229+
"filename" : "Icon-App-1024x1024@1x-1.png",
229230
"idiom" : "watch-marketing",
230231
"scale" : "1x",
231232
"size" : "1024x1024"

OCKWatchSample/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x-1.png renamed to OCKSample/Supporting Files/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x-1.png

File renamed without changes.

‎OCKWatchSample Extension/Main/Care/CareView.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,6 @@ struct ContentView_Previews: PreviewProvider {
6363
static var previews: some View {
6464
CareView()
6565
.environment(\.careStore, Utility.createPreviewStore())
66+
.careKitStyle(Styler())
6667
}
6768
}

‎OCKWatchSample Extension/Main/MainTabView.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// Copyright © 2025 Network Reconnaissance Lab. All rights reserved.
77
//
88

9+
import CareKitUI
910
import SwiftUI
1011

1112
struct MainTabView: View {

0 commit comments

Comments
 (0)