Skip to content

Commit a1efc34

Browse files
committed
Remove safe area workaround (iOS bug fixed)
1 parent 7ce685a commit a1efc34

File tree

4 files changed

+6
-47
lines changed

4 files changed

+6
-47
lines changed

Demo/Demo.xcodeproj/project.pbxproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
360360
GCC_WARN_UNUSED_FUNCTION = YES;
361361
GCC_WARN_UNUSED_VARIABLE = YES;
362-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
362+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
363363
MTL_ENABLE_DEBUG_INFO = YES;
364364
ONLY_ACTIVE_ARCH = YES;
365365
SDKROOT = iphoneos;
@@ -410,7 +410,7 @@
410410
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
411411
GCC_WARN_UNUSED_FUNCTION = YES;
412412
GCC_WARN_UNUSED_VARIABLE = YES;
413-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
413+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
414414
MTL_ENABLE_DEBUG_INFO = NO;
415415
SDKROOT = iphoneos;
416416
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -427,6 +427,7 @@
427427
CODE_SIGN_IDENTITY = "iPhone Developer";
428428
DEVELOPMENT_TEAM = 38R82CD868;
429429
INFOPLIST_FILE = Demo/Info.plist;
430+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
430431
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
431432
PRODUCT_BUNDLE_IDENTIFIER = it.swiftkick.Demo;
432433
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -443,6 +444,7 @@
443444
CODE_SIGN_IDENTITY = "iPhone Developer";
444445
DEVELOPMENT_TEAM = 38R82CD868;
445446
INFOPLIST_FILE = Demo/Info.plist;
447+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
446448
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
447449
PRODUCT_BUNDLE_IDENTIFIER = it.swiftkick.Demo;
448450
PRODUCT_NAME = "$(TARGET_NAME)";

SwiftMessages.xcodeproj/project.pbxproj

-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
220655121FAF82B600F4E00F /* MarginAdjustable+Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 220655111FAF82B600F4E00F /* MarginAdjustable+Animation.swift */; };
11-
2249D6792304F82F00C3369F /* ViewControllerContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2249D6782304F82F00C3369F /* ViewControllerContainerView.swift */; };
1211
224FB69921153B440081D4DE /* CALayer+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 224FB69821153B440081D4DE /* CALayer+Utils.swift */; };
1312
225304622290C76E00A03ACF /* NSLayoutConstraint+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225304612290C76E00A03ACF /* NSLayoutConstraint+Utils.swift */; };
1413
225304662293000C00A03ACF /* KeyboardTrackingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225304652293000C00A03ACF /* KeyboardTrackingView.swift */; };
@@ -94,7 +93,6 @@
9493

9594
/* Begin PBXFileReference section */
9695
220655111FAF82B600F4E00F /* MarginAdjustable+Animation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MarginAdjustable+Animation.swift"; sourceTree = "<group>"; };
97-
2249D6782304F82F00C3369F /* ViewControllerContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewControllerContainerView.swift; sourceTree = "<group>"; };
9896
224FB69821153B440081D4DE /* CALayer+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+Utils.swift"; sourceTree = "<group>"; };
9997
225304612290C76E00A03ACF /* NSLayoutConstraint+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSLayoutConstraint+Utils.swift"; sourceTree = "<group>"; };
10098
225304652293000C00A03ACF /* KeyboardTrackingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardTrackingView.swift; sourceTree = "<group>"; };
@@ -316,7 +314,6 @@
316314
224FB69821153B440081D4DE /* CALayer+Utils.swift */,
317315
862C0CB01D5911C100D06168 /* NSBundle+Utils.swift */,
318316
225304612290C76E00A03ACF /* NSLayoutConstraint+Utils.swift */,
319-
2249D6782304F82F00C3369F /* ViewControllerContainerView.swift */,
320317
);
321318
name = Internal;
322319
sourceTree = "<group>";
@@ -520,7 +517,6 @@
520517
2298C2051EE47DC900E2DDC1 /* Weak.swift in Sources */,
521518
86BBA9001D5E040600FE8F16 /* PassthroughView.swift in Sources */,
522519
22DFC9181F00674E001B1CA1 /* PhysicsPanHandler.swift in Sources */,
523-
2249D6792304F82F00C3369F /* ViewControllerContainerView.swift in Sources */,
524520
227BA6D920BF224A00E5A843 /* SwiftMessagesSegue.swift in Sources */,
525521
220655121FAF82B600F4E00F /* MarginAdjustable+Animation.swift in Sources */,
526522
22E307FF1E74C5B100E35893 /* AccessibleMessage.swift in Sources */,

SwiftMessages/SwiftMessagesSegue.swift

+2-4
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ open class SwiftMessagesSegue: UIStoryboardSegue {
161161
`messageView`. This view provides configurable squircle (round) corners (see the parent
162162
class `CornerRoundingView`).
163163
*/
164-
public var containerView: CornerRoundingView = ViewControllerContainerView()
164+
public var containerView: CornerRoundingView = CornerRoundingView()
165165

166166
/**
167167
Specifies how the view controller's view is installed into the
@@ -309,8 +309,7 @@ extension SwiftMessagesSegue {
309309

310310
func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
311311
guard let segue = segue,
312-
let toView = transitionContext.view(forKey: .to),
313-
let toViewController = transitionContext.viewController(forKey: .to) else {
312+
let toView = transitionContext.view(forKey: .to) else {
314313
transitionContext.completeTransition(false)
315314
return
316315
}
@@ -322,7 +321,6 @@ extension SwiftMessagesSegue {
322321
// of Xcode 10 beta 2.
323322
segue.safeAreaWorkaroundViewController.view = segue.presenter.maskingView
324323
}
325-
(segue.containerView as! ViewControllerContainerView).viewController = toViewController
326324
completeTransition = transitionContext.completeTransition
327325
let transitionContainer = transitionContext.containerView
328326
toView.translatesAutoresizingMaskIntoConstraints = false

SwiftMessages/ViewControllerContainerView.swift

-37
This file was deleted.

0 commit comments

Comments
 (0)