add Emoji and old one is now ApiEmoji

added async code to Emoji to load image
added app groups to share files
This commit is contained in:
neon443
2025-10-22 15:20:18 +01:00
parent 95d377de30
commit 2841bc2109
8 changed files with 156 additions and 39 deletions

View File

@@ -7,7 +7,9 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
A940FE3D2EA232590016870B /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = A940FE3C2EA232590016870B /* Emoji.swift */; }; A924C3722EA9127200F20781 /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = A924C3712EA9127200F20781 /* Emoji.swift */; };
A924C3732EA9127200F20781 /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = A924C3712EA9127200F20781 /* Emoji.swift */; };
A940FE3D2EA232590016870B /* ApiEmoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = A940FE3C2EA232590016870B /* ApiEmoji.swift */; };
A949B1F32EA04E8200215164 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A949B1EF2EA04E8200215164 /* Assets.xcassets */; }; A949B1F32EA04E8200215164 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A949B1EF2EA04E8200215164 /* Assets.xcassets */; };
A949B1F42EA04E8200215164 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1F02EA04E8200215164 /* ContentView.swift */; }; A949B1F42EA04E8200215164 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1F02EA04E8200215164 /* ContentView.swift */; };
A949B1F52EA04E8200215164 /* StickerSlackApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1F12EA04E8200215164 /* StickerSlackApp.swift */; }; A949B1F52EA04E8200215164 /* StickerSlackApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1F12EA04E8200215164 /* StickerSlackApp.swift */; };
@@ -21,7 +23,7 @@
A969D6AF2EA3F1AF00399C05 /* MessagesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A969D6AA2EA3F1AF00399C05 /* MessagesViewController.swift */; }; A969D6AF2EA3F1AF00399C05 /* MessagesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A969D6AA2EA3F1AF00399C05 /* MessagesViewController.swift */; };
A9773C2F2EA54AF000F3B753 /* EmojiPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9773C2E2EA54AF000F3B753 /* EmojiPreview.swift */; }; A9773C2F2EA54AF000F3B753 /* EmojiPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9773C2E2EA54AF000F3B753 /* EmojiPreview.swift */; };
A9BE06DB2EA656B80033B213 /* EmojiHoarder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1F72EA04F2300215164 /* EmojiHoarder.swift */; }; A9BE06DB2EA656B80033B213 /* EmojiHoarder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1F72EA04F2300215164 /* EmojiHoarder.swift */; };
A9BE06DC2EA657C70033B213 /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = A940FE3C2EA232590016870B /* Emoji.swift */; }; A9BE06DC2EA657C70033B213 /* ApiEmoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = A940FE3C2EA232590016870B /* ApiEmoji.swift */; };
A9BE06DD2EA657CF0033B213 /* SlackResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1FA2EA0518800215164 /* SlackResponse.swift */; }; A9BE06DD2EA657CF0033B213 /* SlackResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1FA2EA0518800215164 /* SlackResponse.swift */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@@ -50,7 +52,10 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
A940FE3C2EA232590016870B /* Emoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Emoji.swift; sourceTree = "<group>"; }; A924C3712EA9127200F20781 /* Emoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Emoji.swift; sourceTree = "<group>"; };
A924C3742EA9134C00F20781 /* StickerSlack.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = StickerSlack.entitlements; sourceTree = "<group>"; };
A924C3752EA9137A00F20781 /* StickerSlackiMessageExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = StickerSlackiMessageExtension.entitlements; sourceTree = "<group>"; };
A940FE3C2EA232590016870B /* ApiEmoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiEmoji.swift; sourceTree = "<group>"; };
A949B1DF2EA04C0B00215164 /* StickerSlack.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StickerSlack.app; sourceTree = BUILT_PRODUCTS_DIR; }; A949B1DF2EA04C0B00215164 /* StickerSlack.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StickerSlack.app; sourceTree = BUILT_PRODUCTS_DIR; };
A949B1EF2EA04E8200215164 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; A949B1EF2EA04E8200215164 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A949B1F02EA04E8200215164 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; }; A949B1F02EA04E8200215164 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -117,6 +122,7 @@
A949B1F22EA04E8200215164 /* StickerSlack */ = { A949B1F22EA04E8200215164 /* StickerSlack */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A924C3742EA9134C00F20781 /* StickerSlack.entitlements */,
A949B1F12EA04E8200215164 /* StickerSlackApp.swift */, A949B1F12EA04E8200215164 /* StickerSlackApp.swift */,
A949B1F72EA04F2300215164 /* EmojiHoarder.swift */, A949B1F72EA04F2300215164 /* EmojiHoarder.swift */,
A949B1F92EA0517800215164 /* Emoji */, A949B1F92EA0517800215164 /* Emoji */,
@@ -139,7 +145,8 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A949B1FA2EA0518800215164 /* SlackResponse.swift */, A949B1FA2EA0518800215164 /* SlackResponse.swift */,
A940FE3C2EA232590016870B /* Emoji.swift */, A940FE3C2EA232590016870B /* ApiEmoji.swift */,
A924C3712EA9127200F20781 /* Emoji.swift */,
); );
path = Emoji; path = Emoji;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -155,6 +162,7 @@
A969D6AB2EA3F1AF00399C05 /* StickerSlackiMessageExtension */ = { A969D6AB2EA3F1AF00399C05 /* StickerSlackiMessageExtension */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A924C3752EA9137A00F20781 /* StickerSlackiMessageExtension.entitlements */,
A969D6A62EA3F1AF00399C05 /* Assets.xcassets */, A969D6A62EA3F1AF00399C05 /* Assets.xcassets */,
A969D6A72EA3F1AF00399C05 /* Info.plist */, A969D6A72EA3F1AF00399C05 /* Info.plist */,
A969D6A92EA3F1AF00399C05 /* MainInterface.storyboard */, A969D6A92EA3F1AF00399C05 /* MainInterface.storyboard */,
@@ -270,10 +278,11 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
A940FE3D2EA232590016870B /* Emoji.swift in Sources */, A940FE3D2EA232590016870B /* ApiEmoji.swift in Sources */,
A949B1F42EA04E8200215164 /* ContentView.swift in Sources */, A949B1F42EA04E8200215164 /* ContentView.swift in Sources */,
A949B1F52EA04E8200215164 /* StickerSlackApp.swift in Sources */, A949B1F52EA04E8200215164 /* StickerSlackApp.swift in Sources */,
A949B1FB2EA0518800215164 /* SlackResponse.swift in Sources */, A949B1FB2EA0518800215164 /* SlackResponse.swift in Sources */,
A924C3732EA9127200F20781 /* Emoji.swift in Sources */,
A949B1F82EA04F2300215164 /* EmojiHoarder.swift in Sources */, A949B1F82EA04F2300215164 /* EmojiHoarder.swift in Sources */,
A9773C2F2EA54AF000F3B753 /* EmojiPreview.swift in Sources */, A9773C2F2EA54AF000F3B753 /* EmojiPreview.swift in Sources */,
); );
@@ -283,7 +292,8 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
A9BE06DC2EA657C70033B213 /* Emoji.swift in Sources */, A924C3722EA9127200F20781 /* Emoji.swift in Sources */,
A9BE06DC2EA657C70033B213 /* ApiEmoji.swift in Sources */,
A9BE06DB2EA656B80033B213 /* EmojiHoarder.swift in Sources */, A9BE06DB2EA656B80033B213 /* EmojiHoarder.swift in Sources */,
A969D6AF2EA3F1AF00399C05 /* MessagesViewController.swift in Sources */, A969D6AF2EA3F1AF00399C05 /* MessagesViewController.swift in Sources */,
A9BE06DD2EA657CF0033B213 /* SlackResponse.swift in Sources */, A9BE06DD2EA657CF0033B213 /* SlackResponse.swift in Sources */,
@@ -433,6 +443,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = StickerSlack/StickerSlack.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8JGND254B7; DEVELOPMENT_TEAM = 8JGND254B7;
@@ -477,6 +488,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = StickerSlack/StickerSlack.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8JGND254B7; DEVELOPMENT_TEAM = 8JGND254B7;
@@ -520,6 +532,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon";
CODE_SIGN_ENTITLEMENTS = StickerSlackiMessageExtension/StickerSlackiMessageExtension.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8JGND254B7; DEVELOPMENT_TEAM = 8JGND254B7;
@@ -551,6 +564,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon";
CODE_SIGN_ENTITLEMENTS = StickerSlackiMessageExtension/StickerSlackiMessageExtension.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8JGND254B7; DEVELOPMENT_TEAM = 8JGND254B7;

