Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[webview_flutter_wkwebview] Implementation of Objective-C WKWebView Host Apis #5341

Merged
bparrishMines merged 22 commits into from
Apr 30, 2022
Merged

[webview_flutter_wkwebview] Implementation of Objective-C WKWebView Host Apis #5341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fa84355
implementation of host apis
bparrishMines Apr 22, 2022
7c13474
move comment and fix test
bparrishMines Apr 22, 2022
e48695f
add test to verify error
bparrishMines Apr 22, 2022
085e363
add other methods
bparrishMines Apr 23, 2022
8755174
change method name and add documentation
bparrishMines Apr 23, 2022
fa5dbeb
an
bparrishMines Apr 23, 2022
16d19e9
PR feedback
bparrishMines Apr 26, 2022
dd0bb72
naming conventions
bparrishMines Apr 26, 2022
c4f5abb
use nonatomic
bparrishMines Apr 26, 2022
0ae3db5
use nonatomic
bparrishMines Apr 26, 2022
ddb8971
format
bparrishMines Apr 26, 2022
5b1245c
implement host api methods
bparrishMines Apr 28, 2022
88e10d0
more tests
bparrishMines Apr 28, 2022
6d7fdfd
misspelling
bparrishMines Apr 28, 2022
196c07b
assets test
bparrishMines Apr 28, 2022
25ce261
rest of tests
bparrishMines Apr 28, 2022
99f043e
Merge branch 'master' of github.com:flutter/plugins into host_api
bparrishMines Apr 28, 2022
5280385
test converter
bparrishMines Apr 28, 2022
11ac0a3
URL
bparrishMines Apr 28, 2022
d3fc5e9
Merge branch 'master' of github.com:flutter/plugins into host_api
bparrishMines Apr 30, 2022
eba9e4b
fix test
bparrishMines Apr 30, 2022
4bdbb1d
improve objc naming
bparrishMines Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
misspelling
  • Loading branch information
@bparrishMines
bparrishMines committed Apr 28, 2022
commit 6d7fdfd3bd7a63b27eb008f04767521d8bc66874
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ NSObject<FlutterMessageCodec> *FWFWKWebViewHostApiGetCodec(void);
fileURL:(NSString *)url
readAccessURL:(NSString *)readAccessUrl
error:(FlutterError *_Nullable *_Nonnull)error;
- (void)loadAssetForWebViewWithIdintefier:(NSNumber *)instanceId
- (void)loadAssetForWebViewWithIdentifier:(NSNumber *)instanceId
assetKey:(NSString *)key
error:(FlutterError *_Nullable *_Nonnull)error;
/// @return `nil` only when `error != nil`.
Expand Down
6 changes: 3 additions & 3 deletions packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,17 +1711,17 @@ void FWFWKWebViewHostApiSetup(id<FlutterBinaryMessenger> binaryMessenger,
binaryMessenger:binaryMessenger
codec:FWFWKWebViewHostApiGetCodec()];
if (api) {
NSCAssert([api respondsToSelector:@selector(loadAssetForWebViewWithIdintefier:
NSCAssert([api respondsToSelector:@selector(loadAssetForWebViewWithIdentifier:
assetKey:error:)],
@"FWFWKWebViewHostApi api (%@) doesn't respond to "
@"@selector(loadAssetForWebViewWithIdintefier:assetKey:error:)",
@"@selector(loadAssetForWebViewWithIdentifier:assetKey:error:)",
api);
[channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
NSArray *args = message;
NSNumber *arg_instanceId = GetNullableObjectAtIndex(args, 0);
NSString *arg_key = GetNullableObjectAtIndex(args, 1);
FlutterError *error;
[api loadAssetForWebViewWithIdintefier:arg_instanceId assetKey:arg_key error:&error];
[api loadAssetForWebViewWithIdentifier:arg_instanceId assetKey:arg_key error:&error];
callback(wrapResult(nil, error));
}];
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFWebViewHostApi.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ - (void)goForwardForWebViewWithIdentifier:(nonnull NSNumber *)instanceId
[[self webViewForIdentifier:instanceId] goForward];
}

- (void)loadAssetForWebViewWithIdintefier:(nonnull NSNumber *)instanceId
- (void)loadAssetForWebViewWithIdentifier:(nonnull NSNumber *)instanceId
assetKey:(nonnull NSString *)key
error:(FlutterError *_Nullable __autoreleasing *_Nonnull)error {
NSString *assetFilePath = [FlutterDartProject lookupKeyForAsset:key];
Expand Down
2 changes: 1 addition & 1 deletion packages/webview_flutter/webview_flutter_wkwebview/pigeons/web_kit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ abstract class WKWebViewHostApi {
@ObjCSelector('loadFileForWebViewWithIdentifier:fileURL:readAccessURL:')
void loadFileUrl(int instanceId, String url, String readAccessUrl);

@ObjCSelector('loadAssetForWebViewWithIdintefier:assetKey:')
@ObjCSelector('loadAssetForWebViewWithIdentifier:assetKey:')
void loadFlutterAsset(int instanceId, String key);

@ObjCSelector('canGoBackForWebViewWithIdentifier:')
Expand Down