refactor: refuse to Configuration usage

Author: htmlprogrammist

EmojiPicker.podspec

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

EmojiPicker.xcodeproj/project.pbxproj

@@ -17,15 +17,13 @@
 F0A435002971A6A500663826 /* PickerArrowDirectionModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0A434FF2971A6A500663826 /* PickerArrowDirectionModeTests.swift */; };
 F0A435022971A87500663826 /* EmojiCategoryTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0A435012971A87500663826 /* EmojiCategoryTypeTests.swift */; };
 F0BB7EC3297157D3004EEBFC /* EmojiPicker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0BB7EBA297157D3004EEBFC /* EmojiPicker.framework */; };
-F0BB7EC8297157D3004EEBFC /* ConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7EC7297157D3004EEBFC /* ConfigurationTests.swift */; };
 F0BB7ED629715831004EEBFC /* EmojiPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = F0BB7ED329715830004EEBFC /* EmojiPicker.h */; };
 F0BB7ED829715831004EEBFC /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = F0BB7ED529715830004EEBFC /* README.md */; };
 F0BB7EDB297158BD004EEBFC /* EmojiPicker.podspec in Resources */ = {isa = PBXBuildFile; fileRef = F0BB7ED9297158BC004EEBFC /* EmojiPicker.podspec */; };
 F0BB7F17297159A6004EEBFC /* EmojiPickerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7EF2297159A6004EEBFC /* EmojiPickerViewModel.swift */; };
 F0BB7F18297159A6004EEBFC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F0BB7EF5297159A6004EEBFC /* Localizable.strings */; };
 F0BB7F19297159A6004EEBFC /* EmojiModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7EF9297159A6004EEBFC /* EmojiModel.swift */; };
 F0BB7F1A297159A6004EEBFC /* PickerArrowDirectionMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7EFA297159A6004EEBFC /* PickerArrowDirectionMode.swift */; };
-F0BB7F1B297159A6004EEBFC /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7EFB297159A6004EEBFC /* Configuration.swift */; };
 F0BB7F1C297159A6004EEBFC /* UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7EFE297159A6004EEBFC /* UIView.swift */; };
 F0BB7F1D297159A6004EEBFC /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7EFF297159A6004EEBFC /* UIColor.swift */; };
 F0BB7F1E297159A6004EEBFC /* Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0BB7F01297159A6004EEBFC /* Array.swift */; };
