tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:rename protocol to delegate

Browse Source
This commit is contained in:
pengfei.zhou 2019-11-25 14:27:14 +08:00
parent 28f29d7396
commit cec878320f
11 changed files with 33 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iOS/Pod/Classes/Doric.h
View File

@ -22,5 +22,6 @@
#import "DoricUtil.h" #import "DoricUtil.h"
#import "DoricPanel.h" #import "DoricPanel.h"
#import "DoricJSLoaderManager.h" #import "DoricJSLoaderManager.h"
#import "DoricNavigatorProtocol.h" #import "DoricNavigatorDelegate.h"
#import "DoricNavBarDelegate.h"
#import "DoricViewController.h" #import "DoricViewController.h"

8
iOS/Pod/Classes/DoricContext.h
View File

@ -22,16 +22,16 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "DoricDriver.h" #import "DoricDriver.h"
#import "DoricNavigatorProtocol.h" #import "DoricNavigatorDelegate.h"
#import "DoricNavBarProtocol.h" #import "DoricNavBarDelegate.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class DoricRootNode; @class DoricRootNode;
@interface DoricContext : NSObject @interface DoricContext : NSObject
@property(nonatomic, weak) id <DoricNavigatorProtocol> navigator; @property(nonatomic, weak) id <DoricNavigatorDelegate> navigator;
@property(nonatomic, weak) id <DoricNavBarProtocol> navBar; @property(nonatomic, weak) id <DoricNavBarDelegate> navBar;
@property(nonatomic, strong) NSString *contextId; @property(nonatomic, strong) NSString *contextId;
@property(nonatomic, strong) DoricDriver *driver; @property(nonatomic, strong) DoricDriver *driver;
@property(nonatomic, strong) NSMutableDictionary *pluginInstanceMap; @property(nonatomic, strong) NSMutableDictionary *pluginInstanceMap;

2
iOS/Pod/Classes/DoricPanel.h
View File

@ -20,7 +20,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "DoricContext.h" #import "DoricContext.h"
#import "DoricNavigatorProtocol.h" #import "DoricNavigatorDelegate.h"
@interface DoricPanel : UIViewController @interface DoricPanel : UIViewController
@property(nonatomic, strong) DoricContext *doricContext; @property(nonatomic, strong) DoricContext *doricContext;

6
iOS/Pod/Classes/DoricViewController.h
View File

@ -18,9 +18,9 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "DoricNavigatorProtocol.h" #import "DoricNavigatorDelegate.h"
#import "DoricNavBarProtocol.h" #import "DoricNavBarDelegate.h"
@interface DoricViewController : UIViewController <DoricNavigatorProtocol, DoricNavBarProtocol> @interface DoricViewController : UIViewController <DoricNavigatorDelegate, DoricNavBarDelegate>
- (instancetype)initWithScheme:(NSString *)scheme alias:(NSString *)alias; - (instancetype)initWithScheme:(NSString *)scheme alias:(NSString *)alias;
@end @end

14
iOS/Pod/Classes/DoricViewController.m
View File

@ -48,24 +48,28 @@ - (instancetype)initWithScheme:(NSString *)scheme alias:(NSString *)alias {
return self; return self;
} }
- (void)push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated { - (void)doric_navigator_push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated {
DoricViewController *viewController = [[DoricViewController alloc] initWithScheme:scheme alias:alias]; DoricViewController *viewController = [[DoricViewController alloc] initWithScheme:scheme alias:alias];
[self.navigationController pushViewController:viewController animated:animated]; [self.navigationController pushViewController:viewController animated:animated];
} }
- (void)pop:(BOOL)animated { - (void)doric_navigator_pop:(BOOL)animated {
[self.navigationController popViewControllerAnimated:animated]; [self.navigationController popViewControllerAnimated:animated];
} }
- (BOOL)isHidden { - (BOOL)doric_navBar_isHidden {
return self.navigationController.navigationBarHidden; return self.navigationController.navigationBarHidden;
} }
- (void)setHidden:(BOOL)hidden { - (void)doric_navBar_setHidden:(BOOL)hidden {
[self.navigationController setNavigationBarHidden:hidden]; [self.navigationController setNavigationBarHidden:hidden];
} }
- (void)setBackgroundColor:(UIColor *)color { - (void)doric_navBar_setTitle:(NSString *)title {
self.title = title;
}
- (void)doric_navBar_setBackgroundColor:(UIColor *)color {
[self.navigationController.navigationBar setBackgroundColor:color]; [self.navigationController.navigationBar setBackgroundColor:color];
} }

10
iOS/Pod/Classes/NavBar/DoricNavBarProtocol.h → iOS/Pod/Classes/NavBar/DoricNavBarDelegate.h
View File

@ -20,12 +20,12 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@protocol DoricNavBarProtocol <NSObject> @protocol DoricNavBarDelegate <NSObject>
- (BOOL)isHidden; - (BOOL)doric_navBar_isHidden;
- (void)setHidden:(BOOL)hidden; - (void)doric_navBar_setHidden:(BOOL)hidden;
- (void)setTitle:(NSString *)title; - (void)doric_navBar_setTitle:(NSString *)title;
- (void)setBackgroundColor:(UIColor *)color; - (void)doric_navBar_setBackgroundColor:(UIColor *)color;
@end @end