View File

@@ -74,6 +74,7 @@
savedToolIdentifier = "" savedToolIdentifier = ""
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2"> launchAutomaticallySubstyle = "2">
<RemoteRunnable <RemoteRunnable
runnableDebuggingMode = "1" runnableDebuggingMode = "1"

View File

@@ -0,0 +1,55 @@
//
// Emoji.swift
// StickerSlack
//
// Created by neon443 on 17/10/2025.
//
import Foundation
import SwiftUI
protocol EmojiProtocol: Codable, Hashable {
var name: String { get set }
var urlString: String { get set }
}
struct ApiEmoji: EmojiProtocol {
var name: String
var urlString: String
var url: URL {
return URL(string: urlString) ?? URL(string: "https://")!
}
init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
self.init(
name: try container.decode(String.self, forKey: .name),
url: try container.decode(String.self, forKey: .urlString)
)
}
init(
name: String,
url: String,
) {
self.name = name
self.urlString = url
}
enum CodingKeys: CodingKey {
case name
case urlString
}
func toEmoji() -> Emoji {
return Emoji(apiEmoji: self)
}
func encode(to encoder: any Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(self.name, forKey: .name)
try container.encode(self.urlString, forKey: .urlString)
}
}

View File

@@ -6,46 +6,60 @@
// //
import Foundation import Foundation
import SwiftUI import UIKit
import UniformTypeIdentifiers
protocol EmojiProtocol: Codable, Hashable { struct Emoji: Codable, Identifiable, Hashable {
var name: String { get set } var id: UUID
var urlString: String { get set }
}
struct Emoji: EmojiProtocol {
var name: String var name: String
var urlString: String var localImageURL: URL
var remoteImageURL: URL
var url: URL { var image: UIImage?
return URL(string: urlString) ?? URL(string: "https://")!
enum CodingKeys: String, CodingKey {
case id = "id"
case name = "name"
case localImageURL = "localImageURL"
case remoteImageURL = "remoteImageURL"
} }
init(from decoder: any Decoder) throws { init(from decoder: any Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self) let container = try decoder.container(keyedBy: CodingKeys.self)
self.init( self.id = try container.decode(UUID.self, forKey: .id)
name: try container.decode(String.self, forKey: .name), self.name = try container.decode(String.self, forKey: .name)
url: try container.decode(String.self, forKey: .urlString) self.localImageURL = try container.decode(URL.self, forKey: .localImageURL)
) self.remoteImageURL = try container.decode(URL.self, forKey: .remoteImageURL)
if let data = try? Data(contentsOf: localImageURL),
let img = UIImage(data: data) {
self.image = img
} else {
self.image = nil
}
} }
init( init(
name: String, apiEmoji: ApiEmoji,
url: String, id: UUID = UUID()
) { ) {
self.name = name self.id = id
self.urlString = url self.name = apiEmoji.name
self.remoteImageURL = apiEmoji.url
self.localImageURL = EmojiHoarder.container.appendingPathComponent(id.uuidString, conformingTo: .image)
// Task { [weak self] in
// let (data, response) = try await URLSession.shared.data(from: apiEmoji.url)
// self.image = UIImage(data: data)
// }
// let image = try! Data(contentsOf: apiEmoji.url)
// try! image.write(to: localImageURL)
// self.image = UIImage(data: image) ?? UIImage()
} }
enum CodingKeys: CodingKey { func loadImage() async throws -> UIImage {
case name let (data, _) = try await URLSession.shared.data(from: remoteImageURL)
case urlString return UIImage(data: data)!
}
func encode(to encoder: any Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(self.name, forKey: .name)
try container.encode(self.urlString, forKey: .urlString)
} }
} }

View File

@@ -10,13 +10,21 @@ import SwiftUI
import Combine import Combine
class EmojiHoarder: ObservableObject { class EmojiHoarder: ObservableObject {
static let container = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.com.neon443.StickerSlack")!
private let endpoint: URL = URL(string: "https://cachet.dunkirk.sh/emojis")! private let endpoint: URL = URL(string: "https://cachet.dunkirk.sh/emojis")!
@Published var emojis: [Emoji] @Published var emojis: [Emoji]
init() { init() {
let data = try! Data(contentsOf: endpoint) guard let data = try? Data(contentsOf: endpoint) else { fatalError("cachet unreachable") }
let decoded: [SlackResponse] = try! JSONDecoder().decode([SlackResponse].self, from: data) let decoded: [SlackResponse] = try! JSONDecoder().decode([SlackResponse].self, from: data)
self.emojis = decoded.map { Emoji(name: $0.name, url: $0.imageUrl) } self.emojis = decoded.map { ApiEmoji(name: $0.name, url: $0.imageUrl).toEmoji() }
// Task {
// for i in emojis.indices {
// emojis[i].image = try? await emojis[i].loadImage()
// }
// }
} }
// func storeStickers
} }

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.neon443.StickerSlack</string>
</array>
</dict>
</plist>

View File

@@ -15,7 +15,12 @@ struct EmojiPreview: View {
var body: some View { var body: some View {
VStack { VStack {
Text(emoji.name) Text(emoji.name)
AsyncImage(url: emoji.url) { phase in if let image = emoji.image {
Image(uiImage: image)
} else {
ProgressView()
}
AsyncImage(url: emoji.remoteImageURL) { phase in
if let image = phase.image { if let image = phase.image {
image image
.resizable().scaledToFit() .resizable().scaledToFit()
@@ -38,9 +43,9 @@ struct EmojiPreview: View {
#Preview { #Preview {
EmojiPreview( EmojiPreview(
emoji: Emoji( emoji: ApiEmoji(
name: "s?", name: "s?",
url: "https://neon443.github.io/images/fav.ico" url: "https://neon443.github.io/images/fav.ico"
) ).toEmoji()
) )
} }

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.neon443.StickerSlack</string>
</array>
</dict>
</plist>