[webview_flutter] Extract Android implementation into a separate package #4343

mvanbeusekom · 2021-09-14T10:25:16Z

This PR puts the native Android implementation of the platform interface (which was separated in #4302) into its own package, in preparation for moving the main plugin to a federated architecture.

Relevant issue:

[webview_flutter] Migrate plugin to federated architecture flutter#86286

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Creates a new `webview_flutter_android` directory and adds the following meta-data files: - `AUTHORS`: copied from the `webview_flutter` package and added my name; - `CHANGELOG.md`: new file adding description for release 0.0.1; - `LICENSE`: copied from the `webview_flutter` package; - `README.md`: new file adding the standard platform implementation description; - `pubspec.yaml`: new file adding package meta-data for the `webview_flutter_android` package.

A one to one copy of the `webview_flutter/android` folder to `webview_flutter_android/` using the following command: ``` cp -R ./webview_flutter/android ./webview_flutter_android/ ```

Copied the Android specific .dart files over from the `./webview_flutter` package. Note that the `SurfaceAndroidWebView` class in the `./webview_flutter_android/lib/webview_surface_android.dart` file is copied directly (without modifactions) from the `./webview_flutter/lib/webview_flutter.dart` file.

Make sure the `AndroidWebView` and `SurfaceAndroidWebView` widgets extend the `WebViewPlatform` class from the `webview_flutter_platform_interface` package correctly by accepting an instance of the `JavascriptChannelRegistry` class.

This commit makes a direct copy of the `webview_flutter/example` app to the `webview_flutter_android` package. After the copy the `example/ios` folder is removed as it doesn't serve a purpose in the Android specific package. Commands run where: ``` cp -R ./webview_flutter/example ./webview_flutter_android/ rm -rf ./webview_flutter_android/example/ios ```

This commit updates the example App so it directly implements an Android specific implementation of the webview_flutter_platform_interface.

Updated the existing integration tests (copied from webview_flutter package) so they work correctly with the implementation of the webview_flutter_android package.

google-cla · 2021-09-14T10:25:26Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla · 2021-09-14T10:28:38Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

google-cla · 2021-09-14T11:27:05Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

BeMacized · 2021-09-14T13:15:22Z

@flutter/googlebot I consent.

Updated the pubspec.yaml to depend on version 1.0.0 of the webview_flutter_platform_interface package instead of using a path reference (which is now possible since the platform interface package has now been published). Co-authored-by: BeMacized <[email protected]>

google-cla · 2021-09-14T13:23:50Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

BeMacized · 2021-09-14T13:25:04Z

@googlebot I consent.

Make sure the `webview_flutter` and `webview_flutter_android` example apps use different application identifiers so that the CI doesn't run into problems.

Make sure the webview_flutter_android and webview_flutter_wkwebview packages are excluded from the Build All plugins step as they will cause conflicts with the current implementation which is still part of the webview_flutter package.

stuartmorgan-g · 2021-09-15T20:37:09Z

packages/webview_flutter/webview_flutter_android/pubspec.yaml

+description: A Flutter plugin that provides a WebView widget on Android.
+repository: https://github.com/flutter/plugins/tree/master/packages/webview_flutter/webview_flutter_android
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22
+version: 0.0.1


Same version comment here as for iOS.

stuartmorgan-g · 2021-09-15T20:39:40Z

packages/webview_flutter/webview_flutter_android/example/lib/main.dart

@@ -352,3 +364,599 @@ class NavigationControls extends StatelessWidget {
    );
  }
 }
+
+/// A web view widget for showing html content.


Same comment here as for iOS about moving to a separate file.

stuartmorgan-g · 2021-09-15T20:41:06Z

