[webview_flutter_android] Adds support for use of old hybrid composition

packages/webview_flutter/webview_flutter_android/CHANGELOG.md

@@ -1,6 +1,11 @@
-## NEXT
+## 2.9.0
 
 * Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/106316).
+* Fixes bug where `Directionality` from context didn't affect `SurfaceAndroidWebView`.
+* Fixes bug where default text direction was different for `SurfaceAndroidWebView` and `AndroidWebView`.
+  Default is now `TextDirection.ltr` for both.
+* Adds support for hybrid composition though `ExpensiveSurfaceAndroidWebView`.
+* Raises minimum Flutter version to 3.0.0.
 
 ## 2.8.14
 

packages/webview_flutter/webview_flutter_android/lib/webview_expensive_surface_android.dart

@@ -0,0 +1,80 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
+
+import 'src/android_webview.dart';
+import 'src/instance_manager.dart';
+import 'webview_android.dart';
+import 'webview_android_widget.dart';
+
+/// Android [WebViewPlatform] that uses [AndroidViewSurface] to build the [WebView] widget.
+///
+/// To use this, set [WebView.platform] to an instance of this class.
+///
+/// This implementation uses hybrid composition to render the [WebView] on
+/// Android. It solves multiple issues related to accessibility and interaction
+/// with the [WebView] at the cost of some performance on Android versions below
+/// 10. See https://github.com/flutter/flutter/wiki/Hybrid-Composition for more
+/// information.
+class ExpensiveSurfaceAndroidWebView extends AndroidWebView {
+  @override
+  Widget build({
+    required BuildContext context,
+    required CreationParams creationParams,
+    required JavascriptChannelRegistry javascriptChannelRegistry,
+    WebViewPlatformCreatedCallback? onWebViewPlatformCreated,
+    Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers,
+    required WebViewPlatformCallbacksHandler webViewPlatformCallbacksHandler,
+  }) {
+    return WebViewAndroidWidget(
+      useHybridComposition: true,
+      creationParams: creationParams,
+      callbacksHandler: webViewPlatformCallbacksHandler,
+      javascriptChannelRegistry: javascriptChannelRegistry,
+      onBuildWidget: (WebViewAndroidPlatformController controller) {
+        return PlatformViewLink(
+          viewType: 'plugins.flutter.io/webview',
+          surfaceFactory: (
+            BuildContext context,
+            PlatformViewController controller,
+          ) {
+            return AndroidViewSurface(
+              controller: controller as AndroidViewController,
+              gestureRecognizers: gestureRecognizers ??
+                  const <Factory<OneSequenceGestureRecognizer>>{},
+              hitTestBehavior: PlatformViewHitTestBehavior.opaque,
+            );
+          },
+          onCreatePlatformView: (PlatformViewCreationParams params) {
+            return PlatformViewsService.initExpensiveAndroidView(
+              id: params.id,
+              viewType: 'plugins.flutter.io/webview',
+              // WebView content is not affected by the Android view's layout direction,
+              // we explicitly set it here so that the widget doesn't require an ambient
+              // directionality.
+              layoutDirection:
+                  Directionality.maybeOf(context) ?? TextDirection.ltr,
+              creationParams:
+                  InstanceManager.instance.getInstanceId(controller.webView),
+              creationParamsCodec: const StandardMessageCodec(),
+            )
+              ..addOnPlatformViewCreatedListener(params.onPlatformViewCreated)
+              ..addOnPlatformViewCreatedListener((int id) {
+                if (onWebViewPlatformCreated != null) {
+                  onWebViewPlatformCreated(controller);
+                }
+              })
+              ..create();
+          },
+        );
+      },
+    );
+  }
+}

packages/webview_flutter/webview_flutter_android/lib/webview_surface_android.dart

@@ -17,12 +17,6 @@ import 'webview_android_widget.dart';
 /// Android [WebViewPlatform] that uses [AndroidViewSurface] to build the [WebView] widget.
 ///
 /// To use this, set [WebView.platform] to an instance of this class.
