v1.5 JFToastView 支持iPhone14 Pro系列 灵动岛 (Toast Style Support iPhone14 …

…Pro + Dynamic Island)

Example/JFPopup/OCViewController.m

@@ -11,6 +11,7 @@
 
 @interface OCViewController ()
 @property (nonatomic, strong) UIButton *button;
+@property (nonatomic, strong) UIButton *button1;
 @end
 
 @implementation OCViewController
@@ -24,6 +25,15 @@ - (UIButton *)button {
     return _button;
 }
 
+- (UIButton *)button1 {
+    if (!_button1) {
+        _button1 = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_button1 setTitle:@"Dismiss" forState:UIControlStateNormal];
+        [_button1 setBackgroundColor:UIColor.blueColor];
+    }
+    return _button1;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.title = @"OC";
@@ -37,9 +47,19 @@ - (void)viewDidLoad {
     [self.view addSubview:self.button];
     self.button.frame = CGRectMake(50, 150, 150, 150);
     [self.button addTarget:self action:@selector(clickMe) forControlEvents:UIControlEventTouchUpInside];
+
+    [self.view addSubview:self.button1];
+    self.button1.frame = CGRectMake(50, 315, 150, 150);
+    [self.button1 addTarget:self action:@selector(clickMe1) forControlEvents:UIControlEventTouchUpInside];
     // Do any additional setup after loading the view.
 }
 
+- (void)clickMe1 {
+    [self dismissViewControllerAnimated:YES completion:^{
+
+    }];
+}
+
 - (void)clickMe {
     //暂时只兼容 这三种， 后续有issue 可以继续支持
     int random = arc4random() % 3;

Example/JFPopup/PopupInViewController.swift

@@ -79,6 +79,12 @@ class PopupInViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        var t: CGFloat = 0
+        if #available(iOS 11.0, *) {
+            t = UIApplication.shared.keyWindow?.safeAreaInsets.top ?? 0
+        }
+        print("safe area top: " + "\(t)")
         self.title = "Popup From UIView"
         self.view.backgroundColor = .white
         self.view.addSubview(self.scrollView)
@@ -101,7 +107,7 @@ class PopupInViewController: UIViewController {
 
         self.buildLabel(withTitle: "Toast Usage (v1.1 add)")
 
-        let btn6 = self.buildButton(withTitle: "普通toast,默认superview可以响应")
+        let btn6 = self.buildButton(withTitle: "默认toast,支持灵动岛否则默认剧中")
         btn6.addTarget(self, action: #selector(clickAction6), for: .touchUpInside)
 
         let btn7 = self.buildButton(withTitle: "自定义参数")
@@ -240,7 +246,7 @@ class PopupInViewController: UIViewController {
     }
 
     @objc func clickAction6() {
-        JFPopupView.popup.toast(hit: "普通toast,默认superview可以响应")
+        JFPopupView.popup.toast(hit: "默认toast,支持灵动岛")
     }
 
     @objc func clickAction8() {

Example/JFPopup/ViewController.swift

@@ -99,7 +99,9 @@ class ViewController: UIViewController {
     }
 
     @objc func clickAction2() {
-        self.navigationController?.pushViewController(OCViewController(), animated: true)
+//        self.navigationController?.pushViewController(OCViewController(), animated: true)
+        let vc = OCViewController()
+        self.present(vc, animated: true)
     }
 
     @objc func clickAction1() {