From b1f81dbe2fb3b6bedda235c1d877b9a4d9d5697f Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Sun, 25 Dec 2022 13:11:51 +0100 Subject: [PATCH] Fix build --- Packages/DesignSystem/Package.swift | 3 +- .../Sources/DesignSystem/AccountExt.swift | 32 +++++++++++++++++++ .../Sources/Models/Ext/AccountExt.swift | 31 ------------------ 3 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 Packages/DesignSystem/Sources/DesignSystem/AccountExt.swift delete mode 100644 Packages/Models/Sources/Models/Ext/AccountExt.swift diff --git a/Packages/DesignSystem/Package.swift b/Packages/DesignSystem/Package.swift index 71d325bd..af985001 100644 --- a/Packages/DesignSystem/Package.swift +++ b/Packages/DesignSystem/Package.swift @@ -25,7 +25,8 @@ let package = Package( .product(name: "Models", package: "Models"), .product(name: "Env", package: "Env"), .product(name: "Shimmer", package: "SwiftUI-Shimmer"), - .product(name: "NukeUI", package: "Nuke") + .product(name: "NukeUI", package: "Nuke"), + .product(name: "Nuke", package: "Nuke") ]), ] ) diff --git a/Packages/DesignSystem/Sources/DesignSystem/AccountExt.swift b/Packages/DesignSystem/Sources/DesignSystem/AccountExt.swift new file mode 100644 index 00000000..eed9d5a0 --- /dev/null +++ b/Packages/DesignSystem/Sources/DesignSystem/AccountExt.swift @@ -0,0 +1,32 @@ +import Foundation +import SwiftUI +import Nuke +import NukeUI +import Models + +@MainActor +extension Account { + public var displayNameWithEmojis: some View { + let splittedDisplayName = displayName.split(separator: ":") + return HStack(spacing: 0) { + ForEach(splittedDisplayName, id: \.self) { part in + if let emoji = emojis.first(where: { $0.shortcode == part }) { + LazyImage(url: emoji.url) { state in + if let image = state.image { + image + .resizingMode(.aspectFit) + } else if state.isLoading { + ProgressView() + } else { + ProgressView() + } + } + .processors([ImageProcessors.Resize(size: .init(width: 20, height: 20))]) + .frame(width: 20, height: 20) + } else { + Text(part) + } + } + } + } +} diff --git a/Packages/Models/Sources/Models/Ext/AccountExt.swift b/Packages/Models/Sources/Models/Ext/AccountExt.swift deleted file mode 100644 index 0a5e2f0d..00000000 --- a/Packages/Models/Sources/Models/Ext/AccountExt.swift +++ /dev/null @@ -1,31 +0,0 @@ -import Foundation -import SwiftUI -import Nuke -import NukeUI - -@MainActor -extension Account { - public var displayNameWithEmojis: some View { - let splittedDisplayName = displayName.split(separator: ":") - return HStack(spacing: 0) { - ForEach(splittedDisplayName, id: \.self) { part in - if let emoji = emojis.first(where: { $0.shortcode == part }) { - LazyImage(url: emoji.url) { state in - if let image = state.image { - image - .resizingMode(.aspectFit) - } else if state.isLoading { - ProgressView() - } else { - ProgressView() - } - } - .processors([ImageProcessors.Resize(size: .init(width: 20, height: 20))]) - .frame(width: 20, height: 20) - } else { - Text(part) - } - } - } - } -}