Merge branch 'develop' into refactor-emoji-data

Author: htmlprogrammist

.github/workflows/swift.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Build on iOS 16.0
-      run: xcodebuild -workspace Example\ App/EmojiPicker.xcworkspace -scheme EmojiPicker -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=16.0,name=iPhone 14'
-    - name: Test on iOS 16.0
-      run: xcodebuild -workspace Example\ App/EmojiPicker.xcworkspace -scheme EmojiPicker-Example -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=16.0,name=iPhone 14' test
+    - name: Build on iOS 16.2
+      run: xcodebuild -workspace Example\ App/EmojiPicker.xcworkspace -scheme EmojiPicker -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=16.2,name=iPhone 14'
+    - name: Test on iOS 16.2
+      run: xcodebuild -workspace Example\ App/EmojiPicker.xcworkspace -scheme EmojiPicker-Example -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=16.2,name=iPhone 14' test

Example App/EmojiPicker.xcodeproj/project.pbxproj

@@ -359,8 +359,12 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -374,8 +378,12 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

README.md

@@ -178,6 +178,5 @@ To play around with the project, contribute to it, see how it works or adapt it
 1. Clone or fork this repository to yourself
 2. Open `Example App/EmojiPicker.xcworkspace` file
 3. Expand `Pods` target
-4. Expand `Development Pods` and `EmojiPicker` directories
-  Here you can make your changes.
+4. Expand `Development Pods` and `EmojiPicker` directories. Here you can make your changes
 5. Build & Run project to see an immediate result on an example application. Have fun!

Sources/EmojiPicker/Views/EmojiCategoryView/TouchableEmojiCategoryView.swift

@@ -68,6 +68,7 @@ final class TouchableEmojiCategoryView: UIView {
         super.init(frame: .zero)
     }
 
+    @available(*, unavailable, message: "init(coder:) has not been implemented")
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }

Sources/EmojiPicker/Views/EmojiPickerView.swift

@@ -45,8 +45,15 @@ final class EmojiPickerView: UIView {
         collectionView.contentInset = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16)
         collectionView.backgroundColor = .clear
         collectionView.translatesAutoresizingMaskIntoConstraints = false
-        collectionView.register(EmojiCollectionViewCell.self, forCellWithReuseIdentifier: EmojiCollectionViewCell.identifier)
-        collectionView.register(EmojiCollectionViewHeader.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: EmojiCollectionViewHeader.identifier)
+        collectionView.register(
+            EmojiCollectionViewCell.self,
+            forCellWithReuseIdentifier: EmojiCollectionViewCell.identifier
+        )
+        collectionView.register(
+            EmojiCollectionViewHeader.self,
+            forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader,
+            withReuseIdentifier: EmojiCollectionViewHeader.identifier
+        )
         return collectionView
     }()
 
@@ -68,12 +75,23 @@ final class EmojiPickerView: UIView {
     }()
 
     private var categoryViews = [TouchableEmojiCategoryView]()
+    private var selectedCategoryIndex: Int = .zero
 
     /// Describes height for `categoriesStackView`.
     ///
-    /// - 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 {
-        return bounds.width * 0.13
+    /// - 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()
+    }
+  
+    @available(*, unavailable, message: "init(coder:) has not been implemented")
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
     }
 
     // MARK: - Override
@@ -82,27 +100,31 @@ final class EmojiPickerView: UIView {
         super.draw(rect)
 
         setupCategoryViews()
-        setupView()
     }
 
     /// Passes the index of the selected category to all categoryViews to update the state.
     ///
     /// - Parameter categoryIndex: Selected category index.
     func updateSelectedCategoryIcon(with categoryIndex: Int) {
+        selectedCategoryIndex = categoryIndex
         categoryViews.forEach {
             $0.updateCategoryViewState(selectedCategoryIndex: categoryIndex)
         }
     }
 
     // MARK: - Private Methods
-
     private func setupView() {
         backgroundColor = .popoverBackgroundColor
-        
+      
         addSubview(collectionView)
         addSubview(categoriesStackView)
         addSubview(separatorView)
 
+        let categoriesStackHeightConstraint = categoriesStackView.heightAnchor.constraint(
+          equalToConstant: categoriesStackViewHeight
+        )
+        self.categoriesStackHeightConstraint = categoriesStackHeightConstraint
+      
         NSLayoutConstraint.activate([
             collectionView.leadingAnchor.constraint(equalTo: leadingAnchor),
             collectionView.trailingAnchor.constraint(equalTo: trailingAnchor),
@@ -112,7 +134,7 @@ final class EmojiPickerView: UIView {
             categoriesStackView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 16),
             categoriesStackView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -16),
             categoriesStackView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -safeAreaInsets.bottom),
-            categoriesStackView.heightAnchor.constraint(equalToConstant: categoriesStackViewHeight),
+            categoriesStackHeightConstraint,
 
             separatorView.leadingAnchor.constraint(equalTo: leadingAnchor),
             separatorView.trailingAnchor.constraint(equalTo: trailingAnchor),
@@ -122,6 +144,10 @@ final class EmojiPickerView: UIView {
     }
 
     private func setupCategoryViews() {
+        categoriesStackHeightConstraint?.constant = categoriesStackViewHeight
+        categoryViews = []
+        categoriesStackView.subviews.forEach { $0.removeFromSuperview() }
+        
         var index = 0
         for type in CategoryType.allCases {
             let categoryView = TouchableEmojiCategoryView(
@@ -132,7 +158,7 @@ final class EmojiPickerView: UIView {
             )
 
             /// We need to set _selected_ state for the first category (default at the start).
-            categoryView.updateCategoryViewState(selectedCategoryIndex: 0)
+            categoryView.updateCategoryViewState(selectedCategoryIndex: selectedCategoryIndex)
             categoryViews.append(categoryView)
             categoriesStackView.addArrangedSubview(categoryView)
             index += 1

Sources/EmojiPicker/Views/EmojiPickerViewController.swift

@@ -170,16 +170,27 @@ public final class EmojiPickerViewController: UIViewController {
 
     /// Sets up preferred content size.
     ///
-    /// - Note: The number `0.16` was taken based on the proportion of height to the width of the EmojiPicker on MacOS.
+    /// - Note: The number `0.16` was taken based on the proportion of height to the width of the EmojiPicker on macOS.
     private func setupPreferredContentSize() {
-        let sideInset: CGFloat = 20
-        let screenWidth: CGFloat = UIScreen.main.nativeBounds.width / UIScreen.main.nativeScale
-        let popoverWidth: CGFloat = screenWidth - (sideInset * 2)
-        let heightProportionToWidth: CGFloat = 1.16
-        
-        preferredContentSize = CGSize(width: popoverWidth,
-                                      height: customHeight ?? popoverWidth * heightProportionToWidth
-        )
+        let size: CGSize = {
+            switch UIDevice.current.userInterfaceIdiom {
+            case .phone:
+                let sideInset: CGFloat = 20
+                let screenWidth: CGFloat = UIScreen.main.nativeBounds.width / UIScreen.main.nativeScale
+                let popoverWidth: CGFloat = screenWidth - (sideInset * 2)
+                // The number 0.16 was taken based on the proportion of height to the width of the EmojiPicker on macOS.
+                let heightProportionToWidth: CGFloat = 1.16
+                return CGSize(
+                    width: popoverWidth,
+                    height: popoverWidth * heightProportionToWidth
+                )
+            default:
+                // macOS size
+                return CGSize(width: 410, height: 460)
+            }
+        }()
+       
+        preferredContentSize = size
     }
 
     private func setupArrowDirections() {