Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions Examples/CaseStudies/Animations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct AnimationsCaseStudy: SwiftUICaseStudy {
number += 1
let fact = try await String(
decoding: URLSession.shared
.data(from: URL(string: "http://numberapi.com/\(number)")!).0,
.data(from: URL(string: "http://number-trivia.com/\(number)")!).0,
as: UTF8.self
)
try await database.write { db in
Expand Down Expand Up @@ -72,10 +72,7 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
$0.defaultDatabase = .animationDatabase
}
#Preview(traits: .dependencies { $0.defaultDatabase = .animationDatabase }) {
NavigationStack {
CaseStudyView {
AnimationsCaseStudy()
Expand Down
7 changes: 2 additions & 5 deletions Examples/CaseStudies/DynamicQuery.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct DynamicQueryDemo: SwiftUICaseStudy {
number += 1
let fact = try await String(
decoding: URLSession.shared
.data(from: URL(string: "http://numberapi.com/\(number)")!).0,
.data(from: URL(string: "http://number-trivia.com/\(number)")!).0,
as: UTF8.self
)
try await database.write { db in
Expand Down Expand Up @@ -126,10 +126,7 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
$0.defaultDatabase = .dynamicQueryDatabase
}
#Preview(traits: .dependencies { $0.defaultDatabase = .dynamicQueryDatabase }) {
NavigationStack {
CaseStudyView {
DynamicQueryDemo()
Expand Down
7 changes: 2 additions & 5 deletions Examples/CaseStudies/ObservableModelDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private class Model {
await withErrorReporting {
let fact = try await String(
decoding: URLSession.shared
.data(from: URL(string: "http://numberapi.com/\(number)")!).0,
.data(from: URL(string: "http://number-trivia.com/\(number)")!).0,
as: UTF8.self
)
try await database.write { db in
Expand Down Expand Up @@ -112,10 +112,7 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
$0.defaultDatabase = .observableModelDatabase
}
#Preview(traits: .dependencies { $0.defaultDatabase = .observableModelDatabase }) {
NavigationStack {
CaseStudyView {
ObservableModelDemo()
Expand Down
5 changes: 3 additions & 2 deletions Examples/CaseStudies/SectionedQuery.swift
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .sectionedQueryDatabase
}
) {
NavigationStack {
CaseStudyView {
SectionedQueryDemo()
Expand Down
5 changes: 1 addition & 4 deletions Examples/CaseStudies/SwiftDataTemplateDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
$0.defaultDatabase = .swiftDataTemplateDatabase
}
#Preview(traits: .dependencies { $0.defaultDatabase = .swiftDataTemplateDatabase }) {
CaseStudyView {
SwiftDataTemplateView()
}
Expand Down
7 changes: 2 additions & 5 deletions Examples/CaseStudies/SwiftUIDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct SwiftUIDemo: SwiftUICaseStudy {
number += 1
let fact = try await String(
decoding: URLSession.shared
.data(from: URL(string: "http://numberapi.com/\(number)")!).0,
.data(from: URL(string: "http://number-trivia.com/\(number)")!).0,
as: UTF8.self
)
try await database.write { db in
Expand Down Expand Up @@ -81,10 +81,7 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
$0.defaultDatabase = .swiftUIDatabase
}
#Preview(traits: .dependencies { $0.defaultDatabase = .swiftUIDatabase }) {
NavigationStack {
CaseStudyView {
SwiftUIDemo()
Expand Down
7 changes: 2 additions & 5 deletions Examples/CaseStudies/TransactionDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct TransactionDemo: SwiftUICaseStudy {
number += 1
let fact = try await String(
decoding: URLSession.shared
.data(from: URL(string: "http://numberapi.com/\(number)")!).0,
.data(from: URL(string: "http://number-trivia.com/\(number)")!).0,
as: UTF8.self
)
try await database.write { db in
Expand Down Expand Up @@ -98,10 +98,7 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
$0.defaultDatabase = .transactionDemoDatabase
}
#Preview(traits: .dependencies { $0.defaultDatabase = .transactionDemoDatabase }) {
NavigationStack {
CaseStudyView {
TransactionDemo()
Expand Down
7 changes: 4 additions & 3 deletions Examples/CaseStudies/UIKitDemo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ final class UIKitCaseStudyViewController: UICollectionViewController, UIKitCaseS
number += 1
let fact = try? await String(
decoding: URLSession.shared
.data(from: URL(string: "http://numberapi.com/\(number)")!).0,
.data(from: URL(string: "http://number-trivia.com/\(number)")!).0,
as: UTF8.self
)
if let fact {
Expand Down Expand Up @@ -138,9 +138,10 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .uiKitDemoDatabase
}
) {
UINavigationController(caseStudy: UIKitCaseStudyViewController())
}
5 changes: 3 additions & 2 deletions Examples/CloudKitDemo/CountersListFeature.swift
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,12 @@ struct CounterRow: View {
}
}

#Preview {
let _ = try! prepareDependencies {
#Preview(
traits: .dependencies {
try $0.bootstrapDatabase()
try? $0.defaultDatabase.seedSampleData()
}
) {
NavigationStack {
CountersListView()
}
Expand Down
6 changes: 3 additions & 3 deletions Examples/Examples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 77;
objectVersion = 100;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -1255,8 +1255,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swift-dependencies";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.7.0;
branch = "eager-preview-trait-fix";
kind = branch;
};
};
DCBE8A122D4842BF0071F499 /* XCRemoteSwiftPackageReference "swift-case-paths" */ = {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .childIdentityResetDatabase
}
) {
NavigationStack {
CaseStudyView {
ChildIdentityResetCaseStudy()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .parentDrivenQueryDatabase
}
) {
NavigationStack {
CaseStudyView {
ParentDrivenQueryCaseStudy()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .parentRerenderAnimationsDatabase
}
) {
NavigationStack {
CaseStudyView {
ParentRerenderAnimationsCaseStudy()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .parentRerenderCancellationDatabase
}
) {
NavigationStack {
CaseStudyView {
ParentRerenderCancellationCaseStudy()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .parentRerenderDynamicQueryDatabase
}
) {
NavigationStack {
CaseStudyView {
ParentRerenderDynamicQueryCaseStudy()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .parentRerenderLoadErrorDatabase
}
) {
NavigationStack {
CaseStudyView {
ParentRerenderLoadErrorCaseStudy()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,11 @@ extension DatabaseWriter where Self == DatabaseQueue {
}
}

#Preview {
let _ = prepareDependencies {
#Preview(
traits: .dependencies {
$0.defaultDatabase = .parentRerenderLoadedDataDatabase
}
) {
NavigationStack {
CaseStudyView {
ParentRerenderLoadedDataCaseStudy()
Expand Down
13 changes: 6 additions & 7 deletions Examples/Reminders/ReminderForm.swift
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,13 @@ extension Optional {

struct ReminderFormPreview: PreviewProvider {
static var previews: some View {
let (remindersList, reminder) = try! prepareDependencies {
let (reminder, remindersList) = try! prepareDependencies {
$0.defaultDatabase = try Reminders.appDatabase()
return try $0.defaultDatabase.write { db in
let remindersList = try RemindersList.fetchOne(db)!
return (
remindersList,
try Reminder.where { $0.remindersListID.eq(remindersList.id) }.fetchOne(db)!
)
try? $0.defaultDatabase.seedSampleData()
return try! $0.defaultDatabase.read { db in
try Reminder
.join(RemindersList.all) { $0.remindersListID.eq($1.id) }
.fetchOne(db)!
}
}
NavigationStack {
Expand Down
45 changes: 22 additions & 23 deletions Examples/Reminders/ReminderRow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -155,30 +155,29 @@ struct ReminderRow: View {
}
}

struct ReminderRowPreview: PreviewProvider {
static var previews: some View {
var reminder: Reminder!
var remindersList: RemindersList!
let _ = try! prepareDependencies {
$0.defaultDatabase = try Reminders.appDatabase()
try $0.defaultDatabase.read { db in
reminder = try Reminder.fetchOne(db)
remindersList = try RemindersList.fetchOne(db)!
}
#Preview(
traits: .dependencies {
$0.defaultDatabase = try Reminders.appDatabase()
try $0.defaultDatabase.seedSampleData()
}
) {
@Dependency(\.defaultDatabase) var database
let (reminder, remindersList) = {
try! database.read { db in
(try Reminder.fetchOne(db)!, try RemindersList.fetchOne(db)!)
}

NavigationStack {
List {
ReminderRow(
color: remindersList.color,
isPastDue: false,
notes: reminder.notes.replacingOccurrences(of: "\n", with: " "),
reminder: reminder,
remindersList: remindersList,
showCompleted: true,
tags: "#point-free #adulting"
)
}
}()
NavigationStack {
List {
ReminderRow(
color: remindersList.color,
isPastDue: false,
notes: reminder.notes.replacingOccurrences(of: "\n", with: " "),
reminder: reminder,
remindersList: remindersList,
showCompleted: true,
tags: "#point-free #adulting"
)
}
}
}
Loading
Loading