diff --git a/EmojiPackManager.swift b/EmojiPackManager.swift index eeb3320..8542cc3 100644 --- a/EmojiPackManager.swift +++ b/EmojiPackManager.swift @@ -12,7 +12,7 @@ struct EmojiPackManager: View { var body: some View { ForEach(hoarder.emojiPacks) { pack in - EmojiPackView(pack: pack) + EmojiPackView(hoarder: hoarder, pack: pack) } } } diff --git a/StickerSlack/SwiftUI/ContentView.swift b/StickerSlack/SwiftUI/ContentView.swift index 81ae894..b09aee8 100644 --- a/StickerSlack/SwiftUI/ContentView.swift +++ b/StickerSlack/SwiftUI/ContentView.swift @@ -33,13 +33,17 @@ struct ContentView: View { } } else { TabView { + BrowseView(hoarder: hoarder) + .tabItem { + Label("Browse", systemImage: "square.grid.2x2.fill") + } DownloadedView(hoarder: hoarder) .tabItem { Label("Downloaded", systemImage: "arrow.down.circle.fill") } - BrowseView(hoarder: hoarder) + SettingsView(hoarder: hoarder) .tabItem { - Label("Browse", systemImage: "square.grid.2x2.fill") + Label("Setings", systemImage: "gear") } SearchView(hoarder: hoarder) .tabItem { diff --git a/StickerSlack/SwiftUI/Emoji/EmojiPackView.swift b/StickerSlack/SwiftUI/Emoji/EmojiPackView.swift index 551300c..17b705c 100644 --- a/StickerSlack/SwiftUI/Emoji/EmojiPackView.swift +++ b/StickerSlack/SwiftUI/Emoji/EmojiPackView.swift @@ -8,6 +8,7 @@ import SwiftUI struct EmojiPackView: View { + @ObservedObject var hoarder: EmojiHoarder @State var pack: EmojiPack var body: some View { @@ -15,9 +16,15 @@ struct EmojiPackView: View { .bold() Text(pack.description) .foregroundStyle(.gray) + ForEach(pack.emojiNames, id: \.self) { name in + EmojiPreview(hoarder: hoarder, emoji: hoarder.trie.dict[name] ?? .test) + } } } #Preview { - EmojiPackView(pack: .test) + EmojiPackView( + hoarder: EmojiHoarder(localOnly: true, skipIndex: true), + pack: .test + ) } diff --git a/StickerSlack/SwiftUI/SettingsView.swift b/StickerSlack/SwiftUI/SettingsView.swift index 91ebdf4..ee007fd 100644 --- a/StickerSlack/SwiftUI/SettingsView.swift +++ b/StickerSlack/SwiftUI/SettingsView.swift @@ -110,6 +110,12 @@ struct SettingsView: View { Label("Tree", systemImage: "tree") } + NavigationLink { + EmojiPackManager(hoarder: hoarder) + } label: { + Label("packs wip", systemImage: "square.stack") + } + Button("Reindex", systemImage: "list.bullet.clipboard", role: .destructive) { hoarder.resetAllIndexes() hoarder.buildTrie()