From 0c6a02fff81f5804ac1a80f650deb8b6799dc5b7 Mon Sep 17 00:00:00 2001 From: Lorenzo Pichilli Date: Sat, 30 May 2020 23:13:28 +0200 Subject: [PATCH] release v3.3.0 --- CHANGELOG.md | 2 +- example/.flutter-plugins-dependencies | 2 +- example/ios/Flutter/flutter_export_environment.sh | 11 ----------- example/lib/in_app_webiew_example.screen.dart | 1 - example/test_driver/.env.dart | 2 +- lib/src/in_app_webview_controller.dart | 3 +-- lib/src/types.dart | 7 +++---- tool/env.dart | 2 +- 8 files changed, 8 insertions(+), 22 deletions(-) delete mode 100755 example/ios/Flutter/flutter_export_environment.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 176cf0c2..78f38611 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ - Android `clearClientCertPreferences`, `getSafeBrowsingPrivacyPolicyUrl`, `setSafeBrowsingWhitelist` webview methods are static now - Removed iOS event `onDidCommit`; it has been renamed to `onPageCommitVisible` and made cross-platform -- `contextMenu` is `final` now +- `contextMenu` webview attribute is `final` now ## 3.2.0 diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 8ec33c1e..6c7aa6b8 100755 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"e2e","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/e2e-0.2.4+4/","dependencies":[]},{"name":"flutter_inappwebview","path":"/Users/lorenzopichilli/Desktop/flutter_inappwebview/","dependencies":[]},{"name":"permission_handler","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.0.0+hotfix.6/","dependencies":[]}],"android":[{"name":"e2e","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/e2e-0.2.4+4/","dependencies":[]},{"name":"flutter_inappwebview","path":"/Users/lorenzopichilli/Desktop/flutter_inappwebview/","dependencies":[]},{"name":"permission_handler","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.0.0+hotfix.6/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"e2e","dependencies":[]},{"name":"flutter_inappwebview","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2020-05-30 19:55:39.840707","version":"1.17.1"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"e2e","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/e2e-0.2.4+4/","dependencies":[]},{"name":"flutter_inappwebview","path":"/Users/lorenzopichilli/Desktop/flutter_inappwebview/","dependencies":[]},{"name":"permission_handler","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.0.0+hotfix.6/","dependencies":[]}],"android":[{"name":"e2e","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/e2e-0.2.4+4/","dependencies":[]},{"name":"flutter_inappwebview","path":"/Users/lorenzopichilli/Desktop/flutter_inappwebview/","dependencies":[]},{"name":"permission_handler","path":"/Users/lorenzopichilli/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.0.0+hotfix.6/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"e2e","dependencies":[]},{"name":"flutter_inappwebview","dependencies":[]},{"name":"permission_handler","dependencies":[]}],"date_created":"2020-05-30 23:08:18.010942","version":"1.17.1"} \ No newline at end of file diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh deleted file mode 100755 index 4882a9e9..00000000 --- a/example/ios/Flutter/flutter_export_environment.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/lorenzopichilli/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example" -export "FLUTTER_TARGET=lib/main.dart" -export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "OTHER_LDFLAGS=$(inherited) -framework Flutter" -export "FLUTTER_FRAMEWORK_DIR=/Users/lorenzopichilli/flutter/bin/cache/artifacts/engine/ios" -export "FLUTTER_BUILD_NAME=1.0.0" -export "FLUTTER_BUILD_NUMBER=1" diff --git a/example/lib/in_app_webiew_example.screen.dart b/example/lib/in_app_webiew_example.screen.dart index cfba732d..8a836c98 100755 --- a/example/lib/in_app_webiew_example.screen.dart +++ b/example/lib/in_app_webiew_example.screen.dart @@ -1,5 +1,4 @@ import 'dart:io'; -import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; diff --git a/example/test_driver/.env.dart b/example/test_driver/.env.dart index eb8ef3dd..bf49aee5 100755 --- a/example/test_driver/.env.dart +++ b/example/test_driver/.env.dart @@ -1 +1 @@ -final environment = {"NODE_SERVER_IP":"192.168.1.21"}; \ No newline at end of file +final environment = {"NODE_SERVER_IP":"192.168.43.166"}; \ No newline at end of file diff --git a/lib/src/in_app_webview_controller.dart b/lib/src/in_app_webview_controller.dart index 69568709..ed962060 100644 --- a/lib/src/in_app_webview_controller.dart +++ b/lib/src/in_app_webview_controller.dart @@ -704,8 +704,7 @@ class InAppWebViewController { Uint8List body = Uint8List.fromList(argMap["body"].cast()); String mode = argMap["mode"]; FetchRequestCredential credentials = - FetchRequest.createFetchRequestCredentialFromMap( - argMap["credentials"]); + FetchRequest.fromMap(argMap["credentials"]); String cache = argMap["cache"]; String redirect = argMap["redirect"]; String referrer = argMap["referrer"]; diff --git a/lib/src/types.dart b/lib/src/types.dart index ce4ee999..f1e0a20b 100755 --- a/lib/src/types.dart +++ b/lib/src/types.dart @@ -2301,8 +2301,7 @@ class FetchRequest { return toMap().toString(); } - static FetchRequestCredential createFetchRequestCredentialFromMap( - credentialsMap) { + static FetchRequestCredential fromMap(credentialsMap) { if (credentialsMap != null) { if (credentialsMap["type"] == "default") { return FetchRequestCredentialDefault( @@ -2324,7 +2323,7 @@ class FetchRequest { iconURL: credentialsMap["iconURL"]); } } - return FetchRequestCredential(); + return null; } } @@ -3063,7 +3062,7 @@ class RendererPriorityPolicy { rendererRequestedPriority: RendererPriority.fromValue(map["rendererRequestedPriority"]), waivedWhenNotVisible: map["waivedWhenNotVisible"]) - : RendererPriorityPolicy(); + : null; } } diff --git a/tool/env.dart b/tool/env.dart index 655a260f..cb1ed0e1 100755 --- a/tool/env.dart +++ b/tool/env.dart @@ -8,5 +8,5 @@ Future main() async { }; final filename = 'example/test_driver/.env.dart'; - File(filename).writeAsString('final environment = ${json.encode(config)};'); + await File(filename).writeAsString('final environment = ${json.encode(config)};'); } \ No newline at end of file