From 6bf8c541087e5001c99d2305835d826af8f0efa3 Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 15:12:42 +0800 Subject: [PATCH 1/8] feat: add 'loadAssetHtmlFile' and 'loadLocalHtmlFile' methods in android --- .../webviewflutter/FlutterWebView.java | 18 +++++++++++++++++ .../lib/platform_interface.dart | 20 +++++++++++++++++++ .../lib/src/webview_method_channel.dart | 6 ++++++ .../webview_flutter/lib/webview_flutter.dart | 18 +++++++++++++++++ 4 files changed, 62 insertions(+) diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java index f4bc8c32b3d0..8b71eb19c3a7 100644 --- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java +++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java @@ -122,6 +122,12 @@ public void onMethodCall(MethodCall methodCall, Result result) { case "loadUrl": loadUrl(methodCall, result); break; + case "loadAssetHtmlFile": + loadAssetHtmlFile(methodCall, result); + break; + case "loadLocalHtmlFile": + loadLocalHtmlFile(methodCall, result); + break; case "updateSettings": updateSettings(methodCall, result); break; @@ -175,6 +181,18 @@ private void loadUrl(MethodCall methodCall, Result result) { result.success(null); } + private void loadAssetHtmlFile(MethodCall methodCall, Result result) { + String url = (String) methodCall.arguments; + webView.loadUrl("file:///android_asset/flutter_assets/" + url); + result.success(null); + } + + private void loadLocalHtmlFile(MethodCall methodCall, Result result) { + String url = (String) methodCall.arguments; + webView.loadUrl("file:///" + url); + result.success(null); + } + private void canGoBack(Result result) { result.success(webView.canGoBack()); } diff --git a/packages/webview_flutter/lib/platform_interface.dart b/packages/webview_flutter/lib/platform_interface.dart index aaf63c24f08a..77b8cc54c6d8 100644 --- a/packages/webview_flutter/lib/platform_interface.dart +++ b/packages/webview_flutter/lib/platform_interface.dart @@ -64,6 +64,26 @@ abstract class WebViewPlatformController { "WebView loadUrl is not implemented on the current platform"); } + /// Load html file from local path + /// + /// `url` must not be null. + /// + /// Throws an ArgumentError if `url` is not a valid URL string. + Future loadAssetHtmlFile(String url) { + throw UnimplementedError( + "WebView loadAssetHtmlFile is not implemented on the current platform"); + } + + /// Load html file from local path + /// + /// `url` must not be null. + /// + /// Throws an ArgumentError if `url` is not a valid URL string. + Future loadLocalHtmlFile(String url) { + throw UnimplementedError( + "WebView loadLocalHtmlFile is not implemented on the current platform"); + } + /// Updates the webview settings. /// /// Any non null field in `settings` will be set as the new setting value. diff --git a/packages/webview_flutter/lib/src/webview_method_channel.dart b/packages/webview_flutter/lib/src/webview_method_channel.dart index 03d392ef5f8b..f329ba79e702 100644 --- a/packages/webview_flutter/lib/src/webview_method_channel.dart +++ b/packages/webview_flutter/lib/src/webview_method_channel.dart @@ -60,6 +60,12 @@ class MethodChannelWebViewPlatform implements WebViewPlatformController { }); } + @override + Future loadAssetHtmlFile(String url) => _channel.invokeMethod('loadAssetHtmlFile', url); + + @override + Future loadLocalHtmlFile(String url) => _channel.invokeMethod('loadLocalHtmlFile', url); + @override Future currentUrl() => _channel.invokeMethod('currentUrl'); diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart index a91a9ac827ae..9e92c86670e5 100644 --- a/packages/webview_flutter/lib/webview_flutter.dart +++ b/packages/webview_flutter/lib/webview_flutter.dart @@ -531,6 +531,24 @@ class WebViewController { return _webViewPlatformController.loadUrl(url, headers); } + /// Load html file from assets + /// + /// `url` must not be null. + Future loadAssetHtmlFile(String url) async { + assert(url != null); + _validateUrlString(url); + return _webViewPlatformController.loadAssetHtmlFile(url); + } + + /// Load html file from local path + /// + /// `url` must not be null. + Future loadLocalHtmlFile(String url) async { + assert(url != null); + _validateUrlString(url); + return _webViewPlatformController.loadLocalHtmlFile(url); + } + /// Accessor to the current URL that the WebView is displaying. /// /// If [WebView.initialUrl] was never specified, returns `null`. From 87399a11ef98d3fe87d2f6339e9b792e601e3592 Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 15:19:54 +0800 Subject: [PATCH 2/8] fix: remove validate logic of loadLocalHtmlFile --- packages/webview_flutter/lib/webview_flutter.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart index 9e92c86670e5..2dbc9ce52027 100644 --- a/packages/webview_flutter/lib/webview_flutter.dart +++ b/packages/webview_flutter/lib/webview_flutter.dart @@ -545,7 +545,6 @@ class WebViewController { /// `url` must not be null. Future loadLocalHtmlFile(String url) async { assert(url != null); - _validateUrlString(url); return _webViewPlatformController.loadLocalHtmlFile(url); } From 8262f50598c9e98fccfc775881f54f17445cc6f2 Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 15:25:03 +0800 Subject: [PATCH 3/8] fix: remove validate logic of loadAssetHtmlFile --- packages/webview_flutter/lib/webview_flutter.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/webview_flutter/lib/webview_flutter.dart b/packages/webview_flutter/lib/webview_flutter.dart index 2dbc9ce52027..6a76ac2b0c07 100644 --- a/packages/webview_flutter/lib/webview_flutter.dart +++ b/packages/webview_flutter/lib/webview_flutter.dart @@ -536,7 +536,6 @@ class WebViewController { /// `url` must not be null. Future loadAssetHtmlFile(String url) async { assert(url != null); - _validateUrlString(url); return _webViewPlatformController.loadAssetHtmlFile(url); } From fb524fbbd770e8d817d7e62d837a14f1eefabc77 Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 15:58:23 +0800 Subject: [PATCH 4/8] feat: add iOS WKWebView loadAssetHtmlFile method --- .../ios/Classes/FlutterWebView.m | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m index 5e3456d50e49..3acdb69830a4 100644 --- a/packages/webview_flutter/ios/Classes/FlutterWebView.m +++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m @@ -128,6 +128,10 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { [self onUpdateSettings:call result:result]; } else if ([[call method] isEqualToString:@"loadUrl"]) { [self onLoadUrl:call result:result]; + } else if ([[call method] isEqualToString:@"loadAssetHtmlFile"]) { + [self onLoadAssetHtmlFile:call result:result]; + } else if ([[call method] isEqualToString:@"loadLocalHtmlFile"]) { + [self onLoadLocalHtmlFile:call result:result]; } else if ([[call method] isEqualToString:@"canGoBack"]) { [self onCanGoBack:call result:result]; } else if ([[call method] isEqualToString:@"canGoForward"]) { @@ -175,6 +179,17 @@ - (void)onLoadUrl:(FlutterMethodCall*)call result:(FlutterResult)result { } } +- (void)onLoadAssetHtmlFile:(FlutterMethodCall*)call result:(FlutterResult)result { + NSString* url = [call arguments]; + if (![self loadAssetHtmlFile:url]) { + result([FlutterError errorWithCode:@"loadAssetHtmlFile_failed" + message:@"Failed parsing the URL" + details:[NSString stringWithFormat:@"URL was: '%@'", url]]); + } else { + result(nil); + } +} + - (void)onCanGoBack:(FlutterMethodCall*)call result:(FlutterResult)result { BOOL canGoBack = [_webView canGoBack]; result([NSNumber numberWithBool:canGoBack]); @@ -374,6 +389,31 @@ - (bool)loadUrl:(NSString*)url withHeaders:(NSDictionary*) return true; } +- (bool)loadAssetHtmlFile:(NSString*)url { + NSArray* array = [url componentsSeparatedByString:@"?"]; + NSString* pathString = [array objectAtIndex:0]; + NSLog(@"%@%@", @"pathString: ", pathString); + NSString* key = [_registrar lookupKeyForAsset:pathString]; + NSURL* baseURL = [[NSBundle mainBundle] URLForResource:key withExtension:nil]; + if (!baseURL) { + return false; + } + NSURL* newUrl = baseURL; + if ([array count] > 1) { + NSString* queryString = [array objectAtIndex:1]; + NSLog(@"%@%@", @"queryString: ", queryString); + NSString* queryPart = [NSString stringWithFormat:@"%@%@", @"?", queryString]; + NSLog(@"%@%@", @"queryPart: ", queryPart); + newUrl = [NSURL URLWithString:queryPart relativeToURL:baseURL]; + } + if (@available(iOS 9.0, *)) { + [_webView loadFileURL:newUrl allowingReadAccessToURL:[NSURL URLWithString:@"file:///"]]; + } else { + return false; + } + return true; +} + - (void)registerJavaScriptChannels:(NSSet*)channelNames controller:(WKUserContentController*)userContentController { for (NSString* channelName in channelNames) { From 8330bd26a11e0e3024129b367a0b88fcc4692ff3 Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 20:37:15 +0800 Subject: [PATCH 5/8] feat: complete iOS loadHtml file code --- .../ios/Classes/FLTWebViewFlutterPlugin.m | 2 +- .../ios/Classes/FlutterWebView.h | 4 +- .../ios/Classes/FlutterWebView.m | 53 ++++++++++++++++--- 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m b/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m index a131263c9a92..6f20a249a171 100644 --- a/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m +++ b/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m @@ -10,7 +10,7 @@ @implementation FLTWebViewFlutterPlugin + (void)registerWithRegistrar:(NSObject*)registrar { FLTWebViewFactory* webviewFactory = - [[FLTWebViewFactory alloc] initWithMessenger:registrar.messenger]; + [[FLTWebViewFactory alloc] initWithRegistrar:registrar]; [registrar registerViewFactory:webviewFactory withId:@"plugins.flutter.io/webview"]; [FLTCookieManager registerWithRegistrar:registrar]; } diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.h b/packages/webview_flutter/ios/Classes/FlutterWebView.h index 875551d3535d..f3c196b88db3 100644 --- a/packages/webview_flutter/ios/Classes/FlutterWebView.h +++ b/packages/webview_flutter/ios/Classes/FlutterWebView.h @@ -12,13 +12,13 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId arguments:(id _Nullable)args - binaryMessenger:(NSObject*)messenger; + registrar:(NSObject*)registrar; - (UIView*)view; @end @interface FLTWebViewFactory : NSObject -- (instancetype)initWithMessenger:(NSObject*)messenger; +- (instancetype)initWithRegistrar:(NSObject*)registrar; @end /** diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m index 3acdb69830a4..e6bacdb2dac2 100644 --- a/packages/webview_flutter/ios/Classes/FlutterWebView.m +++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m @@ -8,12 +8,14 @@ @implementation FLTWebViewFactory { NSObject* _messenger; + NSObject* _registrar; } -- (instancetype)initWithMessenger:(NSObject*)messenger { +- (instancetype)initWithRegistrar:(NSObject*)registrar { self = [super init]; if (self) { - _messenger = messenger; + _registrar = registrar; + _messenger = registrar.messenger; } return self; } @@ -28,7 +30,7 @@ - (instancetype)initWithMessenger:(NSObject*)messenger { FLTWebViewController* webviewController = [[FLTWebViewController alloc] initWithFrame:frame viewIdentifier:viewId arguments:args - binaryMessenger:_messenger]; + registrar:_registrar]; return webviewController; } @@ -64,17 +66,18 @@ @implementation FLTWebViewController { // The set of registered JavaScript channel names. NSMutableSet* _javaScriptChannelNames; FLTWKNavigationDelegate* _navigationDelegate; + NSObject* _registrar; } - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId arguments:(id _Nullable)args - binaryMessenger:(NSObject*)messenger { + registrar:(nonnull NSObject *)registrar { if (self = [super init]) { _viewId = viewId; - + _registrar = registrar; NSString* channelName = [NSString stringWithFormat:@"plugins.flutter.io/webview_%lld", viewId]; - _channel = [FlutterMethodChannel methodChannelWithName:channelName binaryMessenger:messenger]; + _channel = [FlutterMethodChannel methodChannelWithName:channelName binaryMessenger:_registrar.messenger]; _javaScriptChannelNames = [[NSMutableSet alloc] init]; WKUserContentController* userContentController = [[WKUserContentController alloc] init]; @@ -190,6 +193,17 @@ - (void)onLoadAssetHtmlFile:(FlutterMethodCall*)call result:(FlutterResult)resul } } +- (void)onLoadLocalHtmlFile:(FlutterMethodCall*)call result:(FlutterResult)result { + NSString* url = [call arguments]; + if (![self loadLocalHtmlFile:url]) { + result([FlutterError errorWithCode:@"loadAssetHtmlFile_failed" + message:@"Failed parsing the URL" + details:[NSString stringWithFormat:@"URL was: '%@'", url]]); + } else { + result(nil); + } +} + - (void)onCanGoBack:(FlutterMethodCall*)call result:(FlutterResult)result { BOOL canGoBack = [_webView canGoBack]; result([NSNumber numberWithBool:canGoBack]); @@ -414,6 +428,33 @@ - (bool)loadAssetHtmlFile:(NSString*)url { return true; } +- (bool)loadLocalHtmlFile:(NSString*)url { + NSArray* array = [url componentsSeparatedByString:@"?"]; + NSString* pathString = [array objectAtIndex:0]; + NSLog(@"%@%@", @"pathString: ", pathString); + NSString* key = [_registrar lookupKeyForAsset:pathString]; + NSURL* baseURL = [[NSBundle mainBundle] URLForResource:key withExtension:nil]; + if (!baseURL) { + [_webView loadFileURL:[NSURL fileURLWithPath:pathString] allowingReadAccessToURL:[NSURL fileURLWithPath:pathString]]; + return true; + + } + NSURL* newUrl = baseURL; + if ([array count] > 1) { + NSString* queryString = [array objectAtIndex:1]; + NSLog(@"%@%@", @"queryString: ", queryString); + NSString* queryPart = [NSString stringWithFormat:@"%@%@", @"?", queryString]; + NSLog(@"%@%@", @"queryPart: ", queryPart); + newUrl = [NSURL URLWithString:queryPart relativeToURL:baseURL]; + } + if (@available(iOS 9.0, *)) { + [_webView loadFileURL:newUrl allowingReadAccessToURL:[NSURL URLWithString:@"file:///"]]; + } else { + return false; + } + return true; +} + - (void)registerJavaScriptChannels:(NSSet*)channelNames controller:(WKUserContentController*)userContentController { for (NSString* channelName in channelNames) { From 27b4ab1e72a26dcb76a145c697edc8b0d5dc6027 Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 21:56:47 +0800 Subject: [PATCH 6/8] fix: Cirrus CI format error --- packages/webview_flutter/ios/Classes/FlutterWebView.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m index e6bacdb2dac2..51434c879464 100644 --- a/packages/webview_flutter/ios/Classes/FlutterWebView.m +++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m @@ -11,7 +11,7 @@ @implementation FLTWebViewFactory { NSObject* _registrar; } -- (instancetype)initWithRegistrar:(NSObject*)registrar { +- (instancetype)initWithRegistrar:(NSObject *)registrar { self = [super init]; if (self) { _registrar = registrar; From 0833f9c31fb71e87986f6f4afd293bf18cec0cca Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 22:31:33 +0800 Subject: [PATCH 7/8] fix: cirrus-ci format error --- .../ios/Classes/FLTWebViewFlutterPlugin.m | 3 +-- .../ios/Classes/FlutterWebView.h | 2 +- .../ios/Classes/FlutterWebView.m | 23 ++++++++++--------- .../lib/src/webview_method_channel.dart | 6 +++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m b/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m index 6f20a249a171..33c29376f267 100644 --- a/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m +++ b/packages/webview_flutter/ios/Classes/FLTWebViewFlutterPlugin.m @@ -9,8 +9,7 @@ @implementation FLTWebViewFlutterPlugin + (void)registerWithRegistrar:(NSObject*)registrar { - FLTWebViewFactory* webviewFactory = - [[FLTWebViewFactory alloc] initWithRegistrar:registrar]; + FLTWebViewFactory* webviewFactory = [[FLTWebViewFactory alloc] initWithRegistrar:registrar]; [registrar registerViewFactory:webviewFactory withId:@"plugins.flutter.io/webview"]; [FLTCookieManager registerWithRegistrar:registrar]; } diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.h b/packages/webview_flutter/ios/Classes/FlutterWebView.h index f3c196b88db3..8a0205d28c1b 100644 --- a/packages/webview_flutter/ios/Classes/FlutterWebView.h +++ b/packages/webview_flutter/ios/Classes/FlutterWebView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId arguments:(id _Nullable)args - registrar:(NSObject*)registrar; + registrar:(NSObject*)registrar; - (UIView*)view; @end diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m index 51434c879464..999e9ebbdda1 100644 --- a/packages/webview_flutter/ios/Classes/FlutterWebView.m +++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m @@ -11,7 +11,7 @@ @implementation FLTWebViewFactory { NSObject* _registrar; } -- (instancetype)initWithRegistrar:(NSObject *)registrar { +- (instancetype)initWithRegistrar:(NSObject*)registrar { self = [super init]; if (self) { _registrar = registrar; @@ -30,7 +30,7 @@ - (instancetype)initWithRegistrar:(NSObject *)registrar FLTWebViewController* webviewController = [[FLTWebViewController alloc] initWithFrame:frame viewIdentifier:viewId arguments:args - registrar:_registrar]; + registrar:_registrar]; return webviewController; } @@ -72,12 +72,13 @@ @implementation FLTWebViewController { - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId arguments:(id _Nullable)args - registrar:(nonnull NSObject *)registrar { + registrar:(nonnull NSObject *)registrar { if (self = [super init]) { _viewId = viewId; _registrar = registrar; NSString* channelName = [NSString stringWithFormat:@"plugins.flutter.io/webview_%lld", viewId]; - _channel = [FlutterMethodChannel methodChannelWithName:channelName binaryMessenger:_registrar.messenger]; + _channel = [FlutterMethodChannel methodChannelWithName:channelName + binaryMessenger:_registrar.messenger]; _javaScriptChannelNames = [[NSMutableSet alloc] init]; WKUserContentController* userContentController = [[WKUserContentController alloc] init]; @@ -133,7 +134,7 @@ - (void)onMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { [self onLoadUrl:call result:result]; } else if ([[call method] isEqualToString:@"loadAssetHtmlFile"]) { [self onLoadAssetHtmlFile:call result:result]; - } else if ([[call method] isEqualToString:@"loadLocalHtmlFile"]) { + } else if ([[call method] isEqualToString:@"loadLocalHtmlFile"]) { [self onLoadLocalHtmlFile:call result:result]; } else if ([[call method] isEqualToString:@"canGoBack"]) { [self onCanGoBack:call result:result]; @@ -410,8 +411,8 @@ - (bool)loadAssetHtmlFile:(NSString*)url { NSString* key = [_registrar lookupKeyForAsset:pathString]; NSURL* baseURL = [[NSBundle mainBundle] URLForResource:key withExtension:nil]; if (!baseURL) { - return false; - } + return false; + } NSURL* newUrl = baseURL; if ([array count] > 1) { NSString* queryString = [array objectAtIndex:1]; @@ -435,10 +436,10 @@ - (bool)loadLocalHtmlFile:(NSString*)url { NSString* key = [_registrar lookupKeyForAsset:pathString]; NSURL* baseURL = [[NSBundle mainBundle] URLForResource:key withExtension:nil]; if (!baseURL) { - [_webView loadFileURL:[NSURL fileURLWithPath:pathString] allowingReadAccessToURL:[NSURL fileURLWithPath:pathString]]; - return true; - - } + [_webView loadFileURL:[NSURL fileURLWithPath:pathString] + allowingReadAccessToURL:[NSURL fileURLWithPath:pathString]]; + return true; + } NSURL* newUrl = baseURL; if ([array count] > 1) { NSString* queryString = [array objectAtIndex:1]; diff --git a/packages/webview_flutter/lib/src/webview_method_channel.dart b/packages/webview_flutter/lib/src/webview_method_channel.dart index f329ba79e702..bfcb03794e4a 100644 --- a/packages/webview_flutter/lib/src/webview_method_channel.dart +++ b/packages/webview_flutter/lib/src/webview_method_channel.dart @@ -61,10 +61,12 @@ class MethodChannelWebViewPlatform implements WebViewPlatformController { } @override - Future loadAssetHtmlFile(String url) => _channel.invokeMethod('loadAssetHtmlFile', url); + Future loadAssetHtmlFile(String url) => + _channel.invokeMethod('loadAssetHtmlFile', url); @override - Future loadLocalHtmlFile(String url) => _channel.invokeMethod('loadLocalHtmlFile', url); + Future loadLocalHtmlFile(String url) => + _channel.invokeMethod('loadLocalHtmlFile', url); @override Future currentUrl() => _channel.invokeMethod('currentUrl'); From ecf0d3c23aeeeb340819a6d6fe4515556a98de23 Mon Sep 17 00:00:00 2001 From: Ben <772565130@qq.com> Date: Fri, 6 Mar 2020 22:55:14 +0800 Subject: [PATCH 8/8] fix: cirrus-ci format error --- packages/webview_flutter/ios/Classes/FlutterWebView.m | 2 +- .../webview_flutter/lib/src/webview_method_channel.dart | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/webview_flutter/ios/Classes/FlutterWebView.m b/packages/webview_flutter/ios/Classes/FlutterWebView.m index 999e9ebbdda1..c8534c48b875 100644 --- a/packages/webview_flutter/ios/Classes/FlutterWebView.m +++ b/packages/webview_flutter/ios/Classes/FlutterWebView.m @@ -72,7 +72,7 @@ @implementation FLTWebViewController { - (instancetype)initWithFrame:(CGRect)frame viewIdentifier:(int64_t)viewId arguments:(id _Nullable)args - registrar:(nonnull NSObject *)registrar { + registrar:(nonnull NSObject*)registrar { if (self = [super init]) { _viewId = viewId; _registrar = registrar; diff --git a/packages/webview_flutter/lib/src/webview_method_channel.dart b/packages/webview_flutter/lib/src/webview_method_channel.dart index bfcb03794e4a..9011400d4275 100644 --- a/packages/webview_flutter/lib/src/webview_method_channel.dart +++ b/packages/webview_flutter/lib/src/webview_method_channel.dart @@ -61,12 +61,12 @@ class MethodChannelWebViewPlatform implements WebViewPlatformController { } @override - Future loadAssetHtmlFile(String url) => - _channel.invokeMethod('loadAssetHtmlFile', url); + Future loadAssetHtmlFile(String url) => + _channel.invokeMethod('loadAssetHtmlFile', url); @override - Future loadLocalHtmlFile(String url) => - _channel.invokeMethod('loadLocalHtmlFile', url); + Future loadLocalHtmlFile(String url) => + _channel.invokeMethod('loadLocalHtmlFile', url); @override Future currentUrl() => _channel.invokeMethod('currentUrl');