From cc10c55c2e6124110c43efc8ddbdef21e56bb01e Mon Sep 17 00:00:00 2001 From: Joel Ovienloba Date: Sat, 6 Aug 2022 11:34:00 +0100 Subject: [PATCH 1/4] pub get changes --- .flutter-plugins | 4 ++++ .flutter-plugins-dependencies | 1 + example/pubspec.lock | 23 ++++++++--------------- pubspec.lock | 23 ++++++++--------------- 4 files changed, 21 insertions(+), 30 deletions(-) create mode 100644 .flutter-plugins create mode 100644 .flutter-plugins-dependencies diff --git a/.flutter-plugins b/.flutter-plugins new file mode 100644 index 0000000..71637db --- /dev/null +++ b/.flutter-plugins @@ -0,0 +1,4 @@ +# This is a generated file; do not edit or check into version control. +webview_flutter=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.1/ +webview_flutter_android=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.4/ +webview_flutter_wkwebview=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.1/ diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies new file mode 100644 index 0000000..fff14c6 --- /dev/null +++ b/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.1/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.4/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-08-06 11:33:15.619937","version":"3.0.5"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 0479fb3..ec03fb8 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -101,7 +101,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -115,7 +115,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" plugin_platform_interface: dependency: transitive description: @@ -134,7 +134,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -169,21 +169,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" webview_flutter: dependency: transitive description: @@ -213,5 +206,5 @@ packages: source: hosted version: "2.7.1" sdks: - dart: ">=2.16.2 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.5.0" diff --git a/pubspec.lock b/pubspec.lock index aaec83a..8be3d8e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,14 +42,14 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -87,7 +87,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -101,7 +101,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" plugin_platform_interface: dependency: transitive description: @@ -120,7 +120,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -155,21 +155,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" webview_flutter: dependency: "direct main" description: @@ -199,5 +192,5 @@ packages: source: hosted version: "2.7.1" sdks: - dart: ">=2.16.2 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.5.0" From 3c1eb290716bd3607525459058cab2f4a58073d8 Mon Sep 17 00:00:00 2001 From: Joel Ovienloba Date: Sat, 6 Aug 2022 11:34:23 +0100 Subject: [PATCH 2/4] updated print calls to be conditional on debug mode only --- example/lib/main.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 4b89fd4..89fba13 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,5 @@ +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_tawk/flutter_tawk.dart'; void main() => runApp(const MyApp()); @@ -23,10 +23,14 @@ class MyApp extends StatelessWidget { email: 'ayoubamine2a@gmail.com', ), onLoad: () { - print('Hello Tawk!'); + if (kDebugMode) { + print('Hello Tawk!'); + } }, onLinkTap: (String url) { - print(url); + if (kDebugMode) { + print(url); + } }, placeholder: const Center( child: Text('Loading...'), From 3ea5cb249324c78a745e9d81e1699d30e9d0a859 Mon Sep 17 00:00:00 2001 From: Joel Ovienloba Date: Sat, 6 Aug 2022 12:17:36 +0100 Subject: [PATCH 3/4] updated webview version --- .flutter-plugins | 2 +- .flutter-plugins-dependencies | 2 +- example/pubspec.lock | 2 +- pubspec.lock | 2 +- pubspec.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.flutter-plugins b/.flutter-plugins index 71637db..3b369c0 100644 --- a/.flutter-plugins +++ b/.flutter-plugins @@ -1,4 +1,4 @@ # This is a generated file; do not edit or check into version control. -webview_flutter=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.1/ +webview_flutter=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.4/ webview_flutter_android=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.4/ webview_flutter_wkwebview=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.1/ diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index fff14c6..bfa15ff 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.1/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.4/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-08-06 11:33:15.619937","version":"3.0.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.1/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.4/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-08-06 11:37:43.880864","version":"3.0.5"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index ec03fb8..3372282 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -183,7 +183,7 @@ packages: name: webview_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.4" webview_flutter_android: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index 8be3d8e..c98b404 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -169,7 +169,7 @@ packages: name: webview_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.4" webview_flutter_android: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 5fb59d7..6715539 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter: sdk: flutter - webview_flutter: ^3.0.1 + webview_flutter: ^3.0.4 dev_dependencies: flutter_test: From 17155c53bac0c3d7938adcf6ac23daa0b97aeb03 Mon Sep 17 00:00:00 2001 From: "Zaza.codes" Date: Tue, 7 Mar 2023 02:09:50 +0100 Subject: [PATCH 4/4] UPDATE: webview plugin to 4.0.6 Signed-off-by: Zaza.codes --- .flutter-plugins | 6 +- .flutter-plugins-dependencies | 2 +- example/lib/main.dart | 2 +- example/pubspec.lock | 140 ++++++++++++++++++++-------------- lib/src/tawk_widget.dart | 58 ++++++++------ pubspec.lock | 135 +++++++++++++++++++------------- pubspec.yaml | 2 +- 7 files changed, 203 insertions(+), 142 deletions(-) diff --git a/.flutter-plugins b/.flutter-plugins index 3b369c0..21ffe46 100644 --- a/.flutter-plugins +++ b/.flutter-plugins @@ -1,4 +1,4 @@ # This is a generated file; do not edit or check into version control. -webview_flutter=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.4/ -webview_flutter_android=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.4/ -webview_flutter_wkwebview=/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.1/ +webview_flutter=/Users/joelovien/.pub-cache/hosted/pub.dev/webview_flutter-4.0.6/ +webview_flutter_android=/Users/joelovien/.pub-cache/hosted/pub.dev/webview_flutter_android-3.3.2/ +webview_flutter_wkwebview=/Users/joelovien/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.2.0/ diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index bfa15ff..f591e8a 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.1/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/joelovien/Documents/Development SDKs/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.4/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-08-06 11:37:43.880864","version":"3.0.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"webview_flutter_wkwebview","path":"/Users/joelovien/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.2.0/","native_build":true,"dependencies":[]}],"android":[{"name":"webview_flutter_android","path":"/Users/joelovien/.pub-cache/hosted/pub.dev/webview_flutter_android-3.3.2/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2023-03-06 21:19:16.703868","version":"3.7.0"} \ No newline at end of file diff --git a/example/lib/main.dart b/example/lib/main.dart index 89fba13..6223e95 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -17,7 +17,7 @@ class MyApp extends StatelessWidget { elevation: 0, ), body: Tawk( - directChatLink: 'YOUR_DIRECT_CHAT_LINK', + directChatLink: 'https://tawk.to/chat/627028aeb0d10b6f3e70525b/1g231tqaj', visitor: TawkVisitor( name: 'Ayoub AMINE', email: 'ayoubamine2a@gmail.com', diff --git a/example/pubspec.lock b/example/pubspec.lock index 3372282..0f98366 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,58 +5,58 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -66,7 +66,8 @@ packages: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 + url: "https://pub.dev" source: hosted version: "1.0.4" flutter_tawk: @@ -81,48 +82,62 @@ packages: description: flutter source: sdk version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + url: "https://pub.dev" source: hosted version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sky_engine: dependency: transitive description: flutter @@ -132,79 +147,90 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.4.16" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" webview_flutter: dependency: transitive description: name: webview_flutter - url: "https://pub.dartlang.org" + sha256: b6cd42db3ced5411f3d01599906156885b18e4188f7065a8a351eb84bee347e0 + url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "4.0.6" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - url: "https://pub.dartlang.org" + sha256: "5dd3f32b5c2d8f4bf9d05a349e4a65fa718eb137f396f336c3893d558a58fe84" + url: "https://pub.dev" source: hosted - version: "2.8.4" + version: "3.3.2" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - url: "https://pub.dartlang.org" + sha256: df6472164b3f4eaf3280422227f361dc8424b106726b7f21d79a8656ba53f71f + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "2.0.2" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" + sha256: "87b6353b40e04f04d5f895a484ad6d92d682d9cce4d2d5b32d2d8aca2448d46e" + url: "https://pub.dev" source: hosted - version: "2.7.1" + version: "3.2.0" sdks: - dart: ">=2.17.0-0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.18.0 <4.0.0" + flutter: ">=3.3.0" diff --git a/lib/src/tawk_widget.dart b/lib/src/tawk_widget.dart index 6ff846a..12d81fb 100644 --- a/lib/src/tawk_widget.dart +++ b/lib/src/tawk_widget.dart @@ -1,5 +1,5 @@ -import 'dart:io'; import 'dart:convert'; +import 'dart:io'; import 'package:flutter/material.dart'; import 'package:webview_flutter/webview_flutter.dart'; @@ -58,33 +58,21 @@ class _TawkState extends State { '''; } - _controller.runJavascript(javascriptString); + _controller.runJavaScript(javascriptString); } @override - Widget build(BuildContext context) { - return Stack( - children: [ - WebView( - initialUrl: widget.directChatLink, - javascriptMode: JavascriptMode.unrestricted, - onWebViewCreated: (WebViewController webViewController) { - setState(() { - _controller = webViewController; - }); - }, - navigationDelegate: (NavigationRequest request) { - if (request.url == 'about:blank' || - request.url.contains('tawk.to')) { - return NavigationDecision.navigate; - } - - if (widget.onLinkTap != null) { - widget.onLinkTap!(request.url); - } - - return NavigationDecision.prevent; + void initState() { + super.initState(); + _controller = WebViewController() + ..setJavaScriptMode(JavaScriptMode.unrestricted) + ..loadRequest(Uri.parse(widget.directChatLink)) + ..setNavigationDelegate( + NavigationDelegate( + onProgress: (int progress) { + // Update loading bar. }, + onPageStarted: (String url) {}, onPageFinished: (_) { if (widget.visitor != null) { _setUser(widget.visitor!); @@ -98,6 +86,28 @@ class _TawkState extends State { _isLoading = false; }); }, + onWebResourceError: (WebResourceError error) {}, + onNavigationRequest: (NavigationRequest request) { + if (request.url == 'about:blank' || request.url.contains('tawk.to')) { + return NavigationDecision.navigate; + } + + if (widget.onLinkTap != null) { + widget.onLinkTap!(request.url); + } + + return NavigationDecision.prevent; + }, + ), + ); + } + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + WebViewWidget( + controller: _controller, ), _isLoading ? widget.placeholder ?? diff --git a/pubspec.lock b/pubspec.lock index c98b404..b77cbf2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,51 +5,50 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -59,7 +58,8 @@ packages: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 + url: "https://pub.dev" source: hosted version: "1.0.4" flutter_test: @@ -67,48 +67,62 @@ packages: description: flutter source: sdk version: "0.0.0" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + url: "https://pub.dev" source: hosted version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sky_engine: dependency: transitive description: flutter @@ -118,79 +132,90 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.4.16" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" webview_flutter: dependency: "direct main" description: name: webview_flutter - url: "https://pub.dartlang.org" + sha256: b6cd42db3ced5411f3d01599906156885b18e4188f7065a8a351eb84bee347e0 + url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "4.0.6" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - url: "https://pub.dartlang.org" + sha256: "5dd3f32b5c2d8f4bf9d05a349e4a65fa718eb137f396f336c3893d558a58fe84" + url: "https://pub.dev" source: hosted - version: "2.8.4" + version: "3.3.2" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface - url: "https://pub.dartlang.org" + sha256: df6472164b3f4eaf3280422227f361dc8424b106726b7f21d79a8656ba53f71f + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "2.0.2" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" + sha256: "87b6353b40e04f04d5f895a484ad6d92d682d9cce4d2d5b32d2d8aca2448d46e" + url: "https://pub.dev" source: hosted - version: "2.7.1" + version: "3.2.0" sdks: - dart: ">=2.17.0-0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.18.0 <4.0.0" + flutter: ">=3.3.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6715539..c23c765 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter: sdk: flutter - webview_flutter: ^3.0.4 + webview_flutter: ^4.0.6 dev_dependencies: flutter_test: