Merge branch 'master' into fix/travis

CHANGELOG.md

@@ -2,11 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+### [4.0.1](https://github.com/xmartlabs/XLActionController/releases/tag/4.0.1)
+
+* Bug fixes and stability improvements.
+* Added support for iphone X. 
+
 ### [4.0.0](https://github.com/xmartlabs/XLActionController/releases/tag/4.0.0)
 
 * Support for Swift 4.
-* Added customizable background color to the Skype action controller, [PR #52](https://github.com/xmartlabs/XLActionController/pull/52) 
-* Using status bar style from settings in iOS 10, [PR #53](https://github.com/xmartlabs/XLActionController/pull/53) 
+* Added customizable background color to the Skype action controller, [PR #52](https://github.com/xmartlabs/XLActionController/pull/52)
+* Using status bar style from settings in iOS 10, [PR #53](https://github.com/xmartlabs/XLActionController/pull/53)
 
 ### [3.0.1](https://github.com/xmartlabs/XLActionController/releases/tag/3.0.1)
 
@@ -18,7 +23,7 @@ All notable changes to this project will be documented in this file.
 
 ### [2.1.0](https://github.com/xmartlabs/XLActionController/releases/tag/2.1.0)
 
-* **Breaking change**: `actionTitleLabelConstraintToContainer` and `actionTitleLabelConstraintToImageView` was removed from `ActionCell` class. You must delete these outlets from your xib files, [PR #23](https://github.com/xmartlabs/XLActionController/pull/23). 
+* **Breaking change**: `actionTitleLabelConstraintToContainer` and `actionTitleLabelConstraintToImageView` was removed from `ActionCell` class. You must delete these outlets from your xib files, [PR #23](https://github.com/xmartlabs/XLActionController/pull/23).
 * **Breaking change**: actions' handlers are now executed after the action controller was completely dismissed, [PR #22](https://github.com/xmartlabs/XLActionController/pull/22).
 * Fixed duplicated execution of actions, [PR #22](https://github.com/xmartlabs/XLActionController/pull/22).
 

Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,48 +1,51 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "xl_appicon_58.png",
+      "filename" : "appIcon29pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "xl_appicon_87.png",
+      "filename" : "appIcon29pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "xl_appicon_80.png",
+      "filename" : "appIcon40pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "xl_appicon_120.png",
+      "filename" : "appIcon40pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "xl_appicon_120-1.png",
+      "filename" : "appIcon60pt@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
       "scale" : "3x"
     },
     {

Example/CustomActionControllers/Tweetbot.swift

@@ -73,7 +73,7 @@ open class TweetbotActionController: DynamicsActionController<TweetbotCell, Stri
             cell.setup(action.data, detail: nil, image: nil)
             let actions = self?.sectionForIndex(indexPath.section)?.actions
             let actionsCount = actions!.count
-          cell.separatorView?.isHidden = indexPath.item == (self?.collectionView.numberOfItems(inSection: indexPath.section))! - 1
+            cell.separatorView?.isHidden = indexPath.item == (self?.collectionView.numberOfItems(inSection: indexPath.section))! - 1
             cell.backgroundColor = action.style == .cancel ? UIColor(white: 0.23, alpha: 1.0) : .darkGray
             cell.alpha = action.enabled ? 1.0 : 0.5
 

Source/ActionController.swift

@@ -323,11 +323,13 @@ open class ActionController<ActionViewType: UICollectionViewCell, ActionDataType
     open override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
 
+        collectionView.setNeedsLayout()
+
         if let _ = settings.animation.scale {
             presentingViewController?.view.transform = CGAffineTransform.identity
         }
 
-        self.collectionView.collectionViewLayout.invalidateLayout()
+        collectionView.collectionViewLayout.invalidateLayout()
 
         coordinator.animate(alongsideTransition: { [weak self] _ in
             self?.setUpContentInsetForHeight(size.height)
@@ -336,6 +338,9 @@ open class ActionController<ActionViewType: UICollectionViewCell, ActionDataType
                 self?.presentingViewController?.view.transform = CGAffineTransform(scaleX: scale.width, y: scale.height)
             }
         }, completion: nil)
+
+
+        collectionView.layoutIfNeeded()
     }
 
     override open func viewDidLayoutSubviews() {

XLActionController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name     = 'XLActionController'
-  spec.version  = '4.0.0'
+  spec.version  = '4.0.1'
   spec.license  = 'MIT'
   spec.summary  = 'Fully customizable and extensible action sheet controller written in Swift'
   spec.homepage = 'https://github.com/xmartlabs/XLActionController'

XLActionController.xcodeproj/project.pbxproj

@@ -169,7 +169,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = Xmartlabs;
 				TargetAttributes = {
 					28E191661BFA618E00066B1C = {
@@ -349,6 +349,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;

XLActionController.xcodeproj/xcshareddata/xcschemes/XLActionController.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"