a lot of updates

grid view for downloaded emojis

shared instance of EmojiHoarder
nonisolated static localEmojiDB var
deleteallstickers is @MainActor
This commit is contained in:
neon443
2025-11-06 20:25:40 +00:00
parent 42739c93da
commit 7dcf04f27e
8 changed files with 75 additions and 45 deletions

View File

@@ -9,20 +9,55 @@ import SwiftUI
import Haptics
struct ContentView: View {
@StateObject var hoarder: EmojiHoarder = EmojiHoarder()
@StateObject var hoarder: EmojiHoarder = .shared
@State var searchTerm: String = ""
var col: GridItem = GridItem(.fixed(100), spacing: 0, alignment: .center)
var minColWidth: CGFloat { 75 }
var spacing: CGFloat { 10 }
var col: GridItem {
GridItem(
.flexible(minimum: minColWidth, maximum: 125),
spacing: spacing,
alignment: .center
)
}
@Environment(\.colorScheme) var colorScheme
var isDark: Bool { colorScheme == .dark }
var body: some View {
TabView {
LazyHGrid(rows: Array(repeating: col, count: 4), spacing: 10) {
ForEach(hoarder.downloadedEmojis.sorted(by: <), id: \.self) { name in
if let emoji = hoarder.trie.dict[name] {
EmojiPreview(hoarder: hoarder, emoji: emoji)
ScrollView {
let columns: Int = max(1, Int((UIScreen.main.bounds.width - 2*spacing) / (minColWidth + spacing)))
let layout = Array(repeating: col, count: columns)
LazyVGrid(columns: layout, spacing: 10) {
ForEach(hoarder.emojis, id: \.self) { emoji in
if hoarder.downloadedEmojis.contains(emoji.name) {
ZStack {
Rectangle()
.foregroundStyle(isDark ? .black : .white)
EmojiPreview(emoji: emoji)
RoundedRectangle(cornerRadius: 15)
.stroke(.gray, lineWidth: 1)
}
.aspectRatio(1, contentMode: .fit)
.clipShape(RoundedRectangle(cornerRadius: 15))
.contextMenu {
Text(emoji.name)
Button("Share", systemImage: "square.and.arrow.up") {
}
ShareLink("Share", item: emoji.localImageURL, subject: nil, message: nil)
ShareLink("Share", item: emoji.remoteImageURL, subject: nil, message: nil)
Divider()
Button("Delete", systemImage: "trash.fill", role: .destructive) {
hoarder.delete(emoji: emoji)
}
}
}
}
}
.padding(.horizontal, spacing)
}
.tabItem {
Label("Downloaded", systemImage: "arrow.down.circle.fill")
@@ -30,7 +65,7 @@ struct ContentView: View {
List {
ForEach(hoarder.emojis, id: \.self) { emoji in
EmojiRow(hoarder: hoarder, emoji: emoji)
EmojiRow(emoji: emoji)
}
}
.tabItem {
@@ -42,7 +77,7 @@ struct ContentView: View {
ForEach(hoarder.filteredEmojis, id: \.self) { name in
if let emoji = hoarder.trie.dict[name] {
EmojiRow(hoarder: hoarder, emoji: emoji)
EmojiRow(emoji: emoji)
}
}
}
@@ -59,12 +94,10 @@ struct ContentView: View {
Label("Search", systemImage: "magnifyingglass")
}
TrieTestingView(
hoarder: hoarder,
)
.tabItem {
Label("Tree", systemImage: "tree.fill")
}
TrieTestingView()
.tabItem {
Label("Tree", systemImage: "tree.fill")
}
}
.searchable(text: $searchTerm, placement: .automatic)
}