prefs: 代码优化

Author: l1Dan

NXNavigationExtension/Core/NXNavigationConfiguration.h

@@ -96,7 +96,7 @@ typedef void (^_Nullable NXViewControllerPrepareConfigurationCallback)(__kindof
 @property (nonatomic, assign) BOOL useBlurNavigationBar;
 
 /// 过期：是否禁用边缘滑动返回手势；默认 NO
-/// 使用 `NXNavigationTransitionDelegate` 代理方法 `nx_navigationController:transitionViewController:navigationBackAction`替代
+/// 使用 `NXNavigationTransitionDelegate` 代理方法 `nx_navigationTransition:navigationBackAction:`替代
 /// SwiftUI 使用 `useNXNavigationView(onBackActionHandler:)` 替代
 @property (nonatomic, assign) BOOL disableInteractivePopGesture API_DEPRECATED("No longer supported.", ios(2.0, 2.0));
 

NXNavigationExtension/Core/UINavigationController+NXNavigationExtension.h

@@ -64,28 +64,24 @@ typedef NS_ENUM(NSUInteger, NXNavigationBackAction) {
 };
 
 
-typedef void (^NXNavigationTransitionStateHandler) (UINavigationController *, UIViewController *, NXNavigationTransitionState);
-typedef BOOL (^NXNavigationBackActionHandler) (UINavigationController *, UIViewController *, NXNavigationBackAction);
+typedef void (^NXNavigationTransitionStateHandler) (UIViewController *, NXNavigationTransitionState);
+typedef BOOL (^NXNavigationBackActionHandler) (UIViewController *, NXNavigationBackAction);
 
 @protocol NXNavigationTransitionDelegate <NSObject>
 
 @optional
 
 /// 视图控制器转场状态
-/// @param navigationController 当前导航控制器
-/// @param viewController 转场视图控制器
+/// @param transitionViewController 转场视图控制器
 /// @param state 视图控制器转场状态
-- (void)nx_navigationController:(__kindof UINavigationController *)navigationController
-       transitionViewController:(__kindof UIViewController *)viewController
+- (void)nx_navigationTransition:(__kindof UIViewController *)transitionViewController
       navigationTransitionState:(NXNavigationTransitionState)state;
 
 /// 拦截视图控制器返回操作
-/// @param navigationController 当前导航控制器
-/// @param viewController 转场视图控制器
+/// @param transitionViewController 转场视图控制器
 /// @param action 试图控制器返回事件
 /// @return `YES` 表示继续返回操作；`NO` 表示中断返回操作
-- (BOOL)nx_navigationController:(__kindof UINavigationController *)navigationController
-       transitionViewController:(__kindof UIViewController *)viewController
+- (BOOL)nx_navigationTransition:(__kindof UIViewController *)transitionViewController
            navigationBackAction:(NXNavigationBackAction)action;
 
 @end

NXNavigationExtension/Core/UIViewController+NXNavigationExtension.h

@@ -90,7 +90,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign, readonly) BOOL nx_useBlurNavigationBar;
 
 /// 过期：是否禁用边缘滑动返回手势；默认 NO
-/// 使用 `NXNavigationTransitionDelegate` 代理方法 `nx_navigationController:transitionViewController:navigationBackAction`替代
+/// 使用 `NXNavigationTransitionDelegate` 代理方法 `nx_navigationTransition:navigationBackAction:`替代
 /// SwiftUI 使用 `useNXNavigationView(onBackActionHandler:)` 替代
 @property (nonatomic, assign, readonly) BOOL nx_disableInteractivePopGesture API_DEPRECATED("No longer supported.)", ios(2.0, 2.0));
 

NXNavigationExtension/Private/NXNavigationExtensionInternal.m

