diff --git a/StickerSlack/SwiftUI/ContentView.swift b/StickerSlack/SwiftUI/ContentView.swift index 9211609..79c97e1 100644 --- a/StickerSlack/SwiftUI/ContentView.swift +++ b/StickerSlack/SwiftUI/ContentView.swift @@ -15,10 +15,6 @@ struct ContentView: View { NavigationSplitView { if #available(iOS 18, *) { TabView { - Tab("Downloaded", systemImage: "arrow.down.circle.fill") { - DownloadedView() - } - Tab("Browse", systemImage: "square.grid.2x2.fill") { BrowseView() } @@ -26,7 +22,7 @@ struct ContentView: View { // Tab { // List { // Text("\(searchTerm.isEmpty ? hoarder.emojis.count : hoarder.filteredEmojis.count) Emoji") -// +// // ForEach(hoarder.filteredEmojis, id: \.self) { name in // if let emoji = hoarder.trie.dict[name] { // EmojiRow(emoji: emoji) @@ -46,6 +42,10 @@ struct ContentView: View { // Label("Search", systemImage: "magnifyingglass") // } + Tab("Downloaded", systemImage: "arrow.down.circle.fill") { + DownloadedView() + } + Tab("Tree", systemImage: "tree.fill") { TrieTestingView() } @@ -56,6 +56,7 @@ struct ContentView: View { } } } + .searchable(text: $hoarder.searchTerm, placement: .navigationBarDrawer) // .searchable(text: $hoarder.searchTerm) // .modifier(tabViewActivationSearchActivation()) } else { diff --git a/StickerSlack/SwiftUI/SearchView.swift b/StickerSlack/SwiftUI/SearchView.swift index 8e9e091..f301d12 100644 --- a/StickerSlack/SwiftUI/SearchView.swift +++ b/StickerSlack/SwiftUI/SearchView.swift @@ -20,7 +20,6 @@ struct SearchView: View { } } } - .searchable(text: $hoarder.searchTerm) .onChange(of: hoarder.searchTerm) { _ in hoarder.filterEmojis(by: hoarder.searchTerm) }