mirror of
https://github.com/neon443/StickerSlack.git
synced 2026-03-11 13:26:17 +00:00
had to revert the hash map stuff :pf:
This commit is contained in:
@@ -18,7 +18,6 @@ class EmojiHoarder: ObservableObject {
|
||||
private let decoder = JSONDecoder()
|
||||
|
||||
@Published var emojis: [Emoji] = []
|
||||
@Published var localEmojis: Set<Emoji> = []
|
||||
@Published var filteredEmojis: [Emoji] = []
|
||||
@Published var prefix: Int = 100
|
||||
|
||||
@@ -31,8 +30,6 @@ class EmojiHoarder: ObservableObject {
|
||||
Task.detached {
|
||||
print("start loading remote db")
|
||||
await self.loadRemoteDB()
|
||||
print("start local emojis loading")
|
||||
await self.findLocalEmojis()
|
||||
print("end")
|
||||
}
|
||||
}
|
||||
@@ -47,7 +44,7 @@ class EmojiHoarder: ObservableObject {
|
||||
await withTaskGroup { group in
|
||||
for i in emojis.indices {
|
||||
group.addTask {
|
||||
guard await self.localEmojis.contains(self.emojis[i]) else { return }
|
||||
guard await self.emojis[i].isLocal else { return }
|
||||
await self.emojis[i].deleteImage()
|
||||
DispatchQueue.main.sync {
|
||||
self.emojis[i].refresh()
|
||||
@@ -57,15 +54,6 @@ class EmojiHoarder: ObservableObject {
|
||||
}
|
||||
}
|
||||
|
||||
nonisolated
|
||||
func findLocalEmojis() async {
|
||||
let filteredSetted = await Set(self.emojis.filter { $0.isLocal })
|
||||
await MainActor.run {
|
||||
self.localEmojis = filteredSetted
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func storeDB() {
|
||||
try! encoder.encode(emojis).write(to: EmojiHoarder.localEmojiDB)
|
||||
}
|
||||
@@ -137,32 +125,19 @@ class EmojiHoarder: ObservableObject {
|
||||
case .none:
|
||||
fallthrough
|
||||
case .downloaded:
|
||||
withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { self.localEmojis.contains($0) } }
|
||||
withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { $0.isLocal } }
|
||||
case .notDownloaded:
|
||||
withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { !self.localEmojis.contains($0) } }
|
||||
withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { !$0.isLocal } }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func downloadEmoji(_ toDownload: Emoji) {
|
||||
Task.detached {
|
||||
if (try? await toDownload.downloadImage()) != nil {
|
||||
let index = await self.emojis.firstIndex { $0 == toDownload }
|
||||
guard let index else { return }
|
||||
await MainActor.run {
|
||||
self.localEmojis.insert(toDownload)
|
||||
self.emojis[index].refresh()
|
||||
}
|
||||
}
|
||||
}
|
||||
func downloadEmoji(_ toDownload: Emoji) async {
|
||||
|
||||
}
|
||||
|
||||
@MainActor
|
||||
func deleteEmoji(_ toDelete: Emoji) {
|
||||
toDelete.deleteImage()
|
||||
let index = self.emojis.firstIndex { $0 == toDelete }
|
||||
guard let index else { return }
|
||||
self.localEmojis.remove(toDelete)
|
||||
self.emojis[index].refresh()
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,22 +64,27 @@ struct ContentView: View {
|
||||
}
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
if hoarder.localEmojis.contains(emoji) {
|
||||
if emoji.isLocal {
|
||||
Button("", systemImage: "trash") {
|
||||
hoarder.deleteEmoji(emoji)
|
||||
emoji.refresh()
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
} else {
|
||||
Button("", systemImage: "arrow.down.circle") {
|
||||
hoarder.downloadEmoji(emoji)
|
||||
Task.detached {
|
||||
await hoarder.downloadEmoji(emoji)
|
||||
await emoji.refresh()
|
||||
}
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.swipeActions(edge: .trailing, allowsFullSwipe: true) {
|
||||
if hoarder.localEmojis.contains(emoji) {
|
||||
if emoji.isLocal {
|
||||
Button("Remove", systemImage: "trash") {
|
||||
hoarder.deleteEmoji(emoji)
|
||||
emoji.refresh()
|
||||
}
|
||||
.tint(.red)
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ struct EmojiPreview: View {
|
||||
VStack(alignment: .leading) {
|
||||
Text(emoji.name)
|
||||
Group {
|
||||
if hoarder.localEmojis.contains(emoji) {
|
||||
if emoji.isLocal {
|
||||
Image(uiImage: emoji.image ?? UIImage())
|
||||
.resizable().scaledToFit()
|
||||
.border(.orange)
|
||||
|
||||
Reference in New Issue
Block a user