@@ -70,7 +68,6 @@
 F0A435012971A87500663826 /* EmojiCategoryTypeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiCategoryTypeTests.swift; sourceTree = "<group>"; };
 F0BB7EBA297157D3004EEBFC /* EmojiPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = EmojiPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 F0BB7EC2297157D3004EEBFC /* EmojiPickerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EmojiPickerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-F0BB7EC7297157D3004EEBFC /* ConfigurationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationTests.swift; sourceTree = "<group>"; };
 F0BB7ED329715830004EEBFC /* EmojiPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmojiPicker.h; sourceTree = "<group>"; };
 F0BB7ED429715830004EEBFC /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 F0BB7ED529715830004EEBFC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -80,7 +77,6 @@
 F0BB7EF7297159A6004EEBFC /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 F0BB7EF9297159A6004EEBFC /* EmojiModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmojiModel.swift; sourceTree = "<group>"; };
 F0BB7EFA297159A6004EEBFC /* PickerArrowDirectionMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PickerArrowDirectionMode.swift; sourceTree = "<group>"; };
-F0BB7EFB297159A6004EEBFC /* Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
 F0BB7EFE297159A6004EEBFC /* UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIView.swift; sourceTree = "<group>"; };
 F0BB7EFF297159A6004EEBFC /* UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = "<group>"; };
 F0BB7F01297159A6004EEBFC /* Array.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Array.swift; sourceTree = "<group>"; };
@@ -161,7 +157,6 @@
 F0BB7EC6297157D3004EEBFC /* Tests */ = {
 isa = PBXGroup;
 children = (
-F0BB7EC7297157D3004EEBFC /* ConfigurationTests.swift */,
 F0A434F32971A0C200663826 /* EmojiPickerViewModelTests.swift */,
 F0A435012971A87500663826 /* EmojiCategoryTypeTests.swift */,
 F0A434FB2971A67F00663826 /* UnicodeManagerTests.swift */,
@@ -224,7 +219,6 @@
 F0BB7EF8297159A6004EEBFC /* Models */ = {
 isa = PBXGroup;
 children = (
-F0BB7EFB297159A6004EEBFC /* Configuration.swift */,
 F0BB7EF9297159A6004EEBFC /* EmojiModel.swift */,
 F0BB7EFA297159A6004EEBFC /* PickerArrowDirectionMode.swift */,
 );
@@ -457,7 +451,6 @@
 F0BB7F1E297159A6004EEBFC /* Array.swift in Sources */,
 F0BB7F1A297159A6004EEBFC /* PickerArrowDirectionMode.swift in Sources */,
 F0BB7F19297159A6004EEBFC /* EmojiModel.swift in Sources */,
-F0BB7F1B297159A6004EEBFC /* Configuration.swift in Sources */,
 F0BB7F2D297159A6004EEBFC /* UnicodeManager.swift in Sources */,
 F0BB7F17297159A6004EEBFC /* EmojiPickerViewModel.swift in Sources */,
 F0BB7F29297159A6004EEBFC /* Unicode 14.swift in Sources */,
@@ -469,7 +462,6 @@
 buildActionMask = 2147483647;
 files = (
 F0A435002971A6A500663826 /* PickerArrowDirectionModeTests.swift in Sources */,
-F0BB7EC8297157D3004EEBFC /* ConfigurationTests.swift in Sources */,
 F0BB7F3829716AFD004EEBFC /* EmojiPickerDelegateMock.swift in Sources */,
 F0A435022971A87500663826 /* EmojiCategoryTypeTests.swift in Sources */,
 F0A434F42971A0C200663826 /* EmojiPickerViewModelTests.swift in Sources */,

EmojiPicker.xcodeproj/project.xcworkspace/xcuserdata/egbad.xcuserdatad/UserInterfaceState.xcuserstate

@@ -11,7 +11,7 @@ let package = Package(
  targets: ["AppImport"]),
  ],
  dependencies: [
- .package(url: "https://github.com/htmlprogrammist/EmojiPicker", .upToNextMajor(from: "2.1.3"))
+ .package(url: "https://github.com/htmlprogrammist/EmojiPicker", .upToNextMajor(from: "3.0.0"))
  ],
  targets: [
  .target(

Example App/AppImport/Package.swift

@@ -26,8 +26,8 @@ class ViewController: UIViewController {
  }
 
  @objc private func openEmojiPickerModule(sender: UIButton) {
- let configuration = Configuration(delegate: self, sender: sender)
- let viewController = EmojiPickerViewController(configuration: configuration)
+ let viewController = EmojiPickerViewController()
+ viewController.delegate = self
  viewController.sourceView = sender
  present(viewController, animated: true)
  }

Example App/iOS Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,13 +32,13 @@ public protocol EmojiPickerDelegate: AnyObject {
 /// Emoji Picker view controller. 
 public final class EmojiPickerViewController: UIViewController {
 
- // MARK: - Internal Properties
+ // MARK: - Public Properties
 
  /// Delegate for selecting an emoji object.
- weak var delegate: EmojiPickerDelegate?
+ public weak var delegate: EmojiPickerDelegate?
 
  /// The view containing the anchor rectangle for the popover.
- var sourceView: UIView? {
+ public var sourceView: UIView? {
  didSet {
  popoverPresentationController?.sourceView = sourceView
  }
@@ -49,22 +49,22 @@ public final class EmojiPickerViewController: UIViewController {
 
  - Note: The default value of this property is `.up`.
  */
- let arrowDirection: PickerArrowDirectionMode
+ public var arrowDirection: PickerArrowDirectionMode = .up
 
  /**
  Custom height for EmojiPicker.
 
  - Note: The default value of this property is `nil`.
  - Important: it will be limited by the distance from `sourceView.origin.y` to the upper or lower bound(depends on `permittedArrowDirections`).
  */
- let customHeight: CGFloat?
+ public var customHeight: CGFloat?
 
  /**
  Inset from the sourceView border.
 
  - Note: The default value of this property is `0`.
  */
- let horizontalInset: CGFloat
+ public var horizontalInset: CGFloat = 0
 
  /**
  A boolean value that determines whether the screen will be hidden after the emoji is selected.
@@ -74,14 +74,14 @@ public final class EmojiPickerViewController: UIViewController {
 
  - Note: The default value of this property is `true`.
  */
- let isDismissedAfterChoosing: Bool
+ public var isDismissedAfterChoosing: Bool = true
 
  /**
  Color for the selected emoji category.
 
  - Note: The default value of this property is `.systemBlue`.
  */
- var selectedEmojiCategoryTintColor: UIColor? {
+ public var selectedEmojiCategoryTintColor: UIColor? = .systemBlue {
  didSet {
  guard let selectedEmojiCategoryTintColor = selectedEmojiCategoryTintColor else { return }
  emojiPickerView.selectedEmojiCategoryTintColor = selectedEmojiCategoryTintColor
@@ -93,7 +93,7 @@ public final class EmojiPickerViewController: UIViewController {
 
  - Note: The default value of this property is `.light`.
  */
- var feedbackGeneratorStyle: UIImpactFeedbackGenerator.FeedbackStyle? {
+ public var feedbackGeneratorStyle: UIImpactFeedbackGenerator.FeedbackStyle? {
  didSet {
  guard let feedBackGeneratorStyle = feedbackGeneratorStyle else {
  feedbackGenerator = nil
@@ -115,21 +115,12 @@ public final class EmojiPickerViewController: UIViewController {
  // MARK: - Init
 
  /// Creates EmojiPicker view controller with provided configuration.
- public init(configuration: Configuration) {
- arrowDirection = configuration.arrowDirection
- selectedEmojiCategoryTintColor = configuration.selectedEmojiCategoryTintColor
- horizontalInset = configuration.horizontalInset
- isDismissedAfterChoosing = configuration.isDismissedAfterChoosing
- customHeight = configuration.customHeight
- feedbackGeneratorStyle = configuration.feedbackGeneratorStyle
- 
+ public init() {
  let unicodeManager = UnicodeManager()
  viewModel = EmojiPickerViewModel(unicodeManager: unicodeManager)
 
  super.init(nibName: nil, bundle: nil)
- 
- delegate = configuration.delegate
- sourceView = configuration.sender
+ modalPresentationStyle = .popover
 
  setupDelegates()
  bindViewModel()
@@ -148,8 +139,6 @@ public final class EmojiPickerViewController: UIViewController {
  override public func viewDidLoad() {
  super.viewDidLoad()
 
- modalPresentationStyle = .popover
- 
  setupPreferredContentSize()
  setupArrowDirections()
  setupHorizontalInset()