Merge branch 'uuidev-main' into develop

htmlprogrammist · htmlprogrammist · commit a1069b4dac63 · 2023-01-28T11:44:14.000+03:00
diff --git a/EmojiPicker.podspec b/EmojiPicker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'EmojiPicker'
-  s.version = '3.0.7'
+  s.version = '3.0.8'
   s.license = 'MIT'
   s.summary = 'Emoji picker for iOS like on MacOS'
   s.homepage = 'https://github.com/htmlprogrammist/EmojiPicker'
diff --git a/Example App/EmojiPicker.xcworkspace/xcuserdata/egbad.xcuserdatad/UserInterfaceState.xcuserstate b/Example App/EmojiPicker.xcworkspace/xcuserdata/egbad.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example App/Podfile.lock b/Example App/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
-  - EmojiPicker (3.0.7)
-  - EmojiPicker/Tests (3.0.7)
+  - EmojiPicker (3.0.8)
+  - EmojiPicker/Tests (3.0.8)
 
 DEPENDENCIES:
   - EmojiPicker (from `../`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  EmojiPicker: 296cacb36c0eb34fe978d5411eaa06a67cd6da4b
+  EmojiPicker: 2015f097678687260575d880b5960194802d6958
 
 PODFILE CHECKSUM: e686a8fbd8a5367eac0bf7fb77e0bbddf18a2353
 
diff --git a/Example App/Pods/Local Podspecs/EmojiPicker.podspec.json b/Example App/Pods/Local Podspecs/EmojiPicker.podspec.json
diff --git a/Example App/Pods/Manifest.lock b/Example App/Pods/Manifest.lock
diff --git a/Example App/Pods/Pods.xcodeproj/project.pbxproj b/Example App/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example App/Pods/Target Support Files/EmojiPicker/EmojiPicker-Info.plist b/Example App/Pods/Target Support Files/EmojiPicker/EmojiPicker-Info.plist
diff --git a/Example App/Pods/Target Support Files/EmojiPicker/ResourceBundle-Resources-EmojiPicker-Info.plist b/Example App/Pods/Target Support Files/EmojiPicker/ResourceBundle-Resources-EmojiPicker-Info.plist
diff --git a/README.md b/README.md
@@ -153,16 +153,19 @@ viewController.feedbackGeneratorStyle = .soft
 
 ## Localization
 
+* Chinese 🇨🇳
 * English 🇬🇧
-* Russian 🇷🇺
-* Ukraine 🇺🇦
 * French 🇫🇷
 * German 🇩🇪
 * Hindi 🇮🇳
+* Russian 🇷🇺
 * Turkish 🇹🇷
+* Ukrainian 🇺🇦
 
 You can also contribute your language to this list. Please, read [following heading](#contributing) for more information.
 
+> ❗️ Note that the languages are arranged in alphabetical order
+
 ## Contributing
 
 Contributions are welcomed and encouraged! Please see the [Contributing guide](https://github.com/htmlprogrammist/EmojiPicker/blob/main/CONTRIBUTING.md).
diff --git a/Sources/EmojiPicker.h b/Sources/EmojiPicker.h
diff --git a/Sources/EmojiPicker/Bindings/Observable.swift b/Sources/EmojiPicker/Bindings/Observable.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Extensions/Foundation/Bundle.swift b/Sources/EmojiPicker/Extensions/Foundation/Bundle.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Extensions/UIKit/UIColor.swift b/Sources/EmojiPicker/Extensions/UIKit/UIColor.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Extensions/UIKit/UIView.swift b/Sources/EmojiPicker/Extensions/UIKit/UIView.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Models/Category.swift b/Sources/EmojiPicker/Models/Category.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Egor Badmaev
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Models/Emoji.swift b/Sources/EmojiPicker/Models/Emoji.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Egor Badmaev
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Models/EmojiSet.swift b/Sources/EmojiPicker/Models/EmojiSet.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Egor Badmaev
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Models/PickerArrowDirectionMode.swift b/Sources/EmojiPicker/Models/PickerArrowDirectionMode.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Models/Skin.swift b/Sources/EmojiPicker/Models/Skin.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Egor Badmaev
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Resources/Localization/zh.lproj/Localizable.strings b/Sources/EmojiPicker/Resources/Localization/zh.lproj/Localizable.strings
@@ -0,0 +1,8 @@
+"people" = "微笑与人";
+"nature" = "动物与自然";
+"foods" = "食物及饮品";
+"activity" = "活动";
+"places" = "旅游及地点";
+"objects" = "对象";
+"symbols" = "符号";
+"flags" = "旗帜";
diff --git a/Sources/EmojiPicker/Services/EmojiManager.swift b/Sources/EmojiPicker/Services/EmojiManager.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Egor Badmaev
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -19,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import UIKit
+import Foundation
 
 /// An abstraction over entity that provides emoji set.
 protocol EmojiManagerProtocol {
-    /// Gets version of iOS for current device.
+    /// Provides a set of emojis.
     ///
-    /// - Returns: Array of emoji categories (and array of emojis inside them).
+    /// - Returns: Set of emojis.
     func provideEmojis() -> EmojiSet
 }
 
@@ -62,8 +63,12 @@ final class EmojiManager: EmojiManagerProtocol {
         }
     }
     
+    /// Version of operating system of a device.
+    ///
+    /// It takes major and minor version of a device and returns it as `15.5`.
     private var deviceVersion: Double {
-        return (UIDevice.current.systemVersion as NSString).doubleValue
+        let operatingSystemVersion = ProcessInfo().operatingSystemVersion
+        return Double(operatingSystemVersion.majorVersion) + Double(operatingSystemVersion.minorVersion) / 10
     }
     
     // MARK: - Internal Methods
diff --git a/Sources/EmojiPicker/ViewModel/EmojiPickerViewModel.swift b/Sources/EmojiPicker/ViewModel/EmojiPickerViewModel.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Views/EmojiCategoryView/EmojiCategoryIconView.swift b/Sources/EmojiPicker/Views/EmojiCategoryView/EmojiCategoryIconView.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Views/EmojiCategoryView/TouchableEmojiCategoryView.swift b/Sources/EmojiPicker/Views/EmojiCategoryView/TouchableEmojiCategoryView.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Views/EmojiCollectionViewCell.swift b/Sources/EmojiPicker/Views/EmojiCollectionViewCell.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Views/EmojiCollectionViewHeader.swift b/Sources/EmojiPicker/Views/EmojiCollectionViewHeader.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Sources/EmojiPicker/Views/EmojiPickerView.swift b/Sources/EmojiPicker/Views/EmojiPickerView.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -58,7 +59,7 @@ final class EmojiPickerView: UIView {
     }()
     
     // MARK: - Private Properties
-
+    
     private let separatorView: UIView = {
         let view = UIView()
         view.backgroundColor = .separatorColor
@@ -82,13 +83,14 @@ final class EmojiPickerView: UIView {
     /// - Note: The number `0.13` was taken based on the proportion of this element to the width of the EmojiPicker on macOS.
     private var categoriesStackViewHeight: CGFloat { bounds.width * 0.13 }
     private var categoriesStackHeightConstraint: NSLayoutConstraint?
-  
+    
     // MARK: - Init
+    
     override init(frame: CGRect) {
         super.init(frame: .zero)
-        setupView()
+        setupCategoryViews()
     }
-  
+    
     @available(*, unavailable, message: "init(coder:) has not been implemented")
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -99,7 +101,7 @@ final class EmojiPickerView: UIView {
     override func draw(_ rect: CGRect) {
         super.draw(rect)
         
-        setupCategoryViews()
+        setupView()
     }
     
     /// Passes the index of the selected category to all categoryViews to update the state.
@@ -113,18 +115,17 @@ final class EmojiPickerView: UIView {
     }
     
     // MARK: - Private Methods
+    
     private func setupView() {
-        backgroundColor = .popoverBackgroundColor
-      
         addSubview(collectionView)
         addSubview(categoriesStackView)
         addSubview(separatorView)
         
         let categoriesStackHeightConstraint = categoriesStackView.heightAnchor.constraint(
-          equalToConstant: categoriesStackViewHeight
+            equalToConstant: categoriesStackViewHeight
         )
         self.categoriesStackHeightConstraint = categoriesStackHeightConstraint
-      
+        
         NSLayoutConstraint.activate([
             collectionView.leadingAnchor.constraint(equalTo: leadingAnchor),
             collectionView.trailingAnchor.constraint(equalTo: trailingAnchor),
@@ -144,6 +145,7 @@ final class EmojiPickerView: UIView {
     }
     
     private func setupCategoryViews() {
+        backgroundColor = .popoverBackgroundColor
         categoriesStackHeightConstraint?.constant = categoriesStackViewHeight
         categoryViews = []
         categoriesStackView.subviews.forEach { $0.removeFromSuperview() }
diff --git a/Sources/EmojiPicker/Views/EmojiPickerViewController.swift b/Sources/EmojiPicker/Views/EmojiPickerViewController.swift
@@ -1,4 +1,5 @@
 // The MIT License (MIT)
+//
 // Copyright © 2022 Ivan Izyumkin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