@@ -489,16 +489,14 @@ - (BOOL)nx_viewController:(__kindof UIViewController *)currentViewController
 - (BOOL)nx_preparePopViewController:(__kindof UIViewController *)currentViewController
           destinationViewController:(__kindof UIViewController *)destinationViewController
                navigationBackAction:(NXNavigationBackAction)action {
-    if ([currentViewController.nx_navigationTransitionDelegate respondsToSelector:@selector(nx_navigationController:transitionViewController:navigationBackAction:)]) {
-        return [currentViewController.nx_navigationTransitionDelegate nx_navigationController:self
-                                                                     transitionViewController:destinationViewController
+    if ([currentViewController.nx_navigationTransitionDelegate respondsToSelector:@selector(nx_navigationTransition:navigationBackAction:)]) {
+        return [currentViewController.nx_navigationTransitionDelegate nx_navigationTransition:destinationViewController 
                                                                          navigationBackAction:action];
-    } else if ([currentViewController respondsToSelector:@selector(nx_navigationController:transitionViewController:navigationBackAction:)]) {
-        return [(id<NXNavigationTransitionDelegate>)currentViewController nx_navigationController:self
-                                                                         transitionViewController:destinationViewController
+    } else if ([currentViewController respondsToSelector:@selector(nx_navigationTransition:navigationBackAction:)]) {
+        return [(id<NXNavigationTransitionDelegate>)currentViewController nx_navigationTransition:destinationViewController
                                                                              navigationBackAction:action];
     } else if (currentViewController.navigationItem.nx_backActionHandler) {
-        return currentViewController.navigationItem.nx_backActionHandler(self, destinationViewController, action);
+        return currentViewController.navigationItem.nx_backActionHandler(destinationViewController, action);
     }
     return YES;
 }
@@ -532,10 +530,10 @@ - (void)nx_transitionViewController:(__kindof UIViewController *)appearingViewCo
           navigationTransitionState:(NXNavigationTransitionState)state {
     appearingViewController.nx_navigationTransitionState = state;
 
-    if ([appearingViewController respondsToSelector:@selector(nx_navigationController:transitionViewController:navigationTransitionState:)]) {
-        [(id<NXNavigationTransitionDelegate>)appearingViewController nx_navigationController:self transitionViewController:appearingViewController navigationTransitionState:state];
+    if ([appearingViewController respondsToSelector:@selector(nx_navigationTransition:navigationTransitionState:)]) {
+        [(id<NXNavigationTransitionDelegate>)appearingViewController nx_navigationTransition:appearingViewController navigationTransitionState:state];
     } else if (appearingViewController.navigationItem.nx_transitionStateHandler) {
-        appearingViewController.navigationItem.nx_transitionStateHandler(self, appearingViewController, state);
+        appearingViewController.navigationItem.nx_transitionStateHandler(appearingViewController, state);
     }
 }
 

NXNavigationExtension/Support SwiftUI/NXNavigationVirtualWrapperView.m

@@ -26,8 +26,7 @@
 
 @implementation NXNavigationVirtualWrapperView
 
-- (BOOL)nx_navigationController:(__kindof UINavigationController *)navigationController
-       transitionViewController:(__kindof UIViewController *)viewController
+- (BOOL)nx_navigationTransition:(__kindof UIViewController *)transitionViewController
            navigationBackAction:(NXNavigationBackAction)action {
     return YES;
 }

NXNavigationExtensionSwiftUI/Core/NXNavigationWrapperView.swift

@@ -47,10 +47,9 @@ public class NXNavigationVirtualView: NXNavigationVirtualWrapperView {
     }
 
     /// 重写基类的代理方法。
-    public override func nx_navigationController(_ navigationController: UINavigationController,
-                                                 transitionViewController: UIViewController,
-                                                 navigationBackAction: NXNavigationBackAction) -> Bool {
-        return self.onBackActionHandler?(navigationBackAction) ?? true
+    public override func nx_navigationTransition(_ transitionViewController: UIViewController, 
+                                                 navigationBackAction action: NXNavigationBackAction) -> Bool {
+        return self.onBackActionHandler?(action) ?? true
     }
 
     /// 重写基类的查找规则。