refactor: make updates and models

Author: uuidev

Example App/EmojiPicker.xcworkspace/xcuserdata/egbad.xcuserdatad/UserInterfaceState.xcuserstate

@@ -24,11 +24,11 @@ struct Category: Decodable {
     /// Type-safe category type.
     let type: CategoryType
     /// Identifiers of emojis.
-    let emojis: [String]
+    let identifiers: [Emoji.ID]
 
     enum CodingKeys: String, CodingKey {
         case type = "id"
-        case emojis
+        case identifiers = "emojis"
     }
 }
 

Sources/EmojiPicker/Models/Category.swift

@@ -31,13 +31,15 @@ struct Emoji: Decodable, Identifiable {
     let skins: [Skin]
     /// Version in which the emoji appeared.
     let version: Double
+    /// Skin tone number. We save it so user can use the skin he chose.
+    var skinToneIndex = 0
 }
 
 extension Emoji {
-    /// Main emoji.
+    /// String emoji. For example: 😄
     ///
-    /// This property is used to get the main emoji to show it in the collection view.
+    /// Shows in the collection view.
     var emoji: String {
-        return skins[0].native
+        return skins[skinToneIndex].native
     }
 }

Sources/EmojiPicker/Models/Emoji.swift

@@ -65,12 +65,12 @@ final class EmojiPickerViewModel: EmojiPickerViewModelProtocol {
     }
 
     func numberOfItems(in section: Int) -> Int {
-        return emojiSet.categories[section].emojis.count
+        return emojiSet.categories[section].identifiers.count
     }
 
     func emoji(at indexPath: IndexPath) -> String {
-        let name = emojiSet.categories[indexPath.section].emojis[indexPath.row]
-        return emojiSet.emojis[name]?.emoji ?? "❗️"
+        let name = emojiSet.categories[indexPath.section].identifiers[indexPath.row]
+        return emojiSet.emojis[name]?.emoji ?? "⚠️"
     }
 
     func sectionHeaderViewModel(for section: Int) -> String {

Sources/EmojiPicker/ViewModel/EmojiPickerViewModel.swift

@@ -17,23 +17,29 @@ class CategoryTests: XCTestCase {
     }
 
     func test_decodeCategory_success() throws {
-        let result = try? JSONDecoder().decode(EmojiPicker.Category.self, from: category1)
+        category = try? JSONDecoder().decode(EmojiPicker.Category.self, from: category1)
 
-        XCTAssertNotNil(result)
-        XCTAssertEqual(result?.emojis, ["grinning", "smiley", "smile"])
+        XCTAssertNotNil(category, "The result of decoding should be successful")
+        XCTAssertEqual(category.type, CategoryType.people)
+        XCTAssertEqual(category?.identifiers, ["grinning", "smiley", "smile"])
     }
 
-    func test_decodeCategory_arraySuccess() throws {
-        let result = try? JSONDecoder().decode([EmojiPicker.Category].self, from: category3)
+    func test_decodeCategory_wrongCodingKeys1() throws {
+        category = try? JSONDecoder().decode(EmojiPicker.Category.self, from: category2)
 
-        XCTAssertNotNil(result)
-        XCTAssertEqual(result?.count, 2)
+        XCTAssertNil(category)
     }
 
-    func test_decodeCategory_wrongCodingKeys() throws {
-        let result = try? JSONDecoder().decode(EmojiPicker.Category.self, from: category2)
+    func test_decodeCategory_wrongCodingKeys2() throws {
+        category = try? JSONDecoder().decode(EmojiPicker.Category.self, from: category3)
 
-        XCTAssertNil(result)
+        XCTAssertNil(category)
+    }
+    
+    func test_decodeCategory_wrongCodingKeys3() throws {
+        category = try? JSONDecoder().decode(EmojiPicker.Category.self, from: category4)
+        
+        XCTAssertNil(category)
     }
 }
 
@@ -51,7 +57,7 @@ fileprivate let category1 = Data("""
 fileprivate let category2 = Data("""
 {
     "type": "people",
-    "emojis": [
+    "identifiers": [
         "grinning",
         "smiley",
         "smile",
@@ -60,22 +66,23 @@ fileprivate let category2 = Data("""
 """.utf8)
 
 fileprivate let category3 = Data("""
-[
-    {
-      "id": "people",
-      "emojis": [
+{
+    "id": "people",
+    "identifiers": [
         "grinning",
+        "smiley",
         "smile",
-        "zzz"
-      ]
-    },
-    {
-      "id": "nature",
-      "emojis": [
-        "monkey",
-        "leaves",
-        "dog"
-      ]
-    }
-]
+    ]
+}
+""".utf8)
+
+fileprivate let category4 = Data("""
+{
+    "type": "people",
+    "emojis": [
+        "grinning",
+        "smiley",
+        "smile",
+    ]
+}
 """.utf8)

Tests/EmojiPickerTests/CategoryTests.swift

@@ -41,7 +41,7 @@ class EmojiPickerViewModelTests: XCTestCase {
 
         let result = viewModel.numberOfItems(in: 0)
 
-        XCTAssertEqual(result, emojiManagerStub.emojiSet.categories[section].emojis.count)
+        XCTAssertEqual(result, emojiManagerStub.emojiSet.categories[section].identifiers.count)
     }
 
     func testEmojiAtIndexPathMethod() throws {
@@ -50,7 +50,7 @@ class EmojiPickerViewModelTests: XCTestCase {
         let result = viewModel.emoji(at: indexPath)
 
         let expectedResult = emojiManagerStub.emojiSet.emojis[
-            emojiManagerStub.emojiSet.categories[indexPath.section].emojis[indexPath.row]
+            emojiManagerStub.emojiSet.categories[indexPath.section].identifiers[indexPath.row]
         ]?.emoji
         XCTAssertEqual(result, expectedResult)
     }

Tests/EmojiPickerTests/EmojiPickerViewModelTests.swift

@@ -9,22 +9,18 @@
 
 class EmojiManagerStub: EmojiManagerProtocol {
 
-    var deviceVersion: Double {
-        11.1
-    }
-    
     func provideEmojis() -> EmojiSet {
         emojiSet
     }
 
     var emojiSet = EmojiSet(
         categories: [
-            Category(type: .people, emojis: [
+            Category(type: .people, identifiers: [
                 "smile",
                 "laughing",
                 "grin"
             ]),
-            Category(type: .foods, emojis: [
+            Category(type: .foods, identifiers: [
                 "peach"
             ]),
         ],
@@ -36,31 +32,35 @@ class EmojiManagerStub: EmojiManagerProtocol {
                 skins: [
                     Skin(unified: "1f604", native: "😄")
                 ],
-                version: 1.0),
+                version: 1.0
+            ),
             "laughing": Emoji(
                 id: "laughing",
                 name: "Grinning Squinting Face",
                 keywords: [],
                 skins: [
                     Skin(unified: "1f606", native: "😆")
                 ],
-                version: 1.0),
+                version: 1.0
+            ),
             "grin": Emoji(
                 id: "grin",
                 name: "Beaming Face with Smiling Eyes",
                 keywords: [],
                 skins: [
                     Skin(unified: "1f601", native: "😁")
                 ],
-                version: 1.0),
+                version: 1.0
+            ),
             "peach": Emoji(
                 id: "peach",
                 name: "Peach",
                 keywords: [],
                 skins: [
                     Skin(unified: "1f351", native: "🍑")
                 ],
-                version: 1.0),
+                version: 1.0
+            ),
         ],
         aliases: [:]
     )