10
iOS/Pod/Classes/Navigator/DoricDefaultNavigator.h
View File

@ -1,10 +0,0 @@
//
// Created by pengfei.zhou on 2019/11/25.
//
#import <Foundation/Foundation.h>
#import "DoricNavigatorProtocol.h"
@interface DoricDefaultNavigator : NSObject <DoricNavigatorProtocol>
- (instancetype)initWithNavigationController:(UINavigationController *)navigationController;
@end

29
iOS/Pod/Classes/Navigator/DoricDefaultNavigator.m
View File

@ -1,29 +0,0 @@
//
// Created by pengfei.zhou on 2019/11/25.
//
#import "DoricDefaultNavigator.h"
#import "DoricViewController.h"
@interface DoricDefaultNavigator ()
@property(nonatomic, weak) UINavigationController *navigationController;
@end
@implementation DoricDefaultNavigator
- (instancetype)initWithNavigationController:(UINavigationController *)navigationController {
if (self = [super init]) {
_navigationController = navigationController;
}
return self;
}
- (void)push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated {
DoricViewController *viewController = [[DoricViewController alloc] initWithScheme:scheme alias:alias];
[self.navigationController pushViewController:viewController animated:animated];
}
- (void)pop:(BOOL)animated {
[self.navigationController popViewControllerAnimated:animated];
}
@end

6
iOS/Pod/Classes/Navigator/DoricNavigatorProtocol.h → iOS/Pod/Classes/Navigator/DoricNavigatorDelegate.h
View File

@ -19,8 +19,8 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@protocol DoricNavigatorProtocol <NSObject> @protocol DoricNavigatorDelegate <NSObject>
- (void)push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated; - (void)doric_navigator_push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated;
- (void)pop:(BOOL)animated; - (void)doric_navigator_pop:(BOOL)animated;
@end @end

8
iOS/Pod/Classes/Plugin/DoricNavBarPlugin.m
View File

@ -24,7 +24,7 @@ @implementation DoricNavBarPlugin
- (void)isHidden:(NSDictionary *)param withPromise:(DoricPromise *)promise { - (void)isHidden:(NSDictionary *)param withPromise:(DoricPromise *)promise {
if (self.doricContext.navBar) { if (self.doricContext.navBar) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[promise resolve:@([self.doricContext.navBar isHidden])]; [promise resolve:@([self.doricContext.navBar doric_navBar_isHidden])];
}); });
} else { } else {
[promise reject:@"Not implement NavBar"]; [promise reject:@"Not implement NavBar"];
@ -34,7 +34,7 @@ - (void)isHidden:(NSDictionary *)param withPromise:(DoricPromise *)promise {
- (void)setHidden:(NSDictionary *)param withPromise:(DoricPromise *)promise { - (void)setHidden:(NSDictionary *)param withPromise:(DoricPromise *)promise {
if (self.doricContext.navBar) { if (self.doricContext.navBar) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[self.doricContext.navBar setHidden:[param[@"hidden"] boolValue]]; [self.doricContext.navBar doric_navBar_setHidden:[param[@"hidden"] boolValue]];
[promise resolve:nil]; [promise resolve:nil];
}); });
} else { } else {
@ -45,7 +45,7 @@ - (void)setHidden:(NSDictionary *)param withPromise:(DoricPromise *)promise {
- (void)setTitle:(NSDictionary *)param withPromise:(DoricPromise *)promise { - (void)setTitle:(NSDictionary *)param withPromise:(DoricPromise *)promise {
if (self.doricContext.navBar) { if (self.doricContext.navBar) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
[self.doricContext.navBar setTitle:param[@"title"]]; [self.doricContext.navBar doric_navBar_setTitle:param[@"title"]];
[promise resolve:nil]; [promise resolve:nil];
}); });
} else { } else {
@ -57,7 +57,7 @@ - (void)setBgColor:(NSDictionary *)param withPromise:(DoricPromise *)promise {
if (self.doricContext.navBar) { if (self.doricContext.navBar) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
UIColor *color = DoricColor(param[@"color"]); UIColor *color = DoricColor(param[@"color"]);
[self.doricContext.navBar setBackgroundColor:color]; [self.doricContext.navBar doric_navBar_setBackgroundColor:color];
[promise resolve:nil]; [promise resolve:nil];
}); });
} else { } else {

4
iOS/Pod/Classes/Plugin/DoricNavigatorPlugin.m
View File

@ -27,7 +27,7 @@ - (void)push:(NSDictionary *)params {
if (params[@"animated"]) { if (params[@"animated"]) {
animated = [params[@"animated"] boolValue]; animated = [params[@"animated"] boolValue];
} }
[self.doricContext.navigator push:params[@"scheme"] alias:params[@"alias"] animated:animated]; [self.doricContext.navigator doric_navigator_push:params[@"scheme"] alias:params[@"alias"] animated:animated];
}); });
} }
@ -37,7 +37,7 @@ - (void)pop:(NSDictionary *)params {
if (params[@"animated"]) { if (params[@"animated"]) {
animated = [params[@"animated"] boolValue]; animated = [params[@"animated"] boolValue];
} }
[self.doricContext.navigator pop:animated]; [self.doricContext.navigator doric_navigator_pop:animated];
}); });
} }
@end @end