flutter · auto-submit · Feb 9, 2024 · Mar 11, 2023 · Mar 11, 2023 · Apr 1, 2023
diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.6.4
+
+* Adds support for `setOnContentOffsetChanged` method to the `AndroidWebViewController`.
+
 ## 3.6.3
 
 * Updates gradle, AGP and fixes some lint errors.

diff --git a/...roid/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java b/...roid/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java
diff --git a/...ndroid/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterApiImpl.java b/...ndroid/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterApiImpl.java
@@ -9,6 +9,7 @@
 import androidx.annotation.VisibleForTesting;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.webviewflutter.GeneratedAndroidWebView.WebViewFlutterApi;
+import java.util.Objects;
 
 /**
  * Flutter API implementation for `WebView`.
@@ -56,4 +57,16 @@ public void create(@NonNull WebView instance, @NonNull WebViewFlutterApi.Reply<V
   void setApi(@NonNull WebViewFlutterApi api) {
     this.api = api;
   }
+
+  public void onScrollChanged(
+      @NonNull WebView instance,
+      @NonNull Long xArg,
+      @NonNull Long yArg,
+      @NonNull WebViewFlutterApi.Reply<Void> callback) {
+    api.onScrollPosChange(
+        Objects.requireNonNull(instanceManager.getIdentifierForStrongReference(instance)),
+        xArg,
+        yArg,
+        callback);
+  }
 }
diff --git a/...r_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewHostApiImpl.java b/...r_android/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewHostApiImpl.java
@@ -156,6 +156,13 @@ public WebChromeClient getWebChromeClient() {
       return currentWebChromeClient;
     }
 
+    @Override
+    protected void onScrollChanged(int l, int t, int oldL, int oldT) {
+      super.onScrollChanged(l, t, oldL, oldT);
+      api.onScrollChanged(
+          this, (long) l, (long) t, reply -> {});
+    }
+
     /**
      * Flutter API used to send messages back to Dart.
      *

diff --git a/..._flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/WebViewTest.java b/..._flutter_android/android/src/test/java/io/flutter/plugins/webviewflutter/WebViewTest.java
@@ -356,4 +356,25 @@ public void setImportantForAutofillForParentFlutterView() {
 
     verify(mockFlutterView).setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_YES);
   }
+
+  @Test
+  public void onScrollChanged() {
+    final InstanceManager instanceManager = InstanceManager.create(identifier -> {});
+
+    final WebViewFlutterApiImpl flutterApiImpl =
+        new WebViewFlutterApiImpl(mockBinaryMessenger, instanceManager);
+
+    final WebViewFlutterApi mockFlutterApi = mock(WebViewFlutterApi.class);
+    flutterApiImpl.setApi(mockFlutterApi);
+    flutterApiImpl.create(mockWebView, reply -> {});
+
+    flutterApiImpl.onScrollChanged(mockWebView, 0L, 1L, reply -> {});
+
+    final long instanceIdentifier =
+        Objects.requireNonNull(instanceManager.getIdentifierForStrongReference(mockWebView));
+    verify(mockFlutterApi)
+        .onScrollPosChange(eq(instanceIdentifier), eq(0L), eq(1L), any());
+
+    instanceManager.stopFinalizationListener();
+  }
 }
diff --git a/...ebview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart b/...ebview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
@@ -657,7 +657,8 @@ Future<void> main() async {
   });
 
   group('Programmatic Scroll', () {
-    testWidgets('setAndGetScrollPosition', (WidgetTester tester) async {
+    testWidgets('setAndGetAndListenScrollPosition',
+        (WidgetTester tester) async {
       const String scrollTestPage = '''
         <!DOCTYPE html>
         <html>
@@ -683,6 +684,7 @@ Future<void> main() async {
           base64Encode(const Utf8Encoder().convert(scrollTestPage));
 
       final Completer<void> pageLoaded = Completer<void>();
+      Completer<ContentOffsetChange> offsetsCompleter = Completer<ContentOffsetChange>();
       final PlatformWebViewController controller = PlatformWebViewController(
         const PlatformWebViewControllerCreationParams(),
       )
@@ -698,7 +700,12 @@ Future<void> main() async {
               'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
             ),
           ),
-        );
+        )
+        ..setOnContentOffsetChanged(
+            (ContentOffsetChange contentOffsetChange) {
+              print('comppp $contentOffsetChange');
+          offsetsCompleter.complete(contentOffsetChange);
+        });
 
       await tester.pumpWidget(Builder(
         builder: (BuildContext context) {
@@ -722,17 +729,21 @@ Future<void> main() async {
       // time to settle.
       expect(scrollPos.dx, isNot(X_SCROLL));
       expect(scrollPos.dy, isNot(Y_SCROLL));
-
       await controller.scrollTo(X_SCROLL, Y_SCROLL);
       scrollPos = await controller.getScrollPosition();
       expect(scrollPos.dx, X_SCROLL);
       expect(scrollPos.dy, Y_SCROLL);
-
+      await expectLater(
+          offsetsCompleter.future.then((ContentOffsetChange contentOffsetChange) => <int>[contentOffsetChange.x, contentOffsetChange.y]), completion(<int>[X_SCROLL, Y_SCROLL]));
+
       // Check scrollBy() (on top of scrollTo())
+      offsetsCompleter = Completer<ContentOffsetChange>();
       await controller.scrollBy(X_SCROLL, Y_SCROLL);
       scrollPos = await controller.getScrollPosition();
       expect(scrollPos.dx, X_SCROLL * 2);
       expect(scrollPos.dy, Y_SCROLL * 2);
+      await expectLater(
+          offsetsCompleter.future.then((ContentOffsetChange contentOffsetChange) => <int>[contentOffsetChange.x, contentOffsetChange.y]), completion(<int>[X_SCROLL * 2, Y_SCROLL * 2]));
     });
   });
 

diff --git a/packages/webview_flutter/webview_flutter_android/example/lib/main.dart b/packages/webview_flutter/webview_flutter_android/example/lib/main.dart
@@ -146,7 +146,11 @@ Page resource error:
       )
       ..loadRequest(LoadRequestParams(
         uri: Uri.parse('https://flutter.dev'),
-      ));
+      ))
+      ..setOnContentOffsetChanged((ContentOffsetChange contentOffsetChange) {
+        debugPrint(
+            'Scroll offset change to x = ${contentOffsetChange.x}, y = ${contentOffsetChange.y}');
+      });
   }
 
   @override

diff --git a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
@@ -35,3 +35,9 @@ flutter:
     - assets/sample_video.mp4
     - assets/www/index.html
     - assets/www/styles/style.css
+
+
+# FOR TESTING ONLY. DO NOT MERGE.
+dependency_overrides:
+  webview_flutter_platform_interface:
+    path: ../../../webview_flutter/webview_flutter_platform_interface
diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart b/packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
+
 import 'android_webview.dart' as android_webview;
 
 /// Handles constructing objects and calling static methods for the Android
@@ -25,7 +27,9 @@ class AndroidWebViewProxy {
   });
 
   /// Constructs a [android_webview.WebView].
-  final android_webview.WebView Function() createAndroidWebView;
+  final android_webview.WebView Function(
+      {Function(ContentOffsetChange contentOffsetChange)?
+          onScrollChanged}) createAndroidWebView;
 
   /// Constructs a [android_webview.WebChromeClient].
   final android_webview.WebChromeClient Function({

diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart
@@ -11,6 +11,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart' show BinaryMessenger;
 
 import 'package:flutter/widgets.dart' show WidgetsFlutterBinding;
+import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 import 'android_webview.g.dart';
 import 'android_webview_api_impls.dart';
@@ -89,6 +90,7 @@ class WebView extends JavaObject {
   /// any effect and should not be exposed publicly. More info here:
   /// https://github.com/flutter/flutter/issues/108106
   WebView({
+    this.onScrollChanged,
     @visibleForTesting super.binaryMessenger,
     @visibleForTesting super.instanceManager,
   }) : super.detached() {
@@ -101,6 +103,7 @@ class WebView extends JavaObject {
   /// create copies.
   @protected
   WebView.detached({
+    this.onScrollChanged,
     super.binaryMessenger,
     super.instanceManager,
   }) : super.detached();
@@ -112,6 +115,9 @@ class WebView extends JavaObject {
   /// The [WebSettings] object used to control the settings for this WebView.
   late final WebSettings settings = WebSettings(this);
 
+  /// The [ScrollChangedCallback] object used to listen for scroll changed events.
+  final Function(ContentOffsetChange contentOffsetChange)? onScrollChanged;
+
   /// Enables debugging of web contents (HTML / CSS / JavaScript) loaded into any WebViews of this application.
   ///
   /// This flag can be enabled in order to facilitate debugging of web layouts
@@ -400,6 +406,7 @@ class WebView extends JavaObject {
   @override
   WebView copy() {
     return WebView.detached(
+      onScrollChanged: onScrollChanged,
       binaryMessenger: _api.binaryMessenger,
       instanceManager: _api.instanceManager,
     );