Merge pull request #67 from huri000/bugfix/issues

iPhone X issue with presenting Alert right after previous was closed #62
huri000 · Jun 29, 2018 · a3c5e09 · a3c5e09
2 parents 75d0f45 + 1c5eff2
commit a3c5e09
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 Any notable changes to this project will be documented in this file.
 
+## 0.5.2
+
+### Bug Fixes:
+- [iPhone X issue with presenting Alert right after previous was closed #62](https://github.com/huri000/SwiftEntryKit/issues/62)
+
 ## 0.5.1
 
 Rollback window bug fix

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - Nimble (7.0.2)
   - Quick (1.2.0)
   - QuickLayout (2.0.2)
-  - SwiftEntryKit (0.5.1):
+  - SwiftEntryKit (0.5.2):
     - QuickLayout (= 2.0.2)
 
 DEPENDENCIES:
@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
   Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
   QuickLayout: a730730b646b231fd4ef7cffaeb1e81fe0e1ca92
-  SwiftEntryKit: 08c76c31d041ac69a2a83214f68f98c0df2216e1
+  SwiftEntryKit: 6bd10caa85ad8aed59292638bbeba07d9db823e7
 
 PODFILE CHECKSUM: edd6c2af5cc390dbf823427759474ab6c303ec9e
 

diff --git a/Example/Pods/Local Podspecs/SwiftEntryKit.podspec.json b/Example/Pods/Local Podspecs/SwiftEntryKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/SwiftEntryKit/Info.plist b/Example/Pods/Target Support Files/SwiftEntryKit/Info.plist
diff --git a/Example/SwiftEntryKit/Presets/PresetsData/PresetsDataSource.swift b/Example/SwiftEntryKit/Presets/PresetsData/PresetsDataSource.swift
@@ -478,7 +478,6 @@ struct PresetsDataSource {
         attributes.entryBackground = .clear
         attributes.screenInteraction = .forward
         attributes.entryInteraction = .absorbTouches
-        attributes.roundCorners = .all(radius: 5)
 
         attributes.entranceAnimation = .init(translate: .init(duration: 0.5, spring: .init(damping: 0.9, initialVelocity: 0)),
                                              scale: .init(from: 0.8, to: 1, duration: 0.5, spring: .init(damping: 0.8, initialVelocity: 0)),
@@ -507,7 +506,6 @@ struct PresetsDataSource {
         attributes.entryBackground = .clear
         attributes.screenInteraction = .forward
         attributes.entryInteraction = .absorbTouches
-        attributes.roundCorners = .all(radius: 5)
 
         attributes.entranceAnimation = .init(translate: .init(duration: 0.5, spring: .init(damping: 0.9, initialVelocity: 0)),
                                              scale: .init(from: 0.8, to: 1, duration: 0.5, spring: .init(damping: 0.8, initialVelocity: 0)),

diff --git a/Example/SwiftEntryKit/Presets/Samples/NibExampleView/NibExampleView.swift b/Example/SwiftEntryKit/Presets/Samples/NibExampleView/NibExampleView.swift
@@ -12,11 +12,17 @@ class NibExampleView: UIView {
 
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        fromNib()
+        setup()
     }
 
     init() {
         super.init(frame: .zero)
+        setup()
+    }
+
+    private func setup() {
         fromNib()
+        clipsToBounds = true
+        layer.cornerRadius = 5
     }
 }
diff --git a/Example/SwiftEntryKit/Presets/Samples/NibExampleView/NibExampleView.xib b/Example/SwiftEntryKit/Presets/Samples/NibExampleView/NibExampleView.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NibExampleView" customModule="SwiftEntryKitDemo" customModuleProvider="target"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
+        <view clipsSubviews="YES" contentMode="scaleToFill" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>

diff --git a/README.md b/README.md
@@ -131,7 +131,7 @@ source 'https://github.com/cocoapods/specs.git'
 platform :ios, '9.0'
 use_frameworks!
 
-pod 'SwiftEntryKit', '0.5.1'
+pod 'SwiftEntryKit', '0.5.2'
 ```
 
 Then, run the following command:
@@ -154,7 +154,7 @@ $ brew install carthage
 To integrate SwiftEntryKit into your Xcode project using Carthage, specify the following in your `Cartfile`:
 
 ```ogdl
-github "huri000/SwiftEntryKit" == 0.5.1
+github "huri000/SwiftEntryKit" == 0.5.2
 ```
 
 ## Usage

diff --git a/Source/Extensions/SwiftEntryKit+Execution.swift b/Source/Extensions/SwiftEntryKit+Execution.swift
@@ -14,12 +14,8 @@ extension SwiftEntryKit {
      Executes a UI action on the main thread, thus letting any of the class methods of SwiftEntryKit to be invokes even from a background thread.
      */
     static func execute(action: @escaping () -> ()) {
-        if Thread.isMainThread {
+        DispatchQueue.main.async {
             action()
-        } else {
-            DispatchQueue.main.async {
-                action()
-            }
         }
     }
 }

diff --git a/SwiftEntryKit.podspec b/SwiftEntryKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name = 'SwiftEntryKit'
-  s.version = '0.5.1'
+  s.version = '0.5.2'
   s.summary = 'A simple banner and pop-up displayer for iOS. Written in Swift.'
   s.platform = :ios
   s.ios.deployment_target = '9.0'