From 066e47413172fa3aa5c2c5c13891cd436e642fd8 Mon Sep 17 00:00:00 2001 From: Jidong Chen <jidongchen93@gmail.com> Date: Thu, 27 Jun 2019 17:17:57 +0800 Subject: [PATCH] code style opt --- ios/Classes/1.0/FLBFlutterViewContainer.m | 1 - ios/Classes/1.5/FLB2Factory.h | 1 - ios/Classes/1.5/FLB2FlutterApplication.h | 1 - ios/Classes/1.5/FLB2FlutterEngine.h | 2 -- ios/Classes/1.5/FLB2FlutterViewContainer.h | 4 ---- ios/Classes/Boost/FLB2FlutterProvider.h | 4 ---- ios/Classes/Boost/FLB2Platform.h | 3 --- ios/Classes/Boost/FLBAbstractFactory.h | 4 ---- ios/Classes/Boost/FLBFlutterAppDelegate.h | 3 --- ios/Classes/Boost/FLBFlutterAppDelegate.m | 1 - ios/Classes/Boost/FLBFlutterApplicationInterface.h | 5 ----- ios/Classes/Boost/FLBFlutterContainer.h | 2 -- ios/Classes/Boost/FLBFlutterContainerManager.h | 2 -- ios/Classes/Boost/FLBPlatform.h | 2 -- ios/Classes/Boost/FlutterBoostPlugin.h | 8 ++++---- ios/Classes/Boost/FlutterBoostPlugin_private.h | 7 ++----- ios/Classes/Messaging/BoostMessageChannel.mm | 3 --- 17 files changed, 6 insertions(+), 47 deletions(-) diff --git a/ios/Classes/1.0/FLBFlutterViewContainer.m b/ios/Classes/1.0/FLBFlutterViewContainer.m index 0d7894a..b05379f 100755 --- a/ios/Classes/1.0/FLBFlutterViewContainer.m +++ b/ios/Classes/1.0/FLBFlutterViewContainer.m @@ -35,7 +35,6 @@ #define FLUTTER_VIEW FLUTTER_APP.flutterViewController.view #define FLUTTER_VC FLUTTER_APP.flutterViewController - @interface FLBFlutterViewContainer () @property (nonatomic,copy,readwrite) NSString *name; @property (nonatomic,strong,readwrite) NSDictionary *params; diff --git a/ios/Classes/1.5/FLB2Factory.h b/ios/Classes/1.5/FLB2Factory.h index 427e1b1..256836f 100644 --- a/ios/Classes/1.5/FLB2Factory.h +++ b/ios/Classes/1.5/FLB2Factory.h @@ -28,7 +28,6 @@ NS_ASSUME_NONNULL_BEGIN @interface FLB2Factory : NSObject<FLBAbstractFactory> - @end NS_ASSUME_NONNULL_END diff --git a/ios/Classes/1.5/FLB2FlutterApplication.h b/ios/Classes/1.5/FLB2FlutterApplication.h index fa4c70d..f688235 100755 --- a/ios/Classes/1.5/FLB2FlutterApplication.h +++ b/ios/Classes/1.5/FLB2FlutterApplication.h @@ -33,5 +33,4 @@ NS_ASSUME_NONNULL_BEGIN @interface FLB2FlutterApplication : NSObject<FLBFlutterApplicationInterface> @property (nonatomic,strong) id<FLB2Platform> platform; @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/1.5/FLB2FlutterEngine.h b/ios/Classes/1.5/FLB2FlutterEngine.h index a3b6798..c9107a7 100755 --- a/ios/Classes/1.5/FLB2FlutterEngine.h +++ b/ios/Classes/1.5/FLB2FlutterEngine.h @@ -26,8 +26,6 @@ #import "FLB2FlutterProvider.h" NS_ASSUME_NONNULL_BEGIN - @interface FLB2FlutterEngine : NSObject<FLB2FlutterProvider> @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/1.5/FLB2FlutterViewContainer.h b/ios/Classes/1.5/FLB2FlutterViewContainer.h index 11aac1a..1bbdb51 100755 --- a/ios/Classes/1.5/FLB2FlutterViewContainer.h +++ b/ios/Classes/1.5/FLB2FlutterViewContainer.h @@ -27,11 +27,7 @@ #import "FLBFlutterContainer.h" NS_ASSUME_NONNULL_BEGIN - @interface FLB2FlutterViewContainer : FlutterViewController<FLBFlutterContainer> - - (void)surfaceUpdated:(BOOL)appeared; - @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLB2FlutterProvider.h b/ios/Classes/Boost/FLB2FlutterProvider.h index f99ed8e..4deb31f 100755 --- a/ios/Classes/Boost/FLB2FlutterProvider.h +++ b/ios/Classes/Boost/FLB2FlutterProvider.h @@ -29,15 +29,11 @@ @class FlutterEngine; NS_ASSUME_NONNULL_BEGIN - - @protocol FLB2FlutterProvider <FLBFlutterViewProvider> - @required - (FlutterEngine *)engine; - (void)atacheToViewController:(FlutterViewController *)vc; - (void)detach; - (void)prepareEngineIfNeeded; @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLB2Platform.h b/ios/Classes/Boost/FLB2Platform.h index 001e604..b7f3582 100755 --- a/ios/Classes/Boost/FLB2Platform.h +++ b/ios/Classes/Boost/FLB2Platform.h @@ -26,9 +26,7 @@ #import "FLBPlatform.h" NS_ASSUME_NONNULL_BEGIN - @protocol FLB2Platform <FLBPlatform> - @optional - (BOOL)useBoost2; @@ -43,5 +41,4 @@ NS_ASSUME_NONNULL_BEGIN exts:(NSDictionary *)exts completion:(void (^)(BOOL finished))completion; @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLBAbstractFactory.h b/ios/Classes/Boost/FLBAbstractFactory.h index 8964bbe..c16d015 100644 --- a/ios/Classes/Boost/FLBAbstractFactory.h +++ b/ios/Classes/Boost/FLBAbstractFactory.h @@ -30,13 +30,9 @@ #import "FLBFlutterContainer.h" NS_ASSUME_NONNULL_BEGIN - @protocol FLBAbstractFactory <NSObject> - @required - (id<FLBFlutterApplicationInterface>)createApplication:(id<FLB2Platform>)platform; - (id<FLBFlutterContainer>)createFlutterContainer; - @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLBFlutterAppDelegate.h b/ios/Classes/Boost/FLBFlutterAppDelegate.h index 061a7e6..720080f 100755 --- a/ios/Classes/Boost/FLBFlutterAppDelegate.h +++ b/ios/Classes/Boost/FLBFlutterAppDelegate.h @@ -25,12 +25,9 @@ #import <Flutter/Flutter.h> NS_ASSUME_NONNULL_BEGIN - @interface FLBFlutterAppDelegate : FlutterAppDelegate // Returns the key window's rootViewController, if it's a FlutterViewController. // Otherwise, returns nil. - (FlutterViewController*)rootFlutterViewController; - @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLBFlutterAppDelegate.m b/ios/Classes/Boost/FLBFlutterAppDelegate.m index ab6e0bf..0561424 100755 --- a/ios/Classes/Boost/FLBFlutterAppDelegate.m +++ b/ios/Classes/Boost/FLBFlutterAppDelegate.m @@ -31,5 +31,4 @@ - (FlutterViewController*)rootFlutterViewController { return FlutterBoostPlugin.sharedInstance.application.flutterViewController; } - @end diff --git a/ios/Classes/Boost/FLBFlutterApplicationInterface.h b/ios/Classes/Boost/FLBFlutterApplicationInterface.h index 92e2ad8..b42fa4d 100644 --- a/ios/Classes/Boost/FLBFlutterApplicationInterface.h +++ b/ios/Classes/Boost/FLBFlutterApplicationInterface.h @@ -21,7 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ - #import <Foundation/Foundation.h> #import <Flutter/Flutter.h> #import "FLB2Platform.h" @@ -29,10 +28,8 @@ #import "FLB2FlutterProvider.h" #import "FLBFlutterContainer.h" - NS_ASSUME_NONNULL_BEGIN @protocol FLBFlutterApplicationInterface <NSObject> - @property (nonatomic,strong) id<FLB2Platform> platform; - (id<FLB2FlutterProvider>)flutterProvider; @@ -57,7 +54,6 @@ NS_ASSUME_NONNULL_BEGIN - (BOOL)isRunning; #pragma mark - handle messages - - (void)close:(NSString *)uid result:(NSDictionary *)result exts:(NSDictionary *)exts @@ -79,7 +75,6 @@ NS_ASSUME_NONNULL_BEGIN uniqueId:(NSString *)uniqueId; @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLBFlutterContainer.h b/ios/Classes/Boost/FLBFlutterContainer.h index 60e63c1..7522566 100644 --- a/ios/Classes/Boost/FLBFlutterContainer.h +++ b/ios/Classes/Boost/FLBFlutterContainer.h @@ -26,12 +26,10 @@ #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN - @protocol FLBFlutterContainer <NSObject> - (NSString *)name; - (NSDictionary *)params; - (NSString *)uniqueIDString; - (void)setName:(NSString *)name params:(NSDictionary *)params; @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLBFlutterContainerManager.h b/ios/Classes/Boost/FLBFlutterContainerManager.h index 5058ff7..3199b87 100755 --- a/ios/Classes/Boost/FLBFlutterContainerManager.h +++ b/ios/Classes/Boost/FLBFlutterContainerManager.h @@ -26,7 +26,6 @@ #import "FLBFlutterContainer.h" NS_ASSUME_NONNULL_BEGIN - @interface FLBFlutterContainerManager : NSObject - (NSString *)peak; @@ -35,5 +34,4 @@ NS_ASSUME_NONNULL_BEGIN - (BOOL)contains:(id<FLBFlutterContainer>)vc; @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FLBPlatform.h b/ios/Classes/Boost/FLBPlatform.h index c5c7e42..c440d4b 100755 --- a/ios/Classes/Boost/FLBPlatform.h +++ b/ios/Classes/Boost/FLBPlatform.h @@ -25,7 +25,6 @@ #import <Foundation/Foundation.h> NS_ASSUME_NONNULL_BEGIN - @protocol FLBPlatform <NSObject> @required @@ -39,5 +38,4 @@ NS_ASSUME_NONNULL_BEGIN params:(NSDictionary *)params completion:(void (^)(BOOL finished))completion; @end - NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Boost/FlutterBoostPlugin.h b/ios/Classes/Boost/FlutterBoostPlugin.h index 6c53aa8..60b1933 100755 --- a/ios/Classes/Boost/FlutterBoostPlugin.h +++ b/ios/Classes/Boost/FlutterBoostPlugin.h @@ -27,16 +27,17 @@ #import "FLBTypes.h" @interface FlutterBoostPlugin : NSObject<FlutterPlugin> - - #pragma mark - Initializer + (instancetype)sharedInstance; - (void)startFlutterWithPlatform:(id<FLB2Platform>)platform - onStart:(void (^)(id<FlutterBinaryMessenger, FlutterTextureRegistry, FlutterPluginRegistry> engine))callback; + onStart:(void (^)(id<FlutterBinaryMessenger, + FlutterTextureRegistry, + FlutterPluginRegistry> engine))callback; #pragma mark - Some properties. - (BOOL)isRunning; + - (FlutterViewController *)currentViewController; #pragma mark - broadcast event to/from flutter @@ -45,5 +46,4 @@ - (FLBVoidCallback)addEventListener:(FLBEventListener)listner forName:(NSString *)name; - @end diff --git a/ios/Classes/Boost/FlutterBoostPlugin_private.h b/ios/Classes/Boost/FlutterBoostPlugin_private.h index 1225fcf..838fa40 100644 --- a/ios/Classes/Boost/FlutterBoostPlugin_private.h +++ b/ios/Classes/Boost/FlutterBoostPlugin_private.h @@ -30,13 +30,10 @@ id<FLBFlutterApplicationInterface> _application; id<FLBAbstractFactory> _factory; } - -- (id<FLBFlutterApplicationInterface>)application; -- (id<FLBAbstractFactory>)factory; - @property (nonatomic,strong) FlutterMethodChannel *methodChannel; @property (nonatomic,copy) NSString *fPageId; @property (nonatomic,copy) NSString *fPagename; @property (nonatomic,strong) NSDictionary *fParams; - +- (id<FLBFlutterApplicationInterface>)application; +- (id<FLBAbstractFactory>)factory; @end diff --git a/ios/Classes/Messaging/BoostMessageChannel.mm b/ios/Classes/Messaging/BoostMessageChannel.mm index 49e531f..687940a 100755 --- a/ios/Classes/Messaging/BoostMessageChannel.mm +++ b/ios/Classes/Messaging/BoostMessageChannel.mm @@ -21,12 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ - - #import "BoostMessageChannel.h" #import "FlutterBoostPlugin_private.h" - @implementation BoostMessageChannel + (NSMutableDictionary *)lists{ -- 2.26.2