[webview_flutter] Update webview_flutter to 4.2.3 (flutter-tizen#615)

packages/webview_flutter/CHANGELOG.md

@@ -1,5 +1,9 @@
-## NEXT
+## 0.8.0
 
+* Update webivew_flutter to 4.2.3.
+* Update webview_flutter_platform_interface to 2.3.0.
+* Update integration_test.
+* Implement `NavigationDelegate(onUrlChange)`.
 * Increase the minimum Flutter version to 3.3.
 
 ## 0.7.1

packages/webview_flutter/README.md

@@ -22,8 +22,8 @@ This package is not an _endorsed_ implementation of `webview_flutter`. Therefore
 
 ```yaml
 dependencies:
-  webview_flutter: ^4.0.2
-  webview_flutter_tizen: ^0.7.1
+  webview_flutter: ^4.2.3
+  webview_flutter_tizen: ^0.8.0
 ```
 
 ## Example

packages/webview_flutter/example/lib/main.dart

@@ -115,6 +115,9 @@ Page resource error:
             debugPrint('allowing navigation to ${request.url}');
             return NavigationDecision.navigate;
           },
+          onUrlChange: (UrlChange change) {
+            debugPrint('url change to ${change.url}');
+          },
         ),
       )
       ..addJavaScriptChannel(
@@ -407,7 +410,7 @@ class SampleMenu extends StatelessWidget {
   }
 
   Widget _getCookieList(String cookies) {
-    if (cookies == null || cookies == '""') {
+    if (cookies == '""') {
       return Container();
     }
     final List<String> cookieList = cookies.split(';');

packages/webview_flutter/example/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   path_provider: ^2.0.7
   path_provider_tizen:
     path: ../../path_provider/
-  webview_flutter: ^4.0.2
+  webview_flutter: ^4.2.3
   webview_flutter_tizen:
     path: ../
 

packages/webview_flutter/lib/src/tizen_webview.dart

@@ -18,6 +18,10 @@ class TizenWebView {
   ///
   /// Defaults to false.
   bool hasNavigationDelegate = false;
+  late int _viewId;
+
+  /// Get the if of tizen webview.
+  int get viewId => _viewId;
 
   late final MethodChannel _tizenWebViewChannel;
   bool _isCreated = false;
@@ -58,6 +62,7 @@ class TizenWebView {
   /// Called when [TizenView] is created. Invokes the requested method call before [TizenWebView] is created.
   void onCreate(int viewId) {
     _isCreated = true;
+    _viewId = viewId;
     _tizenWebViewChannel =
         MethodChannel(kTizenWebViewChannelName + viewId.toString());
     _tizenWebViewChannel.setMethodCallHandler(_onMethodCall);

packages/webview_flutter/lib/src/tizen_webview_controller.dart

@@ -28,10 +28,10 @@ class TizenWebViewController extends PlatformWebViewController {
 
   /// Called when [TizenView] is created.
   void onCreate(int viewId) {
+    _webview.onCreate(viewId);
     if (_webview.hasNavigationDelegate) {
-      _tizenNavigationDelegate.onCreate(viewId);
+      _tizenNavigationDelegate.createNavigationDelegateChannel(viewId);
     }
-    _webview.onCreate(viewId);
   }
 
   @override
@@ -139,7 +139,11 @@ class TizenWebViewController extends PlatformWebViewController {
   Future<void> setPlatformNavigationDelegate(
       covariant TizenNavigationDelegate handler) async {
     _tizenNavigationDelegate = handler;
-    _webview.hasNavigationDelegate = true;
+    if (_webview.hasNavigationDelegate) {
+      _tizenNavigationDelegate.createNavigationDelegateChannel(_webview.viewId);
+    } else {
+      _webview.hasNavigationDelegate = true;
+    }
   }
 
   @override
@@ -158,6 +162,17 @@ class TizenWebViewController extends PlatformWebViewController {
   @override
   Future<void> setUserAgent(String? userAgent) =>
       _webview.setUserAgent(userAgent);
+
+  @override
+  Future<void> setOnPlatformPermissionRequest(
+    void Function(
+      PlatformWebViewPermissionRequest request,
+    ) onPermissionRequest,
+  ) async {
+    throw UnimplementedError(
+        'This version of `TizenWebViewController` currently has no '
+        'implementation.');
+  }
 }
 
 /// An implementation of [PlatformWebViewWidget] with the Tizen WebView API.
@@ -272,9 +287,10 @@ class TizenNavigationDelegate extends PlatformNavigationDelegate {
   ProgressCallback? _onProgress;
   WebResourceErrorCallback? _onWebResourceError;
   NavigationRequestCallback? _onNavigationRequest;
+  UrlChangeCallback? _onUrlChange;
 
   /// Called when [TizenView] is created.
-  void onCreate(int viewId) {
+  void createNavigationDelegateChannel(int viewId) {
     _navigationDelegateChannel =
         MethodChannel(kTizenNavigationDelegateChannelName + viewId.toString());
     _navigationDelegateChannel.setMethodCallHandler((MethodCall call) async {
@@ -309,6 +325,11 @@ class TizenNavigationDelegate extends PlatformNavigationDelegate {
             ));
           }
           return null;
+        case 'onUrlChange':
+          if (_onUrlChange != null) {
+            _onUrlChange!(UrlChange(url: arguments['url']! as String));
+          }
+          return null;
       }
 
       throw MissingPluginException(
@@ -381,4 +402,9 @@ class TizenNavigationDelegate extends PlatformNavigationDelegate {
   ) async {
     _onWebResourceError = onWebResourceError;
   }
+
+  @override
+  Future<void> setOnUrlChange(UrlChangeCallback onUrlChange) async {
+    _onUrlChange = onUrlChange;
+  }
 }

packages/webview_flutter/pubspec.yaml

@@ -2,7 +2,7 @@ name: webview_flutter_tizen
 description: Tizen implementation of the webview_flutter plugin.
 homepage: https://github.com/flutter-tizen/plugins
 repository: https://github.com/flutter-tizen/plugins/tree/master/packages/webview_flutter
-version: 0.7.1
+version: 0.8.0
 
 environment:
   sdk: ">=2.18.0 <4.0.0"
@@ -20,5 +20,5 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_tizen: ^0.2.1
-  webview_flutter: ^4.0.2
-  webview_flutter_platform_interface: ^2.0.1
+  webview_flutter: ^4.2.3
+  webview_flutter_platform_interface: ^2.3.0

packages/webview_flutter/tizen/src/webview.cc

@@ -165,6 +165,8 @@ void WebView::Dispose() {
     evas_object_smart_callback_del(webview_instance_,
                                    "policy,navigation,decide",
                                    &WebView::OnNavigationPolicy);
+    evas_object_smart_callback_del(webview_instance_, "url,changed",
+                                   &WebView::OnUrlChange);
     evas_object_del(webview_instance_);
   }
 }
@@ -297,6 +299,8 @@ void WebView::InitWebView() {
                                  &WebView::OnConsoleMessage, this);
   evas_object_smart_callback_add(webview_instance_, "policy,navigation,decide",
                                  &WebView::OnNavigationPolicy, this);
+  evas_object_smart_callback_add(webview_instance_, "url,changed",
+                                 &WebView::OnUrlChange, this);
 
   Resize(width_, height_);
   evas_object_show(webview_instance_);
@@ -665,6 +669,15 @@ void WebView::OnNavigationPolicy(void* data, Evas_Object* obj,
       std::move(result));
 }
 
+void WebView::OnUrlChange(void* data, Evas_Object* obj, void* event_info) {
+  WebView* webview = static_cast<WebView*>(data);
+  std::string url = std::string(ewk_view_url_get(webview->webview_instance_));
+  flutter::EncodableMap args = {
+      {flutter::EncodableValue("url"), flutter::EncodableValue(url)}};
+  webview->navigation_delegate_channel_->InvokeMethod(
+      "onUrlChange", std::make_unique<flutter::EncodableValue>(args));
+}
+
 void WebView::OnEvaluateJavaScript(Evas_Object* obj, const char* result_value,
                                    void* user_data) {
   FlMethodResult* result = static_cast<FlMethodResult*>(user_data);

packages/webview_flutter/tizen/src/webview.h

@@ -75,6 +75,7 @@ class WebView : public PlatformView {
   static void OnConsoleMessage(void* data, Evas_Object* obj, void* event_info);
   static void OnNavigationPolicy(void* data, Evas_Object* obj,
                                  void* event_info);
+  static void OnUrlChange(void* data, Evas_Object* obj, void* event_info);
   static void OnEvaluateJavaScript(Evas_Object* obj, const char* result_value,
                                    void* user_data);
   static void OnJavaScriptMessage(Evas_Object* obj, Ewk_Script_Message message);