chore: 示例代码适配 Swift6

l1Dan · Sep 30, 2024 · 7e9db3f · 7e9db3f
1 parent 83e5454
commit 7e9db3f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/Examples/NXNavigationExtensionDemo.xcodeproj/project.pbxproj b/Examples/NXNavigationExtensionDemo.xcodeproj/project.pbxproj
@@ -199,7 +199,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.l1dan.NXNavigationExtensionDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -227,7 +227,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.l1dan.NXNavigationExtensionDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Examples/NXNavigationExtensionDemo/Common/Extensions/Extensions.swift b/Examples/NXNavigationExtensionDemo/Common/Extensions/Extensions.swift
@@ -137,6 +137,7 @@ extension UIApplication {
 
 extension UIImage {
 
+    @MainActor
     static var navigationBarBackground: UIImage? {
         let statusBarHeight = UIApplication.shared.statusBarHeight
         return statusBarHeight <= 20.0 ? UIImage(named: "NavigationBarBackground64") : UIImage(named: "NavigationBarBackground88")

diff --git a/Examples/NXNavigationExtensionDemo/UIKit/Advanced/ViewController06_WebView.swift b/Examples/NXNavigationExtensionDemo/UIKit/Advanced/ViewController06_WebView.swift
@@ -99,20 +99,24 @@ class ViewController06_WebView: BaseViewController, WKNavigationDelegate {
         navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(clickAddButton(_:)))
 
         estimatedProgressObservation = webView.observe(\.self.estimatedProgress, options: .new) { [weak self] webView, value in
-            self?.progressView.alpha = 1.0
-            self?.progressView.setProgress(Float(webView.estimatedProgress), animated: true)
-
-            if webView.estimatedProgress >= 1.0 {
-                UIView.animate(withDuration: 0.3, delay: 0.3, options: .curveEaseOut) {
-                    self?.progressView.alpha = 0.0
-                } completion: { finished in
-                    self?.progressView.setProgress(0.0, animated: true)
+            Task { @MainActor in
+                self?.progressView.alpha = 1.0
+                self?.progressView.setProgress(Float(webView.estimatedProgress), animated: true)
+
+                if webView.estimatedProgress >= 1.0 {
+                    UIView.animate(withDuration: 0.3, delay: 0.3, options: .curveEaseOut) {
+                        self?.progressView.alpha = 0.0
+                    } completion: { finished in
+                        self?.progressView.setProgress(0.0, animated: true)
+                    }
                 }
             }
         }
 
         titleObservation = webView.observe(\.self.title, options: .new, changeHandler: { [weak self] webView, value in
-            self?.navigationItem.title = webView.title
+            Task { @MainActor in
+                self?.navigationItem.title = webView.title
+            }
         })
 
         if UIDevice.isPhoneDevice {

diff --git a/...NXNavigationExtensionDemo/UIKit/Advanced/ViewController09_ScrollChangeNavigationBar.swift b/...NXNavigationExtensionDemo/UIKit/Advanced/ViewController09_ScrollChangeNavigationBar.swift
@@ -7,6 +7,7 @@
 
 import UIKit
 
+@MainActor
 protocol FakeNavigationBarDelegate: AnyObject {
     func fakeNavigationBar(_ navigationBar: FakeNavigationBar, didClickNavigationItemWith itemType: FakeNavigationBar.ItemType)
 }
@@ -79,7 +80,7 @@ class FakeNavigationBar: UIView {
         backgroundColor = .clear
         titleLabel.alpha = 0.0
 
-        [backButton, titleLabel, rightButton].forEach(addSubview)
+        try? [backButton, titleLabel, rightButton].forEach(addSubview)
 
         backButton.isHidden = !UIDevice.isPhoneDevice
         NSLayoutConstraint.activate([

diff --git a/Examples/NXNavigationExtensionDemo/UIKit/Feature/Sliding/SlidingAnimationController.swift b/Examples/NXNavigationExtensionDemo/UIKit/Feature/Sliding/SlidingAnimationController.swift
@@ -7,6 +7,7 @@
 
 import UIKit
 
+@MainActor
 class SlidingAnimationController: NSObject {
     private lazy var backgroundColorView: UIVisualEffectView = {
         var effect = UIBlurEffect(style: .extraLight)

diff --git a/Examples/NXNavigationExtensionDemo/UIKit/Feature/Sliding/SlidingNavigationController.swift b/Examples/NXNavigationExtensionDemo/UIKit/Feature/Sliding/SlidingNavigationController.swift
@@ -7,6 +7,7 @@
 
 import UIKit
 
+@MainActor
 protocol SlidingInteractiveNavigation {
     var swipeDirectionAction: SlidingSwipeDirectionAction { get }
 }
@@ -17,6 +18,7 @@ enum SlidingSwipeDirectionAction {
 }
 
 
+@MainActor
 fileprivate class SlidingNavigationManager: NSObject {
     static let `default` = SlidingNavigationManager()