Skip to content

Commit 4c92047

Browse files
committed
fix: reinstate global search field on start page
Signed-off-by: Tommy van der Vorst <tommy@pixelspark.nl>
1 parent 91f443c commit 4c92047

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

Sushitrain/ContentView.swift

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ private struct ContentView: View {
9999
Tab("Start", systemImage: self.appState.syncState.systemImage, value: Route.start) {
100100
// Me
101101
NavigationStack {
102-
StartOrSearchView(route: $route)
102+
#if os(iOS)
103+
StartView(route: $route, backgroundManager: appState.backgroundManager)
104+
#else
105+
StartView(route: $route)
106+
#endif
103107
}
104108
}
105109

@@ -121,7 +125,7 @@ private struct ContentView: View {
121125
}
122126
}
123127
}
124-
128+
125129
@ViewBuilder private func tabbedBody() -> some View {
126130
if #available(iOS 26, *) {
127131
self.modernTabbedBody()
@@ -283,7 +287,7 @@ private struct ContentView: View {
283287
private struct LoadingMainView: View {
284288
@State var appState: AppState
285289
@State var route: Route? = .start
286-
290+
287291
#if os(iOS)
288292
// Mirrors ContentView.modernTabbedBody
289293
@available(iOS 26.0, *)
@@ -318,7 +322,7 @@ private struct LoadingMainView: View {
318322
}.disabled(true)
319323
}
320324
}
321-
325+
322326
// Mirrors ContentView.legacyTabbedBody
323327
@ViewBuilder private func legacyTabbedBody() -> some View {
324328
TabView(selection: $route) {
@@ -345,7 +349,7 @@ private struct LoadingMainView: View {
345349
}
346350
}
347351
#endif
348-
352+
349353
var body: some View {
350354
#if os(iOS)
351355
if #available(iOS 26, *) {
@@ -434,13 +438,7 @@ private struct StartOrSearchView: View {
434438
}
435439

436440
@ViewBuilder private func view() -> some View {
437-
if #available(iOS 26, *) {
438-
InnerView(route: $route, searchText: $searchText)
439-
}
440-
else {
441-
ZStack {
442-
InnerView(route: $route, searchText: $searchText)
443-
}
441+
InnerView(route: $route, searchText: $searchText)
444442
.searchable(
445443
text: $searchText, placement: SearchFieldPlacement.toolbar,
446444
prompt: "Search all files and folders..."
@@ -449,7 +447,6 @@ private struct StartOrSearchView: View {
449447
.textInputAutocapitalization(.never)
450448
#endif
451449
.autocorrectionDisabled()
452-
}
453450
}
454451

455452
var body: some View {

0 commit comments

Comments
 (0)