Skip to content

Commit 7e59fe0

Browse files
committed
Apply suggestion from code review.
#678 (comment)
1 parent 7502b7b commit 7e59fe0

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

Shared/Supporting Files/Views/CategoriesView.swift

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,27 +82,21 @@ struct CategoriesView: View {
8282
.navigationDestination(for: String.self) { sampleName in
8383
let sample = SamplesApp.samples.first(where: { $0.name == sampleName })!
8484

85-
if sample.hasTeardown {
86-
if sampleNeedingTeardown != nil, sampleNeedingTeardown != sampleName {
87-
ProgressView("Loading sample")
88-
} else {
89-
SampleDetailView(sample: sample)
90-
.id(sampleName)
91-
.onAppear {
92-
sampleNeedingTeardown = sampleName
93-
}
94-
.environment(\.finishTeardown) {
95-
// Allows the next teardown sample to appear.
96-
sampleNeedingTeardown = nil
97-
}
98-
}
85+
if sampleNeedingTeardown != nil && sampleNeedingTeardown != sampleName {
86+
ProgressView("Loading sample")
87+
} else if sample.hasTeardown {
88+
SampleDetailView(sample: sample)
89+
.id(sampleName)
90+
.onAppear {
91+
sampleNeedingTeardown = sampleName
92+
}
93+
.environment(\.finishTeardown) {
94+
// Allows the next teardown sample to appear.
95+
sampleNeedingTeardown = nil
96+
}
9997
} else {
100-
if sampleNeedingTeardown != nil {
101-
ProgressView("Loading sample…")
102-
} else {
103-
SampleDetailView(sample: sample)
104-
.id(sampleName)
105-
}
98+
SampleDetailView(sample: sample)
99+
.id(sampleName)
106100
}
107101
}
108102
}

0 commit comments

Comments
 (0)