Update dependency webview_flutter to v4 (#841)

* Update `io.dart` because of breaking changes

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Dao Hoang Son <[email protected]>

Author: renovate[bot]

demo_app/integration_test/auto_resize_test.dart

@@ -92,7 +92,6 @@ class WebViewTestCase {
       autoResize: true,
       autoResizeIntervals: [interval, interval * 2, interval * 3],
       debuggingEnabled: true,
-      unsupportedWorkaroundForIssue375: issue375,
     );
     final test = _AspectRatioTest(child: webView);
 

demo_app/pubspec.lock

@@ -896,28 +896,28 @@ packages:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "4.0.1"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.10.4"
+    version: "3.1.1"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.5"
+    version: "2.0.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.5"
+    version: "3.0.1"
   win32:
     dependency: transitive
     description:

packages/fwfh_webview/example/main.dart

@@ -5,7 +5,7 @@ import 'package:fwfh_webview/fwfh_webview.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

packages/fwfh_webview/lib/src/web_view/io.dart

@@ -1,60 +1,76 @@
 import 'dart:async';
-import 'dart:math';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:webview_flutter/webview_flutter.dart' as lib;
+import 'package:webview_flutter_android/webview_flutter_android.dart' as lib;
+import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart'
+    as lib;
 
 import 'web_view.dart';
 
 class WebViewState extends State<WebView> {
   final _timers = <Timer>[];
+  late final lib.WebViewController _controller;
 
   late double _aspectRatio;
   String? _firstFinishedUrl;
   _Issue37? _issue37;
-  lib.WebViewController? _wvc;
 
   @override
   void initState() {
     super.initState();
     _aspectRatio = widget.aspectRatio;
 
+    _initController();
+
     if (widget.unsupportedWorkaroundForIssue37) {
       _issue37 = _Issue37(this);
-      _widgetsBindingInstance?.addObserver(_issue37!);
+      WidgetsBinding.instance.addObserver(_issue37!);
     }
   }
 
-  @override
-  Widget build(BuildContext context) {
-    final webView = _buildWebView();
-
-    if (widget.unsupportedWorkaroundForIssue375 &&
-        defaultTargetPlatform == TargetPlatform.android) {
-      return LayoutBuilder(
-        builder: (context, constraints) {
-          final width = constraints.hasBoundedWidth
-              ? constraints.maxWidth
-              : MediaQuery.of(context).size.width;
-          final height = width / _aspectRatio;
-          return SizedBox(
-            height: min(
-              height,
-              constraints.hasBoundedHeight
-                  ? constraints.maxHeight
-                  : MediaQuery.of(context).size.height,
-            ),
-            width: width,
-            child: webView,
-          );
-        },
+  void _initController() {
+    var params = const lib.PlatformWebViewControllerCreationParams();
+    if (lib.WebViewPlatform.instance is lib.WebKitWebViewPlatform) {
+      params = lib.WebKitWebViewControllerCreationParams(
+        allowsInlineMediaPlayback: true,
+        mediaTypesRequiringUserAction: widget.mediaPlaybackAlwaysAllow
+            ? {}
+            : {...lib.PlaybackMediaTypes.values},
+      );
+    }
+
+    _controller = lib.WebViewController.fromPlatformCreationParams(params)
+      ..setJavaScriptMode(
+        widget.js
+            ? lib.JavaScriptMode.unrestricted
+            : lib.JavaScriptMode.disabled,
+      )
+      ..setNavigationDelegate(
+        lib.NavigationDelegate(
+          onPageFinished: _onPageFinished,
+          onNavigationRequest: widget.interceptNavigationRequest != null
+              ? (req) => _interceptNavigationRequest(req)
+              : null,
+        ),
+      )
+      ..setUserAgent(widget.userAgent)
+      ..loadRequest(Uri.parse(widget.url));
+
+    final platformController = _controller.platform;
+    if (platformController is lib.AndroidWebViewController) {
+      lib.AndroidWebViewController.enableDebugging(widget.debuggingEnabled);
+      platformController.setMediaPlaybackRequiresUserGesture(
+        !widget.mediaPlaybackAlwaysAllow,
       );
     }
+  }
 
+  @override
+  Widget build(BuildContext context) {
     return AspectRatio(
       aspectRatio: _aspectRatio,
-      child: webView,
+      child: _buildWebView(),
     );
   }
 
@@ -63,7 +79,7 @@ class WebViewState extends State<WebView> {
     super.deactivate();
 
     if (widget.unsupportedWorkaroundForIssue37) {
-      _wvc?.reload();
+      _controller.reload();
     }
   }
 
@@ -74,18 +90,21 @@ class WebViewState extends State<WebView> {
     }
 
     if (_issue37 != null) {
-      _widgetsBindingInstance?.removeObserver(_issue37!);
+      WidgetsBinding.instance.removeObserver(_issue37!);
     }
 
     super.dispose();
   }
 
   Future<String> eval(String js) async {
     try {
-      return await _wvc!.runJavascriptReturningResult(js);
-    } catch (_) {
-      return '';
+      final result = await _controller.runJavaScriptReturningResult(js);
+      return '$result';
+    } catch (evalError) {
+      debugPrint('evalError: $evalError');
     }
+
+    return '';
   }
 
   Future<void> _autoResize() async {
@@ -111,36 +130,22 @@ class WebViewState extends State<WebView> {
     }
   }
 
-  Widget _buildWebView() => lib.WebView(
-        debuggingEnabled: widget.debuggingEnabled,
-        initialUrl: widget.url,
-        initialMediaPlaybackPolicy: widget.mediaPlaybackAlwaysAllow
-            ? lib.AutoMediaPlaybackPolicy.always_allow
-            : lib.AutoMediaPlaybackPolicy
-                .require_user_action_for_all_media_types,
-        javascriptMode: widget.js
-            ? lib.JavascriptMode.unrestricted
-            : lib.JavascriptMode.disabled,
+  Widget _buildWebView() => lib.WebViewWidget(
+        controller: _controller,
         key: Key(widget.url),
-        navigationDelegate: widget.interceptNavigationRequest != null
-            ? (req) => _interceptNavigationRequest(req)
-            : null,
-        onPageFinished: _onPageFinished,
-        onWebViewCreated: (c) => _wvc = c,
-        userAgent: widget.userAgent,
       );
 
   lib.NavigationDecision _interceptNavigationRequest(
     lib.NavigationRequest req,
   ) {
     var intercepted = false;
-
-    if (widget.interceptNavigationRequest != null &&
+    final callback = widget.interceptNavigationRequest;
+    if (callback != null &&
         _firstFinishedUrl != null &&
-        req.isForMainFrame &&
+        req.isMainFrame &&
         req.url != widget.url &&
         req.url != _firstFinishedUrl) {
-      intercepted = widget.interceptNavigationRequest!(req.url);
+      intercepted = callback(req.url);
     }
 
     return intercepted
@@ -165,9 +170,6 @@ class WebViewState extends State<WebView> {
   }
 }
 
-// TODO: remove workaround when our minimum Flutter version >2.12
-WidgetsBinding? get _widgetsBindingInstance => WidgetsBinding.instance;
-
 class _Issue37 with WidgetsBindingObserver {
   final WebViewState wvs;
 
@@ -176,7 +178,7 @@ class _Issue37 with WidgetsBindingObserver {
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.paused) {
-      wvs._wvc?.reload();
+      wvs._controller.reload();
     }
   }
 }

packages/fwfh_webview/lib/src/web_view/web_view.dart

@@ -68,16 +68,6 @@ class WebView extends StatefulWidget {
   /// Default: `true`.
   final bool unsupportedWorkaroundForIssue37;
 
-  /// Controls whether or not to apply workaround for
-  /// [crash on Android device](https://github.com/daohoangson/flutter_widget_from_html/issues/375)
-  /// issue.
-  ///
-  /// If your app targets Android 10, it's better to switch to the new webview
-  /// implemention: [hybrid composition](https://pub.dev/packages/webview_flutter#using-hybrid-composition).
-  ///
-  /// Default: `true`.
-  final bool unsupportedWorkaroundForIssue375;
-
   /// {@template web_view.userAgent}
   /// The value used for the HTTP `User-Agent` request header.
   ///
@@ -100,13 +90,11 @@ class WebView extends StatefulWidget {
     this.js = true,
     this.mediaPlaybackAlwaysAllow = false,
     this.unsupportedWorkaroundForIssue37 = true,
-    this.unsupportedWorkaroundForIssue375 = true,
     this.userAgent,
-    Key? key,
-  })  :
+    super.key,
+  }) :
         // ignore: avoid_bool_literals_in_conditional_expressions
-        autoResize = js ? (autoResize ?? js) : false,
-        super(key: key);
+        autoResize = js ? (autoResize ?? js) : false;
 
   @override
   State<WebView> createState() => WebViewState();

packages/fwfh_webview/lib/src/web_view_factory.dart

@@ -48,7 +48,7 @@ mixin WebViewFactory on WidgetFactory {
             sandbox.contains(kAttributeIframeSandboxAllowScripts));
     return WebView(
       url,
-      aspectRatio: dimensOk ? width! / height! : 16 / 9,
+      aspectRatio: dimensOk ? width / height : 16 / 9,
       autoResize: !dimensOk && js,
       debuggingEnabled: webViewDebuggingEnabled,
       interceptNavigationRequest: (newUrl) {

packages/fwfh_webview/pubspec.yaml

@@ -4,14 +4,16 @@ description: WidgetFactory extension to render IFRAME with the official WebView
 homepage: https://github.com/daohoangson/flutter_widget_from_html
 
 environment:
-  flutter: ">=2.5.0"
-  sdk: ">=2.14.0 <3.0.0"
+  flutter: ">=3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_widget_from_html_core: ">=0.8.0 <0.10.0"
-  webview_flutter: ">=2.2.0 <4.0.0"
+  webview_flutter: ^4.0.1
+  webview_flutter_android: ^3.0.0
+  webview_flutter_wkwebview: ^3.0.0
 
 dependency_overrides:
   flutter_widget_from_html_core:
@@ -24,3 +26,5 @@ dev_dependencies:
     sdk: flutter
   lint: any
   measurer: ^2.1.1
+  plugin_platform_interface: any
+  webview_flutter_platform_interface: ^2.0.0

packages/fwfh_webview/test/_.dart

@@ -18,11 +18,6 @@ String? webViewExplainer(helper.Explainer parent, Widget widget) {
             ? ',unsupportedWorkaroundForIssue37='
                 '${widget.unsupportedWorkaroundForIssue37}'
             : '';
-    final unsupportedWorkaroundForIssue375 =
-        !widget.unsupportedWorkaroundForIssue375
-            ? ',unsupportedWorkaroundForIssue375='
-                '${widget.unsupportedWorkaroundForIssue375}'
-            : '';
     final userAgent = widget.userAgent?.isNotEmpty == true
         ? ',userAgent=${widget.userAgent}'
         : '';
@@ -34,7 +29,6 @@ String? webViewExplainer(helper.Explainer parent, Widget widget) {
         "${!widget.js ? ',js=${widget.js}' : ''}"
         '$mediaPlaybackAlwaysAllow'
         '$unsupportedWorkaroundForIssue37'
-        '$unsupportedWorkaroundForIssue375'
         '$userAgent'
         ']';
   }