-///
-/// This implementation uses hybrid composition to render the [WebView] on
-/// Android. It solves multiple issues related to accessibility and interaction
-/// with the [WebView] at the cost of some performance on Android versions below
-/// 10. See https://github.com/flutter/flutter/wiki/Hybrid-Composition for more
-/// information.
 class SurfaceAndroidWebView extends AndroidWebView {
   @override
   Widget build({
@@ -59,7 +53,8 @@ class SurfaceAndroidWebView extends AndroidWebView {
               // WebView content is not affected by the Android view's layout direction,
               // we explicitly set it here so that the widget doesn't require an ambient
               // directionality.
-              layoutDirection: TextDirection.rtl,
+              layoutDirection:
+                  Directionality.maybeOf(context) ?? TextDirection.ltr,
               creationParams:
                   InstanceManager.instance.getInstanceId(controller.webView),
               creationParamsCodec: const StandardMessageCodec(),

packages/webview_flutter/webview_flutter_android/pubspec.yaml

@@ -2,11 +2,11 @@ name: webview_flutter_android
 description: A Flutter plugin that provides a WebView widget on Android.
 repository: https://github.com/flutter/plugins/tree/main/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: 2.8.14
+version: 2.9.0
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=3.0.0"
 
 flutter:
   plugin:

packages/webview_flutter/webview_flutter_android/test/surface_android_test.dart

@@ -0,0 +1,160 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:webview_flutter_android/webview_expensive_surface_android.dart';
+import 'package:webview_flutter_android/webview_surface_android.dart';
+import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('ExpensiveSurfaceAndroidWebView', () {
+    late List<MethodCall> log;
+
+    setUpAll(() {
+      SystemChannels.platform_views.setMockMethodCallHandler(
+        (MethodCall call) async {
+          log.add(call);
+        },
+      );
+    });
+
+    tearDownAll(() {
+      SystemChannels.platform_views.setMockMethodCallHandler(null);
+    });
+
+    setUp(() {
+      log = <MethodCall>[];
+    });
+
+    testWidgets('uses hybrid composition', (WidgetTester tester) async {
+      await tester.pumpWidget(Builder(builder: (BuildContext context) {
+        return ExpensiveSurfaceAndroidWebView().build(
+          context: context,
+          creationParams: CreationParams(
+              webSettings: WebSettings(
+            userAgent: const WebSetting<String?>.absent(),
+            hasNavigationDelegate: false,
+          )),
+          javascriptChannelRegistry: JavascriptChannelRegistry(null),
+          webViewPlatformCallbacksHandler:
+              TestWebViewPlatformCallbacksHandler(),
+        );
+      }));
+      await tester.pumpAndSettle();
+
+      final MethodCall createMethodCall = log[0];
+      expect(createMethodCall.method, 'create');
+      expect(createMethodCall.arguments, containsPair('hybrid', true));
+    });
+
+    testWidgets('default text direction is ltr', (WidgetTester tester) async {
+      await tester.pumpWidget(Builder(builder: (BuildContext context) {
+        return ExpensiveSurfaceAndroidWebView().build(
+          context: context,
+          creationParams: CreationParams(
+              webSettings: WebSettings(
+            userAgent: const WebSetting<String?>.absent(),
+            hasNavigationDelegate: false,
+          )),
+          javascriptChannelRegistry: JavascriptChannelRegistry(null),
+          webViewPlatformCallbacksHandler:
+              TestWebViewPlatformCallbacksHandler(),
+        );
+      }));
+      await tester.pumpAndSettle();
+
+      final MethodCall createMethodCall = log[0];
+      expect(createMethodCall.method, 'create');
+      expect(
+        createMethodCall.arguments,
+        containsPair(
+          'direction',
+          AndroidViewController.kAndroidLayoutDirectionLtr,
+        ),
+      );
+    });
+  });
+
+  group('SurfaceAndroidWebView', () {
+    late List<MethodCall> log;
+
+    setUpAll(() {
+      SystemChannels.platform_views.setMockMethodCallHandler(
+        (MethodCall call) async {
+          log.add(call);
+          if (call.method == 'resize') {
+            return <String, Object?>{
+              'width': call.arguments['width'],
+              'height': call.arguments['height'],
+            };
+          }
+        },
+      );
+    });
+
+    tearDownAll(() {
+      SystemChannels.platform_views.setMockMethodCallHandler(null);
+    });
+
+    setUp(() {
+      log = <MethodCall>[];
+    });
+
+    testWidgets('default text direction is ltr', (WidgetTester tester) async {
+      await tester.pumpWidget(Builder(builder: (BuildContext context) {
+        return SurfaceAndroidWebView().build(
+          context: context,
+          creationParams: CreationParams(
+              webSettings: WebSettings(
+            userAgent: const WebSetting<String?>.absent(),
+            hasNavigationDelegate: false,
+          )),
+          javascriptChannelRegistry: JavascriptChannelRegistry(null),
+          webViewPlatformCallbacksHandler:
+              TestWebViewPlatformCallbacksHandler(),
+        );
+      }));
+      await tester.pumpAndSettle();
+
+      final MethodCall createMethodCall = log[0];
+      expect(createMethodCall.method, 'create');
+      expect(
+        createMethodCall.arguments,
+        containsPair(
+          'direction',
+          AndroidViewController.kAndroidLayoutDirectionLtr,
+        ),
+      );
+    });
+  });
+}
+
+class TestWebViewPlatformCallbacksHandler
+    implements WebViewPlatformCallbacksHandler {
+  @override
+  FutureOr<bool> onNavigationRequest({
+    required String url,
+    required bool isForMainFrame,
+  }) {
+    throw UnimplementedError();
+  }
+
+  @override
+  void onPageFinished(String url) {}
+
+  @override
+  void onPageStarted(String url) {}
+
+  @override
+  void onProgress(int progress) {}
+
+  @override
+  void onWebResourceError(WebResourceError error) {}
+}