...s/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart

 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';

 void main() {
  IntegrationTestWidgetsFlutterBinding.ensureInitialized();

-  const bool _skipDueIssue86757 = false;
+  const bool _skipDueIssue86757 = true;


Nit: _skipDueToIssue86757

Move the `WebView` and related `WebViewController` classes from the main.dart into a separate web_view.dart file.

…_architecture_part_3

stuartmorgan-g

Changes LGTM

fluttergithubbot · 2021-09-20T20:08:04Z

This pull request is not suitable for automatic merging in its current state.

The status or check suite android-platform_tests has failed. Please fix the issues identified (or deflake) before re-applying this label.

…ate package (flutter/plugins#4343)

…age (flutter#4343) * Setup webview_flutter_android package. Creates a new `webview_flutter_android` directory and adds the following meta-data files: - `AUTHORS`: copied from the `webview_flutter` package and added my name; - `CHANGELOG.md`: new file adding description for release 0.0.1; - `LICENSE`: copied from the `webview_flutter` package; - `README.md`: new file adding the standard platform implementation description; - `pubspec.yaml`: new file adding package meta-data for the `webview_flutter_android` package. * Direct copy of "android" folder. A one to one copy of the `webview_flutter/android` folder to `webview_flutter_android/` using the following command: ``` cp -R ./webview_flutter/android ./webview_flutter_android/ ``` * Direct copy of Android specific .dart files. Copied the Android specific .dart files over from the `./webview_flutter` package. Note that the `SurfaceAndroidWebView` class in the `./webview_flutter_android/lib/webview_surface_android.dart` file is copied directly (without modifactions) from the `./webview_flutter/lib/webview_flutter.dart` file. * Modify .dart code to work with platform_interface. Make sure the `AndroidWebView` and `SurfaceAndroidWebView` widgets extend the `WebViewPlatform` class from the `webview_flutter_platform_interface` package correctly by accepting an instance of the `JavascriptChannelRegistry` class. * Direct copy of the `webview_flutter/example` app. This commit makes a direct copy of the `webview_flutter/example` app to the `webview_flutter_android` package. After the copy the `example/ios` folder is removed as it doesn't serve a purpose in the Android specific package. Commands run where: ``` cp -R ./webview_flutter/example ./webview_flutter_android/ rm -rf ./webview_flutter_android/example/ios ``` * Update example to Android specific implementation. This commit updates the example App so it directly implements an Android specific implementation of the webview_flutter_platform_interface. * Update integration tests. Updated the existing integration tests (copied from webview_flutter package) so they work correctly with the implementation of the webview_flutter_android package. * Update webview_flutter_platform_interface dependency Updated the pubspec.yaml to depend on version 1.0.0 of the webview_flutter_platform_interface package instead of using a path reference (which is now possible since the platform interface package has now been published). Co-authored-by: BeMacized <[email protected]> * Use different bundle ID for Android example app. Make sure the `webview_flutter` and `webview_flutter_android` example apps use different application identifiers so that the CI doesn't run into problems. * Skip flaky integration_tests (issue 86757). * Exlude platform implementations from build all step. Make sure the webview_flutter_android and webview_flutter_wkwebview packages are excluded from the Build All plugins step as they will cause conflicts with the current implementation which is still part of the webview_flutter package. * Split helper classes from main example widget. Move the `WebView` and related `WebViewController` classes from the main.dart into a separate web_view.dart file. Co-authored-by: BeMacized <[email protected]>

* master: (51 commits) [webview_flutter] Update version number app_facing package (flutter#4375) [webview_flutter] Adjust integration test domains (flutter#4383) Remove some trivial custom analysis options files (flutter#4379) [google_maps_flutter_platfomr_interface] Add Marker drag events (flutter#2653) [flutter_plugin_tools] Improve version check error handling (flutter#4376) [flutter_plugin_tools] Allow overriding breaking change check (flutter#4369) [url_launcher] Error handling when URL cannot be parsed with Uri.parse (flutter#4365) [webview_flutter] Migrate main package to fully federated architecture. (flutter#4366) [google_sign_in] Bump minimum Flutter version and iOS deployment target (flutter#4334) Add false secret lists, and enforce ordering (flutter#4372) [camera_web] Update usage documentation (flutter#4371) [video_player] VTT Support (flutter#2878) Require authors file (flutter#4367) [flutter_plugin_tools] Fix federated safety check (flutter#4368) [webview_flutter] Extract WKWebView implementation into a separate package (flutter#4345) [webview_flutter] Extract Android implementation into a separate package (flutter#4343) [in_app_purchase] Ensure the `introductoryPriceMicros` field is populated correctly. (flutter#4364) [flutter_plugin_tools] Add a federated PR safety check (flutter#4329) [camera] Add web support (flutter#4240) [webview_flutter] Bump minimum Flutter version and iOS deployment target (flutter#4361) ... # Conflicts: # packages/webview_flutter/webview_flutter/lib/platform_interface.dart # packages/webview_flutter/webview_flutter/lib/src/webview_method_channel.dart # packages/webview_flutter/webview_flutter/lib/webview_flutter.dart

…age (flutter#4343) * Setup webview_flutter_android package. Creates a new `webview_flutter_android` directory and adds the following meta-data files: - `AUTHORS`: copied from the `webview_flutter` package and added my name; - `CHANGELOG.md`: new file adding description for release 0.0.1; - `LICENSE`: copied from the `webview_flutter` package; - `README.md`: new file adding the standard platform implementation description; - `pubspec.yaml`: new file adding package meta-data for the `webview_flutter_android` package. * Direct copy of "android" folder. A one to one copy of the `webview_flutter/android` folder to `webview_flutter_android/` using the following command: ``` cp -R ./webview_flutter/android ./webview_flutter_android/ ``` * Direct copy of Android specific .dart files. Copied the Android specific .dart files over from the `./webview_flutter` package. Note that the `SurfaceAndroidWebView` class in the `./webview_flutter_android/lib/webview_surface_android.dart` file is copied directly (without modifactions) from the `./webview_flutter/lib/webview_flutter.dart` file. * Modify .dart code to work with platform_interface. Make sure the `AndroidWebView` and `SurfaceAndroidWebView` widgets extend the `WebViewPlatform` class from the `webview_flutter_platform_interface` package correctly by accepting an instance of the `JavascriptChannelRegistry` class. * Direct copy of the `webview_flutter/example` app. This commit makes a direct copy of the `webview_flutter/example` app to the `webview_flutter_android` package. After the copy the `example/ios` folder is removed as it doesn't serve a purpose in the Android specific package. Commands run where: ``` cp -R ./webview_flutter/example ./webview_flutter_android/ rm -rf ./webview_flutter_android/example/ios ``` * Update example to Android specific implementation. This commit updates the example App so it directly implements an Android specific implementation of the webview_flutter_platform_interface. * Update integration tests. Updated the existing integration tests (copied from webview_flutter package) so they work correctly with the implementation of the webview_flutter_android package. * Update webview_flutter_platform_interface dependency Updated the pubspec.yaml to depend on version 1.0.0 of the webview_flutter_platform_interface package instead of using a path reference (which is now possible since the platform interface package has now been published). Co-authored-by: BeMacized <[email protected]> * Use different bundle ID for Android example app. Make sure the `webview_flutter` and `webview_flutter_android` example apps use different application identifiers so that the CI doesn't run into problems. * Skip flaky integration_tests (issue 86757). * Exlude platform implementations from build all step. Make sure the webview_flutter_android and webview_flutter_wkwebview packages are excluded from the Build All plugins step as they will cause conflicts with the current implementation which is still part of the webview_flutter package. * Split helper classes from main example widget. Move the `WebView` and related `WebViewController` classes from the main.dart into a separate web_view.dart file. Co-authored-by: BeMacized <[email protected]>

mvanbeusekom added 7 commits September 14, 2021 12:16

Direct copy of "android" folder.

58b7bdb

A one to one copy of the `webview_flutter/android` folder to `webview_flutter_android/` using the following command: ``` cp -R ./webview_flutter/android ./webview_flutter_android/ ```

Modify .dart code to work with platform_interface.

aa74a33

Make sure the `AndroidWebView` and `SurfaceAndroidWebView` widgets extend the `WebViewPlatform` class from the `webview_flutter_platform_interface` package correctly by accepting an instance of the `JavascriptChannelRegistry` class.

Update example to Android specific implementation.

aae5c83

This commit updates the example App so it directly implements an Android specific implementation of the webview_flutter_platform_interface.

Update integration tests.

4c76e5b

Updated the existing integration tests (copied from webview_flutter package) so they work correctly with the implementation of the webview_flutter_android package.

google-cla bot added the cla: no label Sep 14, 2021

github-actions bot added p: webview_flutter Edits files for a webview_flutter plugin platform-android labels Sep 14, 2021

mvanbeusekom force-pushed the webview/federated_architecture_part_3 branch from d5c75af to e157c6e Compare September 14, 2021 10:28

mvanbeusekom force-pushed the webview/federated_architecture_part_3 branch from e157c6e to 7e4193b Compare September 14, 2021 11:26

mvanbeusekom force-pushed the webview/federated_architecture_part_3 branch from 7e4193b to 881e652 Compare September 14, 2021 13:23

google-cla bot added cla: yes and removed cla: no labels Sep 14, 2021

mvanbeusekom mentioned this pull request Sep 14, 2021

[webview_flutter] Move native implementations to their own packages in preparation for federated architecture #4315

Closed

11 tasks

mvanbeusekom added 2 commits September 14, 2021 20:10

Use different bundle ID for Android example app.

2fe112a

Make sure the `webview_flutter` and `webview_flutter_android` example apps use different application identifiers so that the CI doesn't run into problems.

Skip flaky integration_tests (issue 86757).

52859e9

mvanbeusekom force-pushed the webview/federated_architecture_part_3 branch from 72e2e05 to 52859e9 Compare September 15, 2021 14:27

mvanbeusekom mentioned this pull request Sep 15, 2021

[webview_flutter] Migrate plugin to federated architecture flutter/flutter#86286

Closed

12 tasks

mvanbeusekom requested a review from stuartmorgan-g September 15, 2021 17:39

stuartmorgan-g suggested changes Sep 15, 2021

View reviewed changes

Split helper classes from main example widget.

d6f1705

Move the `WebView` and related `WebViewController` classes from the main.dart into a separate web_view.dart file.

mvanbeusekom force-pushed the webview/federated_architecture_part_3 branch from a982131 to d6f1705 Compare September 20, 2021 13:59

mvanbeusekom requested a review from stuartmorgan-g September 20, 2021 14:16

Merge remote-tracking branch 'upstream/master' into webview/federated…

a33132b

…_architecture_part_3

stuartmorgan-g approved these changes Sep 20, 2021

View reviewed changes

mvanbeusekom added the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Sep 20, 2021

fluttergithubbot removed the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Sep 20, 2021

mvanbeusekom merged commit 19bc12e into flutter:master Sep 21, 2021

mvanbeusekom deleted the webview/federated_architecture_part_3 branch September 21, 2021 06:40

engine-flutter-autoroll mentioned this pull request Sep 21, 2021

Roll Plugins from e314c7a8fdcd to c05887f7049a (2 revisions) flutter/flutter#90434

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 21, 2021

19bc12e [webview_flutter] Extract Android implementation into a separ…

73325b2

…ate package (flutter/plugins#4343)

engine-flutter-autoroll mentioned this pull request Sep 21, 2021

Roll Plugins from e314c7a8fdcd to c05887f7049a (2 revisions) flutter/flutter#90442

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 21, 2021

19bc12e [webview_flutter] Extract Android implementation into a separ…

d78ccfc

…ate package (flutter/plugins#4343)

engine-flutter-autoroll mentioned this pull request Sep 21, 2021

Roll Plugins from e314c7a8fdcd to c05887f7049a (2 revisions) flutter/flutter#90450

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 21, 2021

19bc12e [webview_flutter] Extract Android implementation into a separ…

30f01cf

…ate package (flutter/plugins#4343)

engine-flutter-autoroll mentioned this pull request Sep 21, 2021

Roll Plugins from e314c7a8fdcd to 42a17dc4de1c (4 revisions) flutter/flutter#90474

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 21, 2021

19bc12e [webview_flutter] Extract Android implementation into a separ…

bec7994

…ate package (flutter/plugins#4343)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[webview_flutter] Extract Android implementation into a separate package #4343

[webview_flutter] Extract Android implementation into a separate package #4343

mvanbeusekom commented Sep 14, 2021 •

edited

Loading

google-cla bot commented Sep 14, 2021

google-cla bot commented Sep 14, 2021

google-cla bot commented Sep 14, 2021

BeMacized commented Sep 14, 2021

google-cla bot commented Sep 14, 2021

BeMacized commented Sep 14, 2021

stuartmorgan-g Sep 15, 2021

stuartmorgan-g Sep 15, 2021

stuartmorgan-g Sep 15, 2021

stuartmorgan-g left a comment

fluttergithubbot commented Sep 20, 2021

[webview_flutter] Extract Android implementation into a separate package #4343

[webview_flutter] Extract Android implementation into a separate package #4343

Conversation

mvanbeusekom commented Sep 14, 2021 • edited Loading

Pre-launch Checklist

google-cla bot commented Sep 14, 2021

google-cla bot commented Sep 14, 2021

google-cla bot commented Sep 14, 2021

BeMacized commented Sep 14, 2021

google-cla bot commented Sep 14, 2021

BeMacized commented Sep 14, 2021

stuartmorgan-g Sep 15, 2021

Choose a reason for hiding this comment

stuartmorgan-g Sep 15, 2021

Choose a reason for hiding this comment

stuartmorgan-g Sep 15, 2021

Choose a reason for hiding this comment

stuartmorgan-g left a comment

Choose a reason for hiding this comment

fluttergithubbot commented Sep 20, 2021

mvanbeusekom commented Sep 14, 2021 •

edited

Loading