Merge pull request #11 from htmlprogrammist/develop

3.0.7

CONTRIBUTING.md

@@ -84,3 +84,11 @@ If you can't find valid, add new to codestyle agreements please. Other can be us
     docs: update readme with additional information
     docs: update description of run() method
     ```
+
+## Before making pull request
+
+1. Change version in [`EmojiPicker.podspec`](/EmojiPicker.podspec) file
+2. Update version of dependency in Example App:
+    1. Open terminal
+    2. Open Example app directory using `cd Example\ App/`
+    3. Update pod version via command `pod install`

EmojiPicker.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'EmojiPicker'
-  s.version = '3.0.4'
+  s.version = '3.0.7'
   s.license = 'MIT'
   s.summary = 'Emoji picker for iOS like on MacOS'
   s.homepage = 'https://github.com/htmlprogrammist/EmojiPicker'

Example App/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - EmojiPicker (3.0.4)
-  - EmojiPicker/Tests (3.0.4)
+  - EmojiPicker (3.0.7)
+  - EmojiPicker/Tests (3.0.7)
 
 DEPENDENCIES:
   - EmojiPicker (from `../`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  EmojiPicker: a21d785c95a64a0284b0d1472150d90c4348d5e3
+  EmojiPicker: 296cacb36c0eb34fe978d5411eaa06a67cd6da4b
 
 PODFILE CHECKSUM: e686a8fbd8a5367eac0bf7fb77e0bbddf18a2353
 

Sources/EmojiPicker/Services/EmojiManager.swift

@@ -19,13 +19,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import UIKit.UIDevice
+import UIKit
 
+/// An abstraction over entity that provides emoji set.
 protocol EmojiManagerProtocol {
-
-    /// Operating System version of a device.
-    var deviceVersion: Double { get }
-
     /// Gets version of iOS for current device.
     ///
     /// - Returns: Array of emoji categories (and array of emojis inside them).
@@ -37,21 +34,41 @@ final class EmojiManager: EmojiManagerProtocol {
 
     // MARK: - Private Properties
 
+    /// An object that decodes instances of a data type from JSON objects.
     private let decoder = JSONDecoder()
+
     /// Version of emoji set.
     ///
     /// - Note: The value is `5` by default.
-    private var emojiVersion = "5"
-
-    // MARK: - Internal
+    private var emojiVersion: String {
+        switch deviceVersion {
+        case 12.1...13.1:
+            return "11"
+
+        case 13.2...14.1:
+            return "12.1"
+
+        case 14.2...14.4:
+            return "13"
+
+        case 14.5...15.3:
+            return "13.1"
+
+        case 15.4...:
+            return "14"
+
+        default:
+            return "5"
+        }
+    }
 
-    var deviceVersion: Double {
+    private var deviceVersion: Double {
         return (UIDevice.current.systemVersion as NSString).doubleValue
     }
 
+    // MARK: - Internal Methods
+
     func provideEmojis() -> EmojiSet {
-        setEmojiVersion()
-
         guard let path = Bundle.module.path(forResource: emojiVersion, ofType: "json"),
               let data = try? Data(contentsOf: URL(fileURLWithPath: path))
         else {
@@ -65,28 +82,4 @@ final class EmojiManager: EmojiManagerProtocol {
 
         return emojiSet
     }
-
-    // MARK: - Private Methods
-
-    private func setEmojiVersion() {
-        switch deviceVersion {
-        case 12.1...13.1:
-            emojiVersion = "11"
-
-        case 13.2...14.1:
-            emojiVersion = "12.1"
-
-        case 14.2...14.4:
-            emojiVersion = "13"
-
-        case 14.5...15.3:
-            emojiVersion = "13.1"
-
-        case 15.4...:
-            emojiVersion = "14"
-
-        default:
-            emojiVersion = "5"
-        }
-    }
 }

Sources/EmojiPicker/ViewModel/EmojiPickerViewModel.swift

@@ -19,6 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+import Foundation
+
 /// Protocol for a ViewModel which is being used in `EmojiPickerViewController`.
 protocol EmojiPickerViewModelProtocol {
     /// The observed variable that is responsible for the choice of emoji.

Tests/EmojiPickerTests/EmojiManagerTests.swift

@@ -33,13 +33,4 @@ class EmojiManagerTests: XCTestCase {
         XCTAssertGreaterThan(result.categories.count, 0)
         XCTAssertGreaterThan(result.aliases.count, 0)
     }
-
-    /**
-     Tests that device version are identical.
-     */
-    func testDeterminingDeviceVersion() throws {
-        let expectedVersion = (UIDevice.current.systemVersion as NSString).doubleValue
-
-        XCTAssertEqual(emojiManager.deviceVersion, expectedVersion)
-    }
 }