Skip to content

Commit 2e291d2

Browse files
daohoangsondaohoangson
authored
Add support for [email protected] (#1478)
Specifically: * Implement `AndroidWebViewController.setMixedContentMode`
1 parent e54aa9d commit 2e291d2

File tree

4 files changed

+53
-5
lines changed

4 files changed

+53
-5
lines changed

‎demo_app/ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ SPEC CHECKSUMS:
8484
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
8585
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
8686

87-
PODFILE CHECKSUM: 4305caec6b40dde0ae97be1573c53de1882a07e5
87+
PODFILE CHECKSUM: edebb1c1639638767220f0242b2b33982e3a224c
8888

8989
COCOAPODS: 1.16.2

‎demo_app/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
1717
9F1A45147FD0DBE6CF860034 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A8D997B989E7638102ACA728 /* Pods_Runner.framework */; };
1818
CEE01D58FCABD4F31F096C9C /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 178E1D4C2D7566D2808A367F /* Pods_RunnerTests.framework */; };
19+
D5D876D937016C95CD7DA06E /* Pods_Runner_RunnerUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2B5917E1A4F0D7083C424D /* Pods_Runner_RunnerUITests.framework */; };
1920
DB9207632BE7F15900D6B3E1 /* RunnerUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = DB9207622BE7F15900D6B3E1 /* RunnerUITests.m */; };
2021
/* End PBXBuildFile section */
2122

@@ -75,6 +76,7 @@
7576
BF066D85124559E6F9EE6EED /* Pods-Runner-RunnerUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner-RunnerUITests.release.xcconfig"; path = "Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests.release.xcconfig"; sourceTree = "<group>"; };
7677
D25BBEAC0A481DE6132762CB /* Pods-Runner-RunnerUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner-RunnerUITests.debug.xcconfig"; path = "Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests.debug.xcconfig"; sourceTree = "<group>"; };
7778
D8E6F301E12A65460B32AC47 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
79+
DA2B5917E1A4F0D7083C424D /* Pods_Runner_RunnerUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner_RunnerUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7880
DB9207602BE7F15900D6B3E1 /* RunnerUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
7981
DB9207622BE7F15900D6B3E1 /* RunnerUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RunnerUITests.m; sourceTree = "<group>"; };
8082
DD845412D22E33FB3509B498 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
@@ -101,6 +103,7 @@
101103
isa = PBXFrameworksBuildPhase;
102104
buildActionMask = 2147483647;
103105
files = (
106+
D5D876D937016C95CD7DA06E /* Pods_Runner_RunnerUITests.framework in Frameworks */,
104107
);
105108
runOnlyForDeploymentPostprocessing = 0;
106109
};
@@ -112,6 +115,7 @@
112115
children = (
113116
A8D997B989E7638102ACA728 /* Pods_Runner.framework */,
114117
178E1D4C2D7566D2808A367F /* Pods_RunnerTests.framework */,
118+
DA2B5917E1A4F0D7083C424D /* Pods_Runner_RunnerUITests.framework */,
115119
);
116120
name = Frameworks;
117121
sourceTree = "<group>";
@@ -245,11 +249,13 @@
245249
isa = PBXNativeTarget;
246250
buildConfigurationList = DB92076B2BE7F15900D6B3E1 /* Build configuration list for PBXNativeTarget "RunnerUITests" */;
247251
buildPhases = (
252+
D58CF80278129C9EC8788224 /* [CP] Check Pods Manifest.lock */,
248253
DB4BA53B2BE7F2C50075A260 /* xcode_backend build */,
249254
DB92075C2BE7F15900D6B3E1 /* Sources */,
250255
DB92075D2BE7F15900D6B3E1 /* Frameworks */,
251256
DB92075E2BE7F15900D6B3E1 /* Resources */,
252257
DB4BA53C2BE7F2ED0075A260 /* xcode_backend embed_and_thin */,
258+
E5C916FAF6C6382BE76414FE /* [CP] Embed Pods Frameworks */,
253259
);
254260
buildRules = (
255261
);
@@ -426,6 +432,28 @@
426432
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
427433
showEnvVarsInLog = 0;
428434
};
435+
D58CF80278129C9EC8788224 /* [CP] Check Pods Manifest.lock */ = {
436+
isa = PBXShellScriptBuildPhase;
437+
buildActionMask = 2147483647;
438+
files = (
439+
);
440+
inputFileListPaths = (
441+
);
442+
inputPaths = (
443+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
444+
"${PODS_ROOT}/Manifest.lock",
445+
);
446+
name = "[CP] Check Pods Manifest.lock";
447+
outputFileListPaths = (
448+
);
449+
outputPaths = (
450+
"$(DERIVED_FILE_DIR)/Pods-Runner-RunnerUITests-checkManifestLockResult.txt",
451+
);
452+
runOnlyForDeploymentPostprocessing = 0;
453+
shellPath = /bin/sh;
454+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
455+
showEnvVarsInLog = 0;
456+
};
429457
DB4BA53B2BE7F2C50075A260 /* xcode_backend build */ = {
430458
isa = PBXShellScriptBuildPhase;
431459
buildActionMask = 2147483647;
@@ -462,6 +490,23 @@
462490
shellPath = /bin/sh;
463491
shellScript = "# https://patrol.leancode.co/getting-started\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
464492
};
493+
E5C916FAF6C6382BE76414FE /* [CP] Embed Pods Frameworks */ = {
494+
isa = PBXShellScriptBuildPhase;
495+
buildActionMask = 2147483647;
496+
files = (
497+
);
498+
inputFileListPaths = (
499+
"${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
500+
);
501+
name = "[CP] Embed Pods Frameworks";
502+
outputFileListPaths = (
503+
"${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
504+
);
505+
runOnlyForDeploymentPostprocessing = 0;
506+
shellPath = /bin/sh;
507+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-frameworks.sh\"\n";
508+
showEnvVarsInLog = 0;
509+
};
465510
/* End PBXShellScriptBuildPhase section */
466511

467512
/* Begin PBXSourcesBuildPhase section */

‎demo_app/pubspec.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,10 +1153,10 @@ packages:
11531153
dependency: transitive
11541154
description:
11551155
name: webview_flutter_android
1156-
sha256: f6e6afef6e234801da77170f7a1847ded8450778caf2fe13979d140484be3678
1156+
sha256: "769f34fc9855f7d7789b786b79b7c37a60e92ff08f71e3a429208d7f5b81d944"
11571157
url: "https://pub.dev"
11581158
source: hosted
1159-
version: "4.7.0"
1159+
version: "4.8.0"
11601160
webview_flutter_platform_interface:
11611161
dependency: transitive
11621162
description:
@@ -1169,10 +1169,10 @@ packages:
11691169
dependency: transitive
11701170
description:
11711171
name: webview_flutter_wkwebview
1172-
sha256: a3d461fe3467014e05f3ac4962e5fdde2a4bf44c561cb53e9ae5c586600fdbc3
1172+
sha256: "71523b9048cf510cfa1fd4e0a3fa5e476a66e0884d5df51d59d5023dba237107"
11731173
url: "https://pub.dev"
11741174
source: hosted
1175-
version: "3.22.0"
1175+
version: "3.22.1"
11761176
win32:
11771177
dependency: transitive
11781178
description:

‎packages/fwfh_webview/test/mock_webview_platform.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ class __FakeAndroidWebViewController extends FakeWebViewController
203203
androidMediaPlaybackRequiresUserGesture = require;
204204
}
205205

206+
@override
207+
Future<void> setMixedContentMode(dynamic mode) => throw UnimplementedError();
208+
206209
@override
207210
Future<void> setOnShowFileSelector(
208211
Future<List<String>> Function(FileSelectorParams params)?

0 commit comments

Comments
 (0)