Merge pull request #160 from boostcampwm-2024/feat/#143-get-out-ugly-emoji

[FEAT/#143] 몬생긴 이모지를 교체했습니다

Author: 0Hooni

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/EmojiDTO.swift

@@ -2,19 +2,26 @@ import Foundation
 import PhotoGetherDomainInterface
 
 public struct EmojiDTO: Codable {
-    let code: String
-    let character: String
-    let image: String
-    let name: String
-    let group: String
+    let emoji, hexcode: String
+    let group: EmojiGroup
     let subgroup: String
+    let annotation: String
+    let tags, shortcodes, emoticons: [String]
+    let directional, variation: Bool
+    let variationBase: Bool?
+    let unicode: Double
+    let order: Int
+    let skintone: Int?
+    let skintoneCombination, skintoneBase: String?
 }
 
 extension EmojiDTO {
     func toEntity() -> EmojiEntity {
         return .init(
-            image: self.image,
-            name: self.name
-        )    
+            emoji: emoji,
+            hexCode: hexcode,
+            group: group,
+            annotation: annotation
+        )
     }
 }

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/ShapeRepositoryImpl.swift

@@ -4,12 +4,12 @@ import PhotoGetherDomainInterface
 import PhotoGetherNetwork
 
 final public class ShapeRepositoryImpl: ShapeRepository {
-    public func fetchEmojiList() -> AnyPublisher<[EmojiEntity], Never> {
-        return localDataSource.fetchEmojiData(EmojiEndPoint())
+    public func fetchEmojiList(_ group: EmojiGroup) -> AnyPublisher<[EmojiEntity], Never> {
+        return localDataSource.fetchEmojiData(EmojiEndPoint(group: group))
             .catch { [weak self] _ -> AnyPublisher<[EmojiDTO], Never> in
                 guard let self else { return Just([]).eraseToAnyPublisher() }
 
-                return remoteDataSource.fetchEmojiData(EmojiEndPoint())
+                return remoteDataSource.fetchEmojiData(EmojiEndPoint(group: group))
                     .replaceError(with: [])
                     .eraseToAnyPublisher()
             }
@@ -27,17 +27,22 @@ final public class ShapeRepositoryImpl: ShapeRepository {
         self.localDataSource = localDataSource
         self.remoteDataSource = remoteDataSource
     }
+    
 }
 
+
 fileprivate struct EmojiEndPoint: EndPoint {
-    var baseURL: URL { URL(string: "https://api.api-ninjas.com")! }
-    var path: String { "v1/emoji" }
+    let group: EmojiGroup
+    
+    var baseURL: URL { URL(string: "https://www.emoji.family")! }
+    var path: String { "api/emojis" }
     var method: HTTPMethod { .get }
-    /// offset 기준 30개씩 호출
-    var parameters: [String: Any]? { ["group": "objects", "offset": 0] }
-    var headers: [String: String]? {
-        let apiKey = Bundle.main.object(forInfoDictionaryKey: "EMOJI_API_KEY") as? String ?? ""
-        return ["X-Api-Key": apiKey]
-    }
+    var parameters: [String: Any]? { ["group": group.rawValue] }
+    var headers: [String: String]? { nil }
     var body: Encodable? { nil }
+    
+    init(group: EmojiGroup) {
+        self.group = group
+    }
 }
+

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomain/UseCaseImpl/FetchEmojiListUseCaseImpl.swift

@@ -3,8 +3,8 @@ import Foundation
 import PhotoGetherDomainInterface
 
 public final class FetchEmojiListUseCaseImpl: FetchEmojiListUseCase {
-    public func execute() -> AnyPublisher<[EmojiEntity], Never> {
-        return shapeRepository.fetchEmojiList()
+    public func execute(_ group: EmojiGroup) -> AnyPublisher<[EmojiEntity], Never> {
+        return shapeRepository.fetchEmojiList(group)
     }
 
     private let shapeRepository: ShapeRepository

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomainInterface/Entity/EmojiEntity.swift

@@ -1,11 +1,50 @@
 import Foundation
 
 public struct EmojiEntity: Decodable {
-    public let image: String
-    public let name: String
-
-    public init(image: String, name: String) {
-        self.image = image
-        self.name = name
+    public let emoji: String
+    public let hexCode: String
+    public let group: EmojiGroup
+    public let annotation: String
+    public var emojiURL: URL? {
+        guard let emojiURL = URL(string: "https://www.emoji.family/api/emojis")
+        else { return nil }
+        
+        let style = EmojiStyle.twemoji.rawValue
+        let ext = "png"
+        let size = "128"
+        
+        return emojiURL
+            .appendingPathComponent(hexCode)
+            .appendingPathComponent(style)
+            .appendingPathComponent(ext)
+            .appendingPathComponent(size)
+    }
+    
+    public init(
+        emoji: String,
+        hexCode: String,
+        group: EmojiGroup,
+        annotation: String
+    ) {
+        self.emoji = emoji
+        self.hexCode = hexCode
+        self.group = group
+        self.annotation = annotation
+    }
+    
+    private enum EmojiStyle: String {
+        case noto, twemoji, openmoji, blobmoji, fluent, fluentflat
     }
 }
+
+public enum EmojiGroup: String, Codable {
+    case smileysEmotion = "smileys-emotion"
+    case peopleBody = "people-body"
+    case component = "component"
+    case animalsNature = "animals-nature"
+    case foodDrink = "food-drink"
+    case travelPlaces = "travel-places"
+    case activities = "activities"
+    case objects = "objects"
+    case symbols = "symbols"
+}

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomainInterface/Repository/ShapeRepository.swift

@@ -2,5 +2,5 @@ import Combine
 import Foundation
 
 public protocol ShapeRepository {
-    func fetchEmojiList() -> AnyPublisher<[EmojiEntity], Never>
+    func fetchEmojiList(_ group: EmojiGroup) -> AnyPublisher<[EmojiEntity], Never>
 }

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomainInterface/UseCase/FetchEmojiListUseCase.swift

@@ -2,5 +2,5 @@ import Combine
 import Foundation
 
 public protocol FetchEmojiListUseCase {
-    func execute() -> AnyPublisher<[EmojiEntity], Never>
+    func execute(_ group: EmojiGroup) -> AnyPublisher<[EmojiEntity], Never>
 }

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomGuestViewController.swift

@@ -120,9 +120,10 @@ public class EditPhotoRoomGuestViewController: BaseViewController, ViewControlle
     private func createStickerEntity(by entity: EmojiEntity) {
         let imageSize: CGFloat = 72
         let frame = calculateCenterPosition(imageSize: imageSize)
+        guard let emojiURL = entity.emojiURL else { return }
 
         let newSticker = StickerEntity(
-            image: entity.image,
+            image: emojiURL.absoluteString,
             frame: frame,
             owner: nil,
             latestUpdated: Date()

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomHostViewController.swift

@@ -140,9 +140,10 @@ public class EditPhotoRoomHostViewController: BaseViewController, ViewController
     private func createStickerEntity(by entity: EmojiEntity) {
         let imageSize: CGFloat = 72
         let frame = calculateCenterPosition(imageSize: imageSize)
+        guard let emojiURL = entity.emojiURL else { return }
 
         let newSticker = StickerEntity(
-            image: entity.image,
+            image: emojiURL.absoluteString,
             frame: frame,
             owner: nil,
             latestUpdated: Date()

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/StickerBottomSheetViewController.swift

@@ -78,7 +78,6 @@ public final class StickerBottomSheetViewController: UIViewController, ViewContr
             .sink { [weak self] event in
                 switch event {
                 case .emoji(let entity):
-                    // TODO: 이모지 전달
                     self?.sendEmoji(by: entity)
                 }
             }
@@ -122,14 +121,12 @@ extension StickerBottomSheetViewController: UICollectionViewDataSource {
         _ collectionView: UICollectionView,
         cellForItemAt indexPath: IndexPath
     ) -> UICollectionViewCell {
-        guard let cell = collectionView.dequeueReusableCell(
-            withReuseIdentifier: StickerCollectionViewCell.identifier,
-            for: indexPath
-        ) as? StickerCollectionViewCell,
+        guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: StickerCollectionViewCell.identifier,
+                                                            for: indexPath) as? StickerCollectionViewCell,
               let emojiEntity = viewModel.emojiList.value[safe: indexPath.item]
         else { return UICollectionViewCell() }
 
-        cell.setupImage(by: emojiEntity)
+        cell.setImage(by: emojiEntity)
 
         return cell
     }

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/StickerBottomSheetViewModel.swift

@@ -28,7 +28,7 @@ public final class StickerBottomSheetViewModel {
     }
 
     private func bind() {
-        fetchEmojiListUseCase.execute()
+        fetchEmojiListUseCase.execute(.objects)
             .sink { [weak self] emojiEntities in
                 self?.emojiList.send(emojiEntities